diff options
470 files changed, 3372 insertions, 3382 deletions
| diff --git a/docs/write_addons.rst b/docs/write_addons.rst index 7607560ff..9f4436cc5 100644 --- a/docs/write_addons.rst +++ b/docs/write_addons.rst @@ -19,20 +19,20 @@ All addons should start with something like this: ::          from pyload.plugin.Addon import Addon          class YourAddon(Addon): -                __name__ = "YourAddon" -                __version__ = "0.1" -                __description__ = "Does really cool stuff" -                __config__ = [ ("activated" , "bool" , "Activated"  , "True" ) ] +                __name = "YourAddon" +                __version = "0.1" +                __description = "Does really cool stuff" +                __config = [ ("activated" , "bool" , "Activated"  , "True" ) ]                  __author_name__ = ("Me")                  __author_mail__ = ("me@has-no-mail.com") -All meta-data is defined in the header, you need at least one option at ``__config__`` so the user can toggle your +All meta-data is defined in the header, you need at least one option at ``__config`` so the user can toggle your  addon on and off. Dont't overwrite the ``init`` method if not neccesary, use ``setup`` instead.  Using the Config  ---------------- -We are taking a closer look at the ``__config__`` parameter. +We are taking a closer look at the ``__config`` parameter.  You can add more config values as desired by adding tuples of the following format to the config list: ``("name", "type", "description", "default value")``.  When everything went right you can access the config values with ``self.getConfig(name)`` and ``self.setConfig(name, value``. diff --git a/docs/write_plugins.rst b/docs/write_plugins.rst index 7820e5ce6..3f6212dbf 100644 --- a/docs/write_plugins.rst +++ b/docs/write_plugins.rst @@ -10,8 +10,8 @@ There are three kinds of different plugins: **Hoster**, **Crypter**, **Container  All kind of plugins inherit from the base :class:`Plugin <pyload.plugin.Plugin.Plugin>`. You should know its  convenient methods, they make your work easier ;-) -Every plugin defines a ``__pattern__`` and when the user adds urls, every url is matched against the pattern defined in -the plugin. In case the ``__pattern__`` matched on the url the plugin will be assigned to handle it and instanciated when +Every plugin defines a ``__pattern`` and when the user adds urls, every url is matched against the pattern defined in +the plugin. In case the ``__pattern`` matched on the url the plugin will be assigned to handle it and instanciated when  pyLoad begins to download/decrypt the url.  Plugin header @@ -22,13 +22,13 @@ How basic hoster plugin header could look like: ::          from pyload.plugin.Hoster import Hoster          class MyFileHoster(Hoster): -                __name__ = "MyFileHoster" -                __version__ = "0.1" -                __pattern__ = r"http://myfilehoster.example.com/file_id/[0-9]+" -                __config__ = [] +                __name = "MyFileHoster" +                __version = "0.1" +                __pattern = r"http://myfilehoster.example.com/file_id/[0-9]+" +                __config = [] -You have to define these meta-data, ``__pattern__`` has to be a regexp that sucessfully compiles with -``re.compile(__pattern__)``. +You have to define these meta-data, ``__pattern`` has to be a regexp that sucessfully compiles with +``re.compile(__pattern)``.  Just like :ref:`write_addons` you can add and use config values exatly the same way.  If you want a Crypter or Container plugin, just replace the word Hoster with your desired plugin type. diff --git a/pyload/manager/Account.py b/pyload/manager/Account.py index 3acf70311..2631e1c7d 100644 --- a/pyload/manager/Account.py +++ b/pyload/manager/Account.py @@ -176,7 +176,7 @@ class AccountManager(object):              if self.accounts[p]:                  p = self.getAccountPlugin(p)                  if p: -                    data[p.__name__] = p.getAllAccounts(force) +                    data[p.__name] = p.getAllAccounts(force)                  else:  #@NOTE: When an account has been skipped, p is None                      data[p] = []              else: diff --git a/pyload/manager/Addon.py b/pyload/manager/Addon.py index d293109c7..164068634 100644 --- a/pyload/manager/Addon.py +++ b/pyload/manager/Addon.py @@ -105,7 +105,7 @@ class AddonManager(object):          for pluginname in self.core.pluginManager.addonPlugins:              try: -                # hookClass = getattr(plugin, plugin.__name__) +                # hookClass = getattr(plugin, plugin.__name)                  if self.core.config.getPlugin(pluginname, "activated"):                      pluginClass = self.core.pluginManager.loadClass("addon", pluginname)                      if not pluginClass: @@ -113,9 +113,9 @@ class AddonManager(object):                      plugin = pluginClass(self.core, self)                      plugins.append(plugin) -                    self.pluginMap[pluginClass.__name__] = plugin +                    self.pluginMap[pluginClass.__name] = plugin                      if plugin.isActivated(): -                        active.append(pluginClass.__name__) +                        active.append(pluginClass.__name)                  else:                      deactive.append(pluginname) @@ -141,7 +141,7 @@ class AddonManager(object):      def activateAddon(self, pluginname):          # check if already loaded          for inst in self.plugins: -            if inst.__name__ == pluginname: +            if inst.__name == pluginname:                  return          pluginClass = self.core.pluginManager.loadClass("addon", pluginname) @@ -153,14 +153,14 @@ class AddonManager(object):          addon = pluginClass(self.core, self)          self.plugins.append(addon) -        self.pluginMap[pluginClass.__name__] = addon +        self.pluginMap[pluginClass.__name] = addon          addon.activate()      def deactivateAddon(self, pluginname):          for plugin in self.plugins: -            if plugin.__name__ == pluginname: +            if plugin.__name == pluginname:                  addon = plugin                  break          else: @@ -174,7 +174,7 @@ class AddonManager(object):          self.core.log.debug("Removed callback: %s" % self.core.scheduler.removeJob(addon.cb))          self.plugins.remove(addon) -        del self.pluginMap[addon.__name__] +        del self.pluginMap[addon.__name]      @try_catch diff --git a/pyload/manager/Plugin.py b/pyload/manager/Plugin.py index 879430be2..c6aad3fe5 100644 --- a/pyload/manager/Plugin.py +++ b/pyload/manager/Plugin.py @@ -20,10 +20,10 @@ class PluginManager(object):      USERROOT = "userplugins."      TYPES    = ["account", "addon", "container", "crypter", "hook", "hoster", "internal", "ocr"] -    PATTERN = re.compile(r'__pattern__\s*=\s*u?r("|\')([^"\']+)') -    VERSION = re.compile(r'__version__\s*=\s*("|\')([\d.]+)') -    CONFIG  = re.compile(r'__config__\s*=\s*\[([^\]]+)', re.M) -    DESC    = re.compile(r'__description__\s*=\s*("|"""|\')([^"\']+)') +    PATTERN = re.compile(r'__pattern\s*=\s*u?r("|\')([^"\']+)') +    VERSION = re.compile(r'__version\s*=\s*("|\')([\d.]+)') +    CONFIG  = re.compile(r'__config\s*=\s*\[([^\]]+)', re.M) +    DESC    = re.compile(r'__description\s*=\s*("|"""|\')([^"\']+)')      def __init__(self, core): @@ -93,8 +93,7 @@ class PluginManager(object):              pfolder = join(pypath, "pyload", "plugins", folder)          for f in listdir(pfolder): -            if (isfile(join(pfolder, f)) and f.endswith(".py") or f.endswith("_25.pyc") or f.endswith( -                "_26.pyc") or f.endswith("_27.pyc")) and not f.startswith("_"): +            if isfile(join(pfolder, f)) and f.endswith(".py") and not f.startswith("_"):                  try:                      with open(join(pfolder, f)) as data: @@ -104,15 +103,6 @@ class PluginManager(object):                      self.core.log.error(str(e))                      continue -                if f.endswith("_25.pyc") and version_info[0:2] != (2, 5):  #@TODO: Remove in 0.4.10 -                    continue - -                elif f.endswith("_26.pyc") and version_info[0:2] != (2, 6):  #@TODO: Remove in 0.4.10 -                    continue - -                elif f.endswith("_27.pyc") and version_info[0:2] != (2, 7):  #@TODO: Remove in 0.4.10 -                    continue -                  name = f[:-3]                  if name[-1] == ".":                      name = name[:-4] diff --git a/pyload/manager/Thread.py b/pyload/manager/Thread.py index 2ace9c789..6c9304e87 100644 --- a/pyload/manager/Thread.py +++ b/pyload/manager/Thread.py @@ -266,7 +266,7 @@ class ThreadManager(object):                  job.release()                  return -            if job.plugin.__type__ == "hoster": +            if job.plugin.__type == "hoster":                  spaceLeft = freeSpace(self.core.config["general"]["download_folder"]) / 1024 / 1024                  if spaceLeft < self.core.config["general"]["min_free_space"]:                      self.core.log.warning(_("Not enough space left on device")) diff --git a/pyload/manager/thread/Plugin.py b/pyload/manager/thread/Plugin.py index 20d57c933..70ee747a8 100644 --- a/pyload/manager/thread/Plugin.py +++ b/pyload/manager/thread/Plugin.py @@ -72,7 +72,7 @@ class PluginThread(Thread):      def getDebugDump(self, pyfile):          dump = "pyLoad %s Debug Report of %s %s \n\nTRACEBACK:\n %s \n\nFRAMESTACK:\n" % ( -            self.m.core.api.getServerVersion(), pyfile.pluginname, pyfile.plugin.__version__, format_exc()) +            self.m.core.api.getServerVersion(), pyfile.pluginname, pyfile.plugin.__version, format_exc())          tb = exc_info()[2]          stack = [] diff --git a/pyload/plugin/Account.py b/pyload/plugin/Account.py index f8014908f..b14615d3a 100644 --- a/pyload/plugin/Account.py +++ b/pyload/plugin/Account.py @@ -19,13 +19,13 @@ class Account(Base):      Just overwrite `login` and cookies will be stored and account becomes accessible in\      associated hoster plugin. Plugin should also provide `loadAccountInfo`      """ -    __name__    = "Account" -    __type__    = "account" -    __version__ = "0.03" +    __name    = "Account" +    __type    = "account" +    __version = "0.03" -    __description__ = """Base account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de")] +    __description = """Base account plugin""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de")]      #: after that time (in minutes) pyload will relogin the account @@ -197,7 +197,7 @@ class Account(Base):                  "maxtraffic" : None,                  "premium"    : None,                  "timestamp"  : 0,  #: time this info was retrieved -                "type"       : self.__name__} +                "type"       : self.__name}      def getAllAccounts(self, force=False): @@ -210,7 +210,7 @@ class Account(Base):          if not user:              return None -        req = self.core.requestFactory.getRequest(self.__name__, user) +        req = self.core.requestFactory.getRequest(self.__name, user)          return req @@ -220,7 +220,7 @@ class Account(Base):          if not user:              return None -        cj = self.core.requestFactory.getCookieJar(self.__name__, user) +        cj = self.core.requestFactory.getCookieJar(self.__name, user)          return cj diff --git a/pyload/plugin/Addon.py b/pyload/plugin/Addon.py index 3525d4e4d..dc07a2513 100644 --- a/pyload/plugin/Addon.py +++ b/pyload/plugin/Addon.py @@ -23,15 +23,15 @@ def threaded(fn):  class Addon(Base): -    __name__    = "Addon" -    __type__    = "addon" -    __version__ = "0.01" +    __name    = "Addon" +    __type    = "addon" +    __version = "0.01" -    __config__ = []  #: [("name", "type", "desc", "default")] +    __config = []  #: [("name", "type", "desc", "default")] -    __description__ = """Base addon plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de"), +    __description = """Base addon plugin""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de"),                       ("RaNaN", "RaNaN@pyload.org")] @@ -100,7 +100,7 @@ class Addon(Base):      def __repr__(self): -        return "<Addon %s>" % self.__name__ +        return "<Addon %s>" % self.__name      def setup(self): @@ -119,7 +119,7 @@ class Addon(Base):      def isActivated(self):          """ checks if addon is activated""" -        return self.core.config.getPlugin(self.__name__, "activated") +        return self.core.config.getPlugin(self.__name, "activated")      # Event methods - overwrite these if needed diff --git a/pyload/plugin/Captcha.py b/pyload/plugin/Captcha.py index 36b60f026..383eedac8 100644 --- a/pyload/plugin/Captcha.py +++ b/pyload/plugin/Captcha.py @@ -7,13 +7,13 @@ from pyload.plugin.Plugin import Base  #@TODO: Extend Plugin class; remove all `html` args  class Captcha(Base): -    __name__    = "Captcha" -    __type__    = "captcha" -    __version__ = "0.25" +    __name    = "Captcha" +    __type    = "captcha" +    __version = "0.25" -    __description__ = """Base captcha service plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Base captcha service plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      def __init__(self, plugin): diff --git a/pyload/plugin/Container.py b/pyload/plugin/Container.py index bfc5713a7..e2e0f2248 100644 --- a/pyload/plugin/Container.py +++ b/pyload/plugin/Container.py @@ -12,16 +12,16 @@ from pyload.utils import safe_join  class Container(Crypter): -    __name__    = "Container" -    __type__    = "container" -    __version__ = "0.01" +    __name    = "Container" +    __type    = "container" +    __version = "0.01" -    __pattern__ = r'^unmatchable$' -    __config__  = []  #: [("name", "type", "desc", "default")] +    __pattern = r'^unmatchable$' +    __config  = []  #: [("name", "type", "desc", "default")] -    __description__ = """Base container decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de")] +    __description = """Base container decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de")]      def preprocessing(self, thread): diff --git a/pyload/plugin/Crypter.py b/pyload/plugin/Crypter.py index f93ee254a..aa9966ab4 100644 --- a/pyload/plugin/Crypter.py +++ b/pyload/plugin/Crypter.py @@ -7,17 +7,17 @@ from pyload.utils import decode, safe_filename  class Crypter(Plugin): -    __name__    = "Crypter" -    __type__    = "crypter" -    __version__ = "0.05" +    __name    = "Crypter" +    __type    = "crypter" +    __version = "0.05" -    __pattern__ = r'^unmatchable$' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package'] +    __pattern = r'^unmatchable$' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Base decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Base decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      html = None  #: last html loaded diff --git a/pyload/plugin/Extractor.py b/pyload/plugin/Extractor.py index 27573f860..2582e4ad2 100644 --- a/pyload/plugin/Extractor.py +++ b/pyload/plugin/Extractor.py @@ -19,12 +19,12 @@ class PasswordError(Exception):  class Extractor(Base): -    __name__    = "Extractor" -    __version__ = "0.20" +    __name    = "Extractor" +    __version = "0.20" -    __description__ = """Base extractor plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "ranan@pyload.org"), +    __description = """Base extractor plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "ranan@pyload.org"),                         ("Walter Purcaro", "vuolter@gmail.com"),                         ("Immenz", "immenz@gmx.net")] diff --git a/pyload/plugin/Hook.py b/pyload/plugin/Hook.py index 58dda9d8b..ccd4d635b 100644 --- a/pyload/plugin/Hook.py +++ b/pyload/plugin/Hook.py @@ -4,12 +4,12 @@ from pyload.plugin.Addon import Addon, threaded  class Hook(Addon): -    __name__    = "Hook" -    __type__    = "hook" -    __version__ = "0.03" +    __name    = "Hook" +    __type    = "hook" +    __version = "0.03" -    __config__ = []  #: [("name", "type", "desc", "default")] +    __config = []  #: [("name", "type", "desc", "default")] -    __description__ = """Base hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Base hook plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/Hoster.py b/pyload/plugin/Hoster.py index 2d43ee845..df778c72f 100644 --- a/pyload/plugin/Hoster.py +++ b/pyload/plugin/Hoster.py @@ -9,13 +9,13 @@ def getInfo(self):  class Hoster(Plugin): -    __name__    = "Hoster" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "Hoster" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'^unmatchable$' -    __config__  = []  #: [("name", "type", "desc", "default")] +    __pattern = r'^unmatchable$' +    __config  = []  #: [("name", "type", "desc", "default")] -    __description__ = """Base hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de")] +    __description = """Base hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de")] diff --git a/pyload/plugin/OCR.py b/pyload/plugin/OCR.py index 623f02865..73b3a788a 100644 --- a/pyload/plugin/OCR.py +++ b/pyload/plugin/OCR.py @@ -18,13 +18,13 @@ from pyload.utils import safe_join  class OCR(Base): -    __name__    = "OCR" -    __type__    = "ocr" -    __version__ = "0.11" +    __name    = "OCR" +    __type    = "ocr" +    __version = "0.11" -    __description__ = """OCR base plugin""" -    __license__     = "GPLv3" -    __authors__     = [("pyLoad Team", "admin@pyload.org")] +    __description = """OCR base plugin""" +    __license     = "GPLv3" +    __authors     = [("pyLoad Team", "admin@pyload.org")]      def __init__(self): @@ -60,11 +60,11 @@ class OCR(Base):      def run_tesser(self, subset=False, digits=True, lowercase=True, uppercase=True):          #tmpTif = tempfile.NamedTemporaryFile(suffix=".tif")          try: -            tmpTif = open(safe_join("tmp", "tmpTif_%s.tif" % self.__name__), "wb") +            tmpTif = open(safe_join("tmp", "tmpTif_%s.tif" % self.__name), "wb")              tmpTif.close()              #tmpTxt = tempfile.NamedTemporaryFile(suffix=".txt") -            tmpTxt = open(safe_join("tmp", "tmpTxt_%s.txt" % self.__name__), "wb") +            tmpTxt = open(safe_join("tmp", "tmpTxt_%s.txt" % self.__name), "wb")              tmpTxt.close()          except IOError, e: @@ -83,7 +83,7 @@ class OCR(Base):          if subset and (digits or lowercase or uppercase):              #tmpSub = tempfile.NamedTemporaryFile(suffix=".subset") -            with open(safe_join("tmp", "tmpSub_%s.subset" % self.__name__), "wb") as tmpSub: +            with open(safe_join("tmp", "tmpSub_%s.subset" % self.__name), "wb") as tmpSub:                  tmpSub.write("tessedit_char_whitelist ")                  if digits: diff --git a/pyload/plugin/Plugin.py b/pyload/plugin/Plugin.py index 0a9c647fb..07797e8c6 100644 --- a/pyload/plugin/Plugin.py +++ b/pyload/plugin/Plugin.py @@ -62,7 +62,7 @@ class Base(object):      def _log(self, type, args):          msg = " | ".join([encode(a).strip() for a in args if a])          logger = getattr(self.core.log, type) -        logger("%s: %s" % (self.__name__, msg or _("%s MARK" % type.upper()))) +        logger("%s: %s" % (self.__name, msg or _("%s MARK" % type.upper())))      def logDebug(self, *args): @@ -99,7 +99,7 @@ class Base(object):          :param value:          :return:          """ -        self.core.config.setPlugin(self.__name__, option, value) +        self.core.config.setPlugin(self.__name, option, value)      #: Deprecated method @@ -114,24 +114,24 @@ class Base(object):          :param option:          :return:          """ -        return self.core.config.getPlugin(self.__name__, option) +        return self.core.config.getPlugin(self.__name, option)      def setStorage(self, key, value):          """ Saves a value persistently to the database """ -        self.core.db.setStorage(self.__name__, key, value) +        self.core.db.setStorage(self.__name, key, value)      def store(self, key, value):          """ same as `setStorage` """ -        self.core.db.setStorage(self.__name__, key, value) +        self.core.db.setStorage(self.__name, key, value)      def getStorage(self, key=None, default=None):          """ Retrieves saved value or dict of all saved entries if key is None """          if key: -            return self.core.db.getStorage(self.__name__, key) or default -        return self.core.db.getStorage(self.__name__, key) +            return self.core.db.getStorage(self.__name, key) or default +        return self.core.db.getStorage(self.__name, key)      def retrieve(self, *args, **kwargs): @@ -141,7 +141,7 @@ class Base(object):      def delStorage(self, key):          """ Delete entry in db """ -        self.core.db.delStorage(self.__name__, key) +        self.core.db.delStorage(self.__name, key)  class Plugin(Base): @@ -149,16 +149,16 @@ class Plugin(Base):      Base plugin for hoster/crypter.      Overwrite `process` / `decrypt` in your subclassed plugin.      """ -    __name__    = "Plugin" -    __type__    = "hoster" -    __version__ = "0.07" +    __name    = "Plugin" +    __type    = "hoster" +    __version = "0.07" -    __pattern__ = r'^unmatchable$' -    __config__  = []  #: [("name", "type", "desc", "default")] +    __pattern = r'^unmatchable$' +    __config  = []  #: [("name", "type", "desc", "default")] -    __description__ = """Base plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Base plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("spoob", "spoob@pyload.org"),                         ("mkaay", "mkaay@mkaay.de")] @@ -188,7 +188,7 @@ class Plugin(Base):          self.ocr = None          #: account handler instance, see :py:class:`Account` -        self.account = pyfile.m.core.accountManager.getAccountPlugin(self.__name__) +        self.account = pyfile.m.core.accountManager.getAccountPlugin(self.__name)          #: premium status          self.premium = False @@ -209,7 +209,7 @@ class Plugin(Base):              #: premium status              self.premium = self.account.isPremium(self.user)          else: -            self.req = pyfile.m.core.requestFactory.getRequest(self.__name__) +            self.req = pyfile.m.core.requestFactory.getRequest(self.__name)          #: associated pyfile instance, see `PyFile`          self.pyfile = pyfile @@ -240,7 +240,7 @@ class Plugin(Base):      def __call__(self): -        return self.__name__ +        return self.__name      def init(self): @@ -277,7 +277,7 @@ class Plugin(Base):      def resetAccount(self):          """ dont use account and retry download """          self.account = None -        self.req = self.core.requestFactory.getRequest(self.__name__) +        self.req = self.core.requestFactory.getRequest(self.__name)          self.retry() @@ -451,13 +451,13 @@ class Plugin(Base):          id = ("%.2f" % time())[-6:].replace(".", "") -        with open(join("tmp", "tmpCaptcha_%s_%s.%s" % (self.__name__, id, imgtype)), "wb") as tmpCaptcha: +        with open(join("tmp", "tmpCaptcha_%s_%s.%s" % (self.__name, id, imgtype)), "wb") as tmpCaptcha:              tmpCaptcha.write(img) -        has_plugin = self.__name__ in self.core.pluginManager.ocrPlugins +        has_plugin = self.__name in self.core.pluginManager.ocrPlugins          if self.core.captcha: -            Ocr = self.core.pluginManager.loadClass("ocr", self.__name__) +            Ocr = self.core.pluginManager.loadClass("ocr", self.__name)          else:              Ocr = None @@ -535,10 +535,10 @@ class Plugin(Base):              from inspect import currentframe              frame = currentframe() -            framefile = safe_join("tmp", self.__name__, "%s_line%s.dump.html" % (frame.f_back.f_code.co_name, frame.f_back.f_lineno)) +            framefile = safe_join("tmp", self.__name, "%s_line%s.dump.html" % (frame.f_back.f_code.co_name, frame.f_back.f_lineno))              try: -                if not exists(join("tmp", self.__name__)): -                    makedirs(join("tmp", self.__name__)) +                if not exists(join("tmp", self.__name)): +                    makedirs(join("tmp", self.__name))                  with open(framefile, "wb") as f:                      del frame  #: delete the frame or it wont be cleaned diff --git a/pyload/plugin/account/AlldebridCom.py b/pyload/plugin/account/AlldebridCom.py index 7fc11e343..79d503e3d 100644 --- a/pyload/plugin/account/AlldebridCom.py +++ b/pyload/plugin/account/AlldebridCom.py @@ -11,13 +11,13 @@ from pyload.plugin.Account import Account  class AlldebridCom(Account): -    __name__    = "AlldebridCom" -    __type__    = "account" -    __version__ = "0.23" +    __name    = "AlldebridCom" +    __type    = "account" +    __version = "0.23" -    __description__ = """AllDebrid.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Andy Voigt", "spamsales@online.de")] +    __description = """AllDebrid.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Andy Voigt", "spamsales@online.de")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/BackinNet.py b/pyload/plugin/account/BackinNet.py index ac751c8fb..79d46c761 100644 --- a/pyload/plugin/account/BackinNet.py +++ b/pyload/plugin/account/BackinNet.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class BackinNet(XFSAccount): -    __name__    = "BackinNet" -    __type__    = "account" -    __version__ = "0.01" +    __name    = "BackinNet" +    __type    = "account" +    __version = "0.01" -    __description__ = """Backin.net account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Backin.net account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "backin.net" diff --git a/pyload/plugin/account/BillionuploadsCom.py b/pyload/plugin/account/BillionuploadsCom.py index a3325c427..982a2cc34 100644 --- a/pyload/plugin/account/BillionuploadsCom.py +++ b/pyload/plugin/account/BillionuploadsCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class BillionuploadsCom(XFSAccount): -    __name__    = "BillionuploadsCom" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "BillionuploadsCom" +    __type    = "account" +    __version = "0.02" -    __description__ = """Billionuploads.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Billionuploads.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "billionuploads.com" diff --git a/pyload/plugin/account/BitshareCom.py b/pyload/plugin/account/BitshareCom.py index 4774b9062..717df2769 100644 --- a/pyload/plugin/account/BitshareCom.py +++ b/pyload/plugin/account/BitshareCom.py @@ -4,13 +4,13 @@ from pyload.plugin.Account import Account  class BitshareCom(Account): -    __name__    = "BitshareCom" -    __type__    = "account" -    __version__ = "0.13" +    __name    = "BitshareCom" +    __type    = "account" +    __version = "0.13" -    __description__ = """Bitshare account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Paul King", "")] +    __description = """Bitshare account plugin""" +    __license     = "GPLv3" +    __authors     = [("Paul King", "")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/CatShareNet.py b/pyload/plugin/account/CatShareNet.py index a604ebff1..aae772563 100644 --- a/pyload/plugin/account/CatShareNet.py +++ b/pyload/plugin/account/CatShareNet.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account  class CatShareNet(Account): -    __name__    = "CatShareNet" -    __type__    = "account" -    __version__ = "0.05" +    __name    = "CatShareNet" +    __type    = "account" +    __version = "0.05" -    __description__ = """CatShareNet account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("prOq", "")] +    __description = """CatShareNet account plugin""" +    __license     = "GPLv3" +    __authors     = [("prOq", "")]      PREMIUM_PATTERN      = r'<a href="/premium">Konto:[\s\n]*Premium' diff --git a/pyload/plugin/account/CloudzillaTo.py b/pyload/plugin/account/CloudzillaTo.py index a07621234..af3544da9 100644 --- a/pyload/plugin/account/CloudzillaTo.py +++ b/pyload/plugin/account/CloudzillaTo.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account  class CloudzillaTo(Account): -    __name__    = "CloudzillaTo" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "CloudzillaTo" +    __type    = "account" +    __version = "0.02" -    __description__ = """Cloudzilla.to account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Cloudzilla.to account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      PREMIUM_PATTERN = r'<h2>account type</h2>\s*Premium Account' diff --git a/pyload/plugin/account/CramitIn.py b/pyload/plugin/account/CramitIn.py index 21503f625..ccd291776 100644 --- a/pyload/plugin/account/CramitIn.py +++ b/pyload/plugin/account/CramitIn.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class CramitIn(XFSAccount): -    __name__    = "CramitIn" -    __type__    = "account" -    __version__ = "0.03" +    __name    = "CramitIn" +    __type    = "account" +    __version = "0.03" -    __description__ = """Cramit.in account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Cramit.in account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      HOSTER_DOMAIN = "cramit.in" diff --git a/pyload/plugin/account/CzshareCom.py b/pyload/plugin/account/CzshareCom.py index dfe78c21c..221ffa2ad 100644 --- a/pyload/plugin/account/CzshareCom.py +++ b/pyload/plugin/account/CzshareCom.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account  class CzshareCom(Account): -    __name__    = "CzshareCom" -    __type__    = "account" -    __version__ = "0.18" +    __name    = "CzshareCom" +    __type    = "account" +    __version = "0.18" -    __description__ = """Czshare.com account plugin, now Sdilej.cz""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Czshare.com account plugin, now Sdilej.cz""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/account/DebridItaliaCom.py b/pyload/plugin/account/DebridItaliaCom.py index de97f6e64..89d5cd20e 100644 --- a/pyload/plugin/account/DebridItaliaCom.py +++ b/pyload/plugin/account/DebridItaliaCom.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account  class DebridItaliaCom(Account): -    __name__    = "DebridItaliaCom" -    __type__    = "account" -    __version__ = "0.13" +    __name    = "DebridItaliaCom" +    __type    = "account" +    __version = "0.13" -    __description__ = """Debriditalia.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it"), +    __description = """Debriditalia.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/account/DepositfilesCom.py b/pyload/plugin/account/DepositfilesCom.py index b3e896d31..f3b977bad 100644 --- a/pyload/plugin/account/DepositfilesCom.py +++ b/pyload/plugin/account/DepositfilesCom.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account  class DepositfilesCom(Account): -    __name__    = "DepositfilesCom" -    __type__    = "account" -    __version__ = "0.32" +    __name    = "DepositfilesCom" +    __type    = "account" +    __version = "0.32" -    __description__ = """Depositfiles.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de"), +    __description = """Depositfiles.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de"),                         ("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/account/DropboxCom.py b/pyload/plugin/account/DropboxCom.py index 862b7a8df..6c3e16793 100644 --- a/pyload/plugin/account/DropboxCom.py +++ b/pyload/plugin/account/DropboxCom.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class DropboxCom(SimpleHoster): -    __name__    = "DropboxCom" -    __type__    = "hoster" -    __version__ = "0.04" +    __name    = "DropboxCom" +    __type    = "hoster" +    __version = "0.04" -    __pattern__ = r'https?://(?:www\.)?dropbox\.com/.+' +    __pattern = r'https?://(?:www\.)?dropbox\.com/.+' -    __description__ = """Dropbox.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description = """Dropbox.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]      NAME_PATTERN = r'<title>Dropbox - (?P<N>.+?)<' diff --git a/pyload/plugin/account/EasybytezCom.py b/pyload/plugin/account/EasybytezCom.py index c7d717474..c1f641669 100644 --- a/pyload/plugin/account/EasybytezCom.py +++ b/pyload/plugin/account/EasybytezCom.py @@ -6,13 +6,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class EasybytezCom(XFSAccount): -    __name__    = "EasybytezCom" -    __type__    = "account" -    __version__ = "0.12" +    __name    = "EasybytezCom" +    __type    = "account" +    __version = "0.12" -    __description__ = """EasyBytez.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """EasyBytez.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("guidobelix", "guidobelix@hotmail.it")] diff --git a/pyload/plugin/account/EuroshareEu.py b/pyload/plugin/account/EuroshareEu.py index b37fc68fa..f0842d031 100644 --- a/pyload/plugin/account/EuroshareEu.py +++ b/pyload/plugin/account/EuroshareEu.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account  class EuroshareEu(Account): -    __name__    = "EuroshareEu" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "EuroshareEu" +    __type    = "account" +    __version = "0.02" -    __description__ = """Euroshare.eu account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Euroshare.eu account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/ExashareCom.py b/pyload/plugin/account/ExashareCom.py index efd2587c0..e61c2f12d 100644 --- a/pyload/plugin/account/ExashareCom.py +++ b/pyload/plugin/account/ExashareCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class ExashareCom(XFSAccount): -    __name__    = "ExashareCom" -    __type__    = "account" -    __version__ = "0.01" +    __name    = "ExashareCom" +    __type    = "account" +    __version = "0.01" -    __description__ = """Exashare.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Exashare.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "exashare.com" diff --git a/pyload/plugin/account/FastixRu.py b/pyload/plugin/account/FastixRu.py index 69f78c3d9..fbb635437 100644 --- a/pyload/plugin/account/FastixRu.py +++ b/pyload/plugin/account/FastixRu.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads  class FastixRu(Account): -    __name__    = "FastixRu" -    __type__    = "account" -    __version__ = "0.03" +    __name    = "FastixRu" +    __type    = "account" +    __version = "0.03" -    __description__ = """Fastix account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")] +    __description = """Fastix account plugin""" +    __license     = "GPLv3" +    __authors     = [("Massimo Rosamilia", "max@spiritix.eu")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/FastshareCz.py b/pyload/plugin/account/FastshareCz.py index 8fe98438b..4ce94be5e 100644 --- a/pyload/plugin/account/FastshareCz.py +++ b/pyload/plugin/account/FastshareCz.py @@ -7,13 +7,13 @@ from pyload.utils import parseFileSize  class FastshareCz(Account): -    __name__    = "FastshareCz" -    __type__    = "account" -    __version__ = "0.05" +    __name    = "FastshareCz" +    __type    = "account" +    __version = "0.05" -    __description__ = """Fastshare.cz account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Fastshare.cz account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/account/File4SafeCom.py b/pyload/plugin/account/File4SafeCom.py index c48956d38..1c7e00fcf 100644 --- a/pyload/plugin/account/File4SafeCom.py +++ b/pyload/plugin/account/File4SafeCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class File4SafeCom(XFSAccount): -    __name__    = "File4SafeCom" -    __type__    = "account" -    __version__ = "0.05" +    __name    = "File4SafeCom" +    __type    = "account" +    __version = "0.05" -    __description__ = """File4Safe.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """File4Safe.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      HOSTER_DOMAIN = "file4safe.com" diff --git a/pyload/plugin/account/FileParadoxIn.py b/pyload/plugin/account/FileParadoxIn.py index 02b923519..0e103c4e7 100644 --- a/pyload/plugin/account/FileParadoxIn.py +++ b/pyload/plugin/account/FileParadoxIn.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class FileParadoxIn(XFSAccount): -    __name__    = "FileParadoxIn" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "FileParadoxIn" +    __type    = "account" +    __version = "0.02" -    __description__ = """FileParadox.in account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """FileParadox.in account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "fileparadox.in" diff --git a/pyload/plugin/account/FilecloudIo.py b/pyload/plugin/account/FilecloudIo.py index 6d2dcb92a..12e2d44f5 100644 --- a/pyload/plugin/account/FilecloudIo.py +++ b/pyload/plugin/account/FilecloudIo.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads  class FilecloudIo(Account): -    __name__    = "FilecloudIo" -    __type__    = "account" -    __version__ = "0.04" +    __name    = "FilecloudIo" +    __type    = "account" +    __version = "0.04" -    __description__ = """FilecloudIo account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """FilecloudIo account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/account/FilefactoryCom.py b/pyload/plugin/account/FilefactoryCom.py index 3395b3f90..635f0ad16 100644 --- a/pyload/plugin/account/FilefactoryCom.py +++ b/pyload/plugin/account/FilefactoryCom.py @@ -9,13 +9,13 @@ from pyload.plugin.Account import Account  class FilefactoryCom(Account): -    __name__    = "FilefactoryCom" -    __type__    = "account" -    __version__ = "0.15" +    __name    = "FilefactoryCom" +    __type    = "account" +    __version = "0.15" -    __description__ = """Filefactory.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Filefactory.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/account/FilejungleCom.py b/pyload/plugin/account/FilejungleCom.py index 2c476bffb..8a0bb344e 100644 --- a/pyload/plugin/account/FilejungleCom.py +++ b/pyload/plugin/account/FilejungleCom.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account  class FilejungleCom(Account): -    __name__    = "FilejungleCom" -    __type__    = "account" -    __version__ = "0.12" +    __name    = "FilejungleCom" +    __type    = "account" +    __version = "0.12" -    __description__ = """Filejungle.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Filejungle.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      login_timeout = 60 diff --git a/pyload/plugin/account/FileomCom.py b/pyload/plugin/account/FileomCom.py index 36a11e411..2868e49e6 100644 --- a/pyload/plugin/account/FileomCom.py +++ b/pyload/plugin/account/FileomCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class FileomCom(XFSAccount): -    __name__    = "FileomCom" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "FileomCom" +    __type    = "account" +    __version = "0.02" -    __description__ = """Fileom.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Fileom.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "fileom.com" diff --git a/pyload/plugin/account/FilerNet.py b/pyload/plugin/account/FilerNet.py index f3cc42367..ac624a4b3 100644 --- a/pyload/plugin/account/FilerNet.py +++ b/pyload/plugin/account/FilerNet.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account  class FilerNet(Account): -    __name__    = "FilerNet" -    __type__    = "account" -    __version__ = "0.04" +    __name    = "FilerNet" +    __type    = "account" +    __version = "0.04" -    __description__ = """Filer.net account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Filer.net account plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      TOKEN_PATTERN = r'_csrf_token" value="([^"]+)" />' diff --git a/pyload/plugin/account/FilerioCom.py b/pyload/plugin/account/FilerioCom.py index 1d9f8744b..d222fa78b 100644 --- a/pyload/plugin/account/FilerioCom.py +++ b/pyload/plugin/account/FilerioCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class FilerioCom(XFSAccount): -    __name__    = "FilerioCom" -    __type__    = "account" -    __version__ = "0.03" +    __name    = "FilerioCom" +    __type    = "account" +    __version = "0.03" -    __description__ = """FileRio.in account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """FileRio.in account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      HOSTER_DOMAIN = "filerio.in" diff --git a/pyload/plugin/account/FilesMailRu.py b/pyload/plugin/account/FilesMailRu.py index e6afd0168..e4e37ce24 100644 --- a/pyload/plugin/account/FilesMailRu.py +++ b/pyload/plugin/account/FilesMailRu.py @@ -4,13 +4,13 @@ from pyload.plugin.Account import Account  class FilesMailRu(Account): -    __name__    = "FilesMailRu" -    __type__    = "account" -    __version__ = "0.11" +    __name    = "FilesMailRu" +    __type    = "account" +    __version = "0.11" -    __description__ = """Filesmail.ru account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org")] +    __description = """Filesmail.ru account plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/FileserveCom.py b/pyload/plugin/account/FileserveCom.py index 9aab88d2b..425b567e2 100644 --- a/pyload/plugin/account/FileserveCom.py +++ b/pyload/plugin/account/FileserveCom.py @@ -7,13 +7,13 @@ from pyload.utils import json_loads  class FileserveCom(Account): -    __name__    = "FileserveCom" -    __type__    = "account" -    __version__ = "0.20" +    __name    = "FileserveCom" +    __type    = "account" +    __version = "0.20" -    __description__ = """Fileserve.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de")] +    __description = """Fileserve.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/FourSharedCom.py b/pyload/plugin/account/FourSharedCom.py index 127f9d58a..a04c9bc46 100644 --- a/pyload/plugin/account/FourSharedCom.py +++ b/pyload/plugin/account/FourSharedCom.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads  class FourSharedCom(Account): -    __name__    = "FourSharedCom" -    __type__    = "account" -    __version__ = "0.04" +    __name    = "FourSharedCom" +    __type    = "account" +    __version = "0.04" -    __description__ = """FourShared.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """FourShared.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/account/FreakshareCom.py b/pyload/plugin/account/FreakshareCom.py index 9c61ac513..a4c4c30fa 100644 --- a/pyload/plugin/account/FreakshareCom.py +++ b/pyload/plugin/account/FreakshareCom.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account  class FreakshareCom(Account): -    __name__    = "FreakshareCom" -    __type__    = "account" -    __version__ = "0.13" +    __name    = "FreakshareCom" +    __type    = "account" +    __version = "0.13" -    __description__ = """Freakshare.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org")] +    __description = """Freakshare.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/FreeWayMe.py b/pyload/plugin/account/FreeWayMe.py index dcd9d34cf..e139b25a6 100644 --- a/pyload/plugin/account/FreeWayMe.py +++ b/pyload/plugin/account/FreeWayMe.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads  class FreeWayMe(Account): -    __name__    = "FreeWayMe" -    __type__    = "account" -    __version__ = "0.13" +    __name    = "FreeWayMe" +    __type    = "account" +    __version = "0.13" -    __description__ = """FreeWayMe account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Nicolas Giese", "james@free-way.me")] +    __description = """FreeWayMe account plugin""" +    __license     = "GPLv3" +    __authors     = [("Nicolas Giese", "james@free-way.me")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/FshareVn.py b/pyload/plugin/account/FshareVn.py index 282a17751..ffddabaa1 100644 --- a/pyload/plugin/account/FshareVn.py +++ b/pyload/plugin/account/FshareVn.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account  class FshareVn(Account): -    __name__    = "FshareVn" -    __type__    = "account" -    __version__ = "0.09" +    __name    = "FshareVn" +    __type    = "account" +    __version = "0.09" -    __description__ = """Fshare.vn account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Fshare.vn account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/account/Ftp.py b/pyload/plugin/account/Ftp.py index 67cde2cdd..c7983b0c2 100644 --- a/pyload/plugin/account/Ftp.py +++ b/pyload/plugin/account/Ftp.py @@ -4,13 +4,13 @@ from pyload.plugin.Account import Account  class Ftp(Account): -    __name__    = "Ftp" -    __type__    = "account" -    __version__ = "0.01" +    __name    = "Ftp" +    __type    = "account" +    __version = "0.01" -    __description__ = """Ftp dummy account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Ftp dummy account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      login_timeout  = -1  #: Unlimited diff --git a/pyload/plugin/account/HellshareCz.py b/pyload/plugin/account/HellshareCz.py index 94467b375..444677c88 100644 --- a/pyload/plugin/account/HellshareCz.py +++ b/pyload/plugin/account/HellshareCz.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account  class HellshareCz(Account): -    __name__    = "HellshareCz" -    __type__    = "account" -    __version__ = "0.16" +    __name    = "HellshareCz" +    __type    = "account" +    __version = "0.16" -    __description__ = """Hellshare.cz account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Hellshare.cz account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      CREDIT_LEFT_PATTERN = r'<div class="credit-link">\s*<table>\s*<tr>\s*<th>(\d+|\d\d\.\d\d\.)</th>' diff --git a/pyload/plugin/account/Http.py b/pyload/plugin/account/Http.py index 2571ef712..aacdbf89f 100644 --- a/pyload/plugin/account/Http.py +++ b/pyload/plugin/account/Http.py @@ -4,13 +4,13 @@ from pyload.plugin.Account import Account  class Http(Account): -    __name__    = "Http" -    __type__    = "account" -    __version__ = "0.01" +    __name    = "Http" +    __type    = "account" +    __version = "0.01" -    __description__ = """Http dummy account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Http dummy account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      login_timeout  = -1  #: Unlimited diff --git a/pyload/plugin/account/HugefilesNet.py b/pyload/plugin/account/HugefilesNet.py index eb383fb17..b4cd6f8c4 100644 --- a/pyload/plugin/account/HugefilesNet.py +++ b/pyload/plugin/account/HugefilesNet.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class HugefilesNet(XFSAccount): -    __name__    = "HugefilesNet" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "HugefilesNet" +    __type    = "account" +    __version = "0.02" -    __description__ = """Hugefiles.net account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Hugefiles.net account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "hugefiles.net" diff --git a/pyload/plugin/account/HundredEightyUploadCom.py b/pyload/plugin/account/HundredEightyUploadCom.py index 72185a4bb..15ee1a12a 100644 --- a/pyload/plugin/account/HundredEightyUploadCom.py +++ b/pyload/plugin/account/HundredEightyUploadCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class HundredEightyUploadCom(XFSAccount): -    __name__    = "HundredEightyUploadCom" -    __type__    = "account" -    __version__ = "0.03" +    __name    = "HundredEightyUploadCom" +    __type    = "account" +    __version = "0.03" -    __description__ = """180upload.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """180upload.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "180upload.com" diff --git a/pyload/plugin/account/JunkyvideoCom.py b/pyload/plugin/account/JunkyvideoCom.py index 3380b8dc7..6c600f971 100644 --- a/pyload/plugin/account/JunkyvideoCom.py +++ b/pyload/plugin/account/JunkyvideoCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class JunkyvideoCom(XFSAccount): -    __name__    = "JunkyvideoCom" -    __type__    = "account" -    __version__ = "0.01" +    __name    = "JunkyvideoCom" +    __type    = "account" +    __version = "0.01" -    __description__ = """Junkyvideo.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Junkyvideo.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "junkyvideo.com" diff --git a/pyload/plugin/account/JunocloudMe.py b/pyload/plugin/account/JunocloudMe.py index 0ffa92eb6..75307c6dd 100644 --- a/pyload/plugin/account/JunocloudMe.py +++ b/pyload/plugin/account/JunocloudMe.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class JunocloudMe(XFSAccount): -    __name__    = "JunocloudMe" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "JunocloudMe" +    __type    = "account" +    __version = "0.02" -    __description__ = """Junocloud.me account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("guidobelix", "guidobelix@hotmail.it")] +    __description = """Junocloud.me account plugin""" +    __license     = "GPLv3" +    __authors     = [("guidobelix", "guidobelix@hotmail.it")]      HOSTER_DOMAIN = "junocloud.me" diff --git a/pyload/plugin/account/Keep2ShareCc.py b/pyload/plugin/account/Keep2ShareCc.py index 7ed15dc62..1086d893f 100644 --- a/pyload/plugin/account/Keep2ShareCc.py +++ b/pyload/plugin/account/Keep2ShareCc.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account  class Keep2shareCc(Account): -    __name__    = "Keep2shareCc" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "Keep2shareCc" +    __type    = "account" +    __version = "0.02" -    __description__ = """Keep2share.cc account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("aeronaut", "aeronaut@pianoguy.de")] +    __description = """Keep2share.cc account plugin""" +    __license     = "GPLv3" +    __authors     = [("aeronaut", "aeronaut@pianoguy.de")]      VALID_UNTIL_PATTERN  = r'Premium expires: <b>(.+?)</b>' diff --git a/pyload/plugin/account/LetitbitNet.py b/pyload/plugin/account/LetitbitNet.py index d0f08d0bb..0ad36f219 100644 --- a/pyload/plugin/account/LetitbitNet.py +++ b/pyload/plugin/account/LetitbitNet.py @@ -5,13 +5,13 @@ from pyload.plugin.Account import Account  class LetitbitNet(Account): -    __name__    = "LetitbitNet" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "LetitbitNet" +    __type    = "account" +    __version = "0.02" -    __description__ = """Letitbit.net account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Letitbit.net account plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/LinestorageCom.py b/pyload/plugin/account/LinestorageCom.py index 7a5d63a47..824d3bf77 100644 --- a/pyload/plugin/account/LinestorageCom.py +++ b/pyload/plugin/account/LinestorageCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class LinestorageCom(XFSAccount): -    __name__    = "LinestorageCom" -    __type__    = "account" -    __version__ = "0.03" +    __name    = "LinestorageCom" +    __type    = "account" +    __version = "0.03" -    __description__ = """Linestorage.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Linestorage.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "linestorage.com" diff --git a/pyload/plugin/account/LinksnappyCom.py b/pyload/plugin/account/LinksnappyCom.py index 0b1176ee9..4b91042e2 100644 --- a/pyload/plugin/account/LinksnappyCom.py +++ b/pyload/plugin/account/LinksnappyCom.py @@ -7,12 +7,12 @@ from pyload.utils import json_loads  class LinksnappyCom(Account): -    __name__    = "LinksnappyCom" -    __type__    = "account" -    __version__ = "0.05" -    __description__ = """Linksnappy.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __name    = "LinksnappyCom" +    __type    = "account" +    __version = "0.05" +    __description = """Linksnappy.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/MegaDebridEu.py b/pyload/plugin/account/MegaDebridEu.py index c2e64bcc7..67af94541 100644 --- a/pyload/plugin/account/MegaDebridEu.py +++ b/pyload/plugin/account/MegaDebridEu.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads  class MegaDebridEu(Account): -    __name__    = "MegaDebridEu" -    __type__    = "account" -    __version__ = "0.20" +    __name    = "MegaDebridEu" +    __type    = "account" +    __version = "0.20" -    __description__ = """mega-debrid.eu account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("D.Ducatel", "dducatel@je-geek.fr")] +    __description = """mega-debrid.eu account plugin""" +    __license     = "GPLv3" +    __authors     = [("D.Ducatel", "dducatel@je-geek.fr")]      # Define the base URL of MegaDebrid api diff --git a/pyload/plugin/account/MegaRapidCz.py b/pyload/plugin/account/MegaRapidCz.py index 5596fd623..662243e0b 100644 --- a/pyload/plugin/account/MegaRapidCz.py +++ b/pyload/plugin/account/MegaRapidCz.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account  class MegaRapidCz(Account): -    __name__    = "MegaRapidCz" -    __type__    = "account" -    __version__ = "0.35" +    __name    = "MegaRapidCz" +    __type    = "account" +    __version = "0.35" -    __description__ = """MegaRapid.cz account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("MikyWoW", "mikywow@seznam.cz"), +    __description = """MegaRapid.cz account plugin""" +    __license     = "GPLv3" +    __authors     = [("MikyWoW", "mikywow@seznam.cz"),                         ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/account/MegasharesCom.py b/pyload/plugin/account/MegasharesCom.py index 53b854f65..3f3181489 100644 --- a/pyload/plugin/account/MegasharesCom.py +++ b/pyload/plugin/account/MegasharesCom.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account  class MegasharesCom(Account): -    __name__    = "MegasharesCom" -    __type__    = "account" -    __version__ = "0.03" +    __name    = "MegasharesCom" +    __type    = "account" +    __version = "0.03" -    __description__ = """Megashares.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Megashares.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      VALID_UNTIL_PATTERN = r'<p class="premium_info_box">Period Ends: (\w{3} \d{1,2}, \d{4})</p>' diff --git a/pyload/plugin/account/MovReelCom.py b/pyload/plugin/account/MovReelCom.py index 4d2855de1..9eabd0a6d 100644 --- a/pyload/plugin/account/MovReelCom.py +++ b/pyload/plugin/account/MovReelCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class MovReelCom(XFSAccount): -    __name__    = "MovReelCom" -    __type__    = "account" -    __version__ = "0.03" +    __name    = "MovReelCom" +    __type    = "account" +    __version = "0.03" -    __description__ = """Movreel.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] +    __description = """Movreel.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]      login_timeout = 60 diff --git a/pyload/plugin/account/MultihostersCom.py b/pyload/plugin/account/MultihostersCom.py index 3f5d90c4e..bc48979bb 100644 --- a/pyload/plugin/account/MultihostersCom.py +++ b/pyload/plugin/account/MultihostersCom.py @@ -4,13 +4,13 @@ from pyload.plugin.account.ZeveraCom import ZeveraCom  class MultihostersCom(ZeveraCom): -    __name__    = "MultihostersCom" -    __type__    = "account" -    __version__ = "0.03" +    __name    = "MultihostersCom" +    __type    = "account" +    __version = "0.03" -    __description__ = """Multihosters.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("tjeh", "tjeh@gmx.net")] +    __description = """Multihosters.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("tjeh", "tjeh@gmx.net")]      HOSTER_DOMAIN = "multihosters.com" diff --git a/pyload/plugin/account/MultishareCz.py b/pyload/plugin/account/MultishareCz.py index 9b4f4447b..ea1aef137 100644 --- a/pyload/plugin/account/MultishareCz.py +++ b/pyload/plugin/account/MultishareCz.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account  class MultishareCz(Account): -    __name__    = "MultishareCz" -    __type__    = "account" -    __version__ = "0.05" +    __name    = "MultishareCz" +    __type    = "account" +    __version = "0.05" -    __description__ = """Multishare.cz account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Multishare.cz account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[\d.,]+) (?P<U>[\w^_]+)</strong>' diff --git a/pyload/plugin/account/MyfastfileCom.py b/pyload/plugin/account/MyfastfileCom.py index 838a1eefd..02bef81ca 100644 --- a/pyload/plugin/account/MyfastfileCom.py +++ b/pyload/plugin/account/MyfastfileCom.py @@ -7,13 +7,13 @@ from pyload.utils import json_loads  class MyfastfileCom(Account): -    __name__    = "MyfastfileCom" -    __type__    = "account" -    __version__ = "0.04" +    __name    = "MyfastfileCom" +    __type    = "account" +    __version = "0.04" -    __description__ = """Myfastfile.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Myfastfile.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/NetloadIn.py b/pyload/plugin/account/NetloadIn.py index 68982e828..00fd8d191 100644 --- a/pyload/plugin/account/NetloadIn.py +++ b/pyload/plugin/account/NetloadIn.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account  class NetloadIn(Account): -    __name__    = "NetloadIn" -    __type__    = "account" -    __version__ = "0.23" +    __name    = "NetloadIn" +    __type    = "account" +    __version = "0.23" -    __description__ = """Netload.in account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Netload.in account plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("CryNickSystems", "webmaster@pcProfil.de")] diff --git a/pyload/plugin/account/NoPremiumPl.py b/pyload/plugin/account/NoPremiumPl.py index 929e8f7d9..6fd0c1935 100644 --- a/pyload/plugin/account/NoPremiumPl.py +++ b/pyload/plugin/account/NoPremiumPl.py @@ -10,12 +10,12 @@ from pyload.utils import json_loads  class NoPremiumPl(Account): -    __name__ = "NoPremiumPl" -    __version__ = "0.01" -    __type__ = "account" -    __description__ = "NoPremium.pl account plugin" -    __license__ = "GPLv3" -    __authors__ = [("goddie", "dev@nopremium.pl")] +    __name = "NoPremiumPl" +    __version = "0.01" +    __type = "account" +    __description = "NoPremium.pl account plugin" +    __license = "GPLv3" +    __authors = [("goddie", "dev@nopremium.pl")]      _api_url = "http://crypt.nopremium.pl" diff --git a/pyload/plugin/account/NosuploadCom.py b/pyload/plugin/account/NosuploadCom.py index 7fc8b49de..10f9007a6 100644 --- a/pyload/plugin/account/NosuploadCom.py +++ b/pyload/plugin/account/NosuploadCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class NosuploadCom(XFSAccount): -    __name__    = "NosuploadCom" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "NosuploadCom" +    __type    = "account" +    __version = "0.02" -    __description__ = """Nosupload.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Nosupload.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "nosupload.com" diff --git a/pyload/plugin/account/NovafileCom.py b/pyload/plugin/account/NovafileCom.py index 71a7dc2dc..8400cc267 100644 --- a/pyload/plugin/account/NovafileCom.py +++ b/pyload/plugin/account/NovafileCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class NovafileCom(XFSAccount): -    __name__    = "NovafileCom" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "NovafileCom" +    __type    = "account" +    __version = "0.02" -    __description__ = """Novafile.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Novafile.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "novafile.com" diff --git a/pyload/plugin/account/NowVideoSx.py b/pyload/plugin/account/NowVideoSx.py index 8359e0410..0b3f7417d 100644 --- a/pyload/plugin/account/NowVideoSx.py +++ b/pyload/plugin/account/NowVideoSx.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account  class NowVideoSx(Account): -    __name__    = "NowVideoSx" -    __type__    = "account" -    __version__ = "0.03" +    __name    = "NowVideoSx" +    __type    = "account" +    __version = "0.03" -    __description__ = """NowVideo.at account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """NowVideo.at account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      VALID_UNTIL_PATTERN = r'>Your premium membership expires on: (.+?)<' diff --git a/pyload/plugin/account/OboomCom.py b/pyload/plugin/account/OboomCom.py index 012fb42c3..7b73c38fa 100644 --- a/pyload/plugin/account/OboomCom.py +++ b/pyload/plugin/account/OboomCom.py @@ -9,13 +9,13 @@ from pyload.plugin.Account import Account  class OboomCom(Account): -    __name__    = "OboomCom" -    __type__    = "account" -    __version__ = "0.23" +    __name    = "OboomCom" +    __type    = "account" +    __version = "0.23" -    __description__ = """Oboom.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stanley", "stanley.foerster@gmail.com")] +    __description = """Oboom.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("stanley", "stanley.foerster@gmail.com")]      def loadAccountData(self, user, req): diff --git a/pyload/plugin/account/OneFichierCom.py b/pyload/plugin/account/OneFichierCom.py index 65ec841c4..3f149e0b6 100644 --- a/pyload/plugin/account/OneFichierCom.py +++ b/pyload/plugin/account/OneFichierCom.py @@ -10,13 +10,13 @@ from pyload.plugin.Account import Account  class OneFichierCom(Account): -    __name__    = "OneFichierCom" -    __type__    = "account" -    __version__ = "0.12" +    __name    = "OneFichierCom" +    __type    = "account" +    __version = "0.12" -    __description__ = """1fichier.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Elrick69", "elrick69[AT]rocketmail[DOT]com"), +    __description = """1fichier.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Elrick69", "elrick69[AT]rocketmail[DOT]com"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/account/OverLoadMe.py b/pyload/plugin/account/OverLoadMe.py index d945dd7bd..700467cb7 100644 --- a/pyload/plugin/account/OverLoadMe.py +++ b/pyload/plugin/account/OverLoadMe.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads  class OverLoadMe(Account): -    __name__    = "OverLoadMe" -    __type__    = "account" -    __version__ = "0.04" +    __name    = "OverLoadMe" +    __type    = "account" +    __version = "0.04" -    __description__ = """Over-Load.me account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("marley", "marley@over-load.me")] +    __description = """Over-Load.me account plugin""" +    __license     = "GPLv3" +    __authors     = [("marley", "marley@over-load.me")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/PremiumTo.py b/pyload/plugin/account/PremiumTo.py index 04bbc10d5..01369554f 100644 --- a/pyload/plugin/account/PremiumTo.py +++ b/pyload/plugin/account/PremiumTo.py @@ -4,13 +4,13 @@ from pyload.plugin.Account import Account  class PremiumTo(Account): -    __name__    = "PremiumTo" -    __type__    = "account" -    __version__ = "0.08" +    __name    = "PremiumTo" +    __type    = "account" +    __version = "0.08" -    __description__ = """Premium.to account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Premium.to account plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/account/PremiumizeMe.py b/pyload/plugin/account/PremiumizeMe.py index 3cd15ce23..7a701d03b 100644 --- a/pyload/plugin/account/PremiumizeMe.py +++ b/pyload/plugin/account/PremiumizeMe.py @@ -6,13 +6,13 @@ from pyload.utils import json_loads  class PremiumizeMe(Account): -    __name__    = "PremiumizeMe" -    __type__    = "account" -    __version__ = "0.13" +    __name    = "PremiumizeMe" +    __type    = "account" +    __version = "0.13" -    __description__ = """Premiumize.me account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Florian Franzen", "FlorianFranzen@gmail.com")] +    __description = """Premiumize.me account plugin""" +    __license     = "GPLv3" +    __authors     = [("Florian Franzen", "FlorianFranzen@gmail.com")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/PutdriveCom.py b/pyload/plugin/account/PutdriveCom.py index b30fb6565..3d7279034 100644 --- a/pyload/plugin/account/PutdriveCom.py +++ b/pyload/plugin/account/PutdriveCom.py @@ -4,13 +4,13 @@ from pyload.plugin.account.ZeveraCom import ZeveraCom  class PutdriveCom(ZeveraCom): -    __name__    = "PutdriveCom" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "PutdriveCom" +    __type    = "account" +    __version = "0.02" -    __description__ = """Putdrive.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Putdrive.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "putdrive.com" diff --git a/pyload/plugin/account/QuickshareCz.py b/pyload/plugin/account/QuickshareCz.py index 2bcde1c9d..67dd11ac3 100644 --- a/pyload/plugin/account/QuickshareCz.py +++ b/pyload/plugin/account/QuickshareCz.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account  class QuickshareCz(Account): -    __name__    = "QuickshareCz" -    __type__    = "account" -    __version__ = "0.03" +    __name    = "QuickshareCz" +    __type    = "account" +    __version = "0.03" -    __description__ = """Quickshare.cz account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Quickshare.cz account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      TRAFFIC_LEFT_PATTERN = r'Stav kreditu: <strong>(.+?)</strong>' diff --git a/pyload/plugin/account/RPNetBiz.py b/pyload/plugin/account/RPNetBiz.py index e0b35b68c..2dfce536b 100644 --- a/pyload/plugin/account/RPNetBiz.py +++ b/pyload/plugin/account/RPNetBiz.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads  class RPNetBiz(Account): -    __name__    = "RPNetBiz" -    __type__    = "account" -    __version__ = "0.12" +    __name    = "RPNetBiz" +    __type    = "account" +    __version = "0.12" -    __description__ = """RPNet.biz account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Dman", "dmanugm@gmail.com")] +    __description = """RPNet.biz account plugin""" +    __license     = "GPLv3" +    __authors     = [("Dman", "dmanugm@gmail.com")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/RapideoPl.py b/pyload/plugin/account/RapideoPl.py index b4b74fab5..e37a22c9a 100644 --- a/pyload/plugin/account/RapideoPl.py +++ b/pyload/plugin/account/RapideoPl.py @@ -10,12 +10,12 @@ from pyload.utils import json_loads  class RapideoPl(Account): -    __name__ = "RapideoPl" -    __version__ = "0.01" -    __type__ = "account" -    __description__ = "Rapideo.pl account plugin" -    __license__ = "GPLv3" -    __authors__ = [("goddie", "dev@rapideo.pl")] +    __name = "RapideoPl" +    __version = "0.01" +    __type = "account" +    __description = "Rapideo.pl account plugin" +    __license = "GPLv3" +    __authors = [("goddie", "dev@rapideo.pl")]      _api_url = "http://enc.rapideo.pl" diff --git a/pyload/plugin/account/RapidfileshareNet.py b/pyload/plugin/account/RapidfileshareNet.py index ec0bf8db4..0b0ed210c 100644 --- a/pyload/plugin/account/RapidfileshareNet.py +++ b/pyload/plugin/account/RapidfileshareNet.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class RapidfileshareNet(XFSAccount): -    __name__    = "RapidfileshareNet" -    __type__    = "account" -    __version__ = "0.05" +    __name    = "RapidfileshareNet" +    __type    = "account" +    __version = "0.05" -    __description__ = """Rapidfileshare.net account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("guidobelix", "guidobelix@hotmail.it")] +    __description = """Rapidfileshare.net account plugin""" +    __license     = "GPLv3" +    __authors     = [("guidobelix", "guidobelix@hotmail.it")]      HOSTER_DOMAIN = "rapidfileshare.net" diff --git a/pyload/plugin/account/RapidgatorNet.py b/pyload/plugin/account/RapidgatorNet.py index 7643f07d2..17b615a0b 100644 --- a/pyload/plugin/account/RapidgatorNet.py +++ b/pyload/plugin/account/RapidgatorNet.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads  class RapidgatorNet(Account): -    __name__    = "RapidgatorNet" -    __type__    = "account" -    __version__ = "0.09" +    __name    = "RapidgatorNet" +    __type    = "account" +    __version = "0.09" -    __description__ = """Rapidgator.net account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Rapidgator.net account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      API_URL = "http://rapidgator.net/api/user" diff --git a/pyload/plugin/account/RapiduNet.py b/pyload/plugin/account/RapiduNet.py index 5c165f486..835266346 100644 --- a/pyload/plugin/account/RapiduNet.py +++ b/pyload/plugin/account/RapiduNet.py @@ -9,13 +9,13 @@ from pyload.utils import json_loads  class RapiduNet(Account): -    __name__    = "RapiduNet" -    __type__    = "account" -    __version__ = "0.05" +    __name    = "RapiduNet" +    __type    = "account" +    __version = "0.05" -    __description__ = """Rapidu.net account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("prOq", None), +    __description = """Rapidu.net account plugin""" +    __license     = "GPLv3" +    __authors     = [("prOq", None),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/account/RarefileNet.py b/pyload/plugin/account/RarefileNet.py index 1dc93681c..fc736bafc 100644 --- a/pyload/plugin/account/RarefileNet.py +++ b/pyload/plugin/account/RarefileNet.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class RarefileNet(XFSAccount): -    __name__    = "RarefileNet" -    __type__    = "account" -    __version__ = "0.04" +    __name    = "RarefileNet" +    __type    = "account" +    __version = "0.04" -    __description__ = """RareFile.net account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """RareFile.net account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      HOSTER_DOMAIN = "rarefile.net" diff --git a/pyload/plugin/account/RealdebridCom.py b/pyload/plugin/account/RealdebridCom.py index 07ff70496..0d28f2ad6 100644 --- a/pyload/plugin/account/RealdebridCom.py +++ b/pyload/plugin/account/RealdebridCom.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account  class RealdebridCom(Account): -    __name__    = "RealdebridCom" -    __type__    = "account" -    __version__ = "0.45" +    __name    = "RealdebridCom" +    __type    = "account" +    __version = "0.45" -    __description__ = """Real-Debrid.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Devirex Hazzard", "naibaf_11@yahoo.de")] +    __description = """Real-Debrid.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/RehostTo.py b/pyload/plugin/account/RehostTo.py index d62e1918a..3b02145fc 100644 --- a/pyload/plugin/account/RehostTo.py +++ b/pyload/plugin/account/RehostTo.py @@ -4,13 +4,13 @@ from pyload.plugin.Account import Account  class RehostTo(Account): -    __name__    = "RehostTo" -    __type__    = "account" -    __version__ = "0.16" +    __name    = "RehostTo" +    __type    = "account" +    __version = "0.16" -    __description__ = """Rehost.to account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org")] +    __description = """Rehost.to account plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/RyushareCom.py b/pyload/plugin/account/RyushareCom.py index 466d971f6..f34d1d388 100644 --- a/pyload/plugin/account/RyushareCom.py +++ b/pyload/plugin/account/RyushareCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class RyushareCom(XFSAccount): -    __name__    = "RyushareCom" -    __type__    = "account" -    __version__ = "0.06" +    __name    = "RyushareCom" +    __type    = "account" +    __version = "0.06" -    __description__ = """Ryushare.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Ryushare.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "ryushare.com" diff --git a/pyload/plugin/account/SafesharingEu.py b/pyload/plugin/account/SafesharingEu.py index f5cbf050e..eae8140fb 100644 --- a/pyload/plugin/account/SafesharingEu.py +++ b/pyload/plugin/account/SafesharingEu.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class SafesharingEu(XFSAccount): -    __name__    = "SafesharingEu" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "SafesharingEu" +    __type    = "account" +    __version = "0.02" -    __description__ = """Safesharing.eu account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("guidobelix", "guidobelix@hotmail.it")] +    __description = """Safesharing.eu account plugin""" +    __license     = "GPLv3" +    __authors     = [("guidobelix", "guidobelix@hotmail.it")]      HOSTER_DOMAIN = "safesharing.eu" diff --git a/pyload/plugin/account/SecureUploadEu.py b/pyload/plugin/account/SecureUploadEu.py index bb47bcba3..b349e893f 100644 --- a/pyload/plugin/account/SecureUploadEu.py +++ b/pyload/plugin/account/SecureUploadEu.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class SecureUploadEu(XFSAccount): -    __name__    = "SecureUploadEu" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "SecureUploadEu" +    __type    = "account" +    __version = "0.02" -    __description__ = """SecureUpload.eu account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """SecureUpload.eu account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "secureupload.eu" diff --git a/pyload/plugin/account/SendmywayCom.py b/pyload/plugin/account/SendmywayCom.py index d64658de3..add0b2183 100644 --- a/pyload/plugin/account/SendmywayCom.py +++ b/pyload/plugin/account/SendmywayCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class SendmywayCom(XFSAccount): -    __name__    = "SendmywayCom" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "SendmywayCom" +    __type    = "account" +    __version = "0.02" -    __description__ = """Sendmyway.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Sendmyway.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "sendmyway.com" diff --git a/pyload/plugin/account/ShareonlineBiz.py b/pyload/plugin/account/ShareonlineBiz.py index 28bc3b9bc..a27d52736 100644 --- a/pyload/plugin/account/ShareonlineBiz.py +++ b/pyload/plugin/account/ShareonlineBiz.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account  class ShareonlineBiz(Account): -    __name__    = "ShareonlineBiz" -    __type__    = "account" -    __version__ = "0.31" +    __name    = "ShareonlineBiz" +    __type    = "account" +    __version = "0.31" -    __description__ = """Share-online.biz account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Share-online.biz account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      def api_response(self, user, req): diff --git a/pyload/plugin/account/SimplyPremiumCom.py b/pyload/plugin/account/SimplyPremiumCom.py index 298ad8d59..92e4edbb9 100644 --- a/pyload/plugin/account/SimplyPremiumCom.py +++ b/pyload/plugin/account/SimplyPremiumCom.py @@ -5,13 +5,13 @@ from pyload.plugin.Account import Account  class SimplyPremiumCom(Account): -    __name__    = "SimplyPremiumCom" -    __type__    = "account" -    __version__ = "0.05" +    __name    = "SimplyPremiumCom" +    __type    = "account" +    __version = "0.05" -    __description__ = """Simply-Premium.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("EvolutionClip", "evolutionclip@live.de")] +    __description = """Simply-Premium.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("EvolutionClip", "evolutionclip@live.de")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/SimplydebridCom.py b/pyload/plugin/account/SimplydebridCom.py index a826e44c7..7b478879a 100644 --- a/pyload/plugin/account/SimplydebridCom.py +++ b/pyload/plugin/account/SimplydebridCom.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account  class SimplydebridCom(Account): -    __name__    = "SimplydebridCom" -    __type__    = "account" -    __version__ = "0.11" +    __name    = "SimplydebridCom" +    __type    = "account" +    __version = "0.11" -    __description__ = """Simply-Debrid.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")] +    __description = """Simply-Debrid.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/SmoozedCom.py b/pyload/plugin/account/SmoozedCom.py index 27249c7c2..17e9700fc 100644 --- a/pyload/plugin/account/SmoozedCom.py +++ b/pyload/plugin/account/SmoozedCom.py @@ -10,13 +10,13 @@ from pyload.plugin.Account import Account  class SmoozedCom(Account): -    __name__    = "SmoozedCom" -    __type__    = "account" -    __version__ = "0.03" +    __name    = "SmoozedCom" +    __type    = "account" +    __version = "0.03" -    __description__ = """Smoozed.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("", "")] +    __description = """Smoozed.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("", "")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/StahnuTo.py b/pyload/plugin/account/StahnuTo.py index ed8df3b77..57f9adc10 100644 --- a/pyload/plugin/account/StahnuTo.py +++ b/pyload/plugin/account/StahnuTo.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account  class StahnuTo(Account): -    __name__    = "StahnuTo" -    __type__    = "account" -    __version__ = "0.05" +    __name    = "StahnuTo" +    __type    = "account" +    __version = "0.05" -    __description__ = """StahnuTo account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """StahnuTo account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/StreamcloudEu.py b/pyload/plugin/account/StreamcloudEu.py index 3ac74fbd0..f3eb6cce9 100644 --- a/pyload/plugin/account/StreamcloudEu.py +++ b/pyload/plugin/account/StreamcloudEu.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class StreamcloudEu(XFSAccount): -    __name__    = "StreamcloudEu" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "StreamcloudEu" +    __type    = "account" +    __version = "0.02" -    __description__ = """Streamcloud.eu account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Streamcloud.eu account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "streamcloud.eu" diff --git a/pyload/plugin/account/TurbobitNet.py b/pyload/plugin/account/TurbobitNet.py index e3c07da2a..397e3b3ee 100644 --- a/pyload/plugin/account/TurbobitNet.py +++ b/pyload/plugin/account/TurbobitNet.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account  class TurbobitNet(Account): -    __name__    = "TurbobitNet" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "TurbobitNet" +    __type    = "account" +    __version = "0.02" -    __description__ = """TurbobitNet account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """TurbobitNet account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/TusfilesNet.py b/pyload/plugin/account/TusfilesNet.py index 84e9ef9c6..b951f8add 100644 --- a/pyload/plugin/account/TusfilesNet.py +++ b/pyload/plugin/account/TusfilesNet.py @@ -8,13 +8,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class TusfilesNet(XFSAccount): -    __name__    = "TusfilesNet" -    __type__    = "account" -    __version__ = "0.06" +    __name    = "TusfilesNet" +    __type    = "account" +    __version = "0.06" -    __description__ = """Tusfile.net account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("guidobelix", "guidobelix@hotmail.it")] +    __description = """Tusfile.net account plugin""" +    __license     = "GPLv3" +    __authors     = [("guidobelix", "guidobelix@hotmail.it")]      HOSTER_DOMAIN = "tusfiles.net" diff --git a/pyload/plugin/account/UlozTo.py b/pyload/plugin/account/UlozTo.py index 1570419b0..aeac52089 100644 --- a/pyload/plugin/account/UlozTo.py +++ b/pyload/plugin/account/UlozTo.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account  class UlozTo(Account): -    __name__    = "UlozTo" -    __type__    = "account" -    __version__ = "0.10" +    __name    = "UlozTo" +    __type    = "account" +    __version = "0.10" -    __description__ = """Uloz.to account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Uloz.to account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("pulpe", "")] diff --git a/pyload/plugin/account/UnrestrictLi.py b/pyload/plugin/account/UnrestrictLi.py index d8d7789bb..8d3071580 100644 --- a/pyload/plugin/account/UnrestrictLi.py +++ b/pyload/plugin/account/UnrestrictLi.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads  class UnrestrictLi(Account): -    __name__    = "UnrestrictLi" -    __type__    = "account" -    __version__ = "0.05" +    __name    = "UnrestrictLi" +    __type    = "account" +    __version = "0.05" -    __description__ = """Unrestrict.li account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Unrestrict.li account plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/UploadableCh.py b/pyload/plugin/account/UploadableCh.py index 9406118cd..15717db44 100644 --- a/pyload/plugin/account/UploadableCh.py +++ b/pyload/plugin/account/UploadableCh.py @@ -4,13 +4,13 @@ from pyload.plugin.Account import Account  class UploadableCh(Account): -    __name__    = "UploadableCh" -    __type__    = "account" -    __version__ = "0.03" +    __name    = "UploadableCh" +    __type    = "account" +    __version = "0.03" -    __description__ = """Uploadable.ch account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Sasch", "gsasch@gmail.com")] +    __description = """Uploadable.ch account plugin""" +    __license     = "GPLv3" +    __authors     = [("Sasch", "gsasch@gmail.com")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/UploadcCom.py b/pyload/plugin/account/UploadcCom.py index 66863c456..01102168c 100644 --- a/pyload/plugin/account/UploadcCom.py +++ b/pyload/plugin/account/UploadcCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class UploadcCom(XFSAccount): -    __name__    = "UploadcCom" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "UploadcCom" +    __type    = "account" +    __version = "0.02" -    __description__ = """Uploadc.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Uploadc.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "uploadc.com" diff --git a/pyload/plugin/account/UploadedTo.py b/pyload/plugin/account/UploadedTo.py index 3b0d957a5..64fbb5275 100644 --- a/pyload/plugin/account/UploadedTo.py +++ b/pyload/plugin/account/UploadedTo.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account  class UploadedTo(Account): -    __name__    = "UploadedTo" -    __type__    = "account" -    __version__ = "0.30" +    __name    = "UploadedTo" +    __type    = "account" +    __version = "0.30" -    __description__ = """Uploaded.to account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Uploaded.to account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      PREMIUM_PATTERN = r'<em>Premium</em>' diff --git a/pyload/plugin/account/UploadheroCom.py b/pyload/plugin/account/UploadheroCom.py index c73fc30f5..a0c8e2aa8 100644 --- a/pyload/plugin/account/UploadheroCom.py +++ b/pyload/plugin/account/UploadheroCom.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account  class UploadheroCom(Account): -    __name__    = "UploadheroCom" -    __type__    = "account" -    __version__ = "0.21" +    __name    = "UploadheroCom" +    __type    = "account" +    __version = "0.21" -    __description__ = """Uploadhero.co account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mcmyst", "mcmyst@hotmail.fr")] +    __description = """Uploadhero.co account plugin""" +    __license     = "GPLv3" +    __authors     = [("mcmyst", "mcmyst@hotmail.fr")]      def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/UploadingCom.py b/pyload/plugin/account/UploadingCom.py index 6d54469e8..7ac1e52ff 100644 --- a/pyload/plugin/account/UploadingCom.py +++ b/pyload/plugin/account/UploadingCom.py @@ -9,13 +9,13 @@ from pyload.plugin.internal.SimpleHoster import set_cookies  class UploadingCom(Account): -    __name__    = "UploadingCom" -    __type__    = "account" -    __version__ = "0.11" +    __name    = "UploadingCom" +    __type    = "account" +    __version = "0.11" -    __description__ = """Uploading.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de")] +    __description = """Uploading.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de")]      PREMIUM_PATTERN = r'UPGRADE TO PREMIUM' diff --git a/pyload/plugin/account/UptoboxCom.py b/pyload/plugin/account/UptoboxCom.py index f7cb7a82e..f7e715a33 100644 --- a/pyload/plugin/account/UptoboxCom.py +++ b/pyload/plugin/account/UptoboxCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class UptoboxCom(XFSAccount): -    __name__    = "UptoboxCom" -    __type__    = "account" -    __version__ = "0.08" +    __name    = "UptoboxCom" +    __type    = "account" +    __version = "0.08" -    __description__ = """DDLStorage.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """DDLStorage.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      HOSTER_DOMAIN = "uptobox.com" diff --git a/pyload/plugin/account/VidPlayNet.py b/pyload/plugin/account/VidPlayNet.py index 390520a00..c5d4e0b5a 100644 --- a/pyload/plugin/account/VidPlayNet.py +++ b/pyload/plugin/account/VidPlayNet.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class VidPlayNet(XFSAccount): -    __name__    = "VidPlayNet" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "VidPlayNet" +    __type    = "account" +    __version = "0.02" -    __description__ = """VidPlay.net account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """VidPlay.net account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = "vidplay.net" diff --git a/pyload/plugin/account/WebshareCz.py b/pyload/plugin/account/WebshareCz.py index efa2a0045..00d94dba5 100644 --- a/pyload/plugin/account/WebshareCz.py +++ b/pyload/plugin/account/WebshareCz.py @@ -10,13 +10,13 @@ from pyload.plugin.Account import Account  class WebshareCz(Account): -    __name__    = "WebshareCz" -    __type__    = "account" -    __version__ = "0.07" +    __name    = "WebshareCz" +    __type    = "account" +    __version = "0.07" -    __description__ = """Webshare.cz account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("rush", "radek.senfeld@gmail.com")] +    __description = """Webshare.cz account plugin""" +    __license     = "GPLv3" +    __authors     = [("rush", "radek.senfeld@gmail.com")]      VALID_UNTIL_PATTERN = r'<vip_until>(.+)</vip_until>' diff --git a/pyload/plugin/account/XFileSharingPro.py b/pyload/plugin/account/XFileSharingPro.py index 216af5385..79b5427ef 100644 --- a/pyload/plugin/account/XFileSharingPro.py +++ b/pyload/plugin/account/XFileSharingPro.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount  class XFileSharingPro(XFSAccount): -    __name__    = "XFileSharingPro" -    __type__    = "account" -    __version__ = "0.06" +    __name    = "XFileSharingPro" +    __type    = "account" +    __version = "0.06" -    __description__ = """XFileSharingPro multi-purpose account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """XFileSharingPro multi-purpose account plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = None diff --git a/pyload/plugin/account/YibaishiwuCom.py b/pyload/plugin/account/YibaishiwuCom.py index 150b0d931..ad9b089a9 100644 --- a/pyload/plugin/account/YibaishiwuCom.py +++ b/pyload/plugin/account/YibaishiwuCom.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account  class YibaishiwuCom(Account): -    __name__    = "YibaishiwuCom" -    __type__    = "account" -    __version__ = "0.02" +    __name    = "YibaishiwuCom" +    __type    = "account" +    __version = "0.02" -    __description__ = """115.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """115.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      ACCOUNT_INFO_PATTERN = r'var USER_PERMISSION = {(.*?)}' diff --git a/pyload/plugin/account/ZeveraCom.py b/pyload/plugin/account/ZeveraCom.py index db23170f3..bc5f4ac6e 100644 --- a/pyload/plugin/account/ZeveraCom.py +++ b/pyload/plugin/account/ZeveraCom.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account  class ZeveraCom(Account): -    __name__    = "ZeveraCom" -    __type__    = "account" -    __version__ = "0.26" +    __name    = "ZeveraCom" +    __type    = "account" +    __version = "0.26" -    __description__ = """Zevera.com account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Zevera.com account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/addon/AndroidPhoneNotify.py b/pyload/plugin/addon/AndroidPhoneNotify.py index 2b4f8fcca..148008116 100644 --- a/pyload/plugin/addon/AndroidPhoneNotify.py +++ b/pyload/plugin/addon/AndroidPhoneNotify.py @@ -7,20 +7,20 @@ from pyload.plugin.Addon import Addon  class AndroidPhoneNotify(Addon): -    __name__    = "AndroidPhoneNotify" -    __type__    = "addon" -    __version__ = "0.05" +    __name    = "AndroidPhoneNotify" +    __type    = "addon" +    __version = "0.05" -    __config__ = [("apikey"         , "str" , "API key"                                  , ""   ), +    __config = [("apikey"         , "str" , "API key"                                  , ""   ),                    ("notifycaptcha"  , "bool", "Notify captcha request"                   , True ),                    ("notifypackage"  , "bool", "Notify package finished"                  , True ),                    ("notifyprocessed", "bool", "Notify processed packages status"         , True ),                    ("timeout"        , "int" , "Timeout between captchas in seconds"      , 5    ),                    ("force"          , "bool", "Send notifications if client is connected", False)] -    __description__ = """Send push notifications to your Android Phone using notifymyandroid.com""" -    __license__     = "GPLv3" -    __authors__     = [("Steven Kosyra", "steven.kosyra@gmail.com"), +    __description = """Send push notifications to your Android Phone using notifymyandroid.com""" +    __license     = "GPLv3" +    __authors     = [("Steven Kosyra", "steven.kosyra@gmail.com"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/addon/Checksum.py b/pyload/plugin/addon/Checksum.py index 35be60773..043a1861c 100644 --- a/pyload/plugin/addon/Checksum.py +++ b/pyload/plugin/addon/Checksum.py @@ -38,20 +38,20 @@ def computeChecksum(local_file, algorithm):  class Checksum(Addon): -    __name__    = "Checksum" -    __type__    = "addon" -    __version__ = "0.16" +    __name    = "Checksum" +    __type    = "addon" +    __version = "0.16" -    __config__ = [("activated"     , "bool"              , "Activated"                                            , True   ), +    __config = [("activated"     , "bool"              , "Activated"                                            , True   ),                  ("check_checksum", "bool"              , "Check checksum? (If False only size will be verified)", True   ),                  ("check_action"  , "fail;retry;nothing", "What to do if check fails?"                           , "retry"),                  ("max_tries"     , "int"               , "Number of retries"                                    , 2      ),                  ("retry_action"  , "fail;nothing"      , "What to do if all retries fail?"                      , "fail" ),                  ("wait_time"     , "int"               , "Time to wait before each retry (seconds)"             , 1      )] -    __description__ = """Verify downloaded file size and checksum""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Verify downloaded file size and checksum""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("Walter Purcaro", "vuolter@gmail.com"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/addon/ClickAndLoad.py b/pyload/plugin/addon/ClickAndLoad.py index cd71e9972..98e650d15 100644 --- a/pyload/plugin/addon/ClickAndLoad.py +++ b/pyload/plugin/addon/ClickAndLoad.py @@ -53,17 +53,17 @@ def create_connection(address, timeout=object(), source_address=None):  class ClickAndLoad(Addon): -    __name__    = "ClickAndLoad" -    __type__    = "addon" -    __version__ = "0.35" +    __name    = "ClickAndLoad" +    __type    = "addon" +    __version = "0.35" -    __config__ = [("activated", "bool", "Activated"                             , True), +    __config = [("activated", "bool", "Activated"                             , True),                    ("port"     , "int" , "Port"                                  , 9666),                    ("extern"   , "bool", "Listen on the public network interface", True)] -    __description__ = """Click'N'Load addon plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.de"), +    __description = """Click'N'Load addon plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.de"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/addon/DeleteFinished.py b/pyload/plugin/addon/DeleteFinished.py index 59f2e3321..045f58d61 100644 --- a/pyload/plugin/addon/DeleteFinished.py +++ b/pyload/plugin/addon/DeleteFinished.py @@ -5,16 +5,16 @@ from pyload.plugin.Addon import Addon  class DeleteFinished(Addon): -    __name__    = "DeleteFinished" -    __type__    = "addon" -    __version__ = "1.11" +    __name    = "DeleteFinished" +    __type    = "addon" +    __version = "1.11" -    __config__ = [('interval'  , 'int' , 'Delete every (hours)'              , '72'   ), +    __config = [('interval'  , 'int' , 'Delete every (hours)'              , '72'   ),                  ('deloffline', 'bool', 'Delete packages with offline links', 'False')] -    __description__ = """Automatically delete all finished packages from queue""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Automatically delete all finished packages from queue""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      # event_list = ["pluginConfigChanged"] @@ -45,7 +45,7 @@ class DeleteFinished(Addon):      def activate(self):          self.info = {'sleep': True}          interval = self.getConfig('interval') -        self.pluginConfigChanged(self.__name__, 'interval', interval) +        self.pluginConfigChanged(self.__name, 'interval', interval)          self.addEvent('packageFinished', self.wakeup) diff --git a/pyload/plugin/addon/DownloadScheduler.py b/pyload/plugin/addon/DownloadScheduler.py index e5e25e389..7f05d89f4 100644 --- a/pyload/plugin/addon/DownloadScheduler.py +++ b/pyload/plugin/addon/DownloadScheduler.py @@ -8,16 +8,16 @@ from pyload.plugin.Addon import Addon  class DownloadScheduler(Addon): -    __name__    = "DownloadScheduler" -    __type__    = "addon" -    __version__ = "0.22" +    __name    = "DownloadScheduler" +    __type    = "addon" +    __version = "0.22" -    __config__ = [("timetable", "str" , "List time periods as hh:mm full or number(kB/s)"      , "0:00 full, 7:00 250, 10:00 0, 17:00 150"), +    __config = [("timetable", "str" , "List time periods as hh:mm full or number(kB/s)"      , "0:00 full, 7:00 250, 10:00 0, 17:00 150"),                  ("abort"    , "bool", "Abort active downloads when start period with speed 0", False                                    )] -    __description__ = """Download Scheduler""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Download Scheduler""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/addon/ExternalScripts.py b/pyload/plugin/addon/ExternalScripts.py index 5aebf2338..139a7e3e7 100644 --- a/pyload/plugin/addon/ExternalScripts.py +++ b/pyload/plugin/addon/ExternalScripts.py @@ -10,16 +10,16 @@ from pyload.utils import safe_join  class ExternalScripts(Addon): -    __name__    = "ExternalScripts" -    __type__    = "addon" -    __version__ = "0.29" +    __name    = "ExternalScripts" +    __type    = "addon" +    __version = "0.29" -    __config__ = [("activated", "bool", "Activated"         , True ), +    __config = [("activated", "bool", "Activated"         , True ),                    ("wait"     , "bool", "Wait script ending", False)] -    __description__ = """Run external scripts""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de"), +    __description = """Run external scripts""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de"),                       ("RaNaN", "ranan@pyload.org"),                       ("spoob", "spoob@pyload.org"),                       ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/addon/ExtractArchive.py b/pyload/plugin/addon/ExtractArchive.py index 951434e3e..b2460bf9d 100644 --- a/pyload/plugin/addon/ExtractArchive.py +++ b/pyload/plugin/addon/ExtractArchive.py @@ -102,11 +102,11 @@ class ArchiveQueue(object):  class ExtractArchive(Addon): -    __name__    = "ExtractArchive" -    __type__    = "addon" -    __version__ = "1.29" +    __name    = "ExtractArchive" +    __type    = "addon" +    __version = "1.29" -    __config__ = [("activated"       , "bool"  , "Activated"                                 , True                                                                     ), +    __config = [("activated"       , "bool"  , "Activated"                                 , True                                                                     ),                    ("fullpath"        , "bool"  , "Extract with full paths"                   , True                                                                     ),                    ("overwrite"       , "bool"  , "Overwrite files"                           , False                                                                    ),                    ("keepbroken"      , "bool"  , "Try to extract broken archives"            , False                                                                    ), @@ -122,9 +122,9 @@ class ExtractArchive(Addon):                    ("waitall"         , "bool"  , "Wait for all downloads to be finished"     , False                                                                    ),                    ("renice"          , "int"   , "CPU priority"                              , 0                                                                        )] -    __description__ = """Extract different kind of archives""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"), +    __description = """Extract different kind of archives""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com"),                         ("Immenz"        , "immenz@gmx.net"   )] @@ -167,7 +167,7 @@ class ExtractArchive(Addon):                      print_exc()          if self.extractors: -            self.logInfo(_("Activated") + " " + "|".join("%s %s" % (Extractor.__name__,Extractor.VERSION) for Extractor in self.extractors)) +            self.logInfo(_("Activated") + " " + "|".join("%s %s" % (Extractor.__name,Extractor.VERSION) for Extractor in self.extractors))              if self.getConfig("waitall"):                  self.extractPackage(*self.queue.get())  #: Resume unfinished extractions @@ -267,7 +267,7 @@ class ExtractArchive(Addon):                  for Extractor in self.extractors:                      targets = Extractor.getTargets(files_ids)                      if targets: -                        self.logDebug("Targets for %s: %s" % (Extractor.__name__, targets)) +                        self.logDebug("Targets for %s: %s" % (Extractor.__name, targets))                          matched = True                      for fname, fid, fout in targets: diff --git a/pyload/plugin/addon/HotFolder.py b/pyload/plugin/addon/HotFolder.py index eb607ac7e..6b1f6c02e 100644 --- a/pyload/plugin/addon/HotFolder.py +++ b/pyload/plugin/addon/HotFolder.py @@ -13,18 +13,18 @@ from pyload.utils import fs_encode, safe_join  class HotFolder(Addon): -    __name__    = "HotFolder" -    __type__    = "addon" -    __version__ = "0.12" +    __name    = "HotFolder" +    __type    = "addon" +    __version = "0.12" -    __config__ = [("folder"    , "str" , "Folder to observe"    , "container"), +    __config = [("folder"    , "str" , "Folder to observe"    , "container"),                  ("watch_file", "bool", "Observe link file"    , False      ),                  ("keep"      , "bool", "Keep added containers", True       ),                  ("file"      , "str" , "Link file"            , "links.txt")] -    __description__ = """Observe folder and file for changes and add container and links""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.de")] +    __description = """Observe folder and file for changes and add container and links""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.de")]      def setup(self): diff --git a/pyload/plugin/addon/IRCInterface.py b/pyload/plugin/addon/IRCInterface.py index 86d9ea688..2f61479ab 100644 --- a/pyload/plugin/addon/IRCInterface.py +++ b/pyload/plugin/addon/IRCInterface.py @@ -18,11 +18,11 @@ from pyload.utils import formatSize  class IRCInterface(Thread, Addon): -    __name__    = "IRCInterface" -    __type__    = "addon" -    __version__ = "0.13" +    __name    = "IRCInterface" +    __type    = "addon" +    __version = "0.13" -    __config__ = [("host"     , "str" , "IRC-Server Address"                           , "Enter your server here!"), +    __config = [("host"     , "str" , "IRC-Server Address"                           , "Enter your server here!"),                  ("port"     , "int" , "IRC-Server Port"                              , 6667                     ),                  ("ident"    , "str" , "Clients ident"                                , "pyload-irc"             ),                  ("realname" , "str" , "Realname"                                     , "pyload-irc"             ), @@ -33,9 +33,9 @@ class IRCInterface(Thread, Addon):                  ("info_pack", "bool", "Inform about every package finished"          , True                     ),                  ("captcha"  , "bool", "Send captcha requests"                        , True                     )] -    __description__ = """Connect to irc and let owner perform different tasks""" -    __license__     = "GPLv3" -    __authors__     = [("Jeix", "Jeix@hasnomail.com")] +    __description = """Connect to irc and let owner perform different tasks""" +    __license     = "GPLv3" +    __authors     = [("Jeix", "Jeix@hasnomail.com")]      def __init__(self, core, manager): diff --git a/pyload/plugin/addon/JustPremium.py b/pyload/plugin/addon/JustPremium.py index d3c4d8eff..b902073a6 100644 --- a/pyload/plugin/addon/JustPremium.py +++ b/pyload/plugin/addon/JustPremium.py @@ -6,15 +6,15 @@ from pyload.plugin.Addon import Addon  class JustPremium(Addon): -    __name__    = "JustPremium" -    __type__    = "addon" -    __version__ = "0.21" +    __name    = "JustPremium" +    __type    = "addon" +    __version = "0.21" -    __config__ = [("excluded", "str", "Exclude hosters (comma separated)", "")] +    __config = [("excluded", "str", "Exclude hosters (comma separated)", "")] -    __description__ = """Remove all not premium links from urls added""" -    __license__     = "GPLv3" -    __authors__     = [("mazleu", "mazleica@gmail.com"), +    __description = """Remove all not premium links from urls added""" +    __license     = "GPLv3" +    __authors     = [("mazleu", "mazleica@gmail.com"),                         ("Walter Purcaro", "vuolter@gmail.com"),                         ("immenz", "immenz@gmx.net")] diff --git a/pyload/plugin/addon/MergeFiles.py b/pyload/plugin/addon/MergeFiles.py index 11e869aee..5efb8383b 100644 --- a/pyload/plugin/addon/MergeFiles.py +++ b/pyload/plugin/addon/MergeFiles.py @@ -12,15 +12,15 @@ from pyload.utils import safe_join  class MergeFiles(Addon): -    __name__    = "MergeFiles" -    __type__    = "addon" -    __version__ = "0.14" +    __name    = "MergeFiles" +    __type    = "addon" +    __version = "0.14" -    __config__ = [("activated", "bool", "Activated", True)] +    __config = [("activated", "bool", "Activated", True)] -    __description__ = """Merges parts splitted with hjsplit""" -    __license__     = "GPLv3" -    __authors__     = [("and9000", "me@has-no-mail.com")] +    __description = """Merges parts splitted with hjsplit""" +    __license     = "GPLv3" +    __authors     = [("and9000", "me@has-no-mail.com")]      BUFFER_SIZE = 4096 diff --git a/pyload/plugin/addon/MultiHome.py b/pyload/plugin/addon/MultiHome.py index 521749fc8..2841c3a35 100644 --- a/pyload/plugin/addon/MultiHome.py +++ b/pyload/plugin/addon/MultiHome.py @@ -6,15 +6,15 @@ from pyload.plugin.Addon import Addon  class MultiHome(Addon): -    __name__    = "MultiHome" -    __type__    = "addon" -    __version__ = "0.12" +    __name    = "MultiHome" +    __type    = "addon" +    __version = "0.12" -    __config__ = [("interfaces", "str", "Interfaces", "None")] +    __config = [("interfaces", "str", "Interfaces", "None")] -    __description__ = """Ip address changer""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de")] +    __description = """Ip address changer""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de")]      def setup(self): diff --git a/pyload/plugin/addon/RestartFailed.py b/pyload/plugin/addon/RestartFailed.py index 2fe5f13bf..5611cc791 100644 --- a/pyload/plugin/addon/RestartFailed.py +++ b/pyload/plugin/addon/RestartFailed.py @@ -4,16 +4,16 @@ from pyload.plugin.Addon import Addon  class RestartFailed(Addon): -    __name__    = "RestartFailed" -    __type__    = "addon" -    __version__ = "1.57" +    __name    = "RestartFailed" +    __type    = "addon" +    __version = "1.57" -    __config__ = [("activated", "bool", "Activated"                , True), +    __config = [("activated", "bool", "Activated"                , True),                  ("interval" , "int" , "Check interval in minutes", 90  )] -    __description__ = """Periodically restart all failed downloads in queue""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Periodically restart all failed downloads in queue""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      # event_list = ["pluginConfigChanged"] @@ -42,4 +42,4 @@ class RestartFailed(Addon):      def activate(self): -        self.pluginConfigChanged(self.__name__, "interval", self.getConfig("interval")) +        self.pluginConfigChanged(self.__name, "interval", self.getConfig("interval")) diff --git a/pyload/plugin/addon/RestartSlow.py b/pyload/plugin/addon/RestartSlow.py index 332047da7..796aed257 100644 --- a/pyload/plugin/addon/RestartSlow.py +++ b/pyload/plugin/addon/RestartSlow.py @@ -6,19 +6,19 @@ from pyload.plugin.Addon import Addon  class RestartSlow(Addon): -    __name__    = "RestartSlow" -    __type__    = "addon" -    __version__ = "0.04" +    __name    = "RestartSlow" +    __type    = "addon" +    __version = "0.04" -    __config__ = [("free_limit"   , "int" ,  "Transfer speed threshold in kilobytes"                     , 100 ), +    __config = [("free_limit"   , "int" ,  "Transfer speed threshold in kilobytes"                     , 100 ),                  ("free_time"    , "int" ,  "Sample interval in minutes"                                , 5   ),                  ("premium_limit", "int" ,  "Transfer speed threshold for premium download in kilobytes", 300 ),                  ("premium_time" , "int" ,  "Sample interval for premium download in minutes"           , 2   ),                  ("safe_mode"    , "bool",  "Don't restart if download is not resumable"                , True)] -    __description__ = """Restart slow downloads""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Restart slow downloads""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      event_map = {'download-start': "downloadStarts"} diff --git a/pyload/plugin/addon/SkipRev.py b/pyload/plugin/addon/SkipRev.py index efc96cb7b..5e56637a8 100644 --- a/pyload/plugin/addon/SkipRev.py +++ b/pyload/plugin/addon/SkipRev.py @@ -16,15 +16,15 @@ def _setup(self):  class SkipRev(Addon): -    __name__    = "SkipRev" -    __type__    = "addon" -    __version__ = "0.25" +    __name    = "SkipRev" +    __type    = "addon" +    __version = "0.25" -    __config__ = [("tokeep", "int", "Number of rev files to keep for package (-1 to auto)", -1)] +    __config = [("tokeep", "int", "Number of rev files to keep for package (-1 to auto)", -1)] -    __description__ = """Skip files ending with extension rev""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Skip files ending with extension rev""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      def _pyname(self, pyfile): diff --git a/pyload/plugin/addon/UnSkipOnFail.py b/pyload/plugin/addon/UnSkipOnFail.py index 7d787d1ed..bf9d781da 100644 --- a/pyload/plugin/addon/UnSkipOnFail.py +++ b/pyload/plugin/addon/UnSkipOnFail.py @@ -5,15 +5,15 @@ from pyload.plugin.Addon import Addon  class UnSkipOnFail(Addon): -    __name__    = "UnSkipOnFail" -    __type__    = "addon" -    __version__ = "0.05" +    __name    = "UnSkipOnFail" +    __type    = "addon" +    __version = "0.05" -    __config__ = [("activated", "bool", "Activated", True)] +    __config = [("activated", "bool", "Activated", True)] -    __description__ = """Queue skipped duplicates when download fails""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Queue skipped duplicates when download fails""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      def downloadFailed(self, pyfile): diff --git a/pyload/plugin/addon/UpdateManager.py b/pyload/plugin/addon/UpdateManager.py index cf138f64a..0c803bea6 100644 --- a/pyload/plugin/addon/UpdateManager.py +++ b/pyload/plugin/addon/UpdateManager.py @@ -14,26 +14,26 @@ from pyload.utils import safe_join  class UpdateManager(Addon): -    __name__    = "UpdateManager" -    __type__    = "addon" -    __version__ = "0.43" +    __name    = "UpdateManager" +    __type    = "addon" +    __version = "0.43" -    __config__ = [("activated"    , "bool"                         , "Activated"                                     , True              ), +    __config = [("activated"    , "bool"                         , "Activated"                                     , True              ),                  ("mode"         , "pyLoad + plugins;plugins only", "Check updates for"                             , "pyLoad + plugins"),                  ("interval"     , "int"                          , "Check interval in hours"                       , 8                 ),                  ("autorestart"  , "bool"                         , "Automatically restart pyLoad when required"    , True              ),                  ("reloadplugins", "bool"                         , "Monitor plugins for code changes in debug mode", True              ),                  ("nodebugupdate", "bool"                         , "Don't check for updates in debug mode"         , False             )] -    __description__ = """Check for updates""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Check for updates""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      # event_list = ["pluginConfigChanged"]      SERVER_URL   = "http://updatemanager.pyload.org" -    VERSION      = re.compile(r'__version__.*=.*("|\')([\d.]+)') +    VERSION      = re.compile(r'__version.*=.*("|\')([\d.]+)')      MIN_INTERVAL = 3 * 60 * 60  #: 3h minimum check interval (value is in seconds) @@ -55,13 +55,13 @@ class UpdateManager(Addon):      def activate(self): -        self.pluginConfigChanged(self.__name__, "interval", self.getConfig("interval")) -        x = lambda: self.pluginConfigChanged(self.__name__, "reloadplugins", self.getConfig("reloadplugins")) +        self.pluginConfigChanged(self.__name, "interval", self.getConfig("interval")) +        x = lambda: self.pluginConfigChanged(self.__name, "reloadplugins", self.getConfig("reloadplugins"))          self.core.scheduler.addJob(10, x, threaded=False)      def deactivate(self): -        self.pluginConfigChanged(self.__name__, "reloadplugins", False) +        self.pluginConfigChanged(self.__name, "reloadplugins", False)      def setup(self): @@ -83,15 +83,15 @@ class UpdateManager(Addon):      def autoreloadPlugins(self):          """ reload and reindex all modified plugins """          modules = filter( -            lambda m: m and (m.__name__.startswith("pyload.plugin.") or -                             m.__name__.startswith("userplugins.")) and -                             m.__name__.count(".") >= 2, sys.modules.itervalues() +            lambda m: m and (m.__name.startswith("pyload.plugin.") or +                             m.__name.startswith("userplugins.")) and +                             m.__name.count(".") >= 2, sys.modules.itervalues()          )          reloads = []          for m in modules: -            root, type, name = m.__name__.rsplit(".", 2) +            root, type, name = m.__name.rsplit(".", 2)              id = (type, name)              if type in self.core.pluginManager.plugins:                  f = m.__file__.replace(".pyc", ".py") diff --git a/pyload/plugin/addon/WindowsPhoneNotify.py b/pyload/plugin/addon/WindowsPhoneNotify.py index b9710c2f0..45324fbdb 100644 --- a/pyload/plugin/addon/WindowsPhoneNotify.py +++ b/pyload/plugin/addon/WindowsPhoneNotify.py @@ -8,11 +8,11 @@ from pyload.plugin.Addon import Addon  class WindowsPhoneNotify(Addon): -    __name__    = "WindowsPhoneNotify" -    __type__    = "addon" -    __version__ = "0.07" +    __name    = "WindowsPhoneNotify" +    __type    = "addon" +    __version = "0.07" -    __config__ = [("id"             , "str" , "Push ID"                                  , ""   ), +    __config = [("id"             , "str" , "Push ID"                                  , ""   ),                    ("url"            , "str" , "Push url"                                 , ""   ),                    ("notifycaptcha"  , "bool", "Notify captcha request"                   , True ),                    ("notifypackage"  , "bool", "Notify package finished"                  , True ), @@ -20,9 +20,9 @@ class WindowsPhoneNotify(Addon):                    ("timeout"        , "int" , "Timeout between captchas in seconds"      , 5    ),                    ("force"          , "bool", "Send notifications if client is connected", False)] -    __description__ = """Send push notifications to Windows Phone""" -    __license__     = "GPLv3" -    __authors__     = [("Andy Voigt", "phone-support@hotmail.de"), +    __description = """Send push notifications to Windows Phone""" +    __license     = "GPLv3" +    __authors     = [("Andy Voigt", "phone-support@hotmail.de"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/addon/XMPPInterface.py b/pyload/plugin/addon/XMPPInterface.py index 77a49af6f..8baffe284 100644 --- a/pyload/plugin/addon/XMPPInterface.py +++ b/pyload/plugin/addon/XMPPInterface.py @@ -10,11 +10,11 @@ from pyload.plugin.addon.IRCInterface import IRCInterface  class XMPPInterface(IRCInterface, JabberClient): -    __name__    = "XMPPInterface" -    __type__    = "addon" -    __version__ = "0.11" +    __name    = "XMPPInterface" +    __type    = "addon" +    __version = "0.11" -    __config__ = [("jid"      , "str" , "Jabber ID"                           , "user@exmaple-jabber-server.org"         ), +    __config = [("jid"      , "str" , "Jabber ID"                           , "user@exmaple-jabber-server.org"         ),                  ("pw"       , "str" , "Password"                            , ""                                       ),                  ("tls"      , "bool", "Use TLS"                             , False                                    ),                  ("owners"   , "str" , "List of JIDs accepting commands from", "me@icq-gateway.org;some@msn-gateway.org"), @@ -22,9 +22,9 @@ class XMPPInterface(IRCInterface, JabberClient):                  ("info_pack", "bool", "Inform about every package finished" , True                                     ),                  ("captcha"  , "bool", "Send captcha requests"               , True                                     )] -    __description__ = """Connect to jabber and let owner perform different tasks""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org")] +    __description = """Connect to jabber and let owner perform different tasks""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org")]      implements(IMessageHandlersProvider) diff --git a/pyload/plugin/captcha/AdYouLike.py b/pyload/plugin/captcha/AdYouLike.py index 0ff1a799b..f2b782e4f 100644 --- a/pyload/plugin/captcha/AdYouLike.py +++ b/pyload/plugin/captcha/AdYouLike.py @@ -7,12 +7,12 @@ from pyload.utils import json_loads  class AdYouLike(Captcha): -    __name__    = "AdYouLike" -    __version__ = "0.05" +    __name    = "AdYouLike" +    __version = "0.05" -    __description__ = """AdYouLike captcha service plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """AdYouLike captcha service plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      AYL_PATTERN      = r'Adyoulike\.create\s*\((.+?)\)' diff --git a/pyload/plugin/captcha/AdsCaptcha.py b/pyload/plugin/captcha/AdsCaptcha.py index 75852e36d..5922e8f0d 100644 --- a/pyload/plugin/captcha/AdsCaptcha.py +++ b/pyload/plugin/captcha/AdsCaptcha.py @@ -8,12 +8,12 @@ from pyload.plugin.Captcha import Captcha  class AdsCaptcha(Captcha): -    __name__    = "AdsCaptcha" -    __version__ = "0.08" +    __name    = "AdsCaptcha" +    __version = "0.08" -    __description__ = """AdsCaptcha captcha service plugin""" -    __license__     = "GPLv3" -    __authors__     = [("pyLoad Team", "admin@pyload.org")] +    __description = """AdsCaptcha captcha service plugin""" +    __license     = "GPLv3" +    __authors     = [("pyLoad Team", "admin@pyload.org")]      CAPTCHAID_PATTERN  = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*CaptchaId=(\d+)' diff --git a/pyload/plugin/captcha/ReCaptcha.py b/pyload/plugin/captcha/ReCaptcha.py index 295491bd8..6cddaba0d 100644 --- a/pyload/plugin/captcha/ReCaptcha.py +++ b/pyload/plugin/captcha/ReCaptcha.py @@ -11,12 +11,12 @@ from pyload.plugin.Captcha import Captcha  class ReCaptcha(Captcha): -    __name__    = "ReCaptcha" -    __version__ = "0.14" +    __name    = "ReCaptcha" +    __version = "0.14" -    __description__ = """ReCaptcha captcha service plugin""" -    __license__     = "GPLv3" -    __authors__     = [("pyLoad Team", "admin@pyload.org"), +    __description = """ReCaptcha captcha service plugin""" +    __license     = "GPLv3" +    __authors     = [("pyLoad Team", "admin@pyload.org"),                         ("Walter Purcaro", "vuolter@gmail.com"),                         ("zapp-brannigan", "fuerst.reinje@web.de")] diff --git a/pyload/plugin/captcha/SolveMedia.py b/pyload/plugin/captcha/SolveMedia.py index af45101b4..5fcf61426 100644 --- a/pyload/plugin/captcha/SolveMedia.py +++ b/pyload/plugin/captcha/SolveMedia.py @@ -6,12 +6,12 @@ from pyload.plugin.Captcha import Captcha  class SolveMedia(Captcha): -    __name__    = "SolveMedia" -    __version__ = "0.12" +    __name    = "SolveMedia" +    __version = "0.12" -    __description__ = """SolveMedia captcha service plugin""" -    __license__     = "GPLv3" -    __authors__     = [("pyLoad Team", "admin@pyload.org")] +    __description = """SolveMedia captcha service plugin""" +    __license     = "GPLv3" +    __authors     = [("pyLoad Team", "admin@pyload.org")]      KEY_PATTERN = r'api\.solvemedia\.com/papi/challenge\.(?:no)?script\?k=(.+?)["\']' diff --git a/pyload/plugin/container/CCF.py b/pyload/plugin/container/CCF.py index 311eb2006..c2771a57b 100644 --- a/pyload/plugin/container/CCF.py +++ b/pyload/plugin/container/CCF.py @@ -13,15 +13,15 @@ from pyload.utils import fs_encode, safe_join  class CCF(Container): -    __name__    = "CCF" -    __type__    = "container" -    __version__ = "0.23" +    __name    = "CCF" +    __type    = "container" +    __version = "0.23" -    __pattern__ = r'.+\.ccf$' +    __pattern = r'.+\.ccf$' -    __description__ = """CCF container decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Willnix", "Willnix@pyload.org"), +    __description = """CCF container decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Willnix", "Willnix@pyload.org"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/container/DLC.py b/pyload/plugin/container/DLC.py index 8b8a0199b..451bab06f 100644 --- a/pyload/plugin/container/DLC.py +++ b/pyload/plugin/container/DLC.py @@ -12,15 +12,15 @@ from pyload.utils import decode, fs_encode  class DLC(Container): -    __name__    = "DLC" -    __type__    = "container" -    __version__ = "0.24" +    __name    = "DLC" +    __type    = "container" +    __version = "0.24" -    __pattern__ = r'.+\.dlc$' +    __pattern = r'.+\.dlc$' -    __description__ = """DLC container decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """DLC container decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("spoob", "spoob@pyload.org"),                         ("mkaay", "mkaay@mkaay.de"),                         ("Schnusch", "Schnusch@users.noreply.github.com"), diff --git a/pyload/plugin/container/RSDF.py b/pyload/plugin/container/RSDF.py index c4b743d14..520ce2e71 100644 --- a/pyload/plugin/container/RSDF.py +++ b/pyload/plugin/container/RSDF.py @@ -12,15 +12,15 @@ from pyload.utils import fs_encode  class RSDF(Container): -    __name__    = "RSDF" -    __type__    = "container" -    __version__ = "0.27" +    __name    = "RSDF" +    __type    = "container" +    __version = "0.27" -    __pattern__ = r'.+\.rsdf$' +    __pattern = r'.+\.rsdf$' -    __description__ = """RSDF container decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """RSDF container decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("spoob", "spoob@pyload.org"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/container/TXT.py b/pyload/plugin/container/TXT.py index 2bf5bf2aa..0f90f6b5a 100644 --- a/pyload/plugin/container/TXT.py +++ b/pyload/plugin/container/TXT.py @@ -7,17 +7,17 @@ from pyload.utils import fs_encode  class TXT(Container): -    __name__    = "TXT" -    __type__    = "container" -    __version__ = "0.15" +    __name    = "TXT" +    __type    = "container" +    __version = "0.15" -    __pattern__ = r'.+\.(txt|text)$' -    __config__ = [("flush"   , "bool"  , "Flush list after adding", False  ), +    __pattern = r'.+\.(txt|text)$' +    __config = [("flush"   , "bool"  , "Flush list after adding", False  ),                    ("encoding", "string", "File encoding"          , "utf-8")] -    __description__ = """Read link lists in plain text formats""" -    __license__     = "GPLv3" -    __authors__     = [("spoob", "spoob@pyload.org"), +    __description = """Read link lists in plain text formats""" +    __license     = "GPLv3" +    __authors     = [("spoob", "spoob@pyload.org"),                         ("jeix", "jeix@hasnomail.com")] diff --git a/pyload/plugin/crypter/BitshareCom.py b/pyload/plugin/crypter/BitshareCom.py index 524307127..dfa7b71df 100644 --- a/pyload/plugin/crypter/BitshareCom.py +++ b/pyload/plugin/crypter/BitshareCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class BitshareCom(SimpleCrypter): -    __name__    = "BitshareCom" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "BitshareCom" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?bitshare\.com/\?d=\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?bitshare\.com/\?d=\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Bitshare.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Bitshare.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      LINK_PATTERN = r'<a href="(http://bitshare\.com/files/.+)">.+</a></td>' diff --git a/pyload/plugin/crypter/C1NeonCom.py b/pyload/plugin/crypter/C1NeonCom.py index dc1555b46..e0e1bda17 100644 --- a/pyload/plugin/crypter/C1NeonCom.py +++ b/pyload/plugin/crypter/C1NeonCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class C1NeonCom(DeadCrypter): -    __name__    = "C1NeonCom" -    __type__    = "crypter" -    __version__ = "0.05" +    __name    = "C1NeonCom" +    __type    = "crypter" +    __version = "0.05" -    __pattern__ = r'http://(?:www\.)?c1neon\.com/.+' -    __config__  = [] +    __pattern = r'http://(?:www\.)?c1neon\.com/.+' +    __config  = [] -    __description__ = """C1neon.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("godofdream", "soilfiction@gmail.com")] +    __description = """C1neon.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("godofdream", "soilfiction@gmail.com")] diff --git a/pyload/plugin/crypter/ChipDe.py b/pyload/plugin/crypter/ChipDe.py index 2f47236e8..6d4baee57 100644 --- a/pyload/plugin/crypter/ChipDe.py +++ b/pyload/plugin/crypter/ChipDe.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter  class ChipDe(Crypter): -    __name__    = "ChipDe" -    __type__    = "crypter" -    __version__ = "0.10" +    __name    = "ChipDe" +    __type    = "crypter" +    __version = "0.10" -    __pattern__ = r'http://(?:www\.)?chip\.de/video/.+\.html' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?chip\.de/video/.+\.html' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Chip.de decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("4Christopher", "4Christopher@gmx.de")] +    __description = """Chip.de decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("4Christopher", "4Christopher@gmx.de")]      def decrypt(self, pyfile): diff --git a/pyload/plugin/crypter/CloudzillaTo.py b/pyload/plugin/crypter/CloudzillaTo.py index 340892136..0990a1efd 100644 --- a/pyload/plugin/crypter/CloudzillaTo.py +++ b/pyload/plugin/crypter/CloudzillaTo.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class CloudzillaTo(SimpleHoster): -    __name__    = "CloudzillaTo" -    __type__    = "crypter" -    __version__ = "0.02" +    __name    = "CloudzillaTo" +    __type    = "crypter" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/folder/(?P<ID>[\w^_]+)' +    __pattern = r'http://(?:www\.)?cloudzilla\.to/share/folder/(?P<ID>[\w^_]+)' -    __description__ = """Cloudzilla.to folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Cloudzilla.to folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      INFO_PATTERN    = r'<span class="name" title="(?P<N>.+?)"' diff --git a/pyload/plugin/crypter/CrockoCom.py b/pyload/plugin/crypter/CrockoCom.py index c93f4afab..23357120f 100644 --- a/pyload/plugin/crypter/CrockoCom.py +++ b/pyload/plugin/crypter/CrockoCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class CrockoCom(SimpleCrypter): -    __name__    = "CrockoCom" -    __type__    = "crypter" -    __version__ = "0.01" +    __name    = "CrockoCom" +    __type    = "crypter" +    __version = "0.01" -    __pattern__ = r'http://(?:www\.)?crocko\.com/f/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?crocko\.com/f/.+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Crocko.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Crocko.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      LINK_PATTERN = r'<td class="last"><a href="([^"]+)">download</a>' diff --git a/pyload/plugin/crypter/CryptItCom.py b/pyload/plugin/crypter/CryptItCom.py index 0d72cba61..615626f4f 100644 --- a/pyload/plugin/crypter/CryptItCom.py +++ b/pyload/plugin/crypter/CryptItCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class CryptItCom(DeadCrypter): -    __name__    = "CryptItCom" -    __type__    = "crypter" -    __version__ = "0.11" +    __name    = "CryptItCom" +    __type    = "crypter" +    __version = "0.11" -    __pattern__ = r'http://(?:www\.)?crypt-it\.com/(s|e|d|c)/\w+' -    __config__  = [] +    __pattern = r'http://(?:www\.)?crypt-it\.com/(s|e|d|c)/\w+' +    __config  = [] -    __description__ = """Crypt-it.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.de")] +    __description = """Crypt-it.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.de")] diff --git a/pyload/plugin/crypter/CzshareCom.py b/pyload/plugin/crypter/CzshareCom.py index e527d683f..4cbd182cb 100644 --- a/pyload/plugin/crypter/CzshareCom.py +++ b/pyload/plugin/crypter/CzshareCom.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter  class CzshareCom(Crypter): -    __name__    = "CzshareCom" -    __type__    = "crypter" -    __version__ = "0.20" +    __name    = "CzshareCom" +    __type    = "crypter" +    __version = "0.20" -    __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Czshare.com folder decrypter plugin, now Sdilej.cz""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Czshare.com folder decrypter plugin, now Sdilej.cz""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      FOLDER_PATTERN = r'<tr class="subdirectory">\s*<td>\s*<table>(.*?)</table>' diff --git a/pyload/plugin/crypter/DDLMusicOrg.py b/pyload/plugin/crypter/DDLMusicOrg.py index 2b6738799..a24cac22d 100644 --- a/pyload/plugin/crypter/DDLMusicOrg.py +++ b/pyload/plugin/crypter/DDLMusicOrg.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter  class DDLMusicOrg(Crypter): -    __name__    = "DDLMusicOrg" -    __type__    = "crypter" -    __version__ = "0.30" +    __name    = "DDLMusicOrg" +    __type    = "crypter" +    __version = "0.30" -    __pattern__ = r'http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Ddl-music.org decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de")] +    __description = """Ddl-music.org decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de")]      def setup(self): diff --git a/pyload/plugin/crypter/DailymotionBatch.py b/pyload/plugin/crypter/DailymotionBatch.py index c66c7c829..7afcccceb 100644 --- a/pyload/plugin/crypter/DailymotionBatch.py +++ b/pyload/plugin/crypter/DailymotionBatch.py @@ -10,17 +10,17 @@ from pyload.utils import safe_join  class DailymotionBatch(Crypter): -    __name__    = "DailymotionBatch" -    __type__    = "crypter" -    __version__ = "0.01" +    __name    = "DailymotionBatch" +    __type    = "crypter" +    __version = "0.01" -    __pattern__ = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Dailymotion.com channel & playlist decrypter""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Dailymotion.com channel & playlist decrypter""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      def api_response(self, ref, req=None): @@ -83,7 +83,7 @@ class DailymotionBatch(Crypter):      def decrypt(self, pyfile): -        m = re.match(self.__pattern__, pyfile.url) +        m = re.match(self.__pattern, pyfile.url)          m_id = m.group('ID')          m_type = m.group('TYPE') diff --git a/pyload/plugin/crypter/DataHu.py b/pyload/plugin/crypter/DataHu.py index f69d6ee3e..bc677253a 100644 --- a/pyload/plugin/crypter/DataHu.py +++ b/pyload/plugin/crypter/DataHu.py @@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class DataHu(SimpleCrypter): -    __name__    = "DataHu" -    __type__    = "crypter" -    __version__ = "0.06" +    __name    = "DataHu" +    __type    = "crypter" +    __version = "0.06" -    __pattern__ = r'http://(?:www\.)?data\.hu/dir/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?data\.hu/dir/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Data.hu folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("crash", ""), +    __description = """Data.hu folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("crash", ""),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/DdlstorageCom.py b/pyload/plugin/crypter/DdlstorageCom.py index f3744e15d..e3e1f1956 100644 --- a/pyload/plugin/crypter/DdlstorageCom.py +++ b/pyload/plugin/crypter/DdlstorageCom.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class DdlstorageCom(DeadCrypter): -    __name__    = "DdlstorageCom" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "DdlstorageCom" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/folder/\w+' -    __config__  = [] +    __pattern = r'https?://(?:www\.)?ddlstorage\.com/folder/\w+' +    __config  = [] -    __description__ = """DDLStorage.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("godofdream", "soilfiction@gmail.com"), +    __description = """DDLStorage.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("godofdream", "soilfiction@gmail.com"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/DepositfilesCom.py b/pyload/plugin/crypter/DepositfilesCom.py index 24fa9134a..8ecbb6f8d 100644 --- a/pyload/plugin/crypter/DepositfilesCom.py +++ b/pyload/plugin/crypter/DepositfilesCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class DepositfilesCom(SimpleCrypter): -    __name__    = "DepositfilesCom" -    __type__    = "crypter" -    __version__ = "0.01" +    __name    = "DepositfilesCom" +    __type    = "crypter" +    __version = "0.01" -    __pattern__ = r'http://(?:www\.)?depositfiles\.com/folders/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?depositfiles\.com/folders/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Depositfiles.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Depositfiles.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      LINK_PATTERN = r'<div class="progressName"[^>]*>\s*<a href="([^"]+)" title="[^"]*" target="_blank">' diff --git a/pyload/plugin/crypter/Dereferer.py b/pyload/plugin/crypter/Dereferer.py index 138282d02..0faebbb87 100644 --- a/pyload/plugin/crypter/Dereferer.py +++ b/pyload/plugin/crypter/Dereferer.py @@ -4,14 +4,14 @@ from pyload.plugin.Crypter import Crypter  class Dereferer(SimpleDereferer): -    __name__    = "Dereferer" -    __type__    = "crypter" -    __version__ = "0.11" +    __name    = "Dereferer" +    __type    = "crypter" +    __version = "0.11" -    __pattern__ = r'https?://([^/]+)/.*?(?P<LINK>(ht|f)tps?(://|%3A%2F%2F).+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'https?://([^/]+)/.*?(?P<LINK>(ht|f)tps?(://|%3A%2F%2F).+)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Crypter for dereferers""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Crypter for dereferers""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/crypter/DevhostSt.py b/pyload/plugin/crypter/DevhostSt.py index 4d1a2ae09..b6814613b 100644 --- a/pyload/plugin/crypter/DevhostSt.py +++ b/pyload/plugin/crypter/DevhostSt.py @@ -11,17 +11,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class DevhostSt(SimpleCrypter): -    __name__    = "DevhostSt" -    __type__    = "crypter" -    __version__ = "0.04" +    __name    = "DevhostSt" +    __type    = "crypter" +    __version = "0.04" -    __pattern__ = r'http://(?:www\.)?d-h\.st/users/(?P<USER>\w+)(/\?fld_id=(?P<ID>\d+))?' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?d-h\.st/users/(?P<USER>\w+)(/\?fld_id=(?P<ID>\d+))?' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """d-h.st folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"), +    __description = """d-h.st folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de"),                         ("Walter Purcaro", "vuolter@gmail.com")] @@ -34,7 +34,7 @@ class DevhostSt(SimpleCrypter):              self.offline()          try: -            id = re.match(self.__pattern__, self.pyfile.url).group('ID') +            id = re.match(self.__pattern, self.pyfile.url).group('ID')              if id == "0":                  raise @@ -49,6 +49,6 @@ class DevhostSt(SimpleCrypter):          except Exception, e:              self.logDebug(e) -            name = folder = re.match(self.__pattern__, self.pyfile.url).group('USER') +            name = folder = re.match(self.__pattern, self.pyfile.url).group('USER')          return {'name': name, 'folder': folder} diff --git a/pyload/plugin/crypter/DlProtectCom.py b/pyload/plugin/crypter/DlProtectCom.py index a5e104f70..7779356d6 100644 --- a/pyload/plugin/crypter/DlProtectCom.py +++ b/pyload/plugin/crypter/DlProtectCom.py @@ -9,17 +9,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class DlProtectCom(SimpleCrypter): -    __name__    = "DlProtectCom" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "DlProtectCom" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'https?://(?:www\.)?dl-protect\.com/((en|fr)/)?\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'https?://(?:www\.)?dl-protect\.com/((en|fr)/)?\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Dl-protect.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Dl-protect.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      COOKIES = [("dl-protect.com", "l", "en")] diff --git a/pyload/plugin/crypter/DontKnowMe.py b/pyload/plugin/crypter/DontKnowMe.py index 1e83ab853..d247e33e4 100644 --- a/pyload/plugin/crypter/DontKnowMe.py +++ b/pyload/plugin/crypter/DontKnowMe.py @@ -4,14 +4,14 @@ from pyload.plugin.Crypter import Crypter  class DontKnowMe(SimpleDereferer): -    __name__    = "DontKnowMe" -    __type__    = "crypter" -    __version__ = "0.11" +    __name    = "DontKnowMe" +    __type    = "crypter" +    __version = "0.11" -    __pattern__ = r'http://(?:www\.)?dontknow\.me/at/\?(?P<LINK>.+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?dontknow\.me/at/\?(?P<LINK>.+)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """DontKnow.me decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("selaux", "")] +    __description = """DontKnow.me decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("selaux", "")] diff --git a/pyload/plugin/crypter/DuckCryptInfo.py b/pyload/plugin/crypter/DuckCryptInfo.py index 55681fd5e..28f9a1505 100644 --- a/pyload/plugin/crypter/DuckCryptInfo.py +++ b/pyload/plugin/crypter/DuckCryptInfo.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter  class DuckCryptInfo(Crypter): -    __name__    = "DuckCryptInfo" -    __type__    = "crypter" -    __version__ = "0.02" +    __name    = "DuckCryptInfo" +    __type    = "crypter" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """DuckCrypt.info decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("godofdream", "soilfiction@gmail.com")] +    __description = """DuckCrypt.info decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("godofdream", "soilfiction@gmail.com")]      TIMER_PATTERN = r'<span id="timer">(.*)</span>' @@ -27,7 +27,7 @@ class DuckCryptInfo(Crypter):      def decrypt(self, pyfile):          url = pyfile.url -        m = re.match(self.__pattern__, url) +        m = re.match(self.__pattern, url)          if m is None:              self.fail(_("Weird error in link"))          if str(m.group(1)) == "link": @@ -38,7 +38,7 @@ class DuckCryptInfo(Crypter):      def handleFolder(self, m):          html = self.load("http://duckcrypt.info/ajax/auth.php?hash=" + str(m.group(2))) -        m = re.match(self.__pattern__, html) +        m = re.match(self.__pattern, html)          self.logDebug("Redirectet to " + str(m.group(0)))          html = self.load(str(m.group(0)))          soup = BeautifulSoup(html) diff --git a/pyload/plugin/crypter/DuploadOrg.py b/pyload/plugin/crypter/DuploadOrg.py index f92eb2ede..445318ccc 100644 --- a/pyload/plugin/crypter/DuploadOrg.py +++ b/pyload/plugin/crypter/DuploadOrg.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class DuploadOrg(DeadCrypter): -    __name__    = "DuploadOrg" -    __type__    = "crypter" -    __version__ = "0.02" +    __name    = "DuploadOrg" +    __type    = "crypter" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?dupload\.org/folder/\d+' -    __config__  = [] +    __pattern = r'http://(?:www\.)?dupload\.org/folder/\d+' +    __config  = [] -    __description__ = """Dupload.org folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Dupload.org folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/EasybytezCom.py b/pyload/plugin/crypter/EasybytezCom.py index c5c7b0193..6433c65b8 100644 --- a/pyload/plugin/crypter/EasybytezCom.py +++ b/pyload/plugin/crypter/EasybytezCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter  class EasybytezCom(XFSCrypter): -    __name__    = "EasybytezCom" -    __type__    = "crypter" -    __version__ = "0.10" +    __name    = "EasybytezCom" +    __type    = "crypter" +    __version = "0.10" -    __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Easybytez.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Easybytez.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      LOGIN_ACCOUNT = True diff --git a/pyload/plugin/crypter/EmbeduploadCom.py b/pyload/plugin/crypter/EmbeduploadCom.py index c94e7e106..55033ce05 100644 --- a/pyload/plugin/crypter/EmbeduploadCom.py +++ b/pyload/plugin/crypter/EmbeduploadCom.py @@ -6,19 +6,19 @@ from pyload.network.HTTPRequest import BadHeader  class EmbeduploadCom(Crypter): -    __name__    = "EmbeduploadCom" -    __type__    = "crypter" -    __version__ = "0.02" +    __name    = "EmbeduploadCom" +    __type    = "crypter" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?embedupload\.com/\?d=.+' -    __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?embedupload\.com/\?d=.+' +    __config = [("use_subfolder", "bool", "Save package to subfolder", True),                  ("subfolder_per_package", "bool", "Create a subfolder for each package", True),                  ("preferedHoster", "str", "Prefered hoster list (bar-separated)", "embedupload"),                  ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")] -    __description__ = """EmbedUpload.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """EmbedUpload.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      LINK_PATTERN = r'<div id="([^"]+)"[^>]*>\s*<a href="([^"]+)" target="_blank" (?:class="DownloadNow"|style="color:red")>' diff --git a/pyload/plugin/crypter/FilebeerInfo.py b/pyload/plugin/crypter/FilebeerInfo.py index e2e0e1e3c..5ec059375 100644 --- a/pyload/plugin/crypter/FilebeerInfo.py +++ b/pyload/plugin/crypter/FilebeerInfo.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class FilebeerInfo(DeadCrypter): -    __name__    = "FilebeerInfo" -    __type__    = "crypter" -    __version__ = "0.02" +    __name    = "FilebeerInfo" +    __type    = "crypter" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?filebeer\.info/\d*~f\w+' -    __config__  = [] +    __pattern = r'http://(?:www\.)?filebeer\.info/\d*~f\w+' +    __config  = [] -    __description__ = """Filebeer.info folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Filebeer.info folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/crypter/FilecloudIo.py b/pyload/plugin/crypter/FilecloudIo.py index f4c967a07..1926d04bb 100644 --- a/pyload/plugin/crypter/FilecloudIo.py +++ b/pyload/plugin/crypter/FilecloudIo.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class FilecloudIo(SimpleCrypter): -    __name__    = "FilecloudIo" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "FilecloudIo" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Filecloud.io folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Filecloud.io folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      LINK_PATTERN = r'href="(http://filecloud\.io/\w+)" title' diff --git a/pyload/plugin/crypter/FilecryptCc.py b/pyload/plugin/crypter/FilecryptCc.py index 816a2d365..6f01fbd19 100644 --- a/pyload/plugin/crypter/FilecryptCc.py +++ b/pyload/plugin/crypter/FilecryptCc.py @@ -14,15 +14,15 @@ from pyload.plugin.internal.CaptchaService import ReCaptcha  class FilecryptCc(Crypter): -    __name__    = "FilecryptCc" -    __type__    = "crypter" -    __version__ = "0.11" +    __name    = "FilecryptCc" +    __type    = "crypter" +    __version = "0.11" -    __pattern__ = r'https?://(?:www\.)?filecrypt\.cc/Container/\w+' +    __pattern = r'https?://(?:www\.)?filecrypt\.cc/Container/\w+' -    __description__ = """Filecrypt.cc decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description = """Filecrypt.cc decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]      # URL_REPLACEMENTS  = [(r'.html$', ""), (r'$', ".html")]  #@TODO: Extend SimpleCrypter diff --git a/pyload/plugin/crypter/FilefactoryCom.py b/pyload/plugin/crypter/FilefactoryCom.py index 40f4c1475..e72cc1430 100644 --- a/pyload/plugin/crypter/FilefactoryCom.py +++ b/pyload/plugin/crypter/FilefactoryCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class FilefactoryCom(SimpleCrypter): -    __name__    = "FilefactoryCom" -    __type__    = "crypter" -    __version__ = "0.32" +    __name    = "FilefactoryCom" +    __type    = "crypter" +    __version = "0.32" -    __pattern__ = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Filefactory.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Filefactory.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      COOKIES = [("filefactory.com", "locale", "en_US.utf8")] diff --git a/pyload/plugin/crypter/FilerNet.py b/pyload/plugin/crypter/FilerNet.py index 45d0dd2ab..1e7e548a4 100644 --- a/pyload/plugin/crypter/FilerNet.py +++ b/pyload/plugin/crypter/FilerNet.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class FilerNet(SimpleCrypter): -    __name__    = "FilerNet" -    __type__    = "crypter" -    __version__ = "0.42" +    __name    = "FilerNet" +    __type    = "crypter" +    __version = "0.42" -    __pattern__ = r'https?://filer\.net/folder/\w{16}' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'https?://filer\.net/folder/\w{16}' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Filer.net decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("nath_schwarz", "nathan.notwhite@gmail.com"), +    __description = """Filer.net decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("nath_schwarz", "nathan.notwhite@gmail.com"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/FileserveCom.py b/pyload/plugin/crypter/FileserveCom.py index ab0665fbd..a9f766b81 100644 --- a/pyload/plugin/crypter/FileserveCom.py +++ b/pyload/plugin/crypter/FileserveCom.py @@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter  class FileserveCom(Crypter): -    __name__    = "FileserveCom" -    __type__    = "crypter" -    __version__ = "0.11" +    __name    = "FileserveCom" +    __type    = "crypter" +    __version = "0.11" -    __pattern__ = r'http://(?:www\.)?fileserve\.com/list/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?fileserve\.com/list/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """FileServe.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("fionnc", "fionnc@gmail.com")] +    __description = """FileServe.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("fionnc", "fionnc@gmail.com")]      FOLDER_PATTERN = r'<table class="file_list">(.*?)</table>' diff --git a/pyload/plugin/crypter/FilesonicCom.py b/pyload/plugin/crypter/FilesonicCom.py index 1ffaa9c01..696053646 100644 --- a/pyload/plugin/crypter/FilesonicCom.py +++ b/pyload/plugin/crypter/FilesonicCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class FilesonicCom(DeadCrypter): -    __name__    = "FilesonicCom" -    __type__    = "crypter" -    __version__ = "0.12" +    __name    = "FilesonicCom" +    __type    = "crypter" +    __version = "0.12" -    __pattern__ = r'http://(?:www\.)?filesonic\.com/folder/\w+' +    __pattern = r'http://(?:www\.)?filesonic\.com/folder/\w+' -    __description__ = """Filesonic.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Filesonic.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/crypter/FilestubeCom.py b/pyload/plugin/crypter/FilestubeCom.py index 36e4a4caf..5238899b0 100644 --- a/pyload/plugin/crypter/FilestubeCom.py +++ b/pyload/plugin/crypter/FilestubeCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class FilestubeCom(SimpleCrypter): -    __name__    = "FilestubeCom" -    __type__    = "crypter" -    __version__ = "0.05" +    __name    = "FilestubeCom" +    __type    = "crypter" +    __version = "0.05" -    __pattern__ = r'http://(?:www\.)?filestube\.(?:com|to)/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?filestube\.(?:com|to)/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Filestube.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Filestube.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      LINK_PATTERN = r'<a class=\"file-link-main(?: noref)?\" [^>]* href=\"(http://[^\"]+)' diff --git a/pyload/plugin/crypter/FiletramCom.py b/pyload/plugin/crypter/FiletramCom.py index 700050a4b..28e38e30e 100644 --- a/pyload/plugin/crypter/FiletramCom.py +++ b/pyload/plugin/crypter/FiletramCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class FiletramCom(SimpleCrypter): -    __name__    = "FiletramCom" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "FiletramCom" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?filetram\.com/[^/]+/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?filetram\.com/[^/]+/.+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Filetram.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("igel", "igelkun@myopera.com"), +    __description = """Filetram.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("igel", "igelkun@myopera.com"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/FiredriveCom.py b/pyload/plugin/crypter/FiredriveCom.py index e258ed42f..be3a9ebdb 100644 --- a/pyload/plugin/crypter/FiredriveCom.py +++ b/pyload/plugin/crypter/FiredriveCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class FiredriveCom(DeadCrypter): -    __name__    = "FiredriveCom" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "FiredriveCom" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/share/.+' -    __config__  = [] +    __pattern = r'https?://(?:www\.)?(firedrive|putlocker)\.com/share/.+' +    __config  = [] -    __description__ = """Firedrive.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Firedrive.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/crypter/FourChanOrg.py b/pyload/plugin/crypter/FourChanOrg.py index 62fb9d3fe..a7427a740 100644 --- a/pyload/plugin/crypter/FourChanOrg.py +++ b/pyload/plugin/crypter/FourChanOrg.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter  class FourChanOrg(Crypter): -    __name__    = "FourChanOrg" -    __type__    = "crypter" -    __version__ = "0.31" +    __name    = "FourChanOrg" +    __type    = "crypter" +    __version = "0.31" -    __pattern__ = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """4chan.org folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [] +    __description = """4chan.org folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = []      def decrypt(self, pyfile): diff --git a/pyload/plugin/crypter/FreakhareCom.py b/pyload/plugin/crypter/FreakhareCom.py index cb766361c..9df8ef200 100644 --- a/pyload/plugin/crypter/FreakhareCom.py +++ b/pyload/plugin/crypter/FreakhareCom.py @@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class FreakhareCom(SimpleCrypter): -    __name__    = "FreakhareCom" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "FreakhareCom" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?freakshare\.com/folder/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?freakshare\.com/folder/.+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Freakhare.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Freakhare.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      LINK_PATTERN = r'<a href="(http://freakshare\.com/files/[^"]+)" target="_blank">' diff --git a/pyload/plugin/crypter/FreetexthostCom.py b/pyload/plugin/crypter/FreetexthostCom.py index 3b082ef7d..db97a8003 100644 --- a/pyload/plugin/crypter/FreetexthostCom.py +++ b/pyload/plugin/crypter/FreetexthostCom.py @@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class FreetexthostCom(SimpleCrypter): -    __name__    = "FreetexthostCom" -    __type__    = "crypter" -    __version__ = "0.01" +    __name    = "FreetexthostCom" +    __type    = "crypter" +    __version = "0.01" -    __pattern__ = r'http://(?:www\.)?freetexthost\.com/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?freetexthost\.com/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Freetexthost.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Freetexthost.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      def getLinks(self): diff --git a/pyload/plugin/crypter/FshareVn.py b/pyload/plugin/crypter/FshareVn.py index 700f87ba4..5a0d94c7c 100644 --- a/pyload/plugin/crypter/FshareVn.py +++ b/pyload/plugin/crypter/FshareVn.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class FshareVn(SimpleCrypter): -    __name__    = "FshareVn" -    __type__    = "crypter" -    __version__ = "0.01" +    __name    = "FshareVn" +    __type    = "crypter" +    __version = "0.01" -    __pattern__ = r'http://(?:www\.)?fshare\.vn/folder/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?fshare\.vn/folder/.+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Fshare.vn folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Fshare.vn folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      LINK_PATTERN = r'<li class="w_80pc"><a href="([^"]+)" target="_blank">' diff --git a/pyload/plugin/crypter/Go4UpCom.py b/pyload/plugin/crypter/Go4UpCom.py index 5bae6e93a..bac9adef2 100644 --- a/pyload/plugin/crypter/Go4UpCom.py +++ b/pyload/plugin/crypter/Go4UpCom.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class Go4UpCom(SimpleCrypter): -    __name__    = "Go4UpCom" -    __type__    = "crypter" -    __version__ = "0.11" +    __name    = "Go4UpCom" +    __type    = "crypter" +    __version = "0.11" -    __pattern__ = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)' +    __pattern = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)' -    __description__ = """Go4Up.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("rlindner81", "rlindner81@gmail.com"), +    __description = """Go4Up.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("rlindner81", "rlindner81@gmail.com"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/crypter/GooGl.py b/pyload/plugin/crypter/GooGl.py index 13ffce505..d1c47935d 100644 --- a/pyload/plugin/crypter/GooGl.py +++ b/pyload/plugin/crypter/GooGl.py @@ -5,17 +5,17 @@ from pyload.utils import json_loads  class GooGl(Crypter): -    __name__    = "GooGl" -    __type__    = "crypter" -    __version__ = "0.01" +    __name    = "GooGl" +    __type    = "crypter" +    __version = "0.01" -    __pattern__ = r'https?://(?:www\.)?goo\.gl/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'https?://(?:www\.)?goo\.gl/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Goo.gl decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Goo.gl decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      API_URL = "https://www.googleapis.com/urlshortener/v1/url" diff --git a/pyload/plugin/crypter/HoerbuchIn.py b/pyload/plugin/crypter/HoerbuchIn.py index a12d7c02a..a809e756c 100644 --- a/pyload/plugin/crypter/HoerbuchIn.py +++ b/pyload/plugin/crypter/HoerbuchIn.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter  class HoerbuchIn(Crypter): -    __name__    = "HoerbuchIn" -    __type__    = "crypter" -    __version__ = "0.60" +    __name    = "HoerbuchIn" +    __type    = "crypter" +    __version = "0.60" -    __pattern__ = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Hoerbuch.in decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("spoob", "spoob@pyload.org"), +    __description = """Hoerbuch.in decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("spoob", "spoob@pyload.org"),                         ("mkaay", "mkaay@mkaay.de")] diff --git a/pyload/plugin/crypter/HotfileCom.py b/pyload/plugin/crypter/HotfileCom.py index 8085aa797..8fc10cf88 100644 --- a/pyload/plugin/crypter/HotfileCom.py +++ b/pyload/plugin/crypter/HotfileCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class HotfileCom(DeadCrypter): -    __name__    = "HotfileCom" -    __type__    = "crypter" -    __version__ = "0.30" +    __name    = "HotfileCom" +    __type    = "crypter" +    __version = "0.30" -    __pattern__ = r'https?://(?:www\.)?hotfile\.com/list/\w+/\w+' -    __config__  = [] +    __pattern = r'https?://(?:www\.)?hotfile\.com/list/\w+/\w+' +    __config  = [] -    __description__ = """Hotfile.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org")] +    __description = """Hotfile.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org")] diff --git a/pyload/plugin/crypter/ILoadTo.py b/pyload/plugin/crypter/ILoadTo.py index f333e262f..e00a88743 100644 --- a/pyload/plugin/crypter/ILoadTo.py +++ b/pyload/plugin/crypter/ILoadTo.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class ILoadTo(DeadCrypter): -    __name__    = "ILoadTo" -    __type__    = "crypter" -    __version__ = "0.11" +    __name    = "ILoadTo" +    __type    = "crypter" +    __version = "0.11" -    __pattern__ = r'http://(?:www\.)?iload\.to/go/\d+-[\w.-]+/' -    __config__  = [] +    __pattern = r'http://(?:www\.)?iload\.to/go/\d+-[\w.-]+/' +    __config  = [] -    __description__ = """Iload.to decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("hzpz", "")] +    __description = """Iload.to decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("hzpz", "")] diff --git a/pyload/plugin/crypter/ImgurComAlbum.py b/pyload/plugin/crypter/ImgurComAlbum.py index d2ca38d40..e7df57cb6 100644 --- a/pyload/plugin/crypter/ImgurComAlbum.py +++ b/pyload/plugin/crypter/ImgurComAlbum.py @@ -5,17 +5,17 @@ from pyload.utils import uniqify  class ImgurComAlbum(SimpleCrypter): -    __name__    = "ImgurComAlbum" -    __type__    = "crypter" -    __version__ = "0.51" +    __name    = "ImgurComAlbum" +    __type    = "crypter" +    __version = "0.51" -    __pattern__ = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Imgur.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("nath_schwarz", "nathan.notwhite@gmail.com")] +    __description = """Imgur.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("nath_schwarz", "nathan.notwhite@gmail.com")]      NAME_PATTERN = r'(?P<N>.+?) - Imgur' diff --git a/pyload/plugin/crypter/LetitbitNet.py b/pyload/plugin/crypter/LetitbitNet.py index 24bc196b3..ca787e31a 100644 --- a/pyload/plugin/crypter/LetitbitNet.py +++ b/pyload/plugin/crypter/LetitbitNet.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter  class LetitbitNet(Crypter): -    __name__    = "LetitbitNet" -    __type__    = "crypter" -    __version__ = "0.10" +    __name    = "LetitbitNet" +    __type    = "crypter" +    __version = "0.10" -    __pattern__ = r'http://(?:www\.)?letitbit\.net/folder/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?letitbit\.net/folder/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Letitbit.net folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("DHMH", "webmaster@pcProfil.de"), +    __description = """Letitbit.net folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("DHMH", "webmaster@pcProfil.de"),                         ("z00nx", "z00nx0@gmail.com")] diff --git a/pyload/plugin/crypter/LinkCryptWs.py b/pyload/plugin/crypter/LinkCryptWs.py index a3eb4f179..8e5ea2a03 100644 --- a/pyload/plugin/crypter/LinkCryptWs.py +++ b/pyload/plugin/crypter/LinkCryptWs.py @@ -12,15 +12,15 @@ from pyload.utils import html_unescape  class LinkCryptWs(Crypter): -    __name__    = "LinkCryptWs" -    __type__    = "crypter" -    __version__ = "0.08" +    __name    = "LinkCryptWs" +    __type    = "crypter" +    __version = "0.08" -    __pattern__ = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P<ID>\w+)' +    __pattern = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P<ID>\w+)' -    __description__ = """LinkCrypt.ws decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("kagenoshin", "kagenoshin[AT]gmx[DOT]ch"), +    __description = """LinkCrypt.ws decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("kagenoshin", "kagenoshin[AT]gmx[DOT]ch"),                         ("glukgluk", ""),                         ("Gummibaer", "")] @@ -37,7 +37,7 @@ class LinkCryptWs(Crypter):      def prepare(self):          # Init -        self.fileid = re.match(self.__pattern__, self.pyfile.url).group('ID') +        self.fileid = re.match(self.__pattern, self.pyfile.url).group('ID')          self.req.cj.setCookie("linkcrypt.ws", "language", "en") diff --git a/pyload/plugin/crypter/LinkSaveIn.py b/pyload/plugin/crypter/LinkSaveIn.py index b303303a0..d01ea0982 100644 --- a/pyload/plugin/crypter/LinkSaveIn.py +++ b/pyload/plugin/crypter/LinkSaveIn.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleDereferer import SimpleDereferer  class LinkSaveIn(SimpleDereferer): -    __name__    = "LinkSaveIn" -    __type__    = "crypter" -    __version__ = "2.03" +    __name    = "LinkSaveIn" +    __type    = "crypter" +    __version = "2.03" -    __pattern__ = r'https?://(?:www\.)?linksave\.in/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'https?://(?:www\.)?linksave\.in/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """LinkSave.in decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """LinkSave.in decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      COOKIES = [("linksave.in", "Linksave_Language", "english")] diff --git a/pyload/plugin/crypter/LinkdecrypterCom.py b/pyload/plugin/crypter/LinkdecrypterCom.py index facec37d5..cce31f8d6 100644 --- a/pyload/plugin/crypter/LinkdecrypterCom.py +++ b/pyload/plugin/crypter/LinkdecrypterCom.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter  class LinkdecrypterCom(Crypter): -    __name__    = "LinkdecrypterCom" -    __type__    = "crypter" -    __version__ = "0.29" +    __name    = "LinkdecrypterCom" +    __type    = "crypter" +    __version = "0.29" -    __pattern__ = r'^unmatchable$' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'^unmatchable$' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Linkdecrypter.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Linkdecrypter.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("flowlee", "")] diff --git a/pyload/plugin/crypter/LixIn.py b/pyload/plugin/crypter/LixIn.py index 4b978723f..8cb2d7957 100644 --- a/pyload/plugin/crypter/LixIn.py +++ b/pyload/plugin/crypter/LixIn.py @@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter  class LixIn(Crypter): -    __name__    = "LixIn" -    __type__    = "crypter" -    __version__ = "0.22" +    __name    = "LixIn" +    __type    = "crypter" +    __version = "0.22" -    __pattern__ = r'http://(?:www\.)?lix\.in/(?P<ID>.+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?lix\.in/(?P<ID>.+)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Lix.in decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("spoob", "spoob@pyload.org")] +    __description = """Lix.in decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("spoob", "spoob@pyload.org")]      CAPTCHA_PATTERN = r'<img src="(captcha_img\.php\?.*?)"' @@ -27,7 +27,7 @@ class LixIn(Crypter):      def decrypt(self, pyfile):          url = pyfile.url -        m = re.match(self.__pattern__, url) +        m = re.match(self.__pattern, url)          if m is None:              self.error(_("Unable to identify file ID")) diff --git a/pyload/plugin/crypter/LofCc.py b/pyload/plugin/crypter/LofCc.py index 076ab59d7..680027b43 100644 --- a/pyload/plugin/crypter/LofCc.py +++ b/pyload/plugin/crypter/LofCc.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class LofCc(DeadCrypter): -    __name__    = "LofCc" -    __type__    = "crypter" -    __version__ = "0.21" +    __name    = "LofCc" +    __type    = "crypter" +    __version = "0.21" -    __pattern__ = r'http://(?:www\.)?lof\.cc/(.+)' -    __config__  = [] +    __pattern = r'http://(?:www\.)?lof\.cc/(.+)' +    __config  = [] -    __description__ = """Lof.cc decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de")] +    __description = """Lof.cc decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de")] diff --git a/pyload/plugin/crypter/MBLinkInfo.py b/pyload/plugin/crypter/MBLinkInfo.py index 7e7be2029..7b39f9b5b 100644 --- a/pyload/plugin/crypter/MBLinkInfo.py +++ b/pyload/plugin/crypter/MBLinkInfo.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class MBLinkInfo(DeadCrypter): -    __name__    = "MBLinkInfo" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "MBLinkInfo" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?mblink\.info/?\?id=(\d+)' -    __config__  = [] +    __pattern = r'http://(?:www\.)?mblink\.info/?\?id=(\d+)' +    __config  = [] -    __description__ = """MBLink.info decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Gummibaer", "Gummibaer@wiki-bierkiste.de"), +    __description = """MBLink.info decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Gummibaer", "Gummibaer@wiki-bierkiste.de"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/MediafireCom.py b/pyload/plugin/crypter/MediafireCom.py index a7360a6db..036c41233 100644 --- a/pyload/plugin/crypter/MediafireCom.py +++ b/pyload/plugin/crypter/MediafireCom.py @@ -7,17 +7,17 @@ from pyload.utils import json_loads  class MediafireCom(Crypter): -    __name__    = "MediafireCom" -    __type__    = "crypter" -    __version__ = "0.14" +    __name    = "MediafireCom" +    __type    = "crypter" +    __version = "0.14" -    __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Mediafire.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Mediafire.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      FOLDER_KEY_PATTERN = r'var afI= \'(\w+)' diff --git a/pyload/plugin/crypter/MegaCoNz.py b/pyload/plugin/crypter/MegaCoNz.py index 3f1d10a5a..66bfe3ec7 100644 --- a/pyload/plugin/crypter/MegaCoNz.py +++ b/pyload/plugin/crypter/MegaCoNz.py @@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter  class MegaCoNz(Crypter): -    __name__    = "MegaCoNz" -    __type__    = "crypter" -    __version__ = "0.04" +    __name    = "MegaCoNz" +    __type    = "crypter" +    __version = "0.04" -    __pattern__ = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#F!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#F!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Mega.co.nz folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Mega.co.nz folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      def setup(self): @@ -24,7 +24,7 @@ class MegaCoNz(Crypter):      def decrypt(self, pyfile): -        url       = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern__, pyfile.url).groups() +        url       = "https://mega.co.nz/#F!%s!%s" % re.match(self.__pattern, pyfile.url).groups()          self.html = self.load("http://rapidgen.org/linkfinder", post={'linklisturl': url})          self.urls = re.findall(r'(https://mega.co.nz/#N!.+?)<', self.html) diff --git a/pyload/plugin/crypter/MegaRapidCz.py b/pyload/plugin/crypter/MegaRapidCz.py index 79900c08a..2cedfec09 100644 --- a/pyload/plugin/crypter/MegaRapidCz.py +++ b/pyload/plugin/crypter/MegaRapidCz.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class MegaRapidCz(SimpleCrypter): -    __name__    = "MegaRapidCz" -    __type__    = "crypter" -    __version__ = "0.02" +    __name    = "MegaRapidCz" +    __type    = "crypter" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Share-Rapid.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Share-Rapid.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      LINK_PATTERN = r'<td class="soubor"[^>]*><a href="([^"]+)">' diff --git a/pyload/plugin/crypter/MegauploadCom.py b/pyload/plugin/crypter/MegauploadCom.py index 72e0268dd..5a5b8252c 100644 --- a/pyload/plugin/crypter/MegauploadCom.py +++ b/pyload/plugin/crypter/MegauploadCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class MegauploadCom(DeadCrypter): -    __name__    = "MegauploadCom" -    __type__    = "crypter" -    __version__ = "0.02" +    __name    = "MegauploadCom" +    __type    = "crypter" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?megaupload\.com/(\?f|xml/folderfiles\.php\?.*&?folderid)=\w+' +    __pattern = r'http://(?:www\.)?megaupload\.com/(\?f|xml/folderfiles\.php\?.*&?folderid)=\w+' -    __description__ = """Megaupload.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Megaupload.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/crypter/Movie2KTo.py b/pyload/plugin/crypter/Movie2KTo.py index f8ff4e756..e807855af 100644 --- a/pyload/plugin/crypter/Movie2KTo.py +++ b/pyload/plugin/crypter/Movie2KTo.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class Movie2KTo(DeadCrypter): -    __name__    = "Movie2KTo" -    __type__    = "crypter" -    __version__ = "0.51" +    __name    = "Movie2KTo" +    __type    = "crypter" +    __version = "0.51" -    __pattern__ = r'http://(?:www\.)?movie2k\.to/(.+)\.html' -    __config__  = [] +    __pattern = r'http://(?:www\.)?movie2k\.to/(.+)\.html' +    __config  = [] -    __description__ = """Movie2k.to decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("4Christopher", "4Christopher@gmx.de")] +    __description = """Movie2k.to decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("4Christopher", "4Christopher@gmx.de")] diff --git a/pyload/plugin/crypter/MultiUpOrg.py b/pyload/plugin/crypter/MultiUpOrg.py index 1585ac1c8..7d046f2e3 100644 --- a/pyload/plugin/crypter/MultiUpOrg.py +++ b/pyload/plugin/crypter/MultiUpOrg.py @@ -7,24 +7,24 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class MultiUpOrg(SimpleCrypter): -    __name__    = "MultiUpOrg" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "MultiUpOrg" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|miror)/\w+(/\w+)?' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|miror)/\w+(/\w+)?' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """MultiUp.org decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """MultiUp.org decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      NAME_PATTERN = r'<title>.*(?:Project|Projet|ownload|élécharger) (?P<N>.+?) (\(|- )'      def getLinks(self): -        m_type = re.match(self.__pattern__, self.pyfile.url).group('TYPE') +        m_type = re.match(self.__pattern, self.pyfile.url).group('TYPE')          if m_type == "project":              pattern = r'\n(http://www\.multiup\.org/(?:en|fr)/download/.*)' diff --git a/pyload/plugin/crypter/MultiloadCz.py b/pyload/plugin/crypter/MultiloadCz.py index 856a94a25..622ccab4d 100644 --- a/pyload/plugin/crypter/MultiloadCz.py +++ b/pyload/plugin/crypter/MultiloadCz.py @@ -5,19 +5,19 @@ from pyload.plugin.Crypter import Crypter  class MultiloadCz(Crypter): -    __name__    = "MultiloadCz" -    __type__    = "crypter" -    __version__ = "0.40" +    __name    = "MultiloadCz" +    __type    = "crypter" +    __version = "0.40" -    __pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.+' -    __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.+' +    __config = [("use_subfolder", "bool", "Save package to subfolder", True),                  ("subfolder_per_package", "bool", "Create a subfolder for each package", True),                  ("usedHoster", "str", "Prefered hoster list (bar-separated)", ""),                  ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")] -    __description__ = """Multiload.cz decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Multiload.cz decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      FOLDER_PATTERN = r'<form action="" method="get"><textarea[^>]*>([^>]*)</textarea></form>' @@ -27,7 +27,7 @@ class MultiloadCz(Crypter):      def decrypt(self, pyfile):          self.html = self.load(pyfile.url, decode=True) -        if re.match(self.__pattern__, pyfile.url).group(1) == "slozka": +        if re.match(self.__pattern, pyfile.url).group(1) == "slozka":              m = re.search(self.FOLDER_PATTERN, self.html)              if m:                  self.urls.extend(m.group(1).split()) diff --git a/pyload/plugin/crypter/MultiuploadCom.py b/pyload/plugin/crypter/MultiuploadCom.py index 9127140f1..439e0e69b 100644 --- a/pyload/plugin/crypter/MultiuploadCom.py +++ b/pyload/plugin/crypter/MultiuploadCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class MultiuploadCom(DeadCrypter): -    __name__    = "MultiuploadCom" -    __type__    = "crypter" -    __version__ = "0.02" +    __name    = "MultiuploadCom" +    __type    = "crypter" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?multiupload\.(com|nl)/\w+' +    __pattern = r'http://(?:www\.)?multiupload\.(com|nl)/\w+' -    __description__ = """MultiUpload.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """MultiUpload.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/crypter/NCryptIn.py b/pyload/plugin/crypter/NCryptIn.py index 29b45b11a..d0e0403fb 100644 --- a/pyload/plugin/crypter/NCryptIn.py +++ b/pyload/plugin/crypter/NCryptIn.py @@ -10,17 +10,17 @@ from pyload.plugin.internal.captcha import ReCaptcha  class NCryptIn(Crypter): -    __name__    = "NCryptIn" -    __type__    = "crypter" -    __version__ = "1.34" +    __name    = "NCryptIn" +    __type    = "crypter" +    __version = "1.34" -    __pattern__ = r'http://(?:www\.)?ncrypt\.in/(?P<TYPE>folder|link|frame)-([^/\?]+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?ncrypt\.in/(?P<TYPE>folder|link|frame)-([^/\?]+)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """NCrypt.in decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es"), +    __description = """NCrypt.in decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),                         ("stickell", "l.stickell@yahoo.it")] @@ -79,7 +79,7 @@ class NCryptIn(Crypter):      def isSingleLink(self): -        link_type = re.match(self.__pattern__, self.pyfile.url).group('TYPE') +        link_type = re.match(self.__pattern, self.pyfile.url).group('TYPE')          return link_type in ("link", "frame") diff --git a/pyload/plugin/crypter/NetfolderIn.py b/pyload/plugin/crypter/NetfolderIn.py index a24a5270f..d99f47328 100644 --- a/pyload/plugin/crypter/NetfolderIn.py +++ b/pyload/plugin/crypter/NetfolderIn.py @@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class NetfolderIn(SimpleCrypter): -    __name__    = "NetfolderIn" -    __type__    = "crypter" -    __version__ = "0.72" +    __name    = "NetfolderIn" +    __type    = "crypter" +    __version = "0.72" -    __pattern__ = r'http://(?:www\.)?netfolder\.in/(folder\.php\?folder_id=)?(?P<ID>\w+)(?(1)|/\w+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?netfolder\.in/(folder\.php\?folder_id=)?(?P<ID>\w+)(?(1)|/\w+)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """NetFolder.in decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """NetFolder.in decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("fragonib", "fragonib[AT]yahoo[DOT]es")] @@ -43,7 +43,7 @@ class NetfolderIn(SimpleCrypter):      def submitPassword(self):          # Gather data          try: -            m  = re.match(self.__pattern__, self.pyfile.url) +            m  = re.match(self.__pattern, self.pyfile.url)              id = m.group('ID')          except AttributeError:              self.logDebug("Unable to get package id from url [%s]" % self.pyfile.url) diff --git a/pyload/plugin/crypter/NosvideoCom.py b/pyload/plugin/crypter/NosvideoCom.py index d048ec956..a9f29cf74 100644 --- a/pyload/plugin/crypter/NosvideoCom.py +++ b/pyload/plugin/crypter/NosvideoCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class NosvideoCom(SimpleCrypter): -    __name__    = "NosvideoCom" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "NosvideoCom" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?nosvideo\.com/\?v=\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?nosvideo\.com/\?v=\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Nosvideo.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("igel", "igelkun@myopera.com")] +    __description = """Nosvideo.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("igel", "igelkun@myopera.com")]      LINK_PATTERN = r'href="(http://(?:w{3}\.)?nosupload\.com/\?d=\w+)"' diff --git a/pyload/plugin/crypter/OneKhDe.py b/pyload/plugin/crypter/OneKhDe.py index 323214df8..f0b6f7db1 100644 --- a/pyload/plugin/crypter/OneKhDe.py +++ b/pyload/plugin/crypter/OneKhDe.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter  class OneKhDe(Crypter): -    __name__    = "OneKhDe" -    __type__    = "crypter" -    __version__ = "0.11" +    __name    = "OneKhDe" +    __type    = "crypter" +    __version = "0.11" -    __pattern__ = r'http://(?:www\.)?1kh\.de/f/' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?1kh\.de/f/' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """1kh.de decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("spoob", "spoob@pyload.org")] +    __description = """1kh.de decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("spoob", "spoob@pyload.org")]      def __init__(self, parent): diff --git a/pyload/plugin/crypter/OronCom.py b/pyload/plugin/crypter/OronCom.py index 257e0e046..316e6d525 100644 --- a/pyload/plugin/crypter/OronCom.py +++ b/pyload/plugin/crypter/OronCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class OronCom(DeadCrypter): -    __name__    = "OronCom" -    __type__    = "crypter" -    __version__ = "0.11" +    __name    = "OronCom" +    __type    = "crypter" +    __version = "0.11" -    __pattern__ = r'http://(?:www\.)?oron\.com/folder/\w+' -    __config__  = [] +    __pattern = r'http://(?:www\.)?oron\.com/folder/\w+' +    __config  = [] -    __description__ = """Oron.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("DHMH", "webmaster@pcProfil.de")] +    __description = """Oron.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("DHMH", "webmaster@pcProfil.de")] diff --git a/pyload/plugin/crypter/PastebinCom.py b/pyload/plugin/crypter/PastebinCom.py index 43a818cf1..95c925733 100644 --- a/pyload/plugin/crypter/PastebinCom.py +++ b/pyload/plugin/crypter/PastebinCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class PastebinCom(SimpleCrypter): -    __name__    = "PastebinCom" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "PastebinCom" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?pastebin\.com/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?pastebin\.com/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Pastebin.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Pastebin.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      LINK_PATTERN = r'<div class="de\d+">(https?://[^ <]+)(?:[^<]*)</div>' diff --git a/pyload/plugin/crypter/QuickshareCz.py b/pyload/plugin/crypter/QuickshareCz.py index 8cd4b9c02..750672ec1 100644 --- a/pyload/plugin/crypter/QuickshareCz.py +++ b/pyload/plugin/crypter/QuickshareCz.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter  class QuickshareCz(Crypter): -    __name__    = "QuickshareCz" -    __type__    = "crypter" -    __version__ = "0.10" +    __name    = "QuickshareCz" +    __type    = "crypter" +    __version = "0.10" -    __pattern__ = r'http://(?:www\.)?quickshare\.cz/slozka-\d+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?quickshare\.cz/slozka-\d+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Quickshare.cz folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Quickshare.cz folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      FOLDER_PATTERN = r'<textarea[^>]*>(.*?)</textarea>' diff --git a/pyload/plugin/crypter/RSLayerCom.py b/pyload/plugin/crypter/RSLayerCom.py index 8ea8a4369..756c356f7 100644 --- a/pyload/plugin/crypter/RSLayerCom.py +++ b/pyload/plugin/crypter/RSLayerCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class RSLayerCom(DeadCrypter): -    __name__    = "RSLayerCom" -    __type__    = "crypter" -    __version__ = "0.21" +    __name    = "RSLayerCom" +    __type    = "crypter" +    __version = "0.21" -    __pattern__ = r'http://(?:www\.)?rs-layer\.com/directory-' -    __config__  = [] +    __pattern = r'http://(?:www\.)?rs-layer\.com/directory-' +    __config  = [] -    __description__ = """RS-Layer.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("hzpz", "")] +    __description = """RS-Layer.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("hzpz", "")] diff --git a/pyload/plugin/crypter/RelinkUs.py b/pyload/plugin/crypter/RelinkUs.py index 0c27c29b5..023024a82 100644 --- a/pyload/plugin/crypter/RelinkUs.py +++ b/pyload/plugin/crypter/RelinkUs.py @@ -12,17 +12,17 @@ from pyload.utils import safe_join  class RelinkUs(Crypter): -    __name__    = "RelinkUs" -    __type__    = "crypter" -    __version__ = "3.12" +    __name    = "RelinkUs" +    __type    = "crypter" +    __version = "3.12" -    __pattern__ = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<ID>.+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<ID>.+)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Relink.us decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es"), +    __description = """Relink.us decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),                         ("AndroKev", "neureither.kevin@gmail.com")] @@ -99,7 +99,7 @@ class RelinkUs(Crypter):      def initPackage(self, pyfile): -        self.fileid = re.match(self.__pattern__, pyfile.url).group('ID') +        self.fileid = re.match(self.__pattern, pyfile.url).group('ID')          self.package = pyfile.package() diff --git a/pyload/plugin/crypter/SafelinkingNet.py b/pyload/plugin/crypter/SafelinkingNet.py index 2d5d273ed..ed2d76e85 100644 --- a/pyload/plugin/crypter/SafelinkingNet.py +++ b/pyload/plugin/crypter/SafelinkingNet.py @@ -10,17 +10,17 @@ from pyload.plugin.internal.captcha import SolveMedia  class SafelinkingNet(Crypter): -    __name__    = "SafelinkingNet" -    __type__    = "crypter" -    __version__ = "0.14" +    __name    = "SafelinkingNet" +    __type    = "crypter" +    __version = "0.14" -    __pattern__ = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Safelinking.net decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("quareevo", "quareevo@arcor.de")] +    __description = """Safelinking.net decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("quareevo", "quareevo@arcor.de")]      SOLVEMEDIA_PATTERN = "solvemediaApiKey = '([\w.-]+)';" @@ -29,7 +29,7 @@ class SafelinkingNet(Crypter):      def decrypt(self, pyfile):          url = pyfile.url -        if re.match(self.__pattern__, url).group(1) == "d": +        if re.match(self.__pattern, url).group(1) == "d":              header = self.load(url, just_header=True)              if 'location' in header: diff --git a/pyload/plugin/crypter/SecuredIn.py b/pyload/plugin/crypter/SecuredIn.py index b0b8eb6d3..23bcea8ab 100644 --- a/pyload/plugin/crypter/SecuredIn.py +++ b/pyload/plugin/crypter/SecuredIn.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class SecuredIn(DeadCrypter): -    __name__    = "SecuredIn" -    __type__    = "crypter" -    __version__ = "0.21" +    __name    = "SecuredIn" +    __type    = "crypter" +    __version = "0.21" -    __pattern__ = r'http://(?:www\.)?secured\.in/download-[\d]+-\w{8}\.html' -    __config__  = [] +    __pattern = r'http://(?:www\.)?secured\.in/download-[\d]+-\w{8}\.html' +    __config  = [] -    __description__ = """Secured.in decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de")] +    __description = """Secured.in decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de")] diff --git a/pyload/plugin/crypter/SexuriaCom.py b/pyload/plugin/crypter/SexuriaCom.py index 10101cd7a..08f289541 100644 --- a/pyload/plugin/crypter/SexuriaCom.py +++ b/pyload/plugin/crypter/SexuriaCom.py @@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter  class SexuriaCom(Crypter): -    __name__    = "SexuriaCom" -    __type__    = "crypter" -    __version__ = "0.01" +    __name    = "SexuriaCom" +    __type    = "crypter" +    __version = "0.01" -    __pattern__ = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Sexuria.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("NETHead", "NETHead.AT.gmx.DOT.net")] +    __description = """Sexuria.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("NETHead", "NETHead.AT.gmx.DOT.net")]      PATTERN_SUPPORTED_MAIN     = re.compile(r'http://(www\.)?sexuria\.com/(v1/)?Pornos_Kostenlos_.+?_(\d+)\.html', flags=re.I) diff --git a/pyload/plugin/crypter/ShareLinksBiz.py b/pyload/plugin/crypter/ShareLinksBiz.py index 1328e86aa..10053640b 100644 --- a/pyload/plugin/crypter/ShareLinksBiz.py +++ b/pyload/plugin/crypter/ShareLinksBiz.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter  class ShareLinksBiz(Crypter): -    __name__    = "ShareLinksBiz" -    __type__    = "crypter" -    __version__ = "1.14" +    __name    = "ShareLinksBiz" +    __type    = "crypter" +    __version = "1.14" -    __pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Share-Links.biz decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es")] +    __description = """Share-Links.biz decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es")]      def setup(self): @@ -67,8 +67,8 @@ class ShareLinksBiz(Crypter):          url = pyfile.url          if 's2l.biz' in url:              url = self.load(url, just_header=True)['location'] -        self.baseUrl = "http://www.%s.biz" % re.match(self.__pattern__, url).group(1) -        self.fileId = re.match(self.__pattern__, url).group('ID') +        self.baseUrl = "http://www.%s.biz" % re.match(self.__pattern, url).group(1) +        self.fileId = re.match(self.__pattern, url).group('ID')          self.package = pyfile.package() diff --git a/pyload/plugin/crypter/SharingmatrixCom.py b/pyload/plugin/crypter/SharingmatrixCom.py index 7db09b246..d3e8f5b35 100644 --- a/pyload/plugin/crypter/SharingmatrixCom.py +++ b/pyload/plugin/crypter/SharingmatrixCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class SharingmatrixCom(DeadCrypter): -    __name__    = "SharingmatrixCom" -    __type__    = "crypter" -    __version__ = "0.01" +    __name    = "SharingmatrixCom" +    __type    = "crypter" +    __version = "0.01" -    __pattern__ = r'http://(?:www\.)?sharingmatrix\.com/folder/\w+' +    __pattern = r'http://(?:www\.)?sharingmatrix\.com/folder/\w+' -    __description__ = """Sharingmatrix.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Sharingmatrix.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/crypter/SpeedLoadOrg.py b/pyload/plugin/crypter/SpeedLoadOrg.py index 95c8864dc..32677e9ef 100644 --- a/pyload/plugin/crypter/SpeedLoadOrg.py +++ b/pyload/plugin/crypter/SpeedLoadOrg.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class SpeedLoadOrg(DeadCrypter): -    __name__    = "SpeedLoadOrg" -    __type__    = "crypter" -    __version__ = "0.30" +    __name    = "SpeedLoadOrg" +    __type    = "crypter" +    __version = "0.30" -    __pattern__ = r'http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)' -    __config__  = [] +    __pattern = r'http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)' +    __config  = [] -    __description__ = """Speedload decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Speedload decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/StealthTo.py b/pyload/plugin/crypter/StealthTo.py index 23747be1b..b974a169c 100644 --- a/pyload/plugin/crypter/StealthTo.py +++ b/pyload/plugin/crypter/StealthTo.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class StealthTo(DeadCrypter): -    __name__    = "StealthTo" -    __type__    = "crypter" -    __version__ = "0.20" +    __name    = "StealthTo" +    __type    = "crypter" +    __version = "0.20" -    __pattern__ = r'http://(?:www\.)?stealth\.to/folder/.+' -    __config__  = [] +    __pattern = r'http://(?:www\.)?stealth\.to/folder/.+' +    __config  = [] -    __description__ = """Stealth.to decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("spoob", "spoob@pyload.org")] +    __description = """Stealth.to decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("spoob", "spoob@pyload.org")] diff --git a/pyload/plugin/crypter/TnyCz.py b/pyload/plugin/crypter/TnyCz.py index d73f6de63..19427b845 100644 --- a/pyload/plugin/crypter/TnyCz.py +++ b/pyload/plugin/crypter/TnyCz.py @@ -6,17 +6,17 @@ import re  class TnyCz(SimpleCrypter): -    __name__    = "TnyCz" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "TnyCz" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?tny\.cz/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?tny\.cz/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Tny.cz decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Tny.cz decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      NAME_PATTERN = r'<title>(?P<N>.+) - .+</title>' diff --git a/pyload/plugin/crypter/TrailerzoneInfo.py b/pyload/plugin/crypter/TrailerzoneInfo.py index 06894054b..cad464d47 100644 --- a/pyload/plugin/crypter/TrailerzoneInfo.py +++ b/pyload/plugin/crypter/TrailerzoneInfo.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class TrailerzoneInfo(DeadCrypter): -    __name__    = "TrailerzoneInfo" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "TrailerzoneInfo" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?trailerzone\.info/.+' -    __config__  = [] +    __pattern = r'http://(?:www\.)?trailerzone\.info/.+' +    __config  = [] -    __description__ = """TrailerZone.info decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("godofdream", "soilfiction@gmail.com")] +    __description = """TrailerZone.info decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("godofdream", "soilfiction@gmail.com")] diff --git a/pyload/plugin/crypter/TurbobitNet.py b/pyload/plugin/crypter/TurbobitNet.py index d6b6d7b38..fa77732ad 100644 --- a/pyload/plugin/crypter/TurbobitNet.py +++ b/pyload/plugin/crypter/TurbobitNet.py @@ -7,17 +7,17 @@ from pyload.utils import json_loads  class TurbobitNet(SimpleCrypter): -    __name__    = "TurbobitNet" -    __type__    = "crypter" -    __version__ = "0.05" +    __name    = "TurbobitNet" +    __type    = "crypter" +    __version = "0.05" -    __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Turbobit.net folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it"), +    __description = """Turbobit.net folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] @@ -39,6 +39,6 @@ class TurbobitNet(SimpleCrypter):      def getLinks(self): -        id = re.match(self.__pattern__, self.pyfile.url).group('ID') +        id = re.match(self.__pattern, self.pyfile.url).group('ID')          fixurl = lambda id: "http://turbobit.net/%s.html" % id          return map(fixurl, self._getLinks(id)) diff --git a/pyload/plugin/crypter/TusfilesNet.py b/pyload/plugin/crypter/TusfilesNet.py index 39d5dee9d..3a62f0ccc 100644 --- a/pyload/plugin/crypter/TusfilesNet.py +++ b/pyload/plugin/crypter/TusfilesNet.py @@ -8,23 +8,23 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter  class TusfilesNet(XFSCrypter): -    __name__    = "TusfilesNet" -    __type__    = "crypter" -    __version__ = "0.08" +    __name    = "TusfilesNet" +    __type    = "crypter" +    __version = "0.08" -    __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Tusfiles.net folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"), +    __description = """Tusfiles.net folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com"),                         ("stickell", "l.stickell@yahoo.it")]      PAGES_PATTERN = r'>\((\d+) \w+\)<' -    URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.tusfiles.net/go/\g<ID>/')] +    URL_REPLACEMENTS = [(__pattern + ".*", r'https://www.tusfiles.net/go/\g<ID>/')]      def loadPage(self, page_n): diff --git a/pyload/plugin/crypter/UlozTo.py b/pyload/plugin/crypter/UlozTo.py index 81fbee172..09ec9fa67 100644 --- a/pyload/plugin/crypter/UlozTo.py +++ b/pyload/plugin/crypter/UlozTo.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter  class UlozTo(Crypter): -    __name__    = "UlozTo" -    __type__    = "crypter" -    __version__ = "0.20" +    __name    = "UlozTo" +    __type    = "crypter" +    __version = "0.20" -    __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Uloz.to folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Uloz.to folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      FOLDER_PATTERN = r'<ul class="profile_files">(.*?)</ul>' diff --git a/pyload/plugin/crypter/UploadableCh.py b/pyload/plugin/crypter/UploadableCh.py index f5fb0c3bc..bf6bd09eb 100644 --- a/pyload/plugin/crypter/UploadableCh.py +++ b/pyload/plugin/crypter/UploadableCh.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class UploadableCh(SimpleCrypter): -    __name__    = "UploadableCh" -    __type__    = "crypter" -    __version__ = "0.03" +    __name    = "UploadableCh" +    __type    = "crypter" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?uploadable\.ch/list/\w+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?uploadable\.ch/list/\w+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Uploadable.ch folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("guidobelix", "guidobelix@hotmail.it"), +    __description = """Uploadable.ch folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("guidobelix", "guidobelix@hotmail.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/crypter/UploadedTo.py b/pyload/plugin/crypter/UploadedTo.py index 282f82be7..4acfc3a79 100644 --- a/pyload/plugin/crypter/UploadedTo.py +++ b/pyload/plugin/crypter/UploadedTo.py @@ -8,17 +8,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class UploadedTo(SimpleCrypter): -    __name__    = "UploadedTo" -    __type__    = "crypter" -    __version__ = "0.42" +    __name    = "UploadedTo" +    __type    = "crypter" +    __version = "0.42" -    __pattern__ = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<ID>\w+)' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<ID>\w+)' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """UploadedTo decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """UploadedTo decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      PLAIN_PATTERN = r'<small class="date"><a href="([\w/]+)" onclick=' diff --git a/pyload/plugin/crypter/WiiReloadedOrg.py b/pyload/plugin/crypter/WiiReloadedOrg.py index 4190cb340..1fed5e4d2 100644 --- a/pyload/plugin/crypter/WiiReloadedOrg.py +++ b/pyload/plugin/crypter/WiiReloadedOrg.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class WiiReloadedOrg(DeadCrypter): -    __name__    = "WiiReloadedOrg" -    __type__    = "crypter" -    __version__ = "0.11" +    __name    = "WiiReloadedOrg" +    __type    = "crypter" +    __version = "0.11" -    __pattern__ = r'http://(?:www\.)?wii-reloaded\.org/protect/get\.php\?i=.+' -    __config__  = [] +    __pattern = r'http://(?:www\.)?wii-reloaded\.org/protect/get\.php\?i=.+' +    __config  = [] -    __description__ = """Wii-Reloaded.org decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("hzpz", "")] +    __description = """Wii-Reloaded.org decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("hzpz", "")] diff --git a/pyload/plugin/crypter/WuploadCom.py b/pyload/plugin/crypter/WuploadCom.py index fb00cb136..cbf9d06fc 100644 --- a/pyload/plugin/crypter/WuploadCom.py +++ b/pyload/plugin/crypter/WuploadCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter  class WuploadCom(DeadCrypter): -    __name__    = "WuploadCom" -    __type__    = "crypter" -    __version__ = "0.01" +    __name    = "WuploadCom" +    __type    = "crypter" +    __version = "0.01" -    __pattern__ = r'http://(?:www\.)?wupload\.com/folder/\w+' +    __pattern = r'http://(?:www\.)?wupload\.com/folder/\w+' -    __description__ = """Wupload.com folder decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Wupload.com folder decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/crypter/XFileSharingPro.py b/pyload/plugin/crypter/XFileSharingPro.py index 3dc2e8f70..c99d9c6dc 100644 --- a/pyload/plugin/crypter/XFileSharingPro.py +++ b/pyload/plugin/crypter/XFileSharingPro.py @@ -6,31 +6,31 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter  class XFileSharingPro(XFSCrypter): -    __name__    = "XFileSharingPro" -    __type__    = "crypter" -    __version__ = "0.04" +    __name    = "XFileSharingPro" +    __type    = "crypter" +    __version = "0.04" -    __pattern__ = r'^unmatchable$' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'^unmatchable$' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """XFileSharingPro dummy folder decrypter plugin for hook""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """XFileSharingPro dummy folder decrypter plugin for hook""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      def _log(self, type, args):          msg = " | ".join(str(a).strip() for a in args if a)          logger = getattr(self.log, type) -        logger("%s: %s: %s" % (self.__name__, self.HOSTER_NAME, msg or _("%s MARK" % type.upper()))) +        logger("%s: %s: %s" % (self.__name, self.HOSTER_NAME, msg or _("%s MARK" % type.upper())))      def init(self):          super(XFileSharingPro, self).init() -        self.__pattern__ = self.core.pluginManager.crypterPlugins[self.__name__]['pattern'] +        self.__pattern = self.core.pluginManager.crypterPlugins[self.__name]['pattern'] -        self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower() +        self.HOSTER_DOMAIN = re.match(self.__pattern, self.pyfile.url).group("DOMAIN").lower()          self.HOSTER_NAME   = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.HOSTER_DOMAIN) if part != '.')          if self.HOSTER_NAME[0].isdigit(): diff --git a/pyload/plugin/crypter/XupPl.py b/pyload/plugin/crypter/XupPl.py index 9d4d27b61..ea6e6d033 100644 --- a/pyload/plugin/crypter/XupPl.py +++ b/pyload/plugin/crypter/XupPl.py @@ -4,17 +4,17 @@ from pyload.plugin.Crypter import Crypter  class XupPl(Crypter): -    __name__    = "XupPl" -    __type__    = "crypter" -    __version__ = "0.10" +    __name    = "XupPl" +    __type    = "crypter" +    __version = "0.10" -    __pattern__ = r'https?://(?:[^/]*\.)?xup\.pl/.+' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'https?://(?:[^/]*\.)?xup\.pl/.+' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Xup.pl decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("z00nx", "z00nx0@gmail.com")] +    __description = """Xup.pl decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("z00nx", "z00nx0@gmail.com")]      def decrypt(self, pyfile): diff --git a/pyload/plugin/crypter/YoutubeBatch.py b/pyload/plugin/crypter/YoutubeBatch.py index 5e4269fd2..3fea12ff0 100644 --- a/pyload/plugin/crypter/YoutubeBatch.py +++ b/pyload/plugin/crypter/YoutubeBatch.py @@ -10,20 +10,20 @@ from pyload.utils import safe_join  class YoutubeBatch(Crypter): -    __name__    = "YoutubeBatch" -    __type__    = "crypter" -    __version__ = "1.01" +    __name    = "YoutubeBatch" +    __type    = "crypter" +    __version = "1.01" -    __pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w-]+)' -    __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w-]+)' +    __config = [("use_subfolder", "bool", "Save package to subfolder", True),                  ("subfolder_per_package", "bool", "Create a subfolder for each package", True),                  ("likes", "bool", "Grab user (channel) liked videos", False),                  ("favorites", "bool", "Grab user (channel) favorite videos", False),                  ("uploads", "bool", "Grab channel unplaylisted videos", True)] -    __description__ = """Youtube.com channel & playlist decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Youtube.com channel & playlist decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      API_KEY = "AIzaSyCKnWLNlkX-L4oD1aEzqqhRw1zczeD6_k0" @@ -95,7 +95,7 @@ class YoutubeBatch(Crypter):      def decrypt(self, pyfile): -        m = re.match(self.__pattern__, pyfile.url) +        m = re.match(self.__pattern, pyfile.url)          m_id = m.group('ID')          m_type = m.group('TYPE') diff --git a/pyload/plugin/extractor/SevenZip.py b/pyload/plugin/extractor/SevenZip.py index 4b23c6ff2..22a7af941 100644 --- a/pyload/plugin/extractor/SevenZip.py +++ b/pyload/plugin/extractor/SevenZip.py @@ -10,12 +10,12 @@ from pyload.utils import fs_encode, safe_join  class SevenZip(UnRar): -    __name__    = "SevenZip" -    __version__ = "0.08" +    __name    = "SevenZip" +    __version = "0.08" -    __description__ = """7-Zip extractor plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Michael Nowak", ""), +    __description = """7-Zip extractor plugin""" +    __license     = "GPLv3" +    __authors     = [("Michael Nowak", ""),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/extractor/UnRar.py b/pyload/plugin/extractor/UnRar.py index 8a3985678..487b8a508 100644 --- a/pyload/plugin/extractor/UnRar.py +++ b/pyload/plugin/extractor/UnRar.py @@ -21,12 +21,12 @@ def renice(pid, value):  class UnRar(Extractor): -    __name__    = "UnRar" -    __version__ = "1.13" +    __name    = "UnRar" +    __version = "1.13" -    __description__ = """Rar extractor plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Rar extractor plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("Walter Purcaro", "vuolter@gmail.com"),                         ("Immenz", "immenz@gmx.net"),] diff --git a/pyload/plugin/extractor/UnZip.py b/pyload/plugin/extractor/UnZip.py index cb6621f99..881642f2f 100644 --- a/pyload/plugin/extractor/UnZip.py +++ b/pyload/plugin/extractor/UnZip.py @@ -11,12 +11,12 @@ from pyload.utils import fs_encode  class UnZip(Extractor): -    __name__    = "UnZip" -    __version__ = "1.10" +    __name    = "UnZip" +    __version = "1.10" -    __description__ = """Zip extractor plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Zip extractor plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      EXTENSIONS = [".zip", ".zip64"] diff --git a/pyload/plugin/hook/AlldebridCom.py b/pyload/plugin/hook/AlldebridCom.py index 6d3e5db48..abd270e93 100644 --- a/pyload/plugin/hook/AlldebridCom.py +++ b/pyload/plugin/hook/AlldebridCom.py @@ -4,11 +4,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class AlldebridCom(MultiHook): -    __name__    = "AlldebridCom" -    __type__    = "hook" -    __version__ = "0.16" +    __name    = "AlldebridCom" +    __type    = "hook" +    __version = "0.16" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -17,9 +17,9 @@ class AlldebridCom(MultiHook):                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   ),                    ("ssl"           , "bool"               , "Use HTTPS"                           , True )] -    __description__ = """Alldebrid.com hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Andy Voigt", "spamsales@online.de")] +    __description = """Alldebrid.com hook plugin""" +    __license     = "GPLv3" +    __authors     = [("Andy Voigt", "spamsales@online.de")]      def getHosters(self): diff --git a/pyload/plugin/hook/BypassCaptcha.py b/pyload/plugin/hook/BypassCaptcha.py index 7b7e156bb..2aba60999 100644 --- a/pyload/plugin/hook/BypassCaptcha.py +++ b/pyload/plugin/hook/BypassCaptcha.py @@ -26,16 +26,16 @@ class BypassCaptchaException(Exception):  class BypassCaptcha(Hook): -    __name__    = "BypassCaptcha" -    __type__    = "hook" -    __version__ = "0.06" +    __name    = "BypassCaptcha" +    __type    = "hook" +    __version = "0.06" -    __config__ = [("force", "bool", "Force BC even if client is connected", False), +    __config = [("force", "bool", "Force BC even if client is connected", False),                  ("passkey", "password", "Passkey", "")] -    __description__ = """Send captchas to BypassCaptcha.com""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Send captchas to BypassCaptcha.com""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("Godofdream", "soilfcition@gmail.com"),                         ("zoidberg", "zoidberg@mujmail.cz")] @@ -104,21 +104,21 @@ class BypassCaptcha(Hook):          if self.getCredits() > 0:              task.handler.append(self) -            task.data['service'] = self.__name__ +            task.data['service'] = self.__name              task.setWaiting(100)              self._processCaptcha(task)          else: -            self.logInfo(_("Your %s account has not enough credits") % self.__name__) +            self.logInfo(_("Your %s account has not enough credits") % self.__name)      def captchaCorrect(self, task): -        if task.data['service'] == self.__name__ and "ticket" in task.data: +        if task.data['service'] == self.__name and "ticket" in task.data:              self.respond(task.data['ticket'], True)      def captchaInvalid(self, task): -        if task.data['service'] == self.__name__ and "ticket" in task.data: +        if task.data['service'] == self.__name and "ticket" in task.data:              self.respond(task.data['ticket'], False) diff --git a/pyload/plugin/hook/Captcha9Kw.py b/pyload/plugin/hook/Captcha9Kw.py index dd3fb1ba1..88b9f58e7 100644 --- a/pyload/plugin/hook/Captcha9Kw.py +++ b/pyload/plugin/hook/Captcha9Kw.py @@ -14,11 +14,11 @@ from pyload.plugin.Hook import Hook, threaded  class Captcha9kw(Hook): -    __name__    = "Captcha9Kw" -    __type__    = "hook" -    __version__ = "0.28" +    __name    = "Captcha9Kw" +    __type    = "hook" +    __version = "0.28" -    __config__ = [("ssl"           , "bool"    , "Use HTTPS"                                                                       , True                                                               ), +    __config = [("ssl"           , "bool"    , "Use HTTPS"                                                                       , True                                                               ),                  ("force"         , "bool"    , "Force captcha resolving even if client is connected"                             , True                                                               ),                  ("confirm"       , "bool"    , "Confirm Captcha (cost +6 credits)"                                               , False                                                              ),                  ("captchaperhour", "int"     , "Captcha per hour"                                                                , "9999"                                                             ), @@ -30,9 +30,9 @@ class Captcha9kw(Hook):                  ("passkey"       , "password", "API key"                                                                         , ""                                                                 ),                  ("timeout"       , "int"     , "Timeout in seconds (min 60, max 3999)"                                           , "900"                                                              )] -    __description__ = """Send captchas to 9kw.eu""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Send captchas to 9kw.eu""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hook/CaptchaBrotherhood.py b/pyload/plugin/hook/CaptchaBrotherhood.py index 554d102ec..b854602b9 100644 --- a/pyload/plugin/hook/CaptchaBrotherhood.py +++ b/pyload/plugin/hook/CaptchaBrotherhood.py @@ -36,17 +36,17 @@ class CaptchaBrotherhoodException(Exception):  class CaptchaBrotherhood(Hook): -    __name__    = "CaptchaBrotherhood" -    __type__    = "hook" -    __version__ = "0.08" +    __name    = "CaptchaBrotherhood" +    __type    = "hook" +    __version = "0.08" -    __config__ = [("username", "str", "Username", ""), +    __config = [("username", "str", "Username", ""),                  ("force", "bool", "Force CT even if client is connected", False),                  ("passkey", "password", "Password", "")] -    __description__ = """Send captchas to CaptchaBrotherhood.com""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Send captchas to CaptchaBrotherhood.com""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("zoidberg", "zoidberg@mujmail.cz")] @@ -142,7 +142,7 @@ class CaptchaBrotherhood(Hook):          if self.getCredits() > 10:              task.handler.append(self) -            task.data['service'] = self.__name__ +            task.data['service'] = self.__name              task.setWaiting(100)              self._processCaptcha(task)          else: @@ -150,7 +150,7 @@ class CaptchaBrotherhood(Hook):      def captchaInvalid(self, task): -        if task.data['service'] == self.__name__ and "ticket" in task.data: +        if task.data['service'] == self.__name and "ticket" in task.data:              res = self.api_response("complainCaptcha", task.data['ticket']) diff --git a/pyload/plugin/hook/DeathByCaptcha.py b/pyload/plugin/hook/DeathByCaptcha.py index e0108963b..47101194e 100644 --- a/pyload/plugin/hook/DeathByCaptcha.py +++ b/pyload/plugin/hook/DeathByCaptcha.py @@ -49,17 +49,17 @@ class DeathByCaptchaException(Exception):  class DeathByCaptcha(Hook): -    __name__    = "DeathByCaptcha" -    __type__    = "hook" -    __version__ = "0.06" +    __name    = "DeathByCaptcha" +    __type    = "hook" +    __version = "0.06" -    __config__ = [("username", "str", "Username", ""), +    __config = [("username", "str", "Username", ""),                  ("passkey", "password", "Password", ""),                  ("force", "bool", "Force DBC even if client is connected", False)] -    __description__ = """Send captchas to DeathByCaptcha.com""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Send captchas to DeathByCaptcha.com""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("zoidberg", "zoidberg@mujmail.cz")] @@ -183,13 +183,13 @@ class DeathByCaptcha(Hook):          if balance > rate:              task.handler.append(self) -            task.data['service'] = self.__name__ +            task.data['service'] = self.__name              task.setWaiting(180)              self._processCaptcha(task)      def captchaInvalid(self, task): -        if task.data['service'] == self.__name__ and "ticket" in task.data: +        if task.data['service'] == self.__name and "ticket" in task.data:              try:                  res = self.api_response("captcha/%d/report" % task.data['ticket'], True) diff --git a/pyload/plugin/hook/DebridItaliaCom.py b/pyload/plugin/hook/DebridItaliaCom.py index e2f766d86..ff5a3aaef 100644 --- a/pyload/plugin/hook/DebridItaliaCom.py +++ b/pyload/plugin/hook/DebridItaliaCom.py @@ -6,11 +6,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class DebridItaliaCom(MultiHook): -    __name__    = "DebridItaliaCom" -    __type__    = "hook" -    __version__ = "0.12" +    __name    = "DebridItaliaCom" +    __type    = "hook" +    __version = "0.12" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -18,9 +18,9 @@ class DebridItaliaCom(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Debriditalia.com hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it"), +    __description = """Debriditalia.com hook plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hook/EasybytezCom.py b/pyload/plugin/hook/EasybytezCom.py index 1163bbf46..7d934fd22 100644 --- a/pyload/plugin/hook/EasybytezCom.py +++ b/pyload/plugin/hook/EasybytezCom.py @@ -6,11 +6,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class EasybytezCom(MultiHook): -    __name__    = "EasybytezCom" -    __type__    = "hook" -    __version__ = "0.07" +    __name    = "EasybytezCom" +    __type    = "hook" +    __version = "0.07" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -18,9 +18,9 @@ class EasybytezCom(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """EasyBytez.com hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """EasyBytez.com hook plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      def getHosters(self): diff --git a/pyload/plugin/hook/ExpertDecoders.py b/pyload/plugin/hook/ExpertDecoders.py index 8fbc88c80..702955229 100644 --- a/pyload/plugin/hook/ExpertDecoders.py +++ b/pyload/plugin/hook/ExpertDecoders.py @@ -12,16 +12,16 @@ from pyload.plugin.Hook import Hook, threaded  class ExpertDecoders(Hook): -    __name__    = "ExpertDecoders" -    __type__    = "hook" -    __version__ = "0.04" +    __name    = "ExpertDecoders" +    __type    = "hook" +    __version = "0.04" -    __config__ = [("force", "bool", "Force CT even if client is connected", False), +    __config = [("force", "bool", "Force CT even if client is connected", False),                  ("passkey", "password", "Access key", "")] -    __description__ = """Send captchas to expertdecoders.com""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Send captchas to expertdecoders.com""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hook/FastixRu.py b/pyload/plugin/hook/FastixRu.py index 8bc3b3f16..0f07d0d84 100644 --- a/pyload/plugin/hook/FastixRu.py +++ b/pyload/plugin/hook/FastixRu.py @@ -5,11 +5,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class FastixRu(MultiHook): -    __name__    = "FastixRu" -    __type__    = "hook" -    __version__ = "0.05" +    __name    = "FastixRu" +    __type    = "hook" +    __version = "0.05" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -17,9 +17,9 @@ class FastixRu(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Fastix.ru hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")] +    __description = """Fastix.ru hook plugin""" +    __license     = "GPLv3" +    __authors     = [("Massimo Rosamilia", "max@spiritix.eu")]      def getHosters(self): diff --git a/pyload/plugin/hook/FreeWayMe.py b/pyload/plugin/hook/FreeWayMe.py index 711be37a8..737cd1e7e 100644 --- a/pyload/plugin/hook/FreeWayMe.py +++ b/pyload/plugin/hook/FreeWayMe.py @@ -4,11 +4,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class FreeWayMe(MultiHook): -    __name__    = "FreeWayMe" -    __type__    = "hook" -    __version__ = "0.14" +    __name    = "FreeWayMe" +    __type    = "hook" +    __version = "0.14" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -16,9 +16,9 @@ class FreeWayMe(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """FreeWay.me hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Nicolas Giese", "james@free-way.me")] +    __description = """FreeWay.me hook plugin""" +    __license     = "GPLv3" +    __authors     = [("Nicolas Giese", "james@free-way.me")]      def getHosters(self): diff --git a/pyload/plugin/hook/ImageTyperz.py b/pyload/plugin/hook/ImageTyperz.py index a9d7326de..d5a05e209 100644 --- a/pyload/plugin/hook/ImageTyperz.py +++ b/pyload/plugin/hook/ImageTyperz.py @@ -30,17 +30,17 @@ class ImageTyperzException(Exception):  class ImageTyperz(Hook): -    __name__    = "ImageTyperz" -    __type__    = "hook" -    __version__ = "0.06" +    __name    = "ImageTyperz" +    __type    = "hook" +    __version = "0.06" -    __config__ = [("username", "str", "Username", ""), +    __config = [("username", "str", "Username", ""),                  ("passkey", "password", "Password", ""),                  ("force", "bool", "Force IT even if client is connected", False)] -    __description__ = """Send captchas to ImageTyperz.com""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Send captchas to ImageTyperz.com""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("zoidberg", "zoidberg@mujmail.cz")] @@ -118,16 +118,16 @@ class ImageTyperz(Hook):          if self.getCredits() > 0:              task.handler.append(self) -            task.data['service'] = self.__name__ +            task.data['service'] = self.__name              task.setWaiting(100)              self._processCaptcha(task)          else: -            self.logInfo(_("Your %s account has not enough credits") % self.__name__) +            self.logInfo(_("Your %s account has not enough credits") % self.__name)      def captchaInvalid(self, task): -        if task.data['service'] == self.__name__ and "ticket" in task.data: +        if task.data['service'] == self.__name and "ticket" in task.data:              res = getURL(self.RESPOND_URL,                           post={'action': "SETBADIMAGE",                                 'username': self.getConfig("username"), diff --git a/pyload/plugin/hook/LinkdecrypterCom.py b/pyload/plugin/hook/LinkdecrypterCom.py index efdf77065..fa52cb482 100644 --- a/pyload/plugin/hook/LinkdecrypterCom.py +++ b/pyload/plugin/hook/LinkdecrypterCom.py @@ -6,18 +6,18 @@ from pyload.plugin.internal.MultiHook import MultiHook  class LinkdecrypterCom(MultiHook): -    __name__    = "LinkdecrypterCom" -    __type__    = "hook" -    __version__ = "1.02" +    __name    = "LinkdecrypterCom" +    __type    = "hook" +    __version = "1.02" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Linkdecrypter.com hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Linkdecrypter.com hook plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      def getCrypters(self): diff --git a/pyload/plugin/hook/LinksnappyCom.py b/pyload/plugin/hook/LinksnappyCom.py index dc0c47496..6a348d85c 100644 --- a/pyload/plugin/hook/LinksnappyCom.py +++ b/pyload/plugin/hook/LinksnappyCom.py @@ -5,11 +5,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class LinksnappyCom(MultiHook): -    __name__    = "LinksnappyCom" -    __type__    = "hook" -    __version__ = "0.04" +    __name    = "LinksnappyCom" +    __type    = "hook" +    __version = "0.04" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -17,9 +17,9 @@ class LinksnappyCom(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Linksnappy.com hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Linksnappy.com hook plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      def getHosters(self): diff --git a/pyload/plugin/hook/MegaDebridEu.py b/pyload/plugin/hook/MegaDebridEu.py index 7e86d4d49..8dc6c4f90 100644 --- a/pyload/plugin/hook/MegaDebridEu.py +++ b/pyload/plugin/hook/MegaDebridEu.py @@ -5,11 +5,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class MegaDebridEu(MultiHook): -    __name__    = "MegaDebridEu" -    __type__    = "hook" -    __version__ = "0.05" +    __name    = "MegaDebridEu" +    __type    = "hook" +    __version = "0.05" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -17,9 +17,9 @@ class MegaDebridEu(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Mega-debrid.eu hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("D.Ducatel", "dducatel@je-geek.fr")] +    __description = """Mega-debrid.eu hook plugin""" +    __license     = "GPLv3" +    __authors     = [("D.Ducatel", "dducatel@je-geek.fr")]      def getHosters(self): diff --git a/pyload/plugin/hook/MultihostersCom.py b/pyload/plugin/hook/MultihostersCom.py index 7b92089a1..5cb2396ee 100644 --- a/pyload/plugin/hook/MultihostersCom.py +++ b/pyload/plugin/hook/MultihostersCom.py @@ -4,15 +4,15 @@ from pyload.plugin.hook.ZeveraCom import ZeveraCom  class MultihostersCom(ZeveraCom): -    __name__    = "MultihostersCom" -    __type__    = "hook" -    __version__ = "0.02" +    __name    = "MultihostersCom" +    __type    = "hook" +    __version = "0.02" -    __config__ = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"), +    __config = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"),                    ("pluginlist"  , "str"                , "Plugin list (comma separated)"                , ""   ),                    ("revertfailed", "bool"               , "Revert to standard download if download fails", False),                    ("interval"    , "int"                , "Reload interval in hours (0 to disable)"      , 12   )] -    __description__ = """Multihosters.com hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("tjeh", "tjeh@gmx.net")] +    __description = """Multihosters.com hook plugin""" +    __license     = "GPLv3" +    __authors     = [("tjeh", "tjeh@gmx.net")] diff --git a/pyload/plugin/hook/MultishareCz.py b/pyload/plugin/hook/MultishareCz.py index 56f30fb39..fcfa2371b 100644 --- a/pyload/plugin/hook/MultishareCz.py +++ b/pyload/plugin/hook/MultishareCz.py @@ -6,11 +6,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class MultishareCz(MultiHook): -    __name__    = "MultishareCz" -    __type__    = "hook" -    __version__ = "0.07" +    __name    = "MultishareCz" +    __type    = "hook" +    __version = "0.07" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -18,9 +18,9 @@ class MultishareCz(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """MultiShare.cz hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """MultiShare.cz hook plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      HOSTER_PATTERN = r'<img class="logo-shareserveru"[^>]*?alt="([^"]+)"></td>\s*<td class="stav">[^>]*?alt="OK"' diff --git a/pyload/plugin/hook/MyfastfileCom.py b/pyload/plugin/hook/MyfastfileCom.py index 097a54b60..33149dd9c 100644 --- a/pyload/plugin/hook/MyfastfileCom.py +++ b/pyload/plugin/hook/MyfastfileCom.py @@ -5,11 +5,11 @@ from pyload.utils import json_loads  class MyfastfileCom(MultiHook): -    __name__    = "MyfastfileCom" -    __type__    = "hook" -    __version__ = "0.05" +    __name    = "MyfastfileCom" +    __type    = "hook" +    __version = "0.05" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -17,9 +17,9 @@ class MyfastfileCom(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Myfastfile.com hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Myfastfile.com hook plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      def getHosters(self): diff --git a/pyload/plugin/hook/NoPremiumPl.py b/pyload/plugin/hook/NoPremiumPl.py index da7967154..da24a6a99 100644 --- a/pyload/plugin/hook/NoPremiumPl.py +++ b/pyload/plugin/hook/NoPremiumPl.py @@ -5,11 +5,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class NoPremiumPl(MultiHook): -    __name__    = "NoPremiumPl" -    __type__    = "hook" -    __version__ = "0.03" +    __name    = "NoPremiumPl" +    __type    = "hook" +    __version = "0.03" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -17,9 +17,9 @@ class NoPremiumPl(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """NoPremium.pl hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("goddie", "dev@nopremium.pl")] +    __description = """NoPremium.pl hook plugin""" +    __license     = "GPLv3" +    __authors     = [("goddie", "dev@nopremium.pl")]      def getHosters(self): diff --git a/pyload/plugin/hook/OverLoadMe.py b/pyload/plugin/hook/OverLoadMe.py index e4602019f..9caa19897 100644 --- a/pyload/plugin/hook/OverLoadMe.py +++ b/pyload/plugin/hook/OverLoadMe.py @@ -4,11 +4,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class OverLoadMe(MultiHook): -    __name__    = "OverLoadMe" -    __type__    = "hook" -    __version__ = "0.04" +    __name    = "OverLoadMe" +    __type    = "hook" +    __version = "0.04" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -17,9 +17,9 @@ class OverLoadMe(MultiHook):                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   ),                    ("ssl"           , "bool"               , "Use HTTPS"                           , True )] -    __description__ = """Over-Load.me hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("marley", "marley@over-load.me")] +    __description = """Over-Load.me hook plugin""" +    __license     = "GPLv3" +    __authors     = [("marley", "marley@over-load.me")]      def getHosters(self): diff --git a/pyload/plugin/hook/PremiumTo.py b/pyload/plugin/hook/PremiumTo.py index 58d753cec..353d10ebd 100644 --- a/pyload/plugin/hook/PremiumTo.py +++ b/pyload/plugin/hook/PremiumTo.py @@ -4,11 +4,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class PremiumTo(MultiHook): -    __name__    = "PremiumTo" -    __type__    = "hook" -    __version__ = "0.08" +    __name    = "PremiumTo" +    __type    = "hook" +    __version = "0.08" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -16,9 +16,9 @@ class PremiumTo(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Premium.to hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Premium.to hook plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hook/PremiumizeMe.py b/pyload/plugin/hook/PremiumizeMe.py index c5f1588ec..a293ca84d 100644 --- a/pyload/plugin/hook/PremiumizeMe.py +++ b/pyload/plugin/hook/PremiumizeMe.py @@ -5,11 +5,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class PremiumizeMe(MultiHook): -    __name__    = "PremiumizeMe" -    __type__    = "hook" -    __version__ = "0.17" +    __name    = "PremiumizeMe" +    __type    = "hook" +    __version = "0.17" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -17,9 +17,9 @@ class PremiumizeMe(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Premiumize.me hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Florian Franzen", "FlorianFranzen@gmail.com")] +    __description = """Premiumize.me hook plugin""" +    __license     = "GPLv3" +    __authors     = [("Florian Franzen", "FlorianFranzen@gmail.com")]      def getHosters(self): diff --git a/pyload/plugin/hook/PutdriveCom.py b/pyload/plugin/hook/PutdriveCom.py index 85e2f541d..126eb86e8 100644 --- a/pyload/plugin/hook/PutdriveCom.py +++ b/pyload/plugin/hook/PutdriveCom.py @@ -4,15 +4,15 @@ from pyload.plugin.hook.ZeveraCom import ZeveraCom  class PutdriveCom(ZeveraCom): -    __name__    = "PutdriveCom" -    __type__    = "hook" -    __version__ = "0.01" +    __name    = "PutdriveCom" +    __type    = "hook" +    __version = "0.01" -    __config__ = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"), +    __config = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"),                    ("pluginlist"  , "str"                , "Plugin list (comma separated)"                , ""   ),                    ("revertfailed", "bool"               , "Revert to standard download if download fails", False),                    ("interval"    , "int"                , "Reload interval in hours (0 to disable)"      , 12   )] -    __description__ = """Putdrive.com hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Putdrive.com hook plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hook/RPNetBiz.py b/pyload/plugin/hook/RPNetBiz.py index 75fe0e39b..8bfc45df3 100644 --- a/pyload/plugin/hook/RPNetBiz.py +++ b/pyload/plugin/hook/RPNetBiz.py @@ -5,11 +5,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class RPNetBiz(MultiHook): -    __name__    = "RPNetBiz" -    __type__    = "hook" -    __version__ = "0.14" +    __name    = "RPNetBiz" +    __type    = "hook" +    __version = "0.14" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -17,9 +17,9 @@ class RPNetBiz(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """RPNet.biz hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Dman", "dmanugm@gmail.com")] +    __description = """RPNet.biz hook plugin""" +    __license     = "GPLv3" +    __authors     = [("Dman", "dmanugm@gmail.com")]      def getHosters(self): diff --git a/pyload/plugin/hook/RapideoPl.py b/pyload/plugin/hook/RapideoPl.py index 12d53830b..875f51938 100644 --- a/pyload/plugin/hook/RapideoPl.py +++ b/pyload/plugin/hook/RapideoPl.py @@ -5,11 +5,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class RapideoPl(MultiHook): -    __name__    = "RapideoPl" -    __type__    = "hook" -    __version__ = "0.03" +    __name    = "RapideoPl" +    __type    = "hook" +    __version = "0.03" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -17,9 +17,9 @@ class RapideoPl(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Rapideo.pl hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("goddie", "dev@rapideo.pl")] +    __description = """Rapideo.pl hook plugin""" +    __license     = "GPLv3" +    __authors     = [("goddie", "dev@rapideo.pl")]      def getHosters(self): diff --git a/pyload/plugin/hook/RealdebridCom.py b/pyload/plugin/hook/RealdebridCom.py index a8eb03f83..681aa1625 100644 --- a/pyload/plugin/hook/RealdebridCom.py +++ b/pyload/plugin/hook/RealdebridCom.py @@ -4,11 +4,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class RealdebridCom(MultiHook): -    __name__    = "RealdebridCom" -    __type__    = "hook" -    __version__ = "0.46" +    __name    = "RealdebridCom" +    __type    = "hook" +    __version = "0.46" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -17,9 +17,9 @@ class RealdebridCom(MultiHook):                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   ),                    ("ssl"           , "bool"               , "Use HTTPS"                           , True )] -    __description__ = """Real-Debrid.com hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Devirex Hazzard", "naibaf_11@yahoo.de")] +    __description = """Real-Debrid.com hook plugin""" +    __license     = "GPLv3" +    __authors     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]      def getHosters(self): diff --git a/pyload/plugin/hook/RehostTo.py b/pyload/plugin/hook/RehostTo.py index cda80417c..95290453b 100644 --- a/pyload/plugin/hook/RehostTo.py +++ b/pyload/plugin/hook/RehostTo.py @@ -4,11 +4,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class RehostTo(MultiHook): -    __name__    = "RehostTo" -    __type__    = "hook" -    __version__ = "0.50" +    __name    = "RehostTo" +    __type    = "hook" +    __version = "0.50" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -16,9 +16,9 @@ class RehostTo(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Rehost.to hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org")] +    __description = """Rehost.to hook plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org")]      def getHosters(self): diff --git a/pyload/plugin/hook/SimplyPremiumCom.py b/pyload/plugin/hook/SimplyPremiumCom.py index 28d9af41f..3ae6238f4 100644 --- a/pyload/plugin/hook/SimplyPremiumCom.py +++ b/pyload/plugin/hook/SimplyPremiumCom.py @@ -5,11 +5,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class SimplyPremiumCom(MultiHook): -    __name__    = "SimplyPremiumCom" -    __type__    = "hook" -    __version__ = "0.05" +    __name    = "SimplyPremiumCom" +    __type    = "hook" +    __version = "0.05" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -17,9 +17,9 @@ class SimplyPremiumCom(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Simply-Premium.com hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("EvolutionClip", "evolutionclip@live.de")] +    __description = """Simply-Premium.com hook plugin""" +    __license     = "GPLv3" +    __authors     = [("EvolutionClip", "evolutionclip@live.de")]      def getHosters(self): diff --git a/pyload/plugin/hook/SimplydebridCom.py b/pyload/plugin/hook/SimplydebridCom.py index 011b346b8..ca2e8f957 100644 --- a/pyload/plugin/hook/SimplydebridCom.py +++ b/pyload/plugin/hook/SimplydebridCom.py @@ -4,11 +4,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class SimplydebridCom(MultiHook): -    __name__    = "SimplydebridCom" -    __type__    = "hook" -    __version__ = "0.04" +    __name    = "SimplydebridCom" +    __type    = "hook" +    __version = "0.04" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -16,9 +16,9 @@ class SimplydebridCom(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Simply-Debrid.com hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")] +    __description = """Simply-Debrid.com hook plugin""" +    __license     = "GPLv3" +    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")]      def getHosters(self): diff --git a/pyload/plugin/hook/SmoozedCom.py b/pyload/plugin/hook/SmoozedCom.py index 3f5aab63d..5e83bb349 100644 --- a/pyload/plugin/hook/SmoozedCom.py +++ b/pyload/plugin/hook/SmoozedCom.py @@ -4,11 +4,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class SmoozedCom(MultiHook): -    __name__    = "SmoozedCom" -    __type__    = "hook" -    __version__ = "0.03" +    __name    = "SmoozedCom" +    __type    = "hook" +    __version = "0.03" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -16,9 +16,9 @@ class SmoozedCom(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Smoozed.com hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("", "")] +    __description = """Smoozed.com hook plugin""" +    __license     = "GPLv3" +    __authors     = [("", "")]      def getHosters(self): diff --git a/pyload/plugin/hook/UnrestrictLi.py b/pyload/plugin/hook/UnrestrictLi.py index 0c4984042..5ebb61b5a 100644 --- a/pyload/plugin/hook/UnrestrictLi.py +++ b/pyload/plugin/hook/UnrestrictLi.py @@ -5,11 +5,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class UnrestrictLi(MultiHook): -    __name__    = "UnrestrictLi" -    __type__    = "hook" -    __version__ = "0.05" +    __name    = "UnrestrictLi" +    __type    = "hook" +    __version = "0.05" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -18,9 +18,9 @@ class UnrestrictLi(MultiHook):                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   ),                    ("history"       , "bool"               , "Delete History"                      , False)] -    __description__ = """Unrestrict.li hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Unrestrict.li hook plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      def getHosters(self): diff --git a/pyload/plugin/hook/XFileSharingPro.py b/pyload/plugin/hook/XFileSharingPro.py index e3f816502..65ef816b8 100644 --- a/pyload/plugin/hook/XFileSharingPro.py +++ b/pyload/plugin/hook/XFileSharingPro.py @@ -6,20 +6,20 @@ from pyload.plugin.Hook import Hook  class XFileSharingPro(Hook): -    __name__    = "XFileSharingPro" -    __type__    = "hook" -    __version__ = "0.31" +    __name    = "XFileSharingPro" +    __type    = "hook" +    __version = "0.31" -    __config__ = [("activated"       , "bool", "Activated"                     , True ), +    __config = [("activated"       , "bool", "Activated"                     , True ),                    ("use_hoster_list" , "bool", "Load listed hosters only"      , False),                    ("use_crypter_list", "bool", "Load listed crypters only"     , False),                    ("use_builtin_list", "bool", "Load built-in plugin list"     , True ),                    ("hoster_list"     , "str" , "Hoster list (comma separated)" , ""   ),                    ("crypter_list"    , "str" , "Crypter list (comma separated)", ""   )] -    __description__ = """Load XFileSharingPro based hosters and crypter which don't need a own plugin to run""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Load XFileSharingPro based hosters and crypter which don't need a own plugin to run""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      # event_list = ["pluginConfigChanged"] @@ -41,7 +41,7 @@ class XFileSharingPro(Hook):      CRYPTER_BUILTIN = ["junocloud.me", "rapidfileshare.net"] -    # def pluginConfigChanged(self.__name__, plugin, name, value): +    # def pluginConfigChanged(self.__name, plugin, name, value):          # self.loadPattern() diff --git a/pyload/plugin/hook/ZeveraCom.py b/pyload/plugin/hook/ZeveraCom.py index a60c33bd4..0f0ecec24 100644 --- a/pyload/plugin/hook/ZeveraCom.py +++ b/pyload/plugin/hook/ZeveraCom.py @@ -4,11 +4,11 @@ from pyload.plugin.internal.MultiHook import MultiHook  class ZeveraCom(MultiHook): -    __name__    = "ZeveraCom" -    __type__    = "hook" -    __version__ = "0.05" +    __name    = "ZeveraCom" +    __type    = "hook" +    __version = "0.05" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -16,9 +16,9 @@ class ZeveraCom(MultiHook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Zevera.com hook plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Zevera.com hook plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/AlldebridCom.py b/pyload/plugin/hoster/AlldebridCom.py index 8ab98bc6f..65272c799 100644 --- a/pyload/plugin/hoster/AlldebridCom.py +++ b/pyload/plugin/hoster/AlldebridCom.py @@ -11,15 +11,15 @@ from pyload.utils import parseFileSize  class AlldebridCom(MultiHoster): -    __name__    = "AlldebridCom" -    __type__    = "hoster" -    __version__ = "0.44" +    __name    = "AlldebridCom" +    __type    = "hoster" +    __version = "0.44" -    __pattern__ = r'https?://(?:www\.|s\d+\.)?alldebrid\.com/dl/[\w^_]+' +    __pattern = r'https?://(?:www\.|s\d+\.)?alldebrid\.com/dl/[\w^_]+' -    __description__ = """Alldebrid.com multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Andy Voigt", "spamsales@online.de")] +    __description = """Alldebrid.com multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Andy Voigt", "spamsales@online.de")]      def getFilename(self, url): diff --git a/pyload/plugin/hoster/AndroidfilehostCom.py b/pyload/plugin/hoster/AndroidfilehostCom.py index 386df4f2c..0d002acc4 100644 --- a/pyload/plugin/hoster/AndroidfilehostCom.py +++ b/pyload/plugin/hoster/AndroidfilehostCom.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class AndroidfilehostCom(SimpleHoster): -    __name__    = "AndroidfilehostCom" -    __type__    = "hoster" -    __version__ = "0.01" +    __name    = "AndroidfilehostCom" +    __type    = "hoster" +    __version = "0.01" -    __pattern__ = r'https?://(?:www\.)?androidfilehost\.com/\?fid=\d+' +    __pattern = r'https?://(?:www\.)?androidfilehost\.com/\?fid=\d+' -    __description__ = """Androidfilehost.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description = """Androidfilehost.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]      NAME_PATTERN    = r'<br />(?P<N>.*?)</h1>' diff --git a/pyload/plugin/hoster/BasketbuildCom.py b/pyload/plugin/hoster/BasketbuildCom.py index fb34bbc40..784d1f8eb 100644 --- a/pyload/plugin/hoster/BasketbuildCom.py +++ b/pyload/plugin/hoster/BasketbuildCom.py @@ -10,15 +10,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class BasketbuildCom(SimpleHoster): -    __name__    = "BasketbuildCom" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "BasketbuildCom" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'https?://(?:www\.)?(?:\w\.)?basketbuild\.com/filedl/.+' +    __pattern = r'https?://(?:www\.)?(?:\w\.)?basketbuild\.com/filedl/.+' -    __description__ = """basketbuild.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description = """basketbuild.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]      NAME_PATTERN    = r'File Name:</strong> (?P<N>.+?)<br/>' diff --git a/pyload/plugin/hoster/BayfilesCom.py b/pyload/plugin/hoster/BayfilesCom.py index 457440bd3..befb5595f 100644 --- a/pyload/plugin/hoster/BayfilesCom.py +++ b/pyload/plugin/hoster/BayfilesCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class BayfilesCom(DeadHoster): -    __name__    = "BayfilesCom" -    __type__    = "hoster" -    __version__ = "0.09" +    __name    = "BayfilesCom" +    __type    = "hoster" +    __version = "0.09" -    __pattern__ = r'https?://(?:www\.)?bayfiles\.(com|net)/file/(?P<ID>\w+/\w+/[^/]+)' +    __pattern = r'https?://(?:www\.)?bayfiles\.(com|net)/file/(?P<ID>\w+/\w+/[^/]+)' -    __description__ = """Bayfiles.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Bayfiles.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/BezvadataCz.py b/pyload/plugin/hoster/BezvadataCz.py index cea32dd5c..722633539 100644 --- a/pyload/plugin/hoster/BezvadataCz.py +++ b/pyload/plugin/hoster/BezvadataCz.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class BezvadataCz(SimpleHoster): -    __name__    = "BezvadataCz" -    __type__    = "hoster" -    __version__ = "0.26" +    __name    = "BezvadataCz" +    __type    = "hoster" +    __version = "0.26" -    __pattern__ = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+' +    __pattern = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+' -    __description__ = """BezvaData.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """BezvaData.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN = r'<p><b>Soubor: (?P<N>[^<]+)</b></p>' diff --git a/pyload/plugin/hoster/BillionuploadsCom.py b/pyload/plugin/hoster/BillionuploadsCom.py index 2dec3e8b8..e34584868 100644 --- a/pyload/plugin/hoster/BillionuploadsCom.py +++ b/pyload/plugin/hoster/BillionuploadsCom.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class BillionuploadsCom(XFSHoster): -    __name__    = "BillionuploadsCom" -    __type__    = "hoster" -    __version__ = "0.04" +    __name    = "BillionuploadsCom" +    __type    = "hoster" +    __version = "0.04" -    __pattern__ = r'http://(?:www\.)?billionuploads\.com/\w{12}' +    __pattern = r'http://(?:www\.)?billionuploads\.com/\w{12}' -    __description__ = """Billionuploads.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Billionuploads.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN = r'<td class="dofir" title="(?P<N>.+?)"' diff --git a/pyload/plugin/hoster/BitshareCom.py b/pyload/plugin/hoster/BitshareCom.py index 81bc8dae9..f1c1cebd5 100644 --- a/pyload/plugin/hoster/BitshareCom.py +++ b/pyload/plugin/hoster/BitshareCom.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class BitshareCom(SimpleHoster): -    __name__    = "BitshareCom" -    __type__    = "hoster" -    __version__ = "0.53" +    __name    = "BitshareCom" +    __type    = "hoster" +    __version = "0.53" -    __pattern__ = r'http://(?:www\.)?bitshare\.com/(files/)?(?(1)|\?f=)(?P<ID>\w+)(?(1)/(?P<NAME>.+?)\.html)' +    __pattern = r'http://(?:www\.)?bitshare\.com/(files/)?(?(1)|\?f=)(?P<ID>\w+)(?(1)/(?P<NAME>.+?)\.html)' -    __description__ = """Bitshare.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Paul King", ""), +    __description = """Bitshare.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Paul King", ""),                         ("fragonib", "fragonib[AT]yahoo[DOT]es")] @@ -40,7 +40,7 @@ class BitshareCom(SimpleHoster):              self.account.relogin(self.user)          # File id -        m = re.match(self.__pattern__, pyfile.url) +        m = re.match(self.__pattern, pyfile.url)          self.file_id = max(m.group('ID1'), m.group('ID2'))          self.logDebug("File id is [%s]" % self.file_id) @@ -58,7 +58,7 @@ class BitshareCom(SimpleHoster):              self.retry()          # File name -        m     = re.match(self.__pattern__, pyfile.url) +        m     = re.match(self.__pattern, pyfile.url)          name1 = m.group('NAME') if m else None          m     = re.search(self.INFO_PATTERN, self.html) diff --git a/pyload/plugin/hoster/BoltsharingCom.py b/pyload/plugin/hoster/BoltsharingCom.py index 39e84cd7c..70a8d7e5e 100644 --- a/pyload/plugin/hoster/BoltsharingCom.py +++ b/pyload/plugin/hoster/BoltsharingCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class BoltsharingCom(DeadHoster): -    __name__    = "BoltsharingCom" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "BoltsharingCom" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?boltsharing\.com/\w{12}' +    __pattern = r'http://(?:www\.)?boltsharing\.com/\w{12}' -    __description__ = """Boltsharing.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Boltsharing.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/CatShareNet.py b/pyload/plugin/hoster/CatShareNet.py index 94a963c45..f3cdd6657 100644 --- a/pyload/plugin/hoster/CatShareNet.py +++ b/pyload/plugin/hoster/CatShareNet.py @@ -7,15 +7,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class CatShareNet(SimpleHoster): -    __name__    = "CatShareNet" -    __type__    = "hoster" -    __version__ = "0.11" +    __name    = "CatShareNet" +    __type    = "hoster" +    __version = "0.11" -    __pattern__ = r'http://(?:www\.)?catshare\.net/\w{16}' +    __pattern = r'http://(?:www\.)?catshare\.net/\w{16}' -    __description__ = """CatShare.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("z00nx", "z00nx0@gmail.com"), +    __description = """CatShare.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("z00nx", "z00nx0@gmail.com"),                         ("prOq", ""),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/CloudzerNet.py b/pyload/plugin/hoster/CloudzerNet.py index c3154e9f1..13a9a6e2b 100644 --- a/pyload/plugin/hoster/CloudzerNet.py +++ b/pyload/plugin/hoster/CloudzerNet.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class CloudzerNet(DeadHoster): -    __name__    = "CloudzerNet" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "CloudzerNet" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'https?://(?:www\.)?(cloudzer\.net/file/|clz\.to/(file/)?)\w+' +    __pattern = r'https?://(?:www\.)?(cloudzer\.net/file/|clz\.to/(file/)?)\w+' -    __description__ = """Cloudzer.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("gs", "I-_-I-_-I@web.de"), +    __description = """Cloudzer.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("gs", "I-_-I-_-I@web.de"),                         ("z00nx", "z00nx0@gmail.com"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/CloudzillaTo.py b/pyload/plugin/hoster/CloudzillaTo.py index e33e2ebe4..089c64451 100644 --- a/pyload/plugin/hoster/CloudzillaTo.py +++ b/pyload/plugin/hoster/CloudzillaTo.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class CloudzillaTo(SimpleHoster): -    __name__    = "CloudzillaTo" -    __type__    = "hoster" -    __version__ = "0.06" +    __name    = "CloudzillaTo" +    __type    = "hoster" +    __version = "0.06" -    __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/file/(?P<ID>[\w^_]+)' +    __pattern = r'http://(?:www\.)?cloudzilla\.to/share/file/(?P<ID>[\w^_]+)' -    __description__ = """Cloudzilla.to hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Cloudzilla.to hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      INFO_PATTERN    = r'title="(?P<N>.+?)">\1</span> <span class="size">\((?P<S>[\d.]+) (?P<U>[\w^_]+)' diff --git a/pyload/plugin/hoster/CramitIn.py b/pyload/plugin/hoster/CramitIn.py index 3ccb3cfc6..9d8d4960d 100644 --- a/pyload/plugin/hoster/CramitIn.py +++ b/pyload/plugin/hoster/CramitIn.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class CramitIn(XFSHoster): -    __name__    = "CramitIn" -    __type__    = "hoster" -    __version__ = "0.07" +    __name    = "CramitIn" +    __type    = "hoster" +    __version = "0.07" -    __pattern__ = r'http://(?:www\.)?cramit\.in/\w{12}' +    __pattern = r'http://(?:www\.)?cramit\.in/\w{12}' -    __description__ = """Cramit.in hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Cramit.in hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      INFO_PATTERN = r'<span class=t2>\s*(?P<N>.*?)</span>.*?<small>\s*\((?P<S>.*?)\)' diff --git a/pyload/plugin/hoster/CrockoCom.py b/pyload/plugin/hoster/CrockoCom.py index bcbbc84a1..8bef76d00 100644 --- a/pyload/plugin/hoster/CrockoCom.py +++ b/pyload/plugin/hoster/CrockoCom.py @@ -7,15 +7,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class CrockoCom(SimpleHoster): -    __name__    = "CrockoCom" -    __type__    = "hoster" -    __version__ = "0.19" +    __name    = "CrockoCom" +    __type    = "hoster" +    __version = "0.19" -    __pattern__ = r'http://(?:www\.)?(crocko|easy-share)\.com/\w+' +    __pattern = r'http://(?:www\.)?(crocko|easy-share)\.com/\w+' -    __description__ = """Crocko hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Crocko hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN = r'<span class="fz24">Download:\s*<strong>(?P<N>.*)' diff --git a/pyload/plugin/hoster/CyberlockerCh.py b/pyload/plugin/hoster/CyberlockerCh.py index c4e1d41b1..853ecf245 100644 --- a/pyload/plugin/hoster/CyberlockerCh.py +++ b/pyload/plugin/hoster/CyberlockerCh.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class CyberlockerCh(DeadHoster): -    __name__    = "CyberlockerCh" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "CyberlockerCh" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?cyberlocker\.ch/\w+' +    __pattern = r'http://(?:www\.)?cyberlocker\.ch/\w+' -    __description__ = """Cyberlocker.ch hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Cyberlocker.ch hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/CzshareCom.py b/pyload/plugin/hoster/CzshareCom.py index 3bf371508..163a41c29 100644 --- a/pyload/plugin/hoster/CzshareCom.py +++ b/pyload/plugin/hoster/CzshareCom.py @@ -10,15 +10,15 @@ from pyload.utils import parseFileSize  class CzshareCom(SimpleHoster): -    __name__    = "CzshareCom" -    __type__    = "hoster" -    __version__ = "0.98" +    __name    = "CzshareCom" +    __type    = "hoster" +    __version = "0.98" -    __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+' +    __pattern = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+' -    __description__ = """CZshare.com hoster plugin, now Sdilej.cz""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """CZshare.com hoster plugin, now Sdilej.cz""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN    = r'<div class="tab" id="parameters">\s*<p>\s*Cel. n.zev: <a href=[^>]*>(?P<N>[^<]+)</a>' diff --git a/pyload/plugin/hoster/DailymotionCom.py b/pyload/plugin/hoster/DailymotionCom.py index c212fa872..4fb007b50 100644 --- a/pyload/plugin/hoster/DailymotionCom.py +++ b/pyload/plugin/hoster/DailymotionCom.py @@ -10,7 +10,7 @@ from pyload.plugin.Hoster import Hoster  def getInfo(urls):      result  = [] -    regex   = re.compile(DailymotionCom.__pattern__) +    regex   = re.compile(DailymotionCom.__pattern)      apiurl  = "https://api.dailymotion.com/video/%s"      request = {"fields": "access_error,status,title"} @@ -38,16 +38,16 @@ def getInfo(urls):  class DailymotionCom(Hoster): -    __name__    = "DailymotionCom" -    __type__    = "hoster" -    __version__ = "0.20" +    __name    = "DailymotionCom" +    __type    = "hoster" +    __version = "0.20" -    __pattern__ = r'https?://(?:www\.)?dailymotion\.com/.*video/(?P<ID>[\w^_]+)' -    __config__  = [("quality", "Lowest;LD 144p;LD 240p;SD 384p;HQ 480p;HD 720p;HD 1080p;Highest", "Quality", "Highest")] +    __pattern = r'https?://(?:www\.)?dailymotion\.com/.*video/(?P<ID>[\w^_]+)' +    __config  = [("quality", "Lowest;LD 144p;LD 240p;SD 384p;HQ 480p;HD 720p;HD 1080p;Highest", "Quality", "Highest")] -    __description__ = """Dailymotion.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Dailymotion.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      def setup(self): @@ -116,7 +116,7 @@ class DailymotionCom(Hoster):      def process(self, pyfile):          self.checkInfo(pyfile) -        id = re.match(self.__pattern__, pyfile.url).group('ID') +        id = re.match(self.__pattern, pyfile.url).group('ID')          self.html = self.load("http://www.dailymotion.com/embed/video/" + id, decode=True)          streams = self.getStreams() diff --git a/pyload/plugin/hoster/DataHu.py b/pyload/plugin/hoster/DataHu.py index 219e73441..3543eb82d 100644 --- a/pyload/plugin/hoster/DataHu.py +++ b/pyload/plugin/hoster/DataHu.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class DataHu(SimpleHoster): -    __name__    = "DataHu" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "DataHu" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?data\.hu/get/\w+' +    __pattern = r'http://(?:www\.)?data\.hu/get/\w+' -    __description__ = """Data.hu hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("crash", ""), +    __description = """Data.hu hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("crash", ""),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/DataportCz.py b/pyload/plugin/hoster/DataportCz.py index 8a32400ec..f8959a37d 100644 --- a/pyload/plugin/hoster/DataportCz.py +++ b/pyload/plugin/hoster/DataportCz.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class DataportCz(SimpleHoster): -    __name__    = "DataportCz" -    __type__    = "hoster" -    __version__ = "0.41" +    __name    = "DataportCz" +    __type    = "hoster" +    __version = "0.41" -    __pattern__ = r'http://(?:www\.)?dataport\.cz/file/(.+)' +    __pattern = r'http://(?:www\.)?dataport\.cz/file/(.+)' -    __description__ = """Dataport.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Dataport.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN = r'<span itemprop="name">(?P<N>[^<]+)</span>' diff --git a/pyload/plugin/hoster/DateiTo.py b/pyload/plugin/hoster/DateiTo.py index 216a758c8..7e83e3f73 100644 --- a/pyload/plugin/hoster/DateiTo.py +++ b/pyload/plugin/hoster/DateiTo.py @@ -7,15 +7,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class DateiTo(SimpleHoster): -    __name__    = "DateiTo" -    __type__    = "hoster" -    __version__ = "0.07" +    __name    = "DateiTo" +    __type    = "hoster" +    __version = "0.07" -    __pattern__ = r'http://(?:www\.)?datei\.to/datei/(?P<ID>\w+)\.html' +    __pattern = r'http://(?:www\.)?datei\.to/datei/(?P<ID>\w+)\.html' -    __description__ = """Datei.to hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Datei.to hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN    = r'Dateiname:</td>\s*<td colspan="2"><strong>(?P<N>.*?)</' diff --git a/pyload/plugin/hoster/DdlstorageCom.py b/pyload/plugin/hoster/DdlstorageCom.py index cfde84ad0..af5f4b413 100644 --- a/pyload/plugin/hoster/DdlstorageCom.py +++ b/pyload/plugin/hoster/DdlstorageCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class DdlstorageCom(DeadHoster): -    __name__    = "DdlstorageCom" -    __type__    = "hoster" -    __version__ = "1.02" +    __name    = "DdlstorageCom" +    __type    = "hoster" +    __version = "1.02" -    __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/\w+' +    __pattern = r'https?://(?:www\.)?ddlstorage\.com/\w+' -    __description__ = """DDLStorage.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """DDLStorage.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/DebridItaliaCom.py b/pyload/plugin/hoster/DebridItaliaCom.py index 1e7e1a338..5797d3cfc 100644 --- a/pyload/plugin/hoster/DebridItaliaCom.py +++ b/pyload/plugin/hoster/DebridItaliaCom.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class DebridItaliaCom(MultiHoster): -    __name__    = "DebridItaliaCom" -    __type__    = "hoster" -    __version__ = "0.17" +    __name    = "DebridItaliaCom" +    __type    = "hoster" +    __version = "0.17" -    __pattern__ = r'https?://(?:www\.|s\d+\.)?debriditalia\.com/dl/\d+' +    __pattern = r'https?://(?:www\.|s\d+\.)?debriditalia\.com/dl/\d+' -    __description__ = """Debriditalia.com multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it"), +    __description = """Debriditalia.com multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/DepositfilesCom.py b/pyload/plugin/hoster/DepositfilesCom.py index 67cfe4bdc..cd1403327 100644 --- a/pyload/plugin/hoster/DepositfilesCom.py +++ b/pyload/plugin/hoster/DepositfilesCom.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class DepositfilesCom(SimpleHoster): -    __name__    = "DepositfilesCom" -    __type__    = "hoster" -    __version__ = "0.53" +    __name    = "DepositfilesCom" +    __type    = "hoster" +    __version = "0.53" -    __pattern__ = r'https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/(?P<ID>\w+)' +    __pattern = r'https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/(?P<ID>\w+)' -    __description__ = """Depositfiles.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("spoob", "spoob@pyload.org"), +    __description = """Depositfiles.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("spoob", "spoob@pyload.org"),                         ("zoidberg", "zoidberg@mujmail.cz"),                         ("Walter Purcaro", "vuolter@gmail.com")] @@ -28,7 +28,7 @@ class DepositfilesCom(SimpleHoster):      NAME_REPLACEMENTS = [(r'\%u([0-9A-Fa-f]{4})', lambda m: unichr(int(m.group(1), 16))),                                (r'.*<b title="(?P<N>[^"]+).*', "\g<N>")] -    URL_REPLACEMENTS  = [(__pattern__ + ".*", "https://dfiles.eu/files/\g<ID>")] +    URL_REPLACEMENTS  = [(__pattern + ".*", "https://dfiles.eu/files/\g<ID>")]      COOKIES = [("dfiles.eu", "lang_current", "en")] diff --git a/pyload/plugin/hoster/DevhostSt.py b/pyload/plugin/hoster/DevhostSt.py index e4c6f819b..8dd895f1c 100644 --- a/pyload/plugin/hoster/DevhostSt.py +++ b/pyload/plugin/hoster/DevhostSt.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class DevhostSt(SimpleHoster): -    __name__    = "DevhostSt" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "DevhostSt" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'http://(?:www\.)?d-h\.st/(?!users/)\w{3}' +    __pattern = r'http://(?:www\.)?d-h\.st/(?!users/)\w{3}' -    __description__ = """d-h.st hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description = """d-h.st hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]      NAME_PATTERN      = r'<span title="(?P<N>.*?)"' diff --git a/pyload/plugin/hoster/DlFreeFr.py b/pyload/plugin/hoster/DlFreeFr.py index b0f9e7b7f..746cf732a 100644 --- a/pyload/plugin/hoster/DlFreeFr.py +++ b/pyload/plugin/hoster/DlFreeFr.py @@ -35,15 +35,15 @@ class CustomBrowser(Browser):  class DlFreeFr(SimpleHoster): -    __name__    = "DlFreeFr" -    __type__    = "hoster" -    __version__ = "0.28" +    __name    = "DlFreeFr" +    __type    = "hoster" +    __version = "0.28" -    __pattern__ = r'http://(?:www\.)?dl\.free\.fr/(\w+|getfile\.pl\?file=/\w+)' +    __pattern = r'http://(?:www\.)?dl\.free\.fr/(\w+|getfile\.pl\?file=/\w+)' -    __description__ = """Dl.free.fr hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("the-razer", "daniel_ AT gmx DOT net"), +    __description = """Dl.free.fr hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("the-razer", "daniel_ AT gmx DOT net"),                         ("zoidberg", "zoidberg@mujmail.cz"),                         ("Toilal", "toilal.dev@gmail.com")] @@ -102,7 +102,7 @@ class DlFreeFr(SimpleHoster):          headers = self.getLastHeaders()          if headers.get("code") == 302 and "set-cookie" in headers and "location" in headers:              m = re.search("(.*?)=(.*?); path=(.*?); domain=(.*?)", headers.get("set-cookie")) -            cj = CookieJar(__name__) +            cj = CookieJar(__name)              if m:                  cj.setCookie(m.group(4), m.group(1), m.group(2), m.group(3))              else: diff --git a/pyload/plugin/hoster/DodanePl.py b/pyload/plugin/hoster/DodanePl.py index 35fa1ecab..d959f23d6 100644 --- a/pyload/plugin/hoster/DodanePl.py +++ b/pyload/plugin/hoster/DodanePl.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class DodanePl(DeadHoster): -    __name__    = "DodanePl" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "DodanePl" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?dodane\.pl/file/\d+' +    __pattern = r'http://(?:www\.)?dodane\.pl/file/\d+' -    __description__ = """Dodane.pl hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("z00nx", "z00nx0@gmail.com")] +    __description = """Dodane.pl hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("z00nx", "z00nx0@gmail.com")] diff --git a/pyload/plugin/hoster/DuploadOrg.py b/pyload/plugin/hoster/DuploadOrg.py index db00c46e9..8953a588d 100644 --- a/pyload/plugin/hoster/DuploadOrg.py +++ b/pyload/plugin/hoster/DuploadOrg.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class DuploadOrg(DeadHoster): -    __name__    = "DuploadOrg" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "DuploadOrg" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?dupload\.org/\w{12}' +    __pattern = r'http://(?:www\.)?dupload\.org/\w{12}' -    __description__ = """Dupload.grg hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Dupload.grg hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/EasybytezCom.py b/pyload/plugin/hoster/EasybytezCom.py index 07e75714d..8dcb04b98 100644 --- a/pyload/plugin/hoster/EasybytezCom.py +++ b/pyload/plugin/hoster/EasybytezCom.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class EasybytezCom(XFSHoster): -    __name__    = "EasybytezCom" -    __type__    = "hoster" -    __version__ = "0.23" +    __name    = "EasybytezCom" +    __type    = "hoster" +    __version = "0.23" -    __pattern__ = r'http://(?:www\.)?easybytez\.com/\w{12}' +    __pattern = r'http://(?:www\.)?easybytez\.com/\w{12}' -    __description__ = """Easybytez.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Easybytez.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/EdiskCz.py b/pyload/plugin/hoster/EdiskCz.py index 7aaef10ae..1669644a6 100644 --- a/pyload/plugin/hoster/EdiskCz.py +++ b/pyload/plugin/hoster/EdiskCz.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class EdiskCz(SimpleHoster): -    __name__    = "EdiskCz" -    __type__    = "hoster" -    __version__ = "0.23" +    __name    = "EdiskCz" +    __type    = "hoster" +    __version = "0.23" -    __pattern__ = r'http://(?:www\.)?edisk\.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.+' +    __pattern = r'http://(?:www\.)?edisk\.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.+' -    __description__ = """Edisk.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Edisk.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      INFO_PATTERN = r'<span class="fl" title="(?P<N>[^"]+)">\s*.*?\((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)</h1></span>' diff --git a/pyload/plugin/hoster/EgoFilesCom.py b/pyload/plugin/hoster/EgoFilesCom.py index a843f5051..364ed62d2 100644 --- a/pyload/plugin/hoster/EgoFilesCom.py +++ b/pyload/plugin/hoster/EgoFilesCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class EgoFilesCom(DeadHoster): -    __name__    = "EgoFilesCom" -    __type__    = "hoster" -    __version__ = "0.16" +    __name    = "EgoFilesCom" +    __type    = "hoster" +    __version = "0.16" -    __pattern__ = r'https?://(?:www\.)?egofiles\.com/\w+' +    __pattern = r'https?://(?:www\.)?egofiles\.com/\w+' -    __description__ = """Egofiles.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Egofiles.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/EnteruploadCom.py b/pyload/plugin/hoster/EnteruploadCom.py index efec5b37c..8466f4a1a 100644 --- a/pyload/plugin/hoster/EnteruploadCom.py +++ b/pyload/plugin/hoster/EnteruploadCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class EnteruploadCom(DeadHoster): -    __name__    = "EnteruploadCom" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "EnteruploadCom" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?enterupload\.com/\w+' +    __pattern = r'http://(?:www\.)?enterupload\.com/\w+' -    __description__ = """EnterUpload.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """EnterUpload.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/EpicShareNet.py b/pyload/plugin/hoster/EpicShareNet.py index 16685088a..fe3206bdc 100644 --- a/pyload/plugin/hoster/EpicShareNet.py +++ b/pyload/plugin/hoster/EpicShareNet.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class EpicShareNet(DeadHoster): -    __name__    = "EpicShareNet" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "EpicShareNet" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'https?://(?:www\.)?epicshare\.net/\w{12}' +    __pattern = r'https?://(?:www\.)?epicshare\.net/\w{12}' -    __description__ = """EpicShare.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] +    __description = """EpicShare.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] diff --git a/pyload/plugin/hoster/EuroshareEu.py b/pyload/plugin/hoster/EuroshareEu.py index 84fbcda08..5977b1b87 100644 --- a/pyload/plugin/hoster/EuroshareEu.py +++ b/pyload/plugin/hoster/EuroshareEu.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class EuroshareEu(SimpleHoster): -    __name__    = "EuroshareEu" -    __type__    = "hoster" -    __version__ = "0.27" +    __name    = "EuroshareEu" +    __type    = "hoster" +    __version = "0.27" -    __pattern__ = r'http://(?:www\.)?euroshare\.(eu|sk|cz|hu|pl)/file/.+' +    __pattern = r'http://(?:www\.)?euroshare\.(eu|sk|cz|hu|pl)/file/.+' -    __description__ = """Euroshare.eu hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Euroshare.eu hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      INFO_PATTERN    = r'<span style="float: left;"><strong>(?P<N>.+?)</strong> \((?P<S>.+?)\)</span>' diff --git a/pyload/plugin/hoster/ExashareCom.py b/pyload/plugin/hoster/ExashareCom.py index 504eef334..c7b876076 100644 --- a/pyload/plugin/hoster/ExashareCom.py +++ b/pyload/plugin/hoster/ExashareCom.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class ExashareCom(XFSHoster): -    __name__    = "ExashareCom" -    __type__    = "hoster" -    __version__ = "0.01" +    __name    = "ExashareCom" +    __type    = "hoster" +    __version = "0.01" -    __pattern__ = r'http://(?:www\.)?exashare\.com/\w{12}' +    __pattern = r'http://(?:www\.)?exashare\.com/\w{12}' -    __description__ = """Exashare.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Exashare.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      INFO_PATTERN      = r'>(?P<NAME>.+?)<small>\( (?P<S>[\d.,]+) (?P<U>[\w^_]+)' diff --git a/pyload/plugin/hoster/ExtabitCom.py b/pyload/plugin/hoster/ExtabitCom.py index d5c1f0ba4..93d9b74a8 100644 --- a/pyload/plugin/hoster/ExtabitCom.py +++ b/pyload/plugin/hoster/ExtabitCom.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, secondsToMidnight  class ExtabitCom(SimpleHoster): -    __name__    = "ExtabitCom" -    __type__    = "hoster" -    __version__ = "0.65" +    __name    = "ExtabitCom" +    __type    = "hoster" +    __version = "0.65" -    __pattern__ = r'http://(?:www\.)?extabit\.com/(file|go|fid)/(?P<ID>\w+)' +    __pattern = r'http://(?:www\.)?extabit\.com/(file|go|fid)/(?P<ID>\w+)' -    __description__ = """Extabit.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Extabit.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN = r'<th>File:</th>\s*<td class="col-fileinfo">\s*<div title="(?P<N>[^"]+)">' @@ -40,7 +40,7 @@ class ExtabitCom(SimpleHoster):              self.wait(secondsToMidnight(gmt=2), True)          self.logDebug("URL: " + self.req.http.lastEffectiveURL) -        m = re.match(self.__pattern__, self.req.http.lastEffectiveURL) +        m = re.match(self.__pattern, self.req.http.lastEffectiveURL)          fileID = m.group('ID') if m else self.info['pattern']['ID']          m = re.search(r'recaptcha/api/challenge\?k=(\w+)', self.html) diff --git a/pyload/plugin/hoster/FastixRu.py b/pyload/plugin/hoster/FastixRu.py index 129259304..d8fd7d808 100644 --- a/pyload/plugin/hoster/FastixRu.py +++ b/pyload/plugin/hoster/FastixRu.py @@ -10,15 +10,15 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class FastixRu(MultiHoster): -    __name__    = "FastixRu" -    __type__    = "hoster" -    __version__ = "0.09" +    __name    = "FastixRu" +    __type    = "hoster" +    __version = "0.09" -    __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}' +    __pattern = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}' -    __description__ = """Fastix multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")] +    __description = """Fastix multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Massimo Rosamilia", "max@spiritix.eu")]      def getFilename(self, url): diff --git a/pyload/plugin/hoster/FastshareCz.py b/pyload/plugin/hoster/FastshareCz.py index 4baa362c3..0151468ff 100644 --- a/pyload/plugin/hoster/FastshareCz.py +++ b/pyload/plugin/hoster/FastshareCz.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FastshareCz(SimpleHoster): -    __name__    = "FastshareCz" -    __type__    = "hoster" -    __version__ = "0.27" +    __name    = "FastshareCz" +    __type    = "hoster" +    __version = "0.27" -    __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+' +    __pattern = r'http://(?:www\.)?fastshare\.cz/\d+/.+' -    __description__ = """FastShare.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """FastShare.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      URL_REPLACEMENTS = [("#.*", "")] diff --git a/pyload/plugin/hoster/FileApeCom.py b/pyload/plugin/hoster/FileApeCom.py index 2c39e314c..adc01fe99 100644 --- a/pyload/plugin/hoster/FileApeCom.py +++ b/pyload/plugin/hoster/FileApeCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FileApeCom(DeadHoster): -    __name__    = "FileApeCom" -    __type__    = "hoster" -    __version__ = "0.12" +    __name    = "FileApeCom" +    __type    = "hoster" +    __version = "0.12" -    __pattern__ = r'http://(?:www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+' +    __pattern = r'http://(?:www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+' -    __description__ = """FileApe.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("espes", "")] +    __description = """FileApe.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("espes", "")] diff --git a/pyload/plugin/hoster/FileSharkPl.py b/pyload/plugin/hoster/FileSharkPl.py index 24b1db6de..5fac94d1b 100644 --- a/pyload/plugin/hoster/FileSharkPl.py +++ b/pyload/plugin/hoster/FileSharkPl.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FileSharkPl(SimpleHoster): -    __name__    = "FileSharkPl" -    __type__    = "hoster" -    __version__ = "0.07" +    __name    = "FileSharkPl" +    __type    = "hoster" +    __version = "0.07" -    __pattern__ = r'http://(?:www\.)?fileshark\.pl/pobierz/\d+/\w+' +    __pattern = r'http://(?:www\.)?fileshark\.pl/pobierz/\d+/\w+' -    __description__ = """FileShark.pl hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("prOq", ""), +    __description = """FileShark.pl hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("prOq", ""),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/FileStoreTo.py b/pyload/plugin/hoster/FileStoreTo.py index 8998c0b1c..d239789eb 100644 --- a/pyload/plugin/hoster/FileStoreTo.py +++ b/pyload/plugin/hoster/FileStoreTo.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FileStoreTo(SimpleHoster): -    __name__    = "FileStoreTo" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "FileStoreTo" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'http://(?:www\.)?filestore\.to/\?d=(?P<ID>\w+)' +    __pattern = r'http://(?:www\.)?filestore\.to/\?d=(?P<ID>\w+)' -    __description__ = """FileStore.to hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"), +    __description = """FileStore.to hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/FilebeerInfo.py b/pyload/plugin/hoster/FilebeerInfo.py index 83fc6dbfc..4e83ddf8c 100644 --- a/pyload/plugin/hoster/FilebeerInfo.py +++ b/pyload/plugin/hoster/FilebeerInfo.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FilebeerInfo(DeadHoster): -    __name__    = "FilebeerInfo" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "FilebeerInfo" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?filebeer\.info/(?!\d*~f)(?P<ID>\w+)' +    __pattern = r'http://(?:www\.)?filebeer\.info/(?!\d*~f)(?P<ID>\w+)' -    __description__ = """Filebeer.info plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Filebeer.info plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/FilecloudIo.py b/pyload/plugin/hoster/FilecloudIo.py index ae50f95bb..ccfaae486 100644 --- a/pyload/plugin/hoster/FilecloudIo.py +++ b/pyload/plugin/hoster/FilecloudIo.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FilecloudIo(SimpleHoster): -    __name__    = "FilecloudIo" -    __type__    = "hoster" -    __version__ = "0.08" +    __name    = "FilecloudIo" +    __type    = "hoster" +    __version = "0.08" -    __pattern__ = r'http://(?:www\.)?(?:filecloud\.io|ifile\.it|mihd\.net)/(?P<ID>\w+)' +    __pattern = r'http://(?:www\.)?(?:filecloud\.io|ifile\.it|mihd\.net)/(?P<ID>\w+)' -    __description__ = """Filecloud.io hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Filecloud.io hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/FilefactoryCom.py b/pyload/plugin/hoster/FilefactoryCom.py index 95d61cd6a..0d8bb4d51 100644 --- a/pyload/plugin/hoster/FilefactoryCom.py +++ b/pyload/plugin/hoster/FilefactoryCom.py @@ -12,22 +12,22 @@ def getInfo(urls):      for url in urls:          h = getURL(url, just_header=True)          m = re.search(r'Location: (.+)\r\n', h) -        if m and not re.match(m.group(1), FilefactoryCom.__pattern__):  #: It's a direct link! Skipping +        if m and not re.match(m.group(1), FilefactoryCom.__pattern):  #: It's a direct link! Skipping              yield (url, 0, 3, url)          else:  #: It's a standard html page              yield parseFileInfo(FilefactoryCom, url, getURL(url))  class FilefactoryCom(SimpleHoster): -    __name__    = "FilefactoryCom" -    __type__    = "hoster" -    __version__ = "0.53" +    __name    = "FilefactoryCom" +    __type    = "hoster" +    __version = "0.53" -    __pattern__ = r'https?://(?:www\.)?filefactory\.com/(file|trafficshare/\w+)/\w+' +    __pattern = r'https?://(?:www\.)?filefactory\.com/(file|trafficshare/\w+)/\w+' -    __description__ = """Filefactory.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it"), +    __description = """Filefactory.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/FilejungleCom.py b/pyload/plugin/hoster/FilejungleCom.py index cd890778b..c8ccbbb25 100644 --- a/pyload/plugin/hoster/FilejungleCom.py +++ b/pyload/plugin/hoster/FilejungleCom.py @@ -5,15 +5,15 @@ from pyload.plugin.Plugin import chunks  class FilejungleCom(FileserveCom): -    __name__    = "FilejungleCom" -    __type__    = "hoster" -    __version__ = "0.51" +    __name    = "FilejungleCom" +    __type    = "hoster" +    __version = "0.51" -    __pattern__ = r'http://(?:www\.)?filejungle\.com/f/(?P<ID>[^/]+)' +    __pattern = r'http://(?:www\.)?filejungle\.com/f/(?P<ID>[^/]+)' -    __description__ = """Filejungle.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Filejungle.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      URLS = ["http://www.filejungle.com/f/", "http://www.filejungle.com/check_links.php", diff --git a/pyload/plugin/hoster/FileomCom.py b/pyload/plugin/hoster/FileomCom.py index cdfc15dd9..bac912c56 100644 --- a/pyload/plugin/hoster/FileomCom.py +++ b/pyload/plugin/hoster/FileomCom.py @@ -7,15 +7,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class FileomCom(XFSHoster): -    __name__    = "FileomCom" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "FileomCom" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}' +    __pattern = r'https?://(?:www\.)?fileom\.com/\w{12}' -    __description__ = """Fileom.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Fileom.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      NAME_PATTERN = r'Filename: <span>(?P<N>.+?)<' diff --git a/pyload/plugin/hoster/FilepostCom.py b/pyload/plugin/hoster/FilepostCom.py index 8c462b5d6..d1d653f1f 100644 --- a/pyload/plugin/hoster/FilepostCom.py +++ b/pyload/plugin/hoster/FilepostCom.py @@ -10,15 +10,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FilepostCom(SimpleHoster): -    __name__    = "FilepostCom" -    __type__    = "hoster" -    __version__ = "0.33" +    __name    = "FilepostCom" +    __type    = "hoster" +    __version = "0.33" -    __pattern__ = r'https?://(?:www\.)?(?:filepost\.com/files|fp\.io)/(?P<ID>[^/]+)' +    __pattern = r'https?://(?:www\.)?(?:filepost\.com/files|fp\.io)/(?P<ID>[^/]+)' -    __description__ = """Filepost.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Filepost.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      INFO_PATTERN = r'<input type="text" id="url" value=\'<a href[^>]*>(?P<N>[^>]+?) - (?P<S>[\d.,]+) (?P<U>[\w^_]+)</a>\' class="inp_text"/>' diff --git a/pyload/plugin/hoster/FilepupNet.py b/pyload/plugin/hoster/FilepupNet.py index b19f40106..dcbd782b1 100644 --- a/pyload/plugin/hoster/FilepupNet.py +++ b/pyload/plugin/hoster/FilepupNet.py @@ -10,15 +10,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FilepupNet(SimpleHoster): -    __name__    = "FilepupNet" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "FilepupNet" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?filepup\.net/files/\w+' +    __pattern = r'http://(?:www\.)?filepup\.net/files/\w+' -    __description__ = """Filepup.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"), +    __description = """Filepup.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/FilerNet.py b/pyload/plugin/hoster/FilerNet.py index 3cf4bec36..b445bfece 100644 --- a/pyload/plugin/hoster/FilerNet.py +++ b/pyload/plugin/hoster/FilerNet.py @@ -14,15 +14,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FilerNet(SimpleHoster): -    __name__    = "FilerNet" -    __type__    = "hoster" -    __version__ = "0.16" +    __name    = "FilerNet" +    __type    = "hoster" +    __version = "0.16" -    __pattern__ = r'https?://(?:www\.)?filer\.net/get/\w+' +    __pattern = r'https?://(?:www\.)?filer\.net/get/\w+' -    __description__ = """Filer.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it"), +    __description = """Filer.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/FilerioCom.py b/pyload/plugin/hoster/FilerioCom.py index 9290bee84..c55fd2c0b 100644 --- a/pyload/plugin/hoster/FilerioCom.py +++ b/pyload/plugin/hoster/FilerioCom.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class FilerioCom(XFSHoster): -    __name__    = "FilerioCom" -    __type__    = "hoster" -    __version__ = "0.07" +    __name    = "FilerioCom" +    __type    = "hoster" +    __version = "0.07" -    __pattern__ = r'http://(?:www\.)?(filerio\.(in|com)|filekeen\.com)/\w{12}' +    __pattern = r'http://(?:www\.)?(filerio\.(in|com)|filekeen\.com)/\w{12}' -    __description__ = """FileRio.in hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """FileRio.in hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      URL_REPLACEMENTS = [(r'filekeen\.com', "filerio.in")] diff --git a/pyload/plugin/hoster/FilesMailRu.py b/pyload/plugin/hoster/FilesMailRu.py index 09da46b01..024da64cd 100644 --- a/pyload/plugin/hoster/FilesMailRu.py +++ b/pyload/plugin/hoster/FilesMailRu.py @@ -30,15 +30,15 @@ def getInfo(urls):  class FilesMailRu(Hoster): -    __name__    = "FilesMailRu" -    __type__    = "hoster" -    __version__ = "0.32" +    __name    = "FilesMailRu" +    __type    = "hoster" +    __version = "0.32" -    __pattern__ = r'http://(?:www\.)?files\.mail\.ru/.+' +    __pattern = r'http://(?:www\.)?files\.mail\.ru/.+' -    __description__ = """Files.mail.ru hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("oZiRiz", "ich@oziriz.de")] +    __description = """Files.mail.ru hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("oZiRiz", "ich@oziriz.de")]      def setup(self): diff --git a/pyload/plugin/hoster/FileserveCom.py b/pyload/plugin/hoster/FileserveCom.py index 18322fa00..e3589445a 100644 --- a/pyload/plugin/hoster/FileserveCom.py +++ b/pyload/plugin/hoster/FileserveCom.py @@ -31,15 +31,15 @@ def checkFile(plugin, urls):  class FileserveCom(Hoster): -    __name__    = "FileserveCom" -    __type__    = "hoster" -    __version__ = "0.54" +    __name    = "FileserveCom" +    __type    = "hoster" +    __version = "0.54" -    __pattern__ = r'http://(?:www\.)?fileserve\.com/file/(?P<ID>[^/]+)' +    __pattern = r'http://(?:www\.)?fileserve\.com/file/(?P<ID>[^/]+)' -    __description__ = """Fileserve.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.de"), +    __description = """Fileserve.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.de"),                         ("mkaay", "mkaay@mkaay.de"),                         ("Paul King", ""),                         ("zoidberg", "zoidberg@mujmail.cz")] @@ -59,7 +59,7 @@ class FileserveCom(Hoster):      def setup(self):          self.resumeDownload = self.multiDL = self.premium -        self.file_id = re.match(self.__pattern__, self.pyfile.url).group('ID') +        self.file_id = re.match(self.__pattern, self.pyfile.url).group('ID')          self.url     = "%s%s" % (self.URLS[0], self.file_id)          self.logDebug("File ID: %s URL: %s" % (self.file_id, self.url)) @@ -144,7 +144,7 @@ class FileserveCom(Hoster):          if "fail" in res:              self.fail(_("Failed getting wait time")) -        if self.__name__ == "FilejungleCom": +        if self.__name == "FilejungleCom":              m = re.search(r'"waitTime":(\d+)', res)              if m is None:                  self.fail(_("Cannot get wait time")) @@ -184,7 +184,7 @@ class FileserveCom(Hoster):      def handlePremium(self, pyfile):          premium_url = None -        if self.__name__ == "FileserveCom": +        if self.__name == "FileserveCom":              #try api download              res = self.load("http://app.fileserve.com/api/download/premium/",                              post={"username": self.user, diff --git a/pyload/plugin/hoster/FileshareInUa.py b/pyload/plugin/hoster/FileshareInUa.py index f7855378a..270130b22 100644 --- a/pyload/plugin/hoster/FileshareInUa.py +++ b/pyload/plugin/hoster/FileshareInUa.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FileshareInUa(DeadHoster): -    __name__    = "FileshareInUa" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "FileshareInUa" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'https?://(?:www\.)?fileshare\.in\.ua/\w{7}' +    __pattern = r'https?://(?:www\.)?fileshare\.in\.ua/\w{7}' -    __description__ = """Fileshare.in.ua hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("fwannmacher", "felipe@warhammerproject.com")] +    __description = """Fileshare.in.ua hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("fwannmacher", "felipe@warhammerproject.com")] diff --git a/pyload/plugin/hoster/FilesonicCom.py b/pyload/plugin/hoster/FilesonicCom.py index 1dee6eefd..cde502f3b 100644 --- a/pyload/plugin/hoster/FilesonicCom.py +++ b/pyload/plugin/hoster/FilesonicCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FilesonicCom(DeadHoster): -    __name__    = "FilesonicCom" -    __type__    = "hoster" -    __version__ = "0.35" +    __name    = "FilesonicCom" +    __type    = "hoster" +    __version = "0.35" -    __pattern__ = r'http://(?:www\.)?filesonic\.com/file/\w+' +    __pattern = r'http://(?:www\.)?filesonic\.com/file/\w+' -    __description__ = """Filesonic.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.de"), +    __description = """Filesonic.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.de"),                         ("paulking", "")] diff --git a/pyload/plugin/hoster/FilezyNet.py b/pyload/plugin/hoster/FilezyNet.py index deab69101..990760632 100644 --- a/pyload/plugin/hoster/FilezyNet.py +++ b/pyload/plugin/hoster/FilezyNet.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FilezyNet(DeadHoster): -    __name__    = "FilezyNet" -    __type__    = "hoster" -    __version__ = "0.20" +    __name    = "FilezyNet" +    __type    = "hoster" +    __version = "0.20" -    __pattern__ = r'http://(?:www\.)?filezy\.net/\w{12}' +    __pattern = r'http://(?:www\.)?filezy\.net/\w{12}' -    __description__ = """Filezy.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [] +    __description = """Filezy.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [] diff --git a/pyload/plugin/hoster/FiredriveCom.py b/pyload/plugin/hoster/FiredriveCom.py index 4ce47e692..5b6bc2f19 100644 --- a/pyload/plugin/hoster/FiredriveCom.py +++ b/pyload/plugin/hoster/FiredriveCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FiredriveCom(DeadHoster): -    __name__    = "FiredriveCom" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "FiredriveCom" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/(mobile/)?(file|embed)/(?P<ID>\w+)' +    __pattern = r'https?://(?:www\.)?(firedrive|putlocker)\.com/(mobile/)?(file|embed)/(?P<ID>\w+)' -    __description__ = """Firedrive.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Firedrive.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/FlyFilesNet.py b/pyload/plugin/hoster/FlyFilesNet.py index 5aff3e811..c44e2330d 100644 --- a/pyload/plugin/hoster/FlyFilesNet.py +++ b/pyload/plugin/hoster/FlyFilesNet.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FlyFilesNet(SimpleHoster): -    __name__    = "FlyFilesNet" -    __type__    = "hoster" -    __version__ = "0.10" +    __name    = "FlyFilesNet" +    __type    = "hoster" +    __version = "0.10" -    __pattern__ = r'http://(?:www\.)?flyfiles\.net/.+' +    __pattern = r'http://(?:www\.)?flyfiles\.net/.+' -    __description__ = """FlyFiles.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [] +    __description = """FlyFiles.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = []      SESSION_PATTERN = r'flyfiles\.net/(.*)/.*'      NAME_PATTERN = r'flyfiles\.net/.*/(.*)' diff --git a/pyload/plugin/hoster/FourSharedCom.py b/pyload/plugin/hoster/FourSharedCom.py index 00209f4f1..2f3b95d53 100644 --- a/pyload/plugin/hoster/FourSharedCom.py +++ b/pyload/plugin/hoster/FourSharedCom.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FourSharedCom(SimpleHoster): -    __name__    = "FourSharedCom" -    __type__    = "hoster" -    __version__ = "0.31" +    __name    = "FourSharedCom" +    __type    = "hoster" +    __version = "0.31" -    __pattern__ = r'https?://(?:www\.)?4shared(\-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+' +    __pattern = r'https?://(?:www\.)?4shared(\-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+' -    __description__ = """4Shared.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.de"), +    __description = """4Shared.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.de"),                         ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/FreakshareCom.py b/pyload/plugin/hoster/FreakshareCom.py index 331d7f2a3..11d17dc01 100644 --- a/pyload/plugin/hoster/FreakshareCom.py +++ b/pyload/plugin/hoster/FreakshareCom.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import secondsToMidnight  class FreakshareCom(Hoster): -    __name__    = "FreakshareCom" -    __type__    = "hoster" -    __version__ = "0.40" +    __name    = "FreakshareCom" +    __type    = "hoster" +    __version = "0.40" -    __pattern__ = r'http://(?:www\.)?freakshare\.(net|com)/files/\S*?/' +    __pattern = r'http://(?:www\.)?freakshare\.(net|com)/files/\S*?/' -    __description__ = """Freakshare.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("sitacuisses", "sitacuisses@yahoo.de"), +    __description = """Freakshare.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("sitacuisses", "sitacuisses@yahoo.de"),                         ("spoob", "spoob@pyload.org"),                         ("mkaay", "mkaay@mkaay.de"),                         ("Toilal", "toilal.dev@gmail.com")] diff --git a/pyload/plugin/hoster/FreeWayMe.py b/pyload/plugin/hoster/FreeWayMe.py index 21f99c19e..b0bb45d16 100644 --- a/pyload/plugin/hoster/FreeWayMe.py +++ b/pyload/plugin/hoster/FreeWayMe.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class FreeWayMe(MultiHoster): -    __name__    = "FreeWayMe" -    __type__    = "hoster" -    __version__ = "0.16" +    __name    = "FreeWayMe" +    __type    = "hoster" +    __version = "0.16" -    __pattern__ = r'https://(?:www\.)?free-way\.me/.+' +    __pattern = r'https://(?:www\.)?free-way\.me/.+' -    __description__ = """FreeWayMe multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Nicolas Giese", "james@free-way.me")] +    __description = """FreeWayMe multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Nicolas Giese", "james@free-way.me")]      def setup(self): diff --git a/pyload/plugin/hoster/FreevideoCz.py b/pyload/plugin/hoster/FreevideoCz.py index 3c9b94ea8..e5e678dcf 100644 --- a/pyload/plugin/hoster/FreevideoCz.py +++ b/pyload/plugin/hoster/FreevideoCz.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FreevideoCz(DeadHoster): -    __name__    = "FreevideoCz" -    __type__    = "hoster" -    __version__ = "0.30" +    __name    = "FreevideoCz" +    __type    = "hoster" +    __version = "0.30" -    __pattern__ = r'http://(?:www\.)?freevideo\.cz/vase-videa/.+' +    __pattern = r'http://(?:www\.)?freevideo\.cz/vase-videa/.+' -    __description__ = """Freevideo.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Freevideo.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/FshareVn.py b/pyload/plugin/hoster/FshareVn.py index 186cb2f87..972e2af8c 100644 --- a/pyload/plugin/hoster/FshareVn.py +++ b/pyload/plugin/hoster/FshareVn.py @@ -23,15 +23,15 @@ def doubleDecode(m):  class FshareVn(SimpleHoster): -    __name__    = "FshareVn" -    __type__    = "hoster" -    __version__ = "0.20" +    __name    = "FshareVn" +    __type    = "hoster" +    __version = "0.20" -    __pattern__ = r'http://(?:www\.)?fshare\.vn/file/.+' +    __pattern = r'http://(?:www\.)?fshare\.vn/file/.+' -    __description__ = """FshareVn hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """FshareVn hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      INFO_PATTERN = r'<p>(?P<N>[^<]+)<\\/p>[\\trn\s]*<p>(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)<\\/p>' diff --git a/pyload/plugin/hoster/Ftp.py b/pyload/plugin/hoster/Ftp.py index 6924c5910..b6808811c 100644 --- a/pyload/plugin/hoster/Ftp.py +++ b/pyload/plugin/hoster/Ftp.py @@ -10,15 +10,15 @@ from pyload.plugin.Hoster import Hoster  class Ftp(Hoster): -    __name__    = "Ftp" -    __type__    = "hoster" -    __version__ = "0.46" +    __name    = "Ftp" +    __type    = "hoster" +    __version = "0.46" -    __pattern__ = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+' +    __pattern = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+' -    __description__ = """Download from ftp directory""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.com"), +    __description = """Download from ftp directory""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.com"),                         ("mkaay", "mkaay@mkaay.de"),                         ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/GamefrontCom.py b/pyload/plugin/hoster/GamefrontCom.py index 89e188010..81568e376 100644 --- a/pyload/plugin/hoster/GamefrontCom.py +++ b/pyload/plugin/hoster/GamefrontCom.py @@ -8,15 +8,15 @@ from pyload.utils import parseFileSize  class GamefrontCom(Hoster): -    __name__    = "GamefrontCom" -    __type__    = "hoster" -    __version__ = "0.04" +    __name    = "GamefrontCom" +    __type    = "hoster" +    __version = "0.04" -    __pattern__ = r'http://(?:www\.)?gamefront\.com/files/\w+' +    __pattern = r'http://(?:www\.)?gamefront\.com/files/\w+' -    __description__ = """Gamefront.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("fwannmacher", "felipe@warhammerproject.com")] +    __description = """Gamefront.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("fwannmacher", "felipe@warhammerproject.com")]      PATTERN_FILENAME = r'<title>(.*?) | Game Front' diff --git a/pyload/plugin/hoster/GigapetaCom.py b/pyload/plugin/hoster/GigapetaCom.py index 9aa842e21..0025aeda6 100644 --- a/pyload/plugin/hoster/GigapetaCom.py +++ b/pyload/plugin/hoster/GigapetaCom.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class GigapetaCom(SimpleHoster): -    __name__    = "GigapetaCom" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "GigapetaCom" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?gigapeta\.com/dl/\w+' +    __pattern = r'http://(?:www\.)?gigapeta\.com/dl/\w+' -    __description__ = """GigaPeta.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """GigaPeta.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN = r'<img src=".*" alt="file" />-->\s*(?P<N>.*?)\s*</td>' diff --git a/pyload/plugin/hoster/GooIm.py b/pyload/plugin/hoster/GooIm.py index 2090141ca..13f8b6684 100644 --- a/pyload/plugin/hoster/GooIm.py +++ b/pyload/plugin/hoster/GooIm.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class GooIm(SimpleHoster): -    __name__    = "GooIm" -    __type__    = "hoster" -    __version__ = "0.04" +    __name    = "GooIm" +    __type    = "hoster" +    __version = "0.04" -    __pattern__ = r'https?://(?:www\.)?goo\.im/.+' +    __pattern = r'https?://(?:www\.)?goo\.im/.+' -    __description__ = """Goo.im hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description = """Goo.im hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]      NAME_PATTERN = r'You will be redirected to .*(?P<N>[^/ ]+)  in' diff --git a/pyload/plugin/hoster/GoogledriveCom.py b/pyload/plugin/hoster/GoogledriveCom.py index 14a9d058d..8813b67e1 100644 --- a/pyload/plugin/hoster/GoogledriveCom.py +++ b/pyload/plugin/hoster/GoogledriveCom.py @@ -10,15 +10,15 @@ from pyload.utils import html_unescape  class GoogledriveCom(SimpleHoster): -    __name__    = "GoogledriveCom" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "GoogledriveCom" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'https?://(?:www\.)?drive\.google\.com/file/.+' +    __pattern = r'https?://(?:www\.)?drive\.google\.com/file/.+' -    __description__ = """Drive.google.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description = """Drive.google.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]      DISPOSITION = False diff --git a/pyload/plugin/hoster/HellshareCz.py b/pyload/plugin/hoster/HellshareCz.py index 2caaeb143..3314aacd8 100644 --- a/pyload/plugin/hoster/HellshareCz.py +++ b/pyload/plugin/hoster/HellshareCz.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class HellshareCz(SimpleHoster): -    __name__    = "HellshareCz" -    __type__    = "hoster" -    __version__ = "0.85" +    __name    = "HellshareCz" +    __type    = "hoster" +    __version = "0.85" -    __pattern__ = r'http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+' +    __pattern = r'http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+' -    __description__ = """Hellshare.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Hellshare.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      CHECK_TRAFFIC = True diff --git a/pyload/plugin/hoster/HellspyCz.py b/pyload/plugin/hoster/HellspyCz.py index 049dd8df3..119cfab69 100644 --- a/pyload/plugin/hoster/HellspyCz.py +++ b/pyload/plugin/hoster/HellspyCz.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class HellspyCz(DeadHoster): -    __name__    = "HellspyCz" -    __type__    = "hoster" -    __version__ = "0.28" +    __name    = "HellspyCz" +    __type    = "hoster" +    __version = "0.28" -    __pattern__ = r'http://(?:www\.)?(?:hellspy\.(?:cz|com|sk|hu|pl)|sciagaj\.pl)(/\S+/\d+)' +    __pattern = r'http://(?:www\.)?(?:hellspy\.(?:cz|com|sk|hu|pl)|sciagaj\.pl)(/\S+/\d+)' -    __description__ = """HellSpy.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """HellSpy.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/HotfileCom.py b/pyload/plugin/hoster/HotfileCom.py index a9b1aa099..a8dd0edf4 100644 --- a/pyload/plugin/hoster/HotfileCom.py +++ b/pyload/plugin/hoster/HotfileCom.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class HotfileCom(DeadHoster): -    __name__    = "HotfileCom" -    __type__    = "hoster" -    __version__ = "0.37" +    __name    = "HotfileCom" +    __type    = "hoster" +    __version = "0.37" -    __pattern__ = r'https?://(?:www\.)?hotfile\.com/dl/\d+/\w+' +    __pattern = r'https?://(?:www\.)?hotfile\.com/dl/\d+/\w+' -    __description__ = """Hotfile.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("sitacuisses", "sitacuisses@yhoo.de"), +    __description = """Hotfile.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("sitacuisses", "sitacuisses@yhoo.de"),                         ("spoob", "spoob@pyload.org"),                         ("mkaay", "mkaay@mkaay.de"),                         ("JoKoT3", "jokot3@gmail.com")] diff --git a/pyload/plugin/hoster/HugefilesNet.py b/pyload/plugin/hoster/HugefilesNet.py index 413191c52..2a591c7fd 100644 --- a/pyload/plugin/hoster/HugefilesNet.py +++ b/pyload/plugin/hoster/HugefilesNet.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class HugefilesNet(XFSHoster): -    __name__    = "HugefilesNet" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "HugefilesNet" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'http://(?:www\.)?hugefiles\.net/\w{12}' +    __pattern = r'http://(?:www\.)?hugefiles\.net/\w{12}' -    __description__ = """Hugefiles.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Hugefiles.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      SIZE_PATTERN = r'File Size:</span>\s*<span[^>]*>(?P<S>[^<]+)</span></div>' diff --git a/pyload/plugin/hoster/HundredEightyUploadCom.py b/pyload/plugin/hoster/HundredEightyUploadCom.py index 14fe6db68..1cea5f4c5 100644 --- a/pyload/plugin/hoster/HundredEightyUploadCom.py +++ b/pyload/plugin/hoster/HundredEightyUploadCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class HundredEightyUploadCom(XFSHoster): -    __name__    = "HundredEightyUploadCom" -    __type__    = "hoster" -    __version__ = "0.04" +    __name    = "HundredEightyUploadCom" +    __type    = "hoster" +    __version = "0.04" -    __pattern__ = r'http://(?:www\.)?180upload\.com/\w{12}' +    __pattern = r'http://(?:www\.)?180upload\.com/\w{12}' -    __description__ = """180upload.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """180upload.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/IFileWs.py b/pyload/plugin/hoster/IFileWs.py index 8effe015a..ad881681f 100644 --- a/pyload/plugin/hoster/IFileWs.py +++ b/pyload/plugin/hoster/IFileWs.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class IFileWs(DeadHoster): -    __name__    = "IFileWs" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "IFileWs" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?ifile\.ws/\w{12}' +    __pattern = r'http://(?:www\.)?ifile\.ws/\w{12}' -    __description__ = """Ifile.ws hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("z00nx", "z00nx0@gmail.com")] +    __description = """Ifile.ws hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("z00nx", "z00nx0@gmail.com")] diff --git a/pyload/plugin/hoster/IcyFilesCom.py b/pyload/plugin/hoster/IcyFilesCom.py index 2a5b1d55a..62e1a5c0d 100644 --- a/pyload/plugin/hoster/IcyFilesCom.py +++ b/pyload/plugin/hoster/IcyFilesCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class IcyFilesCom(DeadHoster): -    __name__    = "IcyFilesCom" -    __type__    = "hoster" -    __version__ = "0.06" +    __name    = "IcyFilesCom" +    __type    = "hoster" +    __version = "0.06" -    __pattern__ = r'http://(?:www\.)?icyfiles\.com/(.+)' +    __pattern = r'http://(?:www\.)?icyfiles\.com/(.+)' -    __description__ = """IcyFiles.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("godofdream", "soilfiction@gmail.com")] +    __description = """IcyFiles.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("godofdream", "soilfiction@gmail.com")] diff --git a/pyload/plugin/hoster/IfileIt.py b/pyload/plugin/hoster/IfileIt.py index 58e64aff1..0c9593247 100644 --- a/pyload/plugin/hoster/IfileIt.py +++ b/pyload/plugin/hoster/IfileIt.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class IfileIt(DeadHoster): -    __name__    = "IfileIt" -    __type__    = "hoster" -    __version__ = "0.29" +    __name    = "IfileIt" +    __type    = "hoster" +    __version = "0.29" -    __pattern__ = r'^unmatchable$' +    __pattern = r'^unmatchable$' -    __description__ = """Ifile.it""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Ifile.it""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/IfolderRu.py b/pyload/plugin/hoster/IfolderRu.py index b6e98674f..c32e22569 100644 --- a/pyload/plugin/hoster/IfolderRu.py +++ b/pyload/plugin/hoster/IfolderRu.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class IfolderRu(SimpleHoster): -    __name__    = "IfolderRu" -    __type__    = "hoster" -    __version__ = "0.39" +    __name    = "IfolderRu" +    __type    = "hoster" +    __version = "0.39" -    __pattern__ = r'http://(?:www\.)?(?:ifolder\.ru|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+)' +    __pattern = r'http://(?:www\.)?(?:ifolder\.ru|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+)' -    __description__ = """Ifolder.ru hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Ifolder.ru hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      SIZE_REPLACEMENTS = [(u'Ðб', 'KB'), (u'Ðб', 'MB'), (u'Ðб', 'GB')] diff --git a/pyload/plugin/hoster/JumbofilesCom.py b/pyload/plugin/hoster/JumbofilesCom.py index fa2ffdbff..9336013fb 100644 --- a/pyload/plugin/hoster/JumbofilesCom.py +++ b/pyload/plugin/hoster/JumbofilesCom.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class JumbofilesCom(SimpleHoster): -    __name__    = "JumbofilesCom" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "JumbofilesCom" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?jumbofiles\.com/(?P<ID>\w{12})' +    __pattern = r'http://(?:www\.)?jumbofiles\.com/(?P<ID>\w{12})' -    __description__ = """JumboFiles.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("godofdream", "soilfiction@gmail.com")] +    __description = """JumboFiles.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("godofdream", "soilfiction@gmail.com")]      INFO_PATTERN = r'<TR><TD>(?P<N>[^<]+?)\s*<small>\((?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)' diff --git a/pyload/plugin/hoster/JunocloudMe.py b/pyload/plugin/hoster/JunocloudMe.py index 4fc6457d7..9054734fb 100644 --- a/pyload/plugin/hoster/JunocloudMe.py +++ b/pyload/plugin/hoster/JunocloudMe.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class JunocloudMe(XFSHoster): -    __name__    = "JunocloudMe" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "JunocloudMe" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'http://(?:\w+\.)?junocloud\.me/\w{12}' +    __pattern = r'http://(?:\w+\.)?junocloud\.me/\w{12}' -    __description__ = """Junocloud.me hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("guidobelix", "guidobelix@hotmail.it")] +    __description = """Junocloud.me hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("guidobelix", "guidobelix@hotmail.it")]      URL_REPLACEMENTS = [(r'//(www\.)?junocloud', "//dl3.junocloud")] diff --git a/pyload/plugin/hoster/Keep2ShareCc.py b/pyload/plugin/hoster/Keep2ShareCc.py index d655cf6ba..b259b4049 100644 --- a/pyload/plugin/hoster/Keep2ShareCc.py +++ b/pyload/plugin/hoster/Keep2ShareCc.py @@ -9,19 +9,19 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class Keep2ShareCc(SimpleHoster): -    __name__    = "Keep2ShareCc" -    __type__    = "hoster" -    __version__ = "0.21" +    __name    = "Keep2ShareCc" +    __type    = "hoster" +    __version = "0.21" -    __pattern__ = r'https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)' +    __pattern = r'https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)' -    __description__ = """Keep2Share.cc hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it"), +    __description = """Keep2Share.cc hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] -    URL_REPLACEMENTS = [(__pattern__ + ".*", "http://k2s.cc/file/\g<ID>")] +    URL_REPLACEMENTS = [(__pattern + ".*", "http://k2s.cc/file/\g<ID>")]      NAME_PATTERN = r'File: <span>(?P<N>.+)</span>'      SIZE_PATTERN = r'Size: (?P<S>[^<]+)</div>' diff --git a/pyload/plugin/hoster/KickloadCom.py b/pyload/plugin/hoster/KickloadCom.py index 5079570af..f0de7c029 100644 --- a/pyload/plugin/hoster/KickloadCom.py +++ b/pyload/plugin/hoster/KickloadCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class KickloadCom(DeadHoster): -    __name__    = "KickloadCom" -    __type__    = "hoster" -    __version__ = "0.21" +    __name    = "KickloadCom" +    __type    = "hoster" +    __version = "0.21" -    __pattern__ = r'http://(?:www\.)?kickload\.com/get/.+' +    __pattern = r'http://(?:www\.)?kickload\.com/get/.+' -    __description__ = """Kickload.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de")] +    __description = """Kickload.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de")] diff --git a/pyload/plugin/hoster/KingfilesNet.py b/pyload/plugin/hoster/KingfilesNet.py index ad856dfb6..33b3835c9 100644 --- a/pyload/plugin/hoster/KingfilesNet.py +++ b/pyload/plugin/hoster/KingfilesNet.py @@ -7,15 +7,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class KingfilesNet(SimpleHoster): -    __name__    = "KingfilesNet" -    __type__    = "hoster" -    __version__ = "0.07" +    __name    = "KingfilesNet" +    __type    = "hoster" +    __version = "0.07" -    __pattern__ = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})' +    __pattern = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})' -    __description__ = """Kingfiles.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"), +    __description = """Kingfiles.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/LemUploadsCom.py b/pyload/plugin/hoster/LemUploadsCom.py index deb0d374f..6a6a6e173 100644 --- a/pyload/plugin/hoster/LemUploadsCom.py +++ b/pyload/plugin/hoster/LemUploadsCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class LemUploadsCom(DeadHoster): -    __name__    = "LemUploadsCom" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "LemUploadsCom" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'https?://(?:www\.)?lemuploads\.com/\w{12}' +    __pattern = r'https?://(?:www\.)?lemuploads\.com/\w{12}' -    __description__ = """LemUploads.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] +    __description = """LemUploads.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] diff --git a/pyload/plugin/hoster/LetitbitNet.py b/pyload/plugin/hoster/LetitbitNet.py index dfdae5784..c205b3b46 100644 --- a/pyload/plugin/hoster/LetitbitNet.py +++ b/pyload/plugin/hoster/LetitbitNet.py @@ -34,15 +34,15 @@ def getInfo(urls):  class LetitbitNet(SimpleHoster): -    __name__    = "LetitbitNet" -    __type__    = "hoster" -    __version__ = "0.30" +    __name    = "LetitbitNet" +    __type    = "hoster" +    __version = "0.30" -    __pattern__ = r'https?://(?:www\.)?(letitbit|shareflare)\.net/download/.+' +    __pattern = r'https?://(?:www\.)?(letitbit|shareflare)\.net/download/.+' -    __description__ = """Letitbit.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Letitbit.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("z00nx", "z00nx0@gmail.com")] diff --git a/pyload/plugin/hoster/LinksnappyCom.py b/pyload/plugin/hoster/LinksnappyCom.py index fe3104579..2b727056d 100644 --- a/pyload/plugin/hoster/LinksnappyCom.py +++ b/pyload/plugin/hoster/LinksnappyCom.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class LinksnappyCom(MultiHoster): -    __name__    = "LinksnappyCom" -    __type__    = "hoster" -    __version__ = "0.08" +    __name    = "LinksnappyCom" +    __type    = "hoster" +    __version = "0.08" -    __pattern__ = r'https?://(?:[^/]+\.)?linksnappy\.com' +    __pattern = r'https?://(?:[^/]+\.)?linksnappy\.com' -    __description__ = """Linksnappy.com multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Linksnappy.com multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      SINGLE_CHUNK_HOSTERS = ["easybytez.com"] diff --git a/pyload/plugin/hoster/LoadTo.py b/pyload/plugin/hoster/LoadTo.py index 42d76b4fa..0a7339ec0 100644 --- a/pyload/plugin/hoster/LoadTo.py +++ b/pyload/plugin/hoster/LoadTo.py @@ -11,15 +11,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class LoadTo(SimpleHoster): -    __name__    = "LoadTo" -    __type__    = "hoster" -    __version__ = "0.22" +    __name    = "LoadTo" +    __type    = "hoster" +    __version = "0.22" -    __pattern__ = r'http://(?:www\.)?load\.to/\w+' +    __pattern = r'http://(?:www\.)?load\.to/\w+' -    __description__ = """Load.to hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("halfman", "Pulpan3@gmail.com"), +    __description = """Load.to hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("halfman", "Pulpan3@gmail.com"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/LomafileCom.py b/pyload/plugin/hoster/LomafileCom.py index 18f315bd6..7ce4abcf7 100644 --- a/pyload/plugin/hoster/LomafileCom.py +++ b/pyload/plugin/hoster/LomafileCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class LomafileCom(DeadHoster): -    __name__    = "LomafileCom" -    __type__    = "hoster" -    __version__ = "0.52" +    __name    = "LomafileCom" +    __type    = "hoster" +    __version = "0.52" -    __pattern__ = r'http://lomafile\.com/\w{12}' +    __pattern = r'http://lomafile\.com/\w{12}' -    __description__ = """Lomafile.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("nath_schwarz", "nathan.notwhite@gmail.com"), +    __description = """Lomafile.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("nath_schwarz", "nathan.notwhite@gmail.com"),                         ("guidobelix", "guidobelix@hotmail.it")] diff --git a/pyload/plugin/hoster/LuckyShareNet.py b/pyload/plugin/hoster/LuckyShareNet.py index d9cc5fe88..d29000f0b 100644 --- a/pyload/plugin/hoster/LuckyShareNet.py +++ b/pyload/plugin/hoster/LuckyShareNet.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class LuckyShareNet(SimpleHoster): -    __name__    = "LuckyShareNet" -    __type__    = "hoster" -    __version__ = "0.06" +    __name    = "LuckyShareNet" +    __type    = "hoster" +    __version = "0.06" -    __pattern__ = r'https?://(?:www\.)?luckyshare\.net/(?P<ID>\d{10,})' +    __pattern = r'https?://(?:www\.)?luckyshare\.net/(?P<ID>\d{10,})' -    __description__ = """LuckyShare.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """LuckyShare.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      INFO_PATTERN = r'<h1 class=\'file_name\'>(?P<N>\S+)</h1>\s*<span class=\'file_size\'>Filesize: (?P<S>[\d.,]+)(?P<U>[\w^_]+)</span>' diff --git a/pyload/plugin/hoster/MediafireCom.py b/pyload/plugin/hoster/MediafireCom.py index 5adf004d0..227004c46 100644 --- a/pyload/plugin/hoster/MediafireCom.py +++ b/pyload/plugin/hoster/MediafireCom.py @@ -52,15 +52,15 @@ def getInfo(urls):  class MediafireCom(SimpleHoster): -    __name__    = "MediafireCom" -    __type__    = "hoster" -    __version__ = "0.84" +    __name    = "MediafireCom" +    __type    = "hoster" +    __version = "0.84" -    __pattern__ = r'http://(?:www\.)?mediafire\.com/(file/|(view/?|download\.php)?\?)(\w{11}|\w{15})($|/)' +    __pattern = r'http://(?:www\.)?mediafire\.com/(file/|(view/?|download\.php)?\?)(\w{11}|\w{15})($|/)' -    __description__ = """Mediafire.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Mediafire.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/MegaCoNz.py b/pyload/plugin/hoster/MegaCoNz.py index 9648e8316..7c7c3624f 100644 --- a/pyload/plugin/hoster/MegaCoNz.py +++ b/pyload/plugin/hoster/MegaCoNz.py @@ -46,15 +46,15 @@ from pyload.utils import decode, fs_decode, fs_encode  class MegaCoNz(Hoster): -    __name__    = "MegaCoNz" -    __type__    = "hoster" -    __version__ = "0.26" +    __name    = "MegaCoNz" +    __type    = "hoster" +    __version = "0.26" -    __pattern__ = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#(?P<TYPE>N|)!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)' +    __pattern = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#(?P<TYPE>N|)!(?P<ID>[\w^_]+)!(?P<KEY>[\w,\\-]+)' -    __description__ = """Mega.co.nz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "ranan@pyload.org"), +    __description = """Mega.co.nz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "ranan@pyload.org"),                         ("Walter Purcaro", "vuolter@gmail.com")] @@ -183,7 +183,7 @@ class MegaCoNz(Hoster):      def process(self, pyfile): -        pattern = re.match(self.__pattern__, pyfile.url).groupdict() +        pattern = re.match(self.__pattern, pyfile.url).groupdict()          id      = pattern['ID']          key     = pattern['KEY']          public  = pattern['TYPE'] == '' diff --git a/pyload/plugin/hoster/MegaDebridEu.py b/pyload/plugin/hoster/MegaDebridEu.py index 842ad4de9..cefd278eb 100644 --- a/pyload/plugin/hoster/MegaDebridEu.py +++ b/pyload/plugin/hoster/MegaDebridEu.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class MegaDebridEu(MultiHoster): -    __name__    = "MegaDebridEu" -    __type__    = "hoster" -    __version__ = "0.46" +    __name    = "MegaDebridEu" +    __type    = "hoster" +    __version = "0.46" -    __pattern__ = r'http://((?:www\d+\.|s\d+\.)?mega-debrid\.eu|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/download/file/[\w^_]+' +    __pattern = r'http://((?:www\d+\.|s\d+\.)?mega-debrid\.eu|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/download/file/[\w^_]+' -    __description__ = """mega-debrid.eu multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("D.Ducatel", "dducatel@je-geek.fr")] +    __description = """mega-debrid.eu multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("D.Ducatel", "dducatel@je-geek.fr")]      API_URL = "https://www.mega-debrid.eu/api.php" diff --git a/pyload/plugin/hoster/MegaFilesSe.py b/pyload/plugin/hoster/MegaFilesSe.py index 3cfd41da4..1464aae6d 100644 --- a/pyload/plugin/hoster/MegaFilesSe.py +++ b/pyload/plugin/hoster/MegaFilesSe.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class MegaFilesSe(DeadHoster): -    __name__    = "MegaFilesSe" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "MegaFilesSe" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?megafiles\.se/\w{12}' +    __pattern = r'http://(?:www\.)?megafiles\.se/\w{12}' -    __description__ = """MegaFiles.se hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] +    __description = """MegaFiles.se hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] diff --git a/pyload/plugin/hoster/MegaRapidCz.py b/pyload/plugin/hoster/MegaRapidCz.py index b7b9e3ffe..8ce5f71dc 100644 --- a/pyload/plugin/hoster/MegaRapidCz.py +++ b/pyload/plugin/hoster/MegaRapidCz.py @@ -21,15 +21,15 @@ def getInfo(urls):  class MegaRapidCz(SimpleHoster): -    __name__    = "MegaRapidCz" -    __type__    = "hoster" -    __version__ = "0.56" +    __name    = "MegaRapidCz" +    __type    = "hoster" +    __version = "0.56" -    __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/soubor/\d+/.+' +    __pattern = r'http://(?:www\.)?(share|mega)rapid\.cz/soubor/\d+/.+' -    __description__ = """MegaRapid.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("MikyWoW", "mikywow@seznam.cz"), +    __description = """MegaRapid.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("MikyWoW", "mikywow@seznam.cz"),                         ("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/MegacrypterCom.py b/pyload/plugin/hoster/MegacrypterCom.py index f8fcb97fe..264ad958d 100644 --- a/pyload/plugin/hoster/MegacrypterCom.py +++ b/pyload/plugin/hoster/MegacrypterCom.py @@ -8,15 +8,15 @@ from pyload.plugin.hoster.MegaCoNz import MegaCoNz  class MegacrypterCom(MegaCoNz): -    __name__    = "MegacrypterCom" -    __type__    = "hoster" -    __version__ = "0.22" +    __name    = "MegacrypterCom" +    __type    = "hoster" +    __version = "0.22" -    __pattern__ = r'https?://\w{0,10}\.?megacrypter\.com/[\w!-]+' +    __pattern = r'https?://\w{0,10}\.?megacrypter\.com/[\w!-]+' -    __description__ = """Megacrypter.com decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("GonzaloSR", "gonzalo@gonzalosr.com")] +    __description = """Megacrypter.com decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("GonzaloSR", "gonzalo@gonzalosr.com")]      API_URL = "http://megacrypter.com/api" @@ -33,7 +33,7 @@ class MegacrypterCom(MegaCoNz):      def process(self, pyfile):          # match is guaranteed because plugin was chosen to handle url -        node = re.match(self.__pattern__, pyfile.url).group(0) +        node = re.match(self.__pattern, pyfile.url).group(0)          # get Mega.co.nz link info          info = self.api_response(link=node, m="info") diff --git a/pyload/plugin/hoster/MegareleaseOrg.py b/pyload/plugin/hoster/MegareleaseOrg.py index c2c7fe357..e23c727d4 100644 --- a/pyload/plugin/hoster/MegareleaseOrg.py +++ b/pyload/plugin/hoster/MegareleaseOrg.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class MegareleaseOrg(DeadHoster): -    __name__    = "MegareleaseOrg" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "MegareleaseOrg" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'https?://(?:www\.)?megarelease\.org/\w{12}' +    __pattern = r'https?://(?:www\.)?megarelease\.org/\w{12}' -    __description__ = """Megarelease.org hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("derek3x", "derek3x@vmail.me"), +    __description = """Megarelease.org hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("derek3x", "derek3x@vmail.me"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/MegasharesCom.py b/pyload/plugin/hoster/MegasharesCom.py index 483969e2e..7143166d4 100644 --- a/pyload/plugin/hoster/MegasharesCom.py +++ b/pyload/plugin/hoster/MegasharesCom.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class MegasharesCom(SimpleHoster): -    __name__    = "MegasharesCom" -    __type__    = "hoster" -    __version__ = "0.28" +    __name    = "MegasharesCom" +    __type    = "hoster" +    __version = "0.28" -    __pattern__ = r'http://(?:www\.)?(d\d{2}\.)?megashares\.com/((index\.php)?\?d\d{2}=|dl/)\w+' +    __pattern = r'http://(?:www\.)?(d\d{2}\.)?megashares\.com/((index\.php)?\?d\d{2}=|dl/)\w+' -    __description__ = """Megashares.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Megashares.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/MegauploadCom.py b/pyload/plugin/hoster/MegauploadCom.py index c1d5b4524..dfb5a7703 100644 --- a/pyload/plugin/hoster/MegauploadCom.py +++ b/pyload/plugin/hoster/MegauploadCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class MegauploadCom(DeadHoster): -    __name__    = "MegauploadCom" -    __type__    = "hoster" -    __version__ = "0.31" +    __name    = "MegauploadCom" +    __type    = "hoster" +    __version = "0.31" -    __pattern__ = r'http://(?:www\.)?megaupload\.com/\?.*&?(d|v)=\w+' +    __pattern = r'http://(?:www\.)?megaupload\.com/\?.*&?(d|v)=\w+' -    __description__ = """Megaupload.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("spoob", "spoob@pyload.org")] +    __description = """Megaupload.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("spoob", "spoob@pyload.org")] diff --git a/pyload/plugin/hoster/MegavideoCom.py b/pyload/plugin/hoster/MegavideoCom.py index 442b0f292..b5db4e508 100644 --- a/pyload/plugin/hoster/MegavideoCom.py +++ b/pyload/plugin/hoster/MegavideoCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class MegavideoCom(DeadHoster): -    __name__    = "MegavideoCom" -    __type__    = "hoster" -    __version__ = "0.21" +    __name    = "MegavideoCom" +    __type    = "hoster" +    __version = "0.21" -    __pattern__ = r'http://(?:www\.)?megavideo\.com/\?.*&?(d|v)=\w+' +    __pattern = r'http://(?:www\.)?megavideo\.com/\?.*&?(d|v)=\w+' -    __description__ = """Megavideo.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.de"), +    __description = """Megavideo.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.de"),                         ("mkaay", "mkaay@mkaay.de")] diff --git a/pyload/plugin/hoster/MovReelCom.py b/pyload/plugin/hoster/MovReelCom.py index f273d623a..1d9cf90bc 100644 --- a/pyload/plugin/hoster/MovReelCom.py +++ b/pyload/plugin/hoster/MovReelCom.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class MovReelCom(XFSHoster): -    __name__    = "MovReelCom" -    __type__    = "hoster" -    __version__ = "1.24" +    __name    = "MovReelCom" +    __type    = "hoster" +    __version = "1.24" -    __pattern__ = r'http://(?:www\.)?movreel\.com/\w{12}' +    __pattern = r'http://(?:www\.)?movreel\.com/\w{12}' -    __description__ = """MovReel.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("JorisV83", "jorisv83-pyload@yahoo.com")] +    __description = """MovReel.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("JorisV83", "jorisv83-pyload@yahoo.com")]      LINK_PATTERN = r'<a href="([^"]+)">Download Link' diff --git a/pyload/plugin/hoster/MultihostersCom.py b/pyload/plugin/hoster/MultihostersCom.py index 3c9e81242..1bb2452bb 100644 --- a/pyload/plugin/hoster/MultihostersCom.py +++ b/pyload/plugin/hoster/MultihostersCom.py @@ -4,12 +4,12 @@ from pyload.plugin.hoster.ZeveraCom import ZeveraCom  class MultihostersCom(ZeveraCom): -    __name__    = "MultihostersCom" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "MultihostersCom" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'https?://(?:www\.)multihosters\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' +    __pattern = r'https?://(?:www\.)multihosters\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' -    __description__ = """Multihosters.com multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("tjeh", "tjeh@gmx.net")] +    __description = """Multihosters.com multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("tjeh", "tjeh@gmx.net")] diff --git a/pyload/plugin/hoster/MultishareCz.py b/pyload/plugin/hoster/MultishareCz.py index 252e9cdb5..eff4de8c1 100644 --- a/pyload/plugin/hoster/MultishareCz.py +++ b/pyload/plugin/hoster/MultishareCz.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class MultishareCz(SimpleHoster): -    __name__    = "MultishareCz" -    __type__    = "hoster" -    __version__ = "0.40" +    __name    = "MultishareCz" +    __type    = "hoster" +    __version = "0.40" -    __pattern__ = r'http://(?:www\.)?multishare\.cz/stahnout/(?P<ID>\d+)' +    __pattern = r'http://(?:www\.)?multishare\.cz/stahnout/(?P<ID>\d+)' -    __description__ = """MultiShare.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """MultiShare.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      SIZE_REPLACEMENTS = [(' ', '')] diff --git a/pyload/plugin/hoster/MyfastfileCom.py b/pyload/plugin/hoster/MyfastfileCom.py index c065c2331..4e4564807 100644 --- a/pyload/plugin/hoster/MyfastfileCom.py +++ b/pyload/plugin/hoster/MyfastfileCom.py @@ -7,15 +7,15 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class MyfastfileCom(MultiHoster): -    __name__    = "MyfastfileCom" -    __type__    = "hoster" -    __version__ = "0.08" +    __name    = "MyfastfileCom" +    __type    = "hoster" +    __version = "0.08" -    __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/' +    __pattern = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/' -    __description__ = """Myfastfile.com multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Myfastfile.com multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/MystoreTo.py b/pyload/plugin/hoster/MystoreTo.py index e2288e344..00c2d4e81 100644 --- a/pyload/plugin/hoster/MystoreTo.py +++ b/pyload/plugin/hoster/MystoreTo.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class MystoreTo(SimpleHoster): -    __name__    = "MystoreTo" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "MystoreTo" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'https?://(?:www\.)?mystore\.to/dl/.+' +    __pattern = r'https?://(?:www\.)?mystore\.to/dl/.+' -    __description__ = """Mystore.to hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "")] +    __description = """Mystore.to hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "")]      NAME_PATTERN    = r'<h1>(?P<N>.+?)<' diff --git a/pyload/plugin/hoster/MyvideoDe.py b/pyload/plugin/hoster/MyvideoDe.py index 4b5fa99ca..08652cdc9 100644 --- a/pyload/plugin/hoster/MyvideoDe.py +++ b/pyload/plugin/hoster/MyvideoDe.py @@ -7,15 +7,15 @@ from pyload.utils import html_unescape  class MyvideoDe(Hoster): -    __name__    = "MyvideoDe" -    __type__    = "hoster" -    __version__ = "0.90" +    __name    = "MyvideoDe" +    __type    = "hoster" +    __version = "0.90" -    __pattern__ = r'http://(?:www\.)?myvideo\.de/watch/' +    __pattern = r'http://(?:www\.)?myvideo\.de/watch/' -    __description__ = """Myvideo.de hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("spoob", "spoob@pyload.org")] +    __description = """Myvideo.de hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("spoob", "spoob@pyload.org")]      def process(self, pyfile): diff --git a/pyload/plugin/hoster/NahrajCz.py b/pyload/plugin/hoster/NahrajCz.py index 6aa87a520..f59727de2 100644 --- a/pyload/plugin/hoster/NahrajCz.py +++ b/pyload/plugin/hoster/NahrajCz.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class NahrajCz(DeadHoster): -    __name__    = "NahrajCz" -    __type__    = "hoster" -    __version__ = "0.21" +    __name    = "NahrajCz" +    __type    = "hoster" +    __version = "0.21" -    __pattern__ = r'http://(?:www\.)?nahraj\.cz/content/download/.+' +    __pattern = r'http://(?:www\.)?nahraj\.cz/content/download/.+' -    __description__ = """Nahraj.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Nahraj.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/NarodRu.py b/pyload/plugin/hoster/NarodRu.py index 7b9da6e4e..5d65e0066 100644 --- a/pyload/plugin/hoster/NarodRu.py +++ b/pyload/plugin/hoster/NarodRu.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class NarodRu(SimpleHoster): -    __name__    = "NarodRu" -    __type__    = "hoster" -    __version__ = "0.12" +    __name    = "NarodRu" +    __type    = "hoster" +    __version = "0.12" -    __pattern__ = r'http://(?:www\.)?narod(\.yandex)?\.ru/(disk|start/\d+\.\w+-narod\.yandex\.ru)/(?P<ID>\d+)/.+' +    __pattern = r'http://(?:www\.)?narod(\.yandex)?\.ru/(disk|start/\d+\.\w+-narod\.yandex\.ru)/(?P<ID>\d+)/.+' -    __description__ = """Narod.ru hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Narod.ru hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN = r'<dt class="name">(?:<[^<]*>)*(?P<N>[^<]+)</dt>' diff --git a/pyload/plugin/hoster/NetloadIn.py b/pyload/plugin/hoster/NetloadIn.py index 2ed298ffa..8a53d41e8 100644 --- a/pyload/plugin/hoster/NetloadIn.py +++ b/pyload/plugin/hoster/NetloadIn.py @@ -15,7 +15,7 @@ def getInfo(urls):      ##  returns list of tupels (name, size (in bytes), status (see database.File), url)      apiurl = "http://api.netload.in/info.php" -    id_regex = re.compile(NetloadIn.__pattern__) +    id_regex = re.compile(NetloadIn.__pattern)      urls_per_query = 80      for chunk in chunks(urls, urls_per_query): @@ -60,15 +60,15 @@ def getInfo(urls):  class NetloadIn(Hoster): -    __name__    = "NetloadIn" -    __type__    = "hoster" -    __version__ = "0.49" +    __name    = "NetloadIn" +    __type    = "hoster" +    __version = "0.49" -    __pattern__ = r'https?://(?:www\.)?netload\.in/(?P<PATH>datei|index\.php\?id=10&file_id=)(?P<ID>\w+)' +    __pattern = r'https?://(?:www\.)?netload\.in/(?P<PATH>datei|index\.php\?id=10&file_id=)(?P<ID>\w+)' -    __description__ = """Netload.in hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("spoob", "spoob@pyload.org"), +    __description = """Netload.in hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("spoob", "spoob@pyload.org"),                         ("RaNaN", "ranan@pyload.org"),                         ("Gregy", "gregy@gregy.cz")] @@ -116,7 +116,7 @@ class NetloadIn(Hoster):      def api_load(self, n=0):          url      = self.url -        id_regex = re.compile(self.__pattern__) +        id_regex = re.compile(self.__pattern)          match    = id_regex.search(url)          if match: diff --git a/pyload/plugin/hoster/NitroflareCom.py b/pyload/plugin/hoster/NitroflareCom.py index 85630a148..30b349eec 100644 --- a/pyload/plugin/hoster/NitroflareCom.py +++ b/pyload/plugin/hoster/NitroflareCom.py @@ -14,15 +14,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class NitroflareCom(SimpleHoster): -    __name__    = "NitroflareCom" -    __type__    = "hoster" -    __version__ = "0.08" +    __name    = "NitroflareCom" +    __type    = "hoster" +    __version = "0.08" -    __pattern__ = r'https?://(?:www\.)?nitroflare\.com/view/(?P<ID>[\w^_]+)' +    __pattern = r'https?://(?:www\.)?nitroflare\.com/view/(?P<ID>[\w^_]+)' -    __description__ = """Nitroflare.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("sahil", "sahilshekhawat01@gmail.com"), +    __description = """Nitroflare.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("sahil", "sahilshekhawat01@gmail.com"),                         ("Walter Purcaro", "vuolter@gmail.com"),                         ("Stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/NoPremiumPl.py b/pyload/plugin/hoster/NoPremiumPl.py index ddb9d78f8..0719fe980 100644 --- a/pyload/plugin/hoster/NoPremiumPl.py +++ b/pyload/plugin/hoster/NoPremiumPl.py @@ -5,15 +5,15 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class NoPremiumPl(MultiHoster): -    __name__    = "NoPremiumPl" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "NoPremiumPl" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'https?://direct\.nopremium\.pl.+' +    __pattern = r'https?://direct\.nopremium\.pl.+' -    __description__ = """NoPremium.pl multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("goddie", "dev@nopremium.pl")] +    __description = """NoPremium.pl multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("goddie", "dev@nopremium.pl")]      API_URL = "http://crypt.nopremium.pl" @@ -78,7 +78,7 @@ class NoPremiumPl(MultiHoster):          if "errno" in parsed.keys():              if parsed["errno"] in self.ERROR_CODES:                  # error code in known -                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name__) +                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name)              else:                  # error code isn't yet added to plugin                  self.fail( diff --git a/pyload/plugin/hoster/NosuploadCom.py b/pyload/plugin/hoster/NosuploadCom.py index edb8c6508..c32934442 100644 --- a/pyload/plugin/hoster/NosuploadCom.py +++ b/pyload/plugin/hoster/NosuploadCom.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class NosuploadCom(XFSHoster): -    __name__    = "NosuploadCom" -    __type__    = "hoster" -    __version__ = "0.31" +    __name    = "NosuploadCom" +    __type    = "hoster" +    __version = "0.31" -    __pattern__ = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}' +    __pattern = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}' -    __description__ = """Nosupload.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("igel", "igelkun@myopera.com")] +    __description = """Nosupload.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("igel", "igelkun@myopera.com")]      SIZE_PATTERN = r'<p><strong>Size:</strong> (?P<S>[\d.,]+) (?P<U>[\w^_]+)</p>' diff --git a/pyload/plugin/hoster/NovafileCom.py b/pyload/plugin/hoster/NovafileCom.py index e79ba5980..f81d21932 100644 --- a/pyload/plugin/hoster/NovafileCom.py +++ b/pyload/plugin/hoster/NovafileCom.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class NovafileCom(XFSHoster): -    __name__    = "NovafileCom" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "NovafileCom" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'http://(?:www\.)?novafile\.com/\w{12}' +    __pattern = r'http://(?:www\.)?novafile\.com/\w{12}' -    __description__ = """Novafile.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Novafile.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/NowDownloadSx.py b/pyload/plugin/hoster/NowDownloadSx.py index 00101a379..8511b7eca 100644 --- a/pyload/plugin/hoster/NowDownloadSx.py +++ b/pyload/plugin/hoster/NowDownloadSx.py @@ -7,15 +7,15 @@ from pyload.utils import fixup  class NowDownloadSx(SimpleHoster): -    __name__    = "NowDownloadSx" -    __type__    = "hoster" -    __version__ = "0.07" +    __name    = "NowDownloadSx" +    __type    = "hoster" +    __version = "0.07" -    __pattern__ = r'http://(?:www\.)?(nowdownload\.(at|ch|co|eu|sx)/(dl/|download\.php\?id=)|likeupload\.org/)\w+' +    __pattern = r'http://(?:www\.)?(nowdownload\.(at|ch|co|eu|sx)/(dl/|download\.php\?id=)|likeupload\.org/)\w+' -    __description__ = """NowDownload.sx hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("godofdream", "soilfiction@gmail.com"), +    __description = """NowDownload.sx hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("godofdream", "soilfiction@gmail.com"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/NowVideoSx.py b/pyload/plugin/hoster/NowVideoSx.py index 3c747c253..a44961932 100644 --- a/pyload/plugin/hoster/NowVideoSx.py +++ b/pyload/plugin/hoster/NowVideoSx.py @@ -6,18 +6,18 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class NowVideoSx(SimpleHoster): -    __name__    = "NowVideoSx" -    __type__    = "hoster" -    __version__ = "0.10" +    __name    = "NowVideoSx" +    __type    = "hoster" +    __version = "0.10" -    __pattern__ = r'http://(?:www\.)?nowvideo\.(at|ch|co|eu|li|sx)/(video|mobile/#/videos)/(?P<ID>\w+)' +    __pattern = r'http://(?:www\.)?nowvideo\.(at|ch|co|eu|li|sx)/(video|mobile/#/videos)/(?P<ID>\w+)' -    __description__ = """NowVideo.sx hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """NowVideo.sx hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] -    URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://www.nowvideo.sx/video/\g<ID>')] +    URL_REPLACEMENTS = [(__pattern + ".*", r'http://www.nowvideo.sx/video/\g<ID>')]      NAME_PATTERN = r'<h4>(?P<N>.+?)<'      OFFLINE_PATTERN = r'>This file no longer exists' diff --git a/pyload/plugin/hoster/OboomCom.py b/pyload/plugin/hoster/OboomCom.py index 43d41c538..f8a9fb8bb 100644 --- a/pyload/plugin/hoster/OboomCom.py +++ b/pyload/plugin/hoster/OboomCom.py @@ -11,15 +11,15 @@ from pyload.plugin.internal.captcha import ReCaptcha  class OboomCom(Hoster): -    __name__    = "OboomCom" -    __type__    = "hoster" -    __version__ = "0.31" +    __name    = "OboomCom" +    __type    = "hoster" +    __version = "0.31" -    __pattern__ = r'https?://(?:www\.)?oboom\.com/(#(id=|/)?)?(?P<ID>\w{8})' +    __pattern = r'https?://(?:www\.)?oboom\.com/(#(id=|/)?)?(?P<ID>\w{8})' -    __description__ = """oboom.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stanley", "stanley.foerster@gmail.com")] +    __description = """oboom.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stanley", "stanley.foerster@gmail.com")]      RECAPTCHA_KEY = "6LdqpO0SAAAAAJGHXo63HyalP7H4qlRs_vff0kJX" @@ -51,7 +51,7 @@ class OboomCom(Hoster):      def getFileId(self, url): -        self.fileId = re.match(OboomCom.__pattern__, url).group('ID') +        self.fileId = re.match(OboomCom.__pattern, url).group('ID')      def getSessionToken(self): diff --git a/pyload/plugin/hoster/OneFichierCom.py b/pyload/plugin/hoster/OneFichierCom.py index b9756e7ff..db9e9cf46 100644 --- a/pyload/plugin/hoster/OneFichierCom.py +++ b/pyload/plugin/hoster/OneFichierCom.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class OneFichierCom(SimpleHoster): -    __name__    = "OneFichierCom" -    __type__    = "hoster" -    __version__ = "0.78" +    __name    = "OneFichierCom" +    __type    = "hoster" +    __version = "0.78" -    __pattern__ = r'https?://(?:www\.)?(?:(?P<ID1>\w+)\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P<ID2>\w+))?' +    __pattern = r'https?://(?:www\.)?(?:(?P<ID1>\w+)\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P<ID2>\w+))?' -    __description__ = """1fichier.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es"), +    __description = """1fichier.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),                         ("the-razer", "daniel_ AT gmx DOT net"),                         ("zoidberg", "zoidberg@mujmail.cz"),                         ("imclem", ""), diff --git a/pyload/plugin/hoster/OronCom.py b/pyload/plugin/hoster/OronCom.py index f28d34391..f11aa3aac 100644 --- a/pyload/plugin/hoster/OronCom.py +++ b/pyload/plugin/hoster/OronCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class OronCom(DeadHoster): -    __name__    = "OronCom" -    __type__    = "hoster" -    __version__ = "0.14" +    __name    = "OronCom" +    __type    = "hoster" +    __version = "0.14" -    __pattern__ = r'https?://(?:www\.)?oron\.com/\w{12}' +    __pattern = r'https?://(?:www\.)?oron\.com/\w{12}' -    __description__ = """Oron.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("chrox", "chrox@pyload.org"), +    __description = """Oron.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("chrox", "chrox@pyload.org"),                         ("DHMH", "DHMH@pyload.org")] diff --git a/pyload/plugin/hoster/OverLoadMe.py b/pyload/plugin/hoster/OverLoadMe.py index 8c0436d78..bcf20c14c 100644 --- a/pyload/plugin/hoster/OverLoadMe.py +++ b/pyload/plugin/hoster/OverLoadMe.py @@ -11,15 +11,15 @@ from pyload.utils import parseFileSize  class OverLoadMe(MultiHoster): -    __name__    = "OverLoadMe" -    __type__    = "hoster" -    __version__ = "0.09" +    __name    = "OverLoadMe" +    __type    = "hoster" +    __version = "0.09" -    __pattern__ = r'https?://.*overload\.me/.+' +    __pattern = r'https?://.*overload\.me/.+' -    __description__ = """Over-Load.me multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("marley", "marley@over-load.me")] +    __description = """Over-Load.me multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("marley", "marley@over-load.me")]      def getFilename(self, url): diff --git a/pyload/plugin/hoster/PandaplaNet.py b/pyload/plugin/hoster/PandaplaNet.py index b9d5b6e5a..d940a74d0 100644 --- a/pyload/plugin/hoster/PandaplaNet.py +++ b/pyload/plugin/hoster/PandaplaNet.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class PandaplaNet(DeadHoster): -    __name__    = "PandaplaNet" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "PandaplaNet" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?pandapla\.net/\w{12}' +    __pattern = r'http://(?:www\.)?pandapla\.net/\w{12}' -    __description__ = """Pandapla.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] +    __description = """Pandapla.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] diff --git a/pyload/plugin/hoster/PornhostCom.py b/pyload/plugin/hoster/PornhostCom.py index 70ce4f32e..819612fcf 100644 --- a/pyload/plugin/hoster/PornhostCom.py +++ b/pyload/plugin/hoster/PornhostCom.py @@ -6,15 +6,15 @@ from pyload.plugin.Hoster import Hoster  class PornhostCom(Hoster): -    __name__    = "PornhostCom" -    __type__    = "hoster" -    __version__ = "0.20" +    __name    = "PornhostCom" +    __type    = "hoster" +    __version = "0.20" -    __pattern__ = r'http://(?:www\.)?pornhost\.com/(\d+/\d+\.html|\d+)' +    __pattern = r'http://(?:www\.)?pornhost\.com/(\d+/\d+\.html|\d+)' -    __description__ = """Pornhost.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.de")] +    __description = """Pornhost.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.de")]      def process(self, pyfile): diff --git a/pyload/plugin/hoster/PornhubCom.py b/pyload/plugin/hoster/PornhubCom.py index 9f8a5eec2..48fd82871 100644 --- a/pyload/plugin/hoster/PornhubCom.py +++ b/pyload/plugin/hoster/PornhubCom.py @@ -6,15 +6,15 @@ from pyload.plugin.Hoster import Hoster  class PornhubCom(Hoster): -    __name__    = "PornhubCom" -    __type__    = "hoster" -    __version__ = "0.50" +    __name    = "PornhubCom" +    __type    = "hoster" +    __version = "0.50" -    __pattern__ = r'http://(?:www\.)?pornhub\.com/view_video\.php\?viewkey=\w+' +    __pattern = r'http://(?:www\.)?pornhub\.com/view_video\.php\?viewkey=\w+' -    __description__ = """Pornhub.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.de")] +    __description = """Pornhub.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.de")]      def process(self, pyfile): diff --git a/pyload/plugin/hoster/PotloadCom.py b/pyload/plugin/hoster/PotloadCom.py index 4845299a5..5941816f2 100644 --- a/pyload/plugin/hoster/PotloadCom.py +++ b/pyload/plugin/hoster/PotloadCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class PotloadCom(DeadHoster): -    __name__    = "PotloadCom" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "PotloadCom" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?potload\.com/\w{12}' +    __pattern = r'http://(?:www\.)?potload\.com/\w{12}' -    __description__ = """Potload.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Potload.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/PremiumTo.py b/pyload/plugin/hoster/PremiumTo.py index 07945f873..93020cbfb 100644 --- a/pyload/plugin/hoster/PremiumTo.py +++ b/pyload/plugin/hoster/PremiumTo.py @@ -9,15 +9,15 @@ from pyload.utils import fs_encode  class PremiumTo(MultiHoster): -    __name__    = "PremiumTo" -    __type__    = "hoster" -    __version__ = "0.21" +    __name    = "PremiumTo" +    __type    = "hoster" +    __version = "0.21" -    __pattern__ = r'^unmatchable$' +    __pattern = r'^unmatchable$' -    __description__ = """Premium.to multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Premium.to multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/PremiumizeMe.py b/pyload/plugin/hoster/PremiumizeMe.py index c1153280b..4a43825dc 100644 --- a/pyload/plugin/hoster/PremiumizeMe.py +++ b/pyload/plugin/hoster/PremiumizeMe.py @@ -5,15 +5,15 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class PremiumizeMe(MultiHoster): -    __name__    = "PremiumizeMe" -    __type__    = "hoster" -    __version__ = "0.16" +    __name    = "PremiumizeMe" +    __type    = "hoster" +    __version = "0.16" -    __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate +    __pattern = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate -    __description__ = """Premiumize.me multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Florian Franzen", "FlorianFranzen@gmail.com")] +    __description = """Premiumize.me multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Florian Franzen", "FlorianFranzen@gmail.com")]      def handlePremium(self, pyfile): diff --git a/pyload/plugin/hoster/PromptfileCom.py b/pyload/plugin/hoster/PromptfileCom.py index fb8c907e5..6a2106c35 100644 --- a/pyload/plugin/hoster/PromptfileCom.py +++ b/pyload/plugin/hoster/PromptfileCom.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class PromptfileCom(SimpleHoster): -    __name__    = "PromptfileCom" -    __type__    = "hoster" -    __version__ = "0.13" +    __name    = "PromptfileCom" +    __type    = "hoster" +    __version = "0.13" -    __pattern__ = r'https?://(?:www\.)?promptfile\.com/' +    __pattern = r'https?://(?:www\.)?promptfile\.com/' -    __description__ = """Promptfile.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("igel", "igelkun@myopera.com")] +    __description = """Promptfile.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("igel", "igelkun@myopera.com")]      INFO_PATTERN = r'<span style="[^"]*" title="[^"]*">(?P<N>.*?) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)</span>' diff --git a/pyload/plugin/hoster/PrzeklejPl.py b/pyload/plugin/hoster/PrzeklejPl.py index bfb27834a..6cd33cace 100644 --- a/pyload/plugin/hoster/PrzeklejPl.py +++ b/pyload/plugin/hoster/PrzeklejPl.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class PrzeklejPl(DeadHoster): -    __name__    = "PrzeklejPl" -    __type__    = "hoster" -    __version__ = "0.11" +    __name    = "PrzeklejPl" +    __type    = "hoster" +    __version = "0.11" -    __pattern__ = r'http://(?:www\.)?przeklej\.pl/plik/.+' +    __pattern = r'http://(?:www\.)?przeklej\.pl/plik/.+' -    __description__ = """Przeklej.pl hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Przeklej.pl hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/PutdriveCom.py b/pyload/plugin/hoster/PutdriveCom.py index 562951e81..051da9473 100644 --- a/pyload/plugin/hoster/PutdriveCom.py +++ b/pyload/plugin/hoster/PutdriveCom.py @@ -4,12 +4,12 @@ from pyload.plugin.hoster.ZeveraCom import ZeveraCom  class PutdriveCom(ZeveraCom): -    __name__    = "PutdriveCom" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "PutdriveCom" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'https?://(?:www\.)putdrive\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' +    __pattern = r'https?://(?:www\.)putdrive\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' -    __description__ = """Multihosters.com multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Multihosters.com multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/QuickshareCz.py b/pyload/plugin/hoster/QuickshareCz.py index 9300d230b..be3b78d7d 100644 --- a/pyload/plugin/hoster/QuickshareCz.py +++ b/pyload/plugin/hoster/QuickshareCz.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class QuickshareCz(SimpleHoster): -    __name__    = "QuickshareCz" -    __type__    = "hoster" -    __version__ = "0.56" +    __name    = "QuickshareCz" +    __type    = "hoster" +    __version = "0.56" -    __pattern__ = r'http://(?:[^/]*\.)?quickshare\.cz/stahnout-soubor/.+' +    __pattern = r'http://(?:[^/]*\.)?quickshare\.cz/stahnout-soubor/.+' -    __description__ = """Quickshare.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Quickshare.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN = r'<th width="145px">Název:</th>\s*<td style="word-wrap:break-word;">(?P<N>[^<]+)</td>' diff --git a/pyload/plugin/hoster/RPNetBiz.py b/pyload/plugin/hoster/RPNetBiz.py index af56d8162..7b347abe6 100644 --- a/pyload/plugin/hoster/RPNetBiz.py +++ b/pyload/plugin/hoster/RPNetBiz.py @@ -7,15 +7,15 @@ from pyload.utils import json_loads  class RPNetBiz(MultiHoster): -    __name__    = "RPNetBiz" -    __type__    = "hoster" -    __version__ = "0.14" +    __name    = "RPNetBiz" +    __type    = "hoster" +    __version = "0.14" -    __description__ = """RPNet.biz multi-hoster plugin""" -    __license__     = "GPLv3" +    __description = """RPNet.biz multi-hoster plugin""" +    __license     = "GPLv3" -    __pattern__ = r'https?://.+rpnet\.biz' -    __authors__     = [("Dman", "dmanugm@gmail.com")] +    __pattern = r'https?://.+rpnet\.biz' +    __authors     = [("Dman", "dmanugm@gmail.com")]      def setup(self): diff --git a/pyload/plugin/hoster/RapideoPl.py b/pyload/plugin/hoster/RapideoPl.py index 9e9bbf58b..8457bd91a 100644 --- a/pyload/plugin/hoster/RapideoPl.py +++ b/pyload/plugin/hoster/RapideoPl.py @@ -5,15 +5,15 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class RapideoPl(MultiHoster): -    __name__    = "RapideoPl" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "RapideoPl" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'^unmatchable$' +    __pattern = r'^unmatchable$' -    __description__ = """Rapideo.pl multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("goddie", "dev@rapideo.pl")] +    __description = """Rapideo.pl multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("goddie", "dev@rapideo.pl")]      API_URL = "http://enc.rapideo.pl" @@ -78,7 +78,7 @@ class RapideoPl(MultiHoster):          if "errno" in parsed.keys():              if parsed["errno"] in self.ERROR_CODES:                  # error code in known -                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name__) +                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name)              else:                  # error code isn't yet added to plugin                  self.fail( diff --git a/pyload/plugin/hoster/RapidfileshareNet.py b/pyload/plugin/hoster/RapidfileshareNet.py index 1b1895b39..8252b49e7 100644 --- a/pyload/plugin/hoster/RapidfileshareNet.py +++ b/pyload/plugin/hoster/RapidfileshareNet.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class RapidfileshareNet(XFSHoster): -    __name__    = "RapidfileshareNet" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "RapidfileshareNet" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?rapidfileshare\.net/\w{12}' +    __pattern = r'http://(?:www\.)?rapidfileshare\.net/\w{12}' -    __description__ = """Rapidfileshare.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("guidobelix", "guidobelix@hotmail.it")] +    __description = """Rapidfileshare.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("guidobelix", "guidobelix@hotmail.it")]      NAME_PATTERN = r'<input type="hidden" name="fname" value="(?P<N>.+?)">' diff --git a/pyload/plugin/hoster/RapidgatorNet.py b/pyload/plugin/hoster/RapidgatorNet.py index 8cd883537..b8f840a4a 100644 --- a/pyload/plugin/hoster/RapidgatorNet.py +++ b/pyload/plugin/hoster/RapidgatorNet.py @@ -11,15 +11,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, secondsToMidnight  class RapidgatorNet(SimpleHoster): -    __name__    = "RapidgatorNet" -    __type__    = "hoster" -    __version__ = "0.32" +    __name    = "RapidgatorNet" +    __type    = "hoster" +    __version = "0.32" -    __pattern__ = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+' +    __pattern = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+' -    __description__ = """Rapidgator.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Rapidgator.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("chrox", ""),                         ("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/RapiduNet.py b/pyload/plugin/hoster/RapiduNet.py index 1e12ab776..acf120acf 100644 --- a/pyload/plugin/hoster/RapiduNet.py +++ b/pyload/plugin/hoster/RapiduNet.py @@ -11,15 +11,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class RapiduNet(SimpleHoster): -    __name__    = "RapiduNet" -    __type__    = "hoster" -    __version__ = "0.07" +    __name    = "RapiduNet" +    __type    = "hoster" +    __version = "0.07" -    __pattern__ = r'https?://(?:www\.)?rapidu\.net/(?P<ID>\d{10})' +    __pattern = r'https?://(?:www\.)?rapidu\.net/(?P<ID>\d{10})' -    __description__ = """Rapidu.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("prOq", "")] +    __description = """Rapidu.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("prOq", "")]      COOKIES = [("rapidu.net", "rapidu_lang", "en")] diff --git a/pyload/plugin/hoster/RarefileNet.py b/pyload/plugin/hoster/RarefileNet.py index 1010c92ca..f89708282 100644 --- a/pyload/plugin/hoster/RarefileNet.py +++ b/pyload/plugin/hoster/RarefileNet.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class RarefileNet(XFSHoster): -    __name__    = "RarefileNet" -    __type__    = "hoster" -    __version__ = "0.09" +    __name    = "RarefileNet" +    __type    = "hoster" +    __version = "0.09" -    __pattern__ = r'http://(?:www\.)?rarefile\.net/\w{12}' +    __pattern = r'http://(?:www\.)?rarefile\.net/\w{12}' -    __description__ = """Rarefile.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Rarefile.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      LINK_PATTERN = r'<a href="(.+?)">\1</a>' diff --git a/pyload/plugin/hoster/RealdebridCom.py b/pyload/plugin/hoster/RealdebridCom.py index ae6f69d7c..1d077909c 100644 --- a/pyload/plugin/hoster/RealdebridCom.py +++ b/pyload/plugin/hoster/RealdebridCom.py @@ -12,15 +12,15 @@ from pyload.utils import parseFileSize  class RealdebridCom(MultiHoster): -    __name__    = "RealdebridCom" -    __type__    = "hoster" -    __version__ = "0.64" +    __name    = "RealdebridCom" +    __type    = "hoster" +    __version = "0.64" -    __pattern__ = r'https?://((?:www\.|s\d+\.)?real-debrid\.com/dl/|[\w^_]\.rdb\.so/d/)[\w^_]+' +    __pattern = r'https?://((?:www\.|s\d+\.)?real-debrid\.com/dl/|[\w^_]\.rdb\.so/d/)[\w^_]+' -    __description__ = """Real-Debrid.com multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Devirex Hazzard", "naibaf_11@yahoo.de")] +    __description = """Real-Debrid.com multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]      def getFilename(self, url): diff --git a/pyload/plugin/hoster/RedtubeCom.py b/pyload/plugin/hoster/RedtubeCom.py index 1f18d09c7..4ab976fdd 100644 --- a/pyload/plugin/hoster/RedtubeCom.py +++ b/pyload/plugin/hoster/RedtubeCom.py @@ -7,15 +7,15 @@ from pyload.utils import html_unescape  class RedtubeCom(Hoster): -    __name__    = "RedtubeCom" -    __type__    = "hoster" -    __version__ = "0.20" +    __name    = "RedtubeCom" +    __type    = "hoster" +    __version = "0.20" -    __pattern__ = r'http://(?:www\.)?redtube\.com/\d+' +    __pattern = r'http://(?:www\.)?redtube\.com/\d+' -    __description__ = """Redtube.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.de")] +    __description = """Redtube.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.de")]      def process(self, pyfile): diff --git a/pyload/plugin/hoster/RehostTo.py b/pyload/plugin/hoster/RehostTo.py index 3e3e88c6c..c0f0d7ae4 100644 --- a/pyload/plugin/hoster/RehostTo.py +++ b/pyload/plugin/hoster/RehostTo.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class RehostTo(MultiHoster): -    __name__    = "RehostTo" -    __type__    = "hoster" -    __version__ = "0.21" +    __name    = "RehostTo" +    __type    = "hoster" +    __version = "0.21" -    __pattern__ = r'https?://.*rehost\.to\..+' +    __pattern = r'https?://.*rehost\.to\..+' -    __description__ = """Rehost.com multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org")] +    __description = """Rehost.com multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org")]      def handlePremium(self, pyfile): diff --git a/pyload/plugin/hoster/RemixshareCom.py b/pyload/plugin/hoster/RemixshareCom.py index a1cd2a37e..e45ac8bab 100644 --- a/pyload/plugin/hoster/RemixshareCom.py +++ b/pyload/plugin/hoster/RemixshareCom.py @@ -14,15 +14,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class RemixshareCom(SimpleHoster): -    __name__    = "RemixshareCom" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "RemixshareCom" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'https?://remixshare\.com/(download|dl)/\w+' +    __pattern = r'https?://remixshare\.com/(download|dl)/\w+' -    __description__ = """Remixshare.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"), +    __description = """Remixshare.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/RgHostNet.py b/pyload/plugin/hoster/RgHostNet.py index d9e548721..14d263984 100644 --- a/pyload/plugin/hoster/RgHostNet.py +++ b/pyload/plugin/hoster/RgHostNet.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class RgHostNet(SimpleHoster): -    __name__    = "RgHostNet" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "RgHostNet" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?rghost\.net/\d+(?:r=\d+)?' +    __pattern = r'http://(?:www\.)?rghost\.net/\d+(?:r=\d+)?' -    __description__ = """RgHost.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("z00nx", "z00nx0@gmail.com")] +    __description = """RgHost.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("z00nx", "z00nx0@gmail.com")]      INFO_PATTERN    = r'<h1>\s+(<a[^>]+>)?(?P<N>[^<]+)(</a>)?\s+<small[^>]+>\s+\((?P<S>[^)]+)\)\s+</small>\s+</h1>' diff --git a/pyload/plugin/hoster/SafesharingEu.py b/pyload/plugin/hoster/SafesharingEu.py index af046af62..0676015a2 100644 --- a/pyload/plugin/hoster/SafesharingEu.py +++ b/pyload/plugin/hoster/SafesharingEu.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class SafesharingEu(XFSHoster): -    __name__    = "SafesharingEu" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "SafesharingEu" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'https?://(?:www\.)?safesharing\.eu/\w{12}' +    __pattern = r'https?://(?:www\.)?safesharing\.eu/\w{12}' -    __description__ = """Safesharing.eu hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description = """Safesharing.eu hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]      ERROR_PATTERN = r'(?:<div class="alert alert-danger">)(.+?)(?:</div>)' diff --git a/pyload/plugin/hoster/SecureUploadEu.py b/pyload/plugin/hoster/SecureUploadEu.py index 4db413c90..8cd310c2c 100644 --- a/pyload/plugin/hoster/SecureUploadEu.py +++ b/pyload/plugin/hoster/SecureUploadEu.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class SecureUploadEu(XFSHoster): -    __name__    = "SecureUploadEu" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "SecureUploadEu" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'https?://(?:www\.)?secureupload\.eu/\w{12}' +    __pattern = r'https?://(?:www\.)?secureupload\.eu/\w{12}' -    __description__ = """SecureUpload.eu hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("z00nx", "z00nx0@gmail.com")] +    __description = """SecureUpload.eu hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("z00nx", "z00nx0@gmail.com")]      INFO_PATTERN = r'<h3>Downloading (?P<N>[^<]+) \((?P<S>[^<]+)\)</h3>' diff --git a/pyload/plugin/hoster/SendspaceCom.py b/pyload/plugin/hoster/SendspaceCom.py index 4d477579d..e81d60f74 100644 --- a/pyload/plugin/hoster/SendspaceCom.py +++ b/pyload/plugin/hoster/SendspaceCom.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class SendspaceCom(SimpleHoster): -    __name__    = "SendspaceCom" -    __type__    = "hoster" -    __version__ = "0.17" +    __name    = "SendspaceCom" +    __type    = "hoster" +    __version = "0.17" -    __pattern__ = r'https?://(?:www\.)?sendspace\.com/file/\w+' +    __pattern = r'https?://(?:www\.)?sendspace\.com/file/\w+' -    __description__ = """Sendspace.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Sendspace.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN    = r'<h2 class="bgray">\s*<(?:b|strong)>(?P<N>[^<]+)</' diff --git a/pyload/plugin/hoster/Share4WebCom.py b/pyload/plugin/hoster/Share4WebCom.py index f2b4e49e9..72e3e4a02 100644 --- a/pyload/plugin/hoster/Share4WebCom.py +++ b/pyload/plugin/hoster/Share4WebCom.py @@ -4,15 +4,15 @@ from pyload.plugin.hoster.UnibytesCom import UnibytesCom  class Share4WebCom(UnibytesCom): -    __name__    = "Share4WebCom" -    __type__    = "hoster" -    __version__ = "0.11" +    __name    = "Share4WebCom" +    __type    = "hoster" +    __version = "0.11" -    __pattern__ = r'https?://(?:www\.)?share4web\.com/get/\w+' +    __pattern = r'https?://(?:www\.)?share4web\.com/get/\w+' -    __description__ = """Share4web.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Share4web.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      HOSTER_DOMAIN = "share4web.com" diff --git a/pyload/plugin/hoster/Share76Com.py b/pyload/plugin/hoster/Share76Com.py index d460726f2..66e69a981 100644 --- a/pyload/plugin/hoster/Share76Com.py +++ b/pyload/plugin/hoster/Share76Com.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class Share76Com(DeadHoster): -    __name__    = "Share76Com" -    __type__    = "hoster" -    __version__ = "0.04" +    __name    = "Share76Com" +    __type    = "hoster" +    __version = "0.04" -    __pattern__ = r'http://(?:www\.)?share76\.com/\w{12}' +    __pattern = r'http://(?:www\.)?share76\.com/\w{12}' -    __description__ = """Share76.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [] +    __description = """Share76.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [] diff --git a/pyload/plugin/hoster/ShareFilesCo.py b/pyload/plugin/hoster/ShareFilesCo.py index edd56572e..3217fc6f7 100644 --- a/pyload/plugin/hoster/ShareFilesCo.py +++ b/pyload/plugin/hoster/ShareFilesCo.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class ShareFilesCo(DeadHoster): -    __name__    = "ShareFilesCo" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "ShareFilesCo" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?sharefiles\.co/\w{12}' +    __pattern = r'http://(?:www\.)?sharefiles\.co/\w{12}' -    __description__ = """Sharefiles.co hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Sharefiles.co hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/SharebeesCom.py b/pyload/plugin/hoster/SharebeesCom.py index 54de21095..fbfd45faf 100644 --- a/pyload/plugin/hoster/SharebeesCom.py +++ b/pyload/plugin/hoster/SharebeesCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class SharebeesCom(DeadHoster): -    __name__    = "SharebeesCom" -    __type__    = "hoster" -    __version__ = "0.02" +    __name    = "SharebeesCom" +    __type    = "hoster" +    __version = "0.02" -    __pattern__ = r'http://(?:www\.)?sharebees\.com/\w{12}' +    __pattern = r'http://(?:www\.)?sharebees\.com/\w{12}' -    __description__ = """ShareBees hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """ShareBees hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/ShareonlineBiz.py b/pyload/plugin/hoster/ShareonlineBiz.py index f3be1aeb2..2c9fb3807 100644 --- a/pyload/plugin/hoster/ShareonlineBiz.py +++ b/pyload/plugin/hoster/ShareonlineBiz.py @@ -12,21 +12,21 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class ShareonlineBiz(SimpleHoster): -    __name__    = "ShareonlineBiz" -    __type__    = "hoster" -    __version__ = "0.48" +    __name    = "ShareonlineBiz" +    __type    = "hoster" +    __version = "0.48" -    __pattern__ = r'https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download\.php\?id=|dl/)(?P<ID>\w+)' +    __pattern = r'https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download\.php\?id=|dl/)(?P<ID>\w+)' -    __description__ = """Shareonline.biz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("spoob", "spoob@pyload.org"), +    __description = """Shareonline.biz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("spoob", "spoob@pyload.org"),                         ("mkaay", "mkaay@mkaay.de"),                         ("zoidberg", "zoidberg@mujmail.cz"),                         ("Walter Purcaro", "vuolter@gmail.com")] -    URL_REPLACEMENTS = [(__pattern__ + ".*", "http://www.share-online.biz/dl/\g<ID>")] +    URL_REPLACEMENTS = [(__pattern + ".*", "http://www.share-online.biz/dl/\g<ID>")]      CHECK_TRAFFIC = True @@ -40,7 +40,7 @@ class ShareonlineBiz(SimpleHoster):          info = {'name': urlparse(unquote(url)).path.split('/')[-1] or _("Unknown"), 'size': 0, 'status': 3 if url else 1, 'url': url}          if url: -            info['pattern'] = re.match(cls.__pattern__, url).groupdict() +            info['pattern'] = re.match(cls.__pattern, url).groupdict()              field = getURL("http://api.share-online.biz/linkcheck.php",                             get={'md5': "1"}, diff --git a/pyload/plugin/hoster/ShareplaceCom.py b/pyload/plugin/hoster/ShareplaceCom.py index 61e0f8723..5fa6ce4c1 100644 --- a/pyload/plugin/hoster/ShareplaceCom.py +++ b/pyload/plugin/hoster/ShareplaceCom.py @@ -8,15 +8,15 @@ from pyload.plugin.Hoster import Hoster  class ShareplaceCom(Hoster): -    __name__    = "ShareplaceCom" -    __type__    = "hoster" -    __version__ = "0.12" +    __name    = "ShareplaceCom" +    __type    = "hoster" +    __version = "0.12" -    __pattern__ = r'http://(?:www\.)?shareplace\.(com|org)/\?\w+' +    __pattern = r'http://(?:www\.)?shareplace\.(com|org)/\?\w+' -    __description__ = """Shareplace.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("ACCakut", "")] +    __description = """Shareplace.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("ACCakut", "")]      def process(self, pyfile): diff --git a/pyload/plugin/hoster/SharingmatrixCom.py b/pyload/plugin/hoster/SharingmatrixCom.py index d1892be14..26b700ab3 100644 --- a/pyload/plugin/hoster/SharingmatrixCom.py +++ b/pyload/plugin/hoster/SharingmatrixCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class SharingmatrixCom(DeadHoster): -    __name__    = "SharingmatrixCom" -    __type__    = "hoster" -    __version__ = "0.01" +    __name    = "SharingmatrixCom" +    __type    = "hoster" +    __version = "0.01" -    __pattern__ = r'http://(?:www\.)?sharingmatrix\.com/file/\w+' +    __pattern = r'http://(?:www\.)?sharingmatrix\.com/file/\w+' -    __description__ = """Sharingmatrix.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.de"), +    __description = """Sharingmatrix.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.de"),                         ("paulking", "")] diff --git a/pyload/plugin/hoster/ShragleCom.py b/pyload/plugin/hoster/ShragleCom.py index 628537108..7c7762d1a 100644 --- a/pyload/plugin/hoster/ShragleCom.py +++ b/pyload/plugin/hoster/ShragleCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class ShragleCom(DeadHoster): -    __name__    = "ShragleCom" -    __type__    = "hoster" -    __version__ = "0.22" +    __name    = "ShragleCom" +    __type    = "hoster" +    __version = "0.22" -    __pattern__ = r'http://(?:www\.)?(cloudnator|shragle)\.com/files/(?P<ID>.+?)/' +    __pattern = r'http://(?:www\.)?(cloudnator|shragle)\.com/files/(?P<ID>.+?)/' -    __description__ = """Cloudnator.com (Shragle.com) hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Cloudnator.com (Shragle.com) hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/SimplyPremiumCom.py b/pyload/plugin/hoster/SimplyPremiumCom.py index 50b278985..e065314d6 100644 --- a/pyload/plugin/hoster/SimplyPremiumCom.py +++ b/pyload/plugin/hoster/SimplyPremiumCom.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import secondsToMidnight  class SimplyPremiumCom(MultiHoster): -    __name__    = "SimplyPremiumCom" -    __type__    = "hoster" -    __version__ = "0.08" +    __name    = "SimplyPremiumCom" +    __type    = "hoster" +    __version = "0.08" -    __pattern__ = r'https?://.+simply-premium\.com' +    __pattern = r'https?://.+simply-premium\.com' -    __description__ = """Simply-Premium.com multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("EvolutionClip", "evolutionclip@live.de")] +    __description = """Simply-Premium.com multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("EvolutionClip", "evolutionclip@live.de")]      def setup(self): diff --git a/pyload/plugin/hoster/SimplydebridCom.py b/pyload/plugin/hoster/SimplydebridCom.py index 4b740ff20..9fde50821 100644 --- a/pyload/plugin/hoster/SimplydebridCom.py +++ b/pyload/plugin/hoster/SimplydebridCom.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.MultiHoster import MultiHoster, replace_patterns  class SimplydebridCom(MultiHoster): -    __name__    = "SimplydebridCom" -    __type__    = "hoster" -    __version__ = "0.15" +    __name    = "SimplydebridCom" +    __type    = "hoster" +    __version = "0.15" -    __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd\.php' +    __pattern = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd\.php' -    __description__ = """Simply-debrid.com multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")] +    __description = """Simply-debrid.com multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")]      def handlePremium(self, pyfile): diff --git a/pyload/plugin/hoster/SmoozedCom.py b/pyload/plugin/hoster/SmoozedCom.py index 715d99b40..9f60c4b53 100644 --- a/pyload/plugin/hoster/SmoozedCom.py +++ b/pyload/plugin/hoster/SmoozedCom.py @@ -5,15 +5,15 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class SmoozedCom(MultiHoster): -    __name__    = "SmoozedCom" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "SmoozedCom" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate +    __pattern = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate -    __description__ = """Smoozed.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("", "")] +    __description = """Smoozed.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("", "")]      def handlePremium(self, pyfile): diff --git a/pyload/plugin/hoster/SockshareCom.py b/pyload/plugin/hoster/SockshareCom.py index e903e3daf..d6d7fcf14 100644 --- a/pyload/plugin/hoster/SockshareCom.py +++ b/pyload/plugin/hoster/SockshareCom.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class SockshareCom(DeadHoster): -    __name__    = "SockshareCom" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "SockshareCom" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'http://(?:www\.)?sockshare\.com/(mobile/)?(file|embed)/(?P<ID>\w+)' +    __pattern = r'http://(?:www\.)?sockshare\.com/(mobile/)?(file|embed)/(?P<ID>\w+)' -    __description__ = """Sockshare.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.de"), +    __description = """Sockshare.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.de"),                         ("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/SoundcloudCom.py b/pyload/plugin/hoster/SoundcloudCom.py index fd5d1ea6c..7ab51ca5e 100644 --- a/pyload/plugin/hoster/SoundcloudCom.py +++ b/pyload/plugin/hoster/SoundcloudCom.py @@ -7,15 +7,15 @@ from pyload.plugin.Hoster import Hoster  class SoundcloudCom(Hoster): -    __name__    = "SoundcloudCom" -    __type__    = "hoster" -    __version__ = "0.10" +    __name    = "SoundcloudCom" +    __type    = "hoster" +    __version = "0.10" -    __pattern__ = r'https?://(?:www\.)?soundcloud\.com/(?P<UID>.+?)/(?P<SID>.+)' +    __pattern = r'https?://(?:www\.)?soundcloud\.com/(?P<UID>.+?)/(?P<SID>.+)' -    __description__ = """SoundCloud.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Peekayy", "peekayy.dev@gmail.com")] +    __description = """SoundCloud.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Peekayy", "peekayy.dev@gmail.com")]      def process(self, pyfile): @@ -41,7 +41,7 @@ class SoundcloudCom(Hoster):              if m:                  pyfile.name = m.group('TITLE') + ".mp3"              else: -                pyfile.name = re.match(self.__pattern__, pyfile.url).group('SID') + ".mp3" +                pyfile.name = re.match(self.__pattern, pyfile.url).group('SID') + ".mp3"              # url to retrieve the actual song url              self.html = self.load("https://api.sndcdn.com/i1/tracks/%s/streams" % songId, get={"client_id": clientId}) diff --git a/pyload/plugin/hoster/SpeedLoadOrg.py b/pyload/plugin/hoster/SpeedLoadOrg.py index a20f87902..02d58ae2e 100644 --- a/pyload/plugin/hoster/SpeedLoadOrg.py +++ b/pyload/plugin/hoster/SpeedLoadOrg.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class SpeedLoadOrg(DeadHoster): -    __name__    = "SpeedLoadOrg" -    __type__    = "hoster" -    __version__ = "1.02" +    __name    = "SpeedLoadOrg" +    __type    = "hoster" +    __version = "1.02" -    __pattern__ = r'http://(?:www\.)?speedload\.org/(?P<ID>\w+)' +    __pattern = r'http://(?:www\.)?speedload\.org/(?P<ID>\w+)' -    __description__ = """Speedload.org hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Speedload.org hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/SpeedfileCz.py b/pyload/plugin/hoster/SpeedfileCz.py index 981ba861d..15299ade4 100644 --- a/pyload/plugin/hoster/SpeedfileCz.py +++ b/pyload/plugin/hoster/SpeedfileCz.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class SpeedfileCz(DeadHoster): -    __name__    = "SpeedFileCz" -    __type__    = "hoster" -    __version__ = "0.32" +    __name    = "SpeedFileCz" +    __type    = "hoster" +    __version = "0.32" -    __pattern__ = r'http://(?:www\.)?speedfile\.cz/.+' +    __pattern = r'http://(?:www\.)?speedfile\.cz/.+' -    __description__ = """Speedfile.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Speedfile.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/SpeedyshareCom.py b/pyload/plugin/hoster/SpeedyshareCom.py index c92522d70..ea42f4592 100644 --- a/pyload/plugin/hoster/SpeedyshareCom.py +++ b/pyload/plugin/hoster/SpeedyshareCom.py @@ -11,15 +11,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class SpeedyshareCom(SimpleHoster): -    __name__    = "SpeedyshareCom" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "SpeedyshareCom" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+' +    __pattern = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+' -    __description__ = """Speedyshare.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description = """Speedyshare.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]      NAME_PATTERN = r'class=downloadfilename>(?P<N>.*)</span></td>' diff --git a/pyload/plugin/hoster/StorageTo.py b/pyload/plugin/hoster/StorageTo.py index 78b9a60bb..f910dc8bb 100644 --- a/pyload/plugin/hoster/StorageTo.py +++ b/pyload/plugin/hoster/StorageTo.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class StorageTo(DeadHoster): -    __name__    = "StorageTo" -    __type__    = "hoster" -    __version__ = "0.01" +    __name    = "StorageTo" +    __type    = "hoster" +    __version = "0.01" -    __pattern__ = r'http://(?:www\.)?storage\.to/get/.+' +    __pattern = r'http://(?:www\.)?storage\.to/get/.+' -    __description__ = """Storage.to hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mkaay", "mkaay@mkaay.de")] +    __description = """Storage.to hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("mkaay", "mkaay@mkaay.de")] diff --git a/pyload/plugin/hoster/StreamCz.py b/pyload/plugin/hoster/StreamCz.py index 95e69abf4..b0fb2cfe9 100644 --- a/pyload/plugin/hoster/StreamCz.py +++ b/pyload/plugin/hoster/StreamCz.py @@ -21,15 +21,15 @@ def getInfo(urls):  class StreamCz(Hoster): -    __name__    = "StreamCz" -    __type__    = "hoster" -    __version__ = "0.20" +    __name    = "StreamCz" +    __type    = "hoster" +    __version = "0.20" -    __pattern__ = r'https?://(?:www\.)?stream\.cz/[^/]+/\d+' +    __pattern = r'https?://(?:www\.)?stream\.cz/[^/]+/\d+' -    __description__ = """Stream.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Stream.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN = r'<link rel="video_src" href="http://www\.stream\.cz/\w+/(\d+)-([^"]+)" />' diff --git a/pyload/plugin/hoster/StreamcloudEu.py b/pyload/plugin/hoster/StreamcloudEu.py index 01e334491..cdf244539 100644 --- a/pyload/plugin/hoster/StreamcloudEu.py +++ b/pyload/plugin/hoster/StreamcloudEu.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class StreamcloudEu(XFSHoster): -    __name__    = "StreamcloudEu" -    __type__    = "hoster" -    __version__ = "0.10" +    __name    = "StreamcloudEu" +    __type    = "hoster" +    __version = "0.10" -    __pattern__ = r'http://(?:www\.)?streamcloud\.eu/\w{12}' +    __pattern = r'http://(?:www\.)?streamcloud\.eu/\w{12}' -    __description__ = """Streamcloud.eu hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("seoester", "seoester@googlemail.com")] +    __description = """Streamcloud.eu hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("seoester", "seoester@googlemail.com")]      WAIT_PATTERN = r'var count = (\d+)' diff --git a/pyload/plugin/hoster/TurbobitNet.py b/pyload/plugin/hoster/TurbobitNet.py index c69158c39..a7c5b2502 100644 --- a/pyload/plugin/hoster/TurbobitNet.py +++ b/pyload/plugin/hoster/TurbobitNet.py @@ -15,19 +15,19 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, timestamp  class TurbobitNet(SimpleHoster): -    __name__    = "TurbobitNet" -    __type__    = "hoster" -    __version__ = "0.19" +    __name    = "TurbobitNet" +    __type    = "hoster" +    __version = "0.19" -    __pattern__ = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)' +    __pattern = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)' -    __description__ = """Turbobit.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Turbobit.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("prOq", "")] -    URL_REPLACEMENTS = [(__pattern__ + ".*", "http://turbobit.net/\g<ID>.html")] +    URL_REPLACEMENTS = [(__pattern + ".*", "http://turbobit.net/\g<ID>.html")]      COOKIES = [("turbobit.net", "user_lang", "en")] @@ -98,7 +98,7 @@ class TurbobitNet(SimpleHoster):      def getRtUpdate(self):          rtUpdate = self.getStorage("rtUpdate")          if not rtUpdate: -            if self.getStorage("version") != self.__version__ \ +            if self.getStorage("version") != self.__version \                 or int(self.getStorage("timestamp", 0)) + 86400000 < timestamp():                  # that's right, we are even using jdownloader updates                  rtUpdate = getURL("http://update0.jdownloader.org/pluginstuff/tbupdate.js") @@ -110,7 +110,7 @@ class TurbobitNet(SimpleHoster):                  self.setStorage("rtUpdate", rtUpdate)                  self.setStorage("timestamp", timestamp()) -                self.setStorage("version", self.__version__) +                self.setStorage("version", self.__version)              else:                  self.logError(_("Unable to download, wait for update..."))                  self.tempOffline() diff --git a/pyload/plugin/hoster/TurbouploadCom.py b/pyload/plugin/hoster/TurbouploadCom.py index e964d1365..38beae4c3 100644 --- a/pyload/plugin/hoster/TurbouploadCom.py +++ b/pyload/plugin/hoster/TurbouploadCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class TurbouploadCom(DeadHoster): -    __name__    = "TurbouploadCom" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "TurbouploadCom" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?turboupload\.com/(\w+)' +    __pattern = r'http://(?:www\.)?turboupload\.com/(\w+)' -    __description__ = """Turboupload.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Turboupload.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/TusfilesNet.py b/pyload/plugin/hoster/TusfilesNet.py index 20a948925..d13938586 100644 --- a/pyload/plugin/hoster/TusfilesNet.py +++ b/pyload/plugin/hoster/TusfilesNet.py @@ -5,15 +5,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class TusfilesNet(XFSHoster): -    __name__    = "TusfilesNet" -    __type__    = "hoster" -    __version__ = "0.09" +    __name    = "TusfilesNet" +    __type    = "hoster" +    __version = "0.09" -    __pattern__ = r'https?://(?:www\.)?tusfiles\.net/\w{12}' +    __pattern = r'https?://(?:www\.)?tusfiles\.net/\w{12}' -    __description__ = """Tusfiles.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"), +    __description = """Tusfiles.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com"),                         ("guidobelix", "guidobelix@hotmail.it")] diff --git a/pyload/plugin/hoster/TwoSharedCom.py b/pyload/plugin/hoster/TwoSharedCom.py index 8c6864414..24c707e93 100644 --- a/pyload/plugin/hoster/TwoSharedCom.py +++ b/pyload/plugin/hoster/TwoSharedCom.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class TwoSharedCom(SimpleHoster): -    __name__    = "TwoSharedCom" -    __type__    = "hoster" -    __version__ = "0.13" +    __name    = "TwoSharedCom" +    __type    = "hoster" +    __version = "0.13" -    __pattern__ = r'http://(?:www\.)?2shared\.com/(account/)?(download|get|file|document|photo|video|audio)/.+' +    __pattern = r'http://(?:www\.)?2shared\.com/(account/)?(download|get|file|document|photo|video|audio)/.+' -    __description__ = """2Shared.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """2Shared.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN    = r'<h1>(?P<N>.*)</h1>' diff --git a/pyload/plugin/hoster/UlozTo.py b/pyload/plugin/hoster/UlozTo.py index 0e4156ad0..17f04acd1 100644 --- a/pyload/plugin/hoster/UlozTo.py +++ b/pyload/plugin/hoster/UlozTo.py @@ -13,15 +13,15 @@ def convertDecimalPrefix(m):  class UlozTo(SimpleHoster): -    __name__    = "UlozTo" -    __type__    = "hoster" -    __version__ = "1.04" +    __name    = "UlozTo" +    __type    = "hoster" +    __version = "1.04" -    __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(?:live/)?(?P<ID>\w+/[^/?]*)' +    __pattern = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(?:live/)?(?P<ID>\w+/[^/?]*)' -    __description__ = """Uloz.to hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Uloz.to hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      INFO_PATTERN    = r'<p>File <strong>(?P<N>[^<]+)</strong> is password protected</p>' diff --git a/pyload/plugin/hoster/UloziskoSk.py b/pyload/plugin/hoster/UloziskoSk.py index ce40c9f7a..4b40c080c 100644 --- a/pyload/plugin/hoster/UloziskoSk.py +++ b/pyload/plugin/hoster/UloziskoSk.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class UloziskoSk(SimpleHoster): -    __name__    = "UloziskoSk" -    __type__    = "hoster" -    __version__ = "0.25" +    __name    = "UloziskoSk" +    __type    = "hoster" +    __version = "0.25" -    __pattern__ = r'http://(?:www\.)?ulozisko\.sk/.+' +    __pattern = r'http://(?:www\.)?ulozisko\.sk/.+' -    __description__ = """Ulozisko.sk hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Ulozisko.sk hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN = r'<div class="down1">(?P<N>[^<]+)</div>' diff --git a/pyload/plugin/hoster/UnibytesCom.py b/pyload/plugin/hoster/UnibytesCom.py index 2c9b9ca5f..ad38f6517 100644 --- a/pyload/plugin/hoster/UnibytesCom.py +++ b/pyload/plugin/hoster/UnibytesCom.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class UnibytesCom(SimpleHoster): -    __name__    = "UnibytesCom" -    __type__    = "hoster" -    __version__ = "0.12" +    __name    = "UnibytesCom" +    __type    = "hoster" +    __version = "0.12" -    __pattern__ = r'https?://(?:www\.)?unibytes\.com/[\w .-]{11}B' +    __pattern = r'https?://(?:www\.)?unibytes\.com/[\w .-]{11}B' -    __description__ = """UniBytes.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """UniBytes.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      HOSTER_DOMAIN = "unibytes.com" diff --git a/pyload/plugin/hoster/UnrestrictLi.py b/pyload/plugin/hoster/UnrestrictLi.py index c81bb0554..973afcac3 100644 --- a/pyload/plugin/hoster/UnrestrictLi.py +++ b/pyload/plugin/hoster/UnrestrictLi.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import secondsToMidnight  class UnrestrictLi(MultiHoster): -    __name__    = "UnrestrictLi" -    __type__    = "hoster" -    __version__ = "0.21" +    __name    = "UnrestrictLi" +    __type    = "hoster" +    __version = "0.21" -    __pattern__ = r'https?://(?:www\.)?(unrestrict|unr)\.li/dl/[\w^_]+' +    __pattern = r'https?://(?:www\.)?(unrestrict|unr)\.li/dl/[\w^_]+' -    __description__ = """Unrestrict.li multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Unrestrict.li multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      LOGIN_ACCOUNT = False diff --git a/pyload/plugin/hoster/UpleaCom.py b/pyload/plugin/hoster/UpleaCom.py index 855d9ed65..46462e94a 100644 --- a/pyload/plugin/hoster/UpleaCom.py +++ b/pyload/plugin/hoster/UpleaCom.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class UpleaCom(XFSHoster): -    __name__    = "UpleaCom" -    __type__    = "hoster" -    __version__ = "0.06" +    __name    = "UpleaCom" +    __type    = "hoster" +    __version = "0.06" -    __pattern__ = r'https?://(?:www\.)?uplea\.com/dl/\w{15}' +    __pattern = r'https?://(?:www\.)?uplea\.com/dl/\w{15}' -    __description__ = """Uplea.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Redleon", "")] +    __description = """Uplea.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Redleon", "")]      NAME_PATTERN = r'class="agmd size18">(?P<N>.+?)<' diff --git a/pyload/plugin/hoster/UploadStationCom.py b/pyload/plugin/hoster/UploadStationCom.py index d77bdb760..d41eb60ea 100644 --- a/pyload/plugin/hoster/UploadStationCom.py +++ b/pyload/plugin/hoster/UploadStationCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class UploadStationCom(DeadHoster): -    __name__    = "UploadStationCom" -    __type__    = "hoster" -    __version__ = "0.52" +    __name    = "UploadStationCom" +    __type    = "hoster" +    __version = "0.52" -    __pattern__ = r'http://(?:www\.)?uploadstation\.com/file/(?P<ID>\w+)' +    __pattern = r'http://(?:www\.)?uploadstation\.com/file/(?P<ID>\w+)' -    __description__ = """UploadStation.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es"), +    __description = """UploadStation.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),                         ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/UploadableCh.py b/pyload/plugin/hoster/UploadableCh.py index c54ecb495..54f80f8a2 100644 --- a/pyload/plugin/hoster/UploadableCh.py +++ b/pyload/plugin/hoster/UploadableCh.py @@ -9,19 +9,19 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class UploadableCh(SimpleHoster): -    __name__    = "UploadableCh" -    __type__    = "hoster" -    __version__ = "0.08" +    __name    = "UploadableCh" +    __type    = "hoster" +    __version = "0.08" -    __pattern__ = r'http://(?:www\.)?uploadable\.ch/file/(?P<ID>\w+)' +    __pattern = r'http://(?:www\.)?uploadable\.ch/file/(?P<ID>\w+)' -    __description__ = """Uploadable.ch hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"), +    __description = """Uploadable.ch hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de"),                         ("Walter Purcaro", "vuolter@gmail.com")] -    URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://www.uploadable.ch/file/\g<ID>')] +    URL_REPLACEMENTS = [(__pattern + ".*", r'http://www.uploadable.ch/file/\g<ID>')]      INFO_PATTERN = r'div id=\"file_name\" title=.*>(?P<N>.+)<span class=\"filename_normal\">\((?P<S>[\d.]+) (?P<U>\w+)\)</span><' diff --git a/pyload/plugin/hoster/UploadboxCom.py b/pyload/plugin/hoster/UploadboxCom.py index 01e4c6854..96c531633 100644 --- a/pyload/plugin/hoster/UploadboxCom.py +++ b/pyload/plugin/hoster/UploadboxCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class UploadboxCom(DeadHoster): -    __name__    = "Uploadbox" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "Uploadbox" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'http://(?:www\.)?uploadbox\.com/files/.+' +    __pattern = r'http://(?:www\.)?uploadbox\.com/files/.+' -    __description__ = """UploadBox.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """UploadBox.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/UploadedTo.py b/pyload/plugin/hoster/UploadedTo.py index f9b121bfe..a008819fb 100644 --- a/pyload/plugin/hoster/UploadedTo.py +++ b/pyload/plugin/hoster/UploadedTo.py @@ -10,20 +10,20 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class UploadedTo(SimpleHoster): -    __name__    = "UploadedTo" -    __type__    = "hoster" -    __version__ = "0.84" +    __name    = "UploadedTo" +    __type    = "hoster" +    __version = "0.84" -    __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' +    __pattern = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' -    __description__ = """Uploaded.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Uploaded.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      API_KEY = "lhF2IeeprweDfu9ccWlxXVVypA5nA3EL" -    URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://uploaded.net/file/\g<ID>')] +    URL_REPLACEMENTS = [(__pattern + ".*", r'http://uploaded.net/file/\g<ID>')]      LINK_PREMIUM_PATTERN = r'<div class="tfree".*\s*<form method="post" action="(.+?)"' @@ -37,7 +37,7 @@ class UploadedTo(SimpleHoster):          for _i in xrange(5):              html = getURL("http://uploaded.net/api/filemultiple", -                          get={"apikey": cls.API_KEY, 'id_0': re.match(cls.__pattern__, url).group('ID')}, +                          get={"apikey": cls.API_KEY, 'id_0': re.match(cls.__pattern, url).group('ID')},                            decode=True)              if html != "can't find request": diff --git a/pyload/plugin/hoster/UploadhereCom.py b/pyload/plugin/hoster/UploadhereCom.py index 77970a97b..3eea93cb9 100644 --- a/pyload/plugin/hoster/UploadhereCom.py +++ b/pyload/plugin/hoster/UploadhereCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class UploadhereCom(DeadHoster): -    __name__    = "UploadhereCom" -    __type__    = "hoster" -    __version__ = "0.12" +    __name    = "UploadhereCom" +    __type    = "hoster" +    __version = "0.12" -    __pattern__ = r'http://(?:www\.)?uploadhere\.com/\w{10}' +    __pattern = r'http://(?:www\.)?uploadhere\.com/\w{10}' -    __description__ = """Uploadhere.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Uploadhere.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/UploadheroCom.py b/pyload/plugin/hoster/UploadheroCom.py index 917053f18..a756fe6e2 100644 --- a/pyload/plugin/hoster/UploadheroCom.py +++ b/pyload/plugin/hoster/UploadheroCom.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class UploadheroCom(SimpleHoster): -    __name__    = "UploadheroCom" -    __type__    = "hoster" -    __version__ = "0.17" +    __name    = "UploadheroCom" +    __type    = "hoster" +    __version = "0.17" -    __pattern__ = r'http://(?:www\.)?uploadhero\.com?/dl/\w+' +    __pattern = r'http://(?:www\.)?uploadhero\.com?/dl/\w+' -    __description__ = """UploadHero.co plugin""" -    __license__     = "GPLv3" -    __authors__     = [("mcmyst", "mcmyst@hotmail.fr"), +    __description = """UploadHero.co plugin""" +    __license     = "GPLv3" +    __authors     = [("mcmyst", "mcmyst@hotmail.fr"),                         ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/UploadingCom.py b/pyload/plugin/hoster/UploadingCom.py index 461b0113a..db719ee4c 100644 --- a/pyload/plugin/hoster/UploadingCom.py +++ b/pyload/plugin/hoster/UploadingCom.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, timestamp  class UploadingCom(SimpleHoster): -    __name__    = "UploadingCom" -    __type__    = "hoster" -    __version__ = "0.40" +    __name    = "UploadingCom" +    __type    = "hoster" +    __version = "0.40" -    __pattern__ = r'http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>\w+)' +    __pattern = r'http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>\w+)' -    __description__ = """Uploading.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.de"), +    __description = """Uploading.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.de"),                         ("mkaay", "mkaay@mkaay.de"),                         ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/UploadkingCom.py b/pyload/plugin/hoster/UploadkingCom.py index 6f4374096..707ab6b40 100644 --- a/pyload/plugin/hoster/UploadkingCom.py +++ b/pyload/plugin/hoster/UploadkingCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class UploadkingCom(DeadHoster): -    __name__    = "UploadkingCom" -    __type__    = "hoster" -    __version__ = "0.14" +    __name    = "UploadkingCom" +    __type    = "hoster" +    __version = "0.14" -    __pattern__ = r'http://(?:www\.)?uploadking\.com/\w{10}' +    __pattern = r'http://(?:www\.)?uploadking\.com/\w{10}' -    __description__ = """UploadKing.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """UploadKing.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/UpstoreNet.py b/pyload/plugin/hoster/UpstoreNet.py index 98e5c0d64..7c549077d 100644 --- a/pyload/plugin/hoster/UpstoreNet.py +++ b/pyload/plugin/hoster/UpstoreNet.py @@ -7,15 +7,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class UpstoreNet(SimpleHoster): -    __name__    = "UpstoreNet" -    __type__    = "hoster" -    __version__ = "0.05" +    __name    = "UpstoreNet" +    __type    = "hoster" +    __version = "0.05" -    __pattern__ = r'https?://(?:www\.)?upstore\.net/' +    __pattern = r'https?://(?:www\.)?upstore\.net/' -    __description__ = """Upstore.Net File Download Hoster""" -    __license__     = "GPLv3" -    __authors__     = [("igel", "igelkun@myopera.com")] +    __description = """Upstore.Net File Download Hoster""" +    __license     = "GPLv3" +    __authors     = [("igel", "igelkun@myopera.com")]      INFO_PATTERN = r'<div class="comment">.*?</div>\s*\n<h2 style="margin:0">(?P<N>.*?)</h2>\s*\n<div class="comment">\s*\n\s*(?P<S>[\d.,]+) (?P<U>[\w^_]+)' diff --git a/pyload/plugin/hoster/UptoboxCom.py b/pyload/plugin/hoster/UptoboxCom.py index da93b3c6b..628e31d76 100644 --- a/pyload/plugin/hoster/UptoboxCom.py +++ b/pyload/plugin/hoster/UptoboxCom.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class UptoboxCom(XFSHoster): -    __name__    = "UptoboxCom" -    __type__    = "hoster" -    __version__ = "0.17" +    __name    = "UptoboxCom" +    __type    = "hoster" +    __version = "0.17" -    __pattern__ = r'https?://(?:www\.)?(uptobox|uptostream)\.com/\w{12}' +    __pattern = r'https?://(?:www\.)?(uptobox|uptostream)\.com/\w{12}' -    __description__ = """Uptobox.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Uptobox.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      INFO_PATTERN    = r'"para_title">(?P<N>.+) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)' diff --git a/pyload/plugin/hoster/VeehdCom.py b/pyload/plugin/hoster/VeehdCom.py index 91d7cc443..30a89f0a8 100644 --- a/pyload/plugin/hoster/VeehdCom.py +++ b/pyload/plugin/hoster/VeehdCom.py @@ -6,17 +6,17 @@ from pyload.plugin.Hoster import Hoster  class VeehdCom(Hoster): -    __name__    = "VeehdCom" -    __type__    = "hoster" -    __version__ = "0.23" +    __name    = "VeehdCom" +    __type    = "hoster" +    __version = "0.23" -    __pattern__ = r'http://veehd\.com/video/\d+_\S+' -    __config__ = [("filename_spaces", "bool", "Allow spaces in filename", False), +    __pattern = r'http://veehd\.com/video/\d+_\S+' +    __config = [("filename_spaces", "bool", "Allow spaces in filename", False),                  ("replacement_char", "str", "Filename replacement character", "_")] -    __description__ = """Veehd.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("cat", "cat@pyload")] +    __description = """Veehd.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("cat", "cat@pyload")]      def setup(self): diff --git a/pyload/plugin/hoster/VeohCom.py b/pyload/plugin/hoster/VeohCom.py index a4394736d..89dd0fe0b 100644 --- a/pyload/plugin/hoster/VeohCom.py +++ b/pyload/plugin/hoster/VeohCom.py @@ -6,22 +6,22 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class VeohCom(SimpleHoster): -    __name__    = "VeohCom" -    __type__    = "hoster" -    __version__ = "0.22" +    __name    = "VeohCom" +    __type    = "hoster" +    __version = "0.22" -    __pattern__ = r'http://(?:www\.)?veoh\.com/(tv/)?(watch|videos)/(?P<ID>v\w+)' -    __config__ = [("quality", "Low;High;Auto", "Quality", "Auto")] +    __pattern = r'http://(?:www\.)?veoh\.com/(tv/)?(watch|videos)/(?P<ID>v\w+)' +    __config = [("quality", "Low;High;Auto", "Quality", "Auto")] -    __description__ = """Veoh.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Veoh.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      NAME_PATTERN    = r'<meta name="title" content="(?P<N>.*?)"'      OFFLINE_PATTERN = r'>Sorry, we couldn\'t find the video you were looking for' -    URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://www.veoh.com/watch/\g<ID>')] +    URL_REPLACEMENTS = [(__pattern + ".*", r'http://www.veoh.com/watch/\g<ID>')]      COOKIES = [("veoh.com", "lassieLocale", "en")] diff --git a/pyload/plugin/hoster/VidPlayNet.py b/pyload/plugin/hoster/VidPlayNet.py index 094da09bd..ab571f9ea 100644 --- a/pyload/plugin/hoster/VidPlayNet.py +++ b/pyload/plugin/hoster/VidPlayNet.py @@ -7,15 +7,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class VidPlayNet(XFSHoster): -    __name__    = "VidPlayNet" -    __type__    = "hoster" -    __version__ = "0.04" +    __name    = "VidPlayNet" +    __type    = "hoster" +    __version = "0.04" -    __pattern__ = r'https?://(?:www\.)?vidplay\.net/\w{12}' +    __pattern = r'https?://(?:www\.)?vidplay\.net/\w{12}' -    __description__ = """VidPlay.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] +    __description = """VidPlay.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]      NAME_PATTERN = r'<b>Password:</b></div>\s*<h[1-6]>(?P<N>[^<]+)</h[1-6]>' diff --git a/pyload/plugin/hoster/VimeoCom.py b/pyload/plugin/hoster/VimeoCom.py index c48ad3414..a72333b96 100644 --- a/pyload/plugin/hoster/VimeoCom.py +++ b/pyload/plugin/hoster/VimeoCom.py @@ -6,24 +6,24 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class VimeoCom(SimpleHoster): -    __name__    = "VimeoCom" -    __type__    = "hoster" -    __version__ = "0.04" +    __name    = "VimeoCom" +    __type    = "hoster" +    __version = "0.04" -    __pattern__ = r'https?://(?:www\.)?(player\.)?vimeo\.com/(video/)?(?P<ID>\d+)' -    __config__ = [("quality", "Lowest;Mobile;SD;HD;Highest", "Quality", "Highest"), +    __pattern = r'https?://(?:www\.)?(player\.)?vimeo\.com/(video/)?(?P<ID>\d+)' +    __config = [("quality", "Lowest;Mobile;SD;HD;Highest", "Quality", "Highest"),                  ("original", "bool", "Try to download the original file first", True)] -    __description__ = """Vimeo.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Vimeo.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      NAME_PATTERN         = r'<title>(?P<N>.+) on Vimeo<'      OFFLINE_PATTERN      = r'class="exception_header"'      TEMP_OFFLINE_PATTERN = r'Please try again in a few minutes.<' -    URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.vimeo.com/\g<ID>')] +    URL_REPLACEMENTS = [(__pattern + ".*", r'https://www.vimeo.com/\g<ID>')]      COOKIES = [("vimeo.com", "language", "en")] diff --git a/pyload/plugin/hoster/Vipleech4UCom.py b/pyload/plugin/hoster/Vipleech4UCom.py index 100def197..e3b7dd06b 100644 --- a/pyload/plugin/hoster/Vipleech4UCom.py +++ b/pyload/plugin/hoster/Vipleech4UCom.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class Vipleech4UCom(DeadHoster): -    __name__    = "Vipleech4UCom" -    __type__    = "hoster" -    __version__ = "0.20" +    __name    = "Vipleech4UCom" +    __type    = "hoster" +    __version = "0.20" -    __pattern__ = r'http://(?:www\.)?vipleech4u\.com/manager\.php' +    __pattern = r'http://(?:www\.)?vipleech4u\.com/manager\.php' -    __description__ = """Vipleech4u.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")] +    __description = """Vipleech4u.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")] diff --git a/pyload/plugin/hoster/WarserverCz.py b/pyload/plugin/hoster/WarserverCz.py index d44b751f9..b45879d34 100644 --- a/pyload/plugin/hoster/WarserverCz.py +++ b/pyload/plugin/hoster/WarserverCz.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class WarserverCz(DeadHoster): -    __name__    = "WarserverCz" -    __type__    = "hoster" -    __version__ = "0.13" +    __name    = "WarserverCz" +    __type    = "hoster" +    __version = "0.13" -    __pattern__ = r'http://(?:www\.)?warserver\.cz/stahnout/\d+' +    __pattern = r'http://(?:www\.)?warserver\.cz/stahnout/\d+' -    __description__ = """Warserver.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Warserver.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/WebshareCz.py b/pyload/plugin/hoster/WebshareCz.py index 58c9c6a44..fe5ef7c9e 100644 --- a/pyload/plugin/hoster/WebshareCz.py +++ b/pyload/plugin/hoster/WebshareCz.py @@ -7,15 +7,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class WebshareCz(SimpleHoster): -    __name__    = "WebshareCz" -    __type__    = "hoster" -    __version__ = "0.16" +    __name    = "WebshareCz" +    __type    = "hoster" +    __version = "0.16" -    __pattern__ = r'https?://(?:www\.)?webshare\.cz/(?:#/)?file/(?P<ID>\w+)' +    __pattern = r'https?://(?:www\.)?webshare\.cz/(?:#/)?file/(?P<ID>\w+)' -    __description__ = """WebShare.cz hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it"), +    __description = """WebShare.cz hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it"),                         ("rush", "radek.senfeld@gmail.com")] @@ -24,7 +24,7 @@ class WebshareCz(SimpleHoster):          info = super(WebshareCz, cls).getInfo(url, html)          if url: -            info['pattern'] = re.match(cls.__pattern__, url).groupdict() +            info['pattern'] = re.match(cls.__pattern, url).groupdict()              api_data = getURL("https://webshare.cz/api/file_info/",                                post={'ident': info['pattern']['ID']}, diff --git a/pyload/plugin/hoster/WrzucTo.py b/pyload/plugin/hoster/WrzucTo.py index de78d7af2..c2326e185 100644 --- a/pyload/plugin/hoster/WrzucTo.py +++ b/pyload/plugin/hoster/WrzucTo.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class WrzucTo(SimpleHoster): -    __name__    = "WrzucTo" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "WrzucTo" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'http://(?:www\.)?wrzuc\.to/(\w+(\.wt|\.html)|(\w+/?linki/\w+))' +    __pattern = r'http://(?:www\.)?wrzuc\.to/(\w+(\.wt|\.html)|(\w+/?linki/\w+))' -    __description__ = """Wrzuc.to hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Wrzuc.to hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN = r'id="file_info">\s*<strong>(?P<N>.*?)</strong>' diff --git a/pyload/plugin/hoster/WuploadCom.py b/pyload/plugin/hoster/WuploadCom.py index 729db1d4d..b2fe8e6bd 100644 --- a/pyload/plugin/hoster/WuploadCom.py +++ b/pyload/plugin/hoster/WuploadCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class WuploadCom(DeadHoster): -    __name__    = "WuploadCom" -    __type__    = "hoster" -    __version__ = "0.23" +    __name    = "WuploadCom" +    __type    = "hoster" +    __version = "0.23" -    __pattern__ = r'http://(?:www\.)?wupload\..+?/file/((\w+/)?\d+)(/.*)?' +    __pattern = r'http://(?:www\.)?wupload\..+?/file/((\w+/)?\d+)(/.*)?' -    __description__ = """Wupload.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.de"), +    __description = """Wupload.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.de"),                         ("Paul King", "")] diff --git a/pyload/plugin/hoster/X7To.py b/pyload/plugin/hoster/X7To.py index ac01bc5ff..98d2681b0 100644 --- a/pyload/plugin/hoster/X7To.py +++ b/pyload/plugin/hoster/X7To.py @@ -4,12 +4,12 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class X7To(DeadHoster): -    __name__    = "X7To" -    __type__    = "hoster" -    __version__ = "0.41" +    __name    = "X7To" +    __type    = "hoster" +    __version = "0.41" -    __pattern__ = r'http://(?:www\.)?x7\.to/' +    __pattern = r'http://(?:www\.)?x7\.to/' -    __description__ = """X7.to hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("ernieb", "ernieb")] +    __description = """X7.to hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("ernieb", "ernieb")] diff --git a/pyload/plugin/hoster/XFileSharingPro.py b/pyload/plugin/hoster/XFileSharingPro.py index 8b9f7fcfa..e9fa553e4 100644 --- a/pyload/plugin/hoster/XFileSharingPro.py +++ b/pyload/plugin/hoster/XFileSharingPro.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class XFileSharingPro(XFSHoster): -    __name__    = "XFileSharingPro" -    __type__    = "hoster" -    __version__ = "0.44" +    __name    = "XFileSharingPro" +    __type    = "hoster" +    __version = "0.44" -    __pattern__ = r'^unmatchable$' +    __pattern = r'^unmatchable$' -    __description__ = """XFileSharingPro dummy hoster plugin for hook""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """XFileSharingPro dummy hoster plugin for hook""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      URL_REPLACEMENTS = [("/embed-", "/")] @@ -23,15 +23,15 @@ class XFileSharingPro(XFSHoster):      def _log(self, type, args):          msg = " | ".join(str(a).strip() for a in args if a)          logger = getattr(self.log, type) -        logger("%s: %s: %s" % (self.__name__, self.HOSTER_NAME, msg or _("%s MARK" % type.upper()))) +        logger("%s: %s: %s" % (self.__name, self.HOSTER_NAME, msg or _("%s MARK" % type.upper())))      def init(self):          super(XFileSharingPro, self).init() -        self.__pattern__ = self.core.pluginManager.hosterPlugins[self.__name__]['pattern'] +        self.__pattern = self.core.pluginManager.hosterPlugins[self.__name]['pattern'] -        self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower() +        self.HOSTER_DOMAIN = re.match(self.__pattern, self.pyfile.url).group("DOMAIN").lower()          self.HOSTER_NAME   = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.HOSTER_DOMAIN) if part != '.')          if self.HOSTER_NAME[0].isdigit(): diff --git a/pyload/plugin/hoster/XHamsterCom.py b/pyload/plugin/hoster/XHamsterCom.py index 92340152f..e1b0d8c32 100644 --- a/pyload/plugin/hoster/XHamsterCom.py +++ b/pyload/plugin/hoster/XHamsterCom.py @@ -17,16 +17,16 @@ def clean_json(json_expr):  class XHamsterCom(Hoster): -    __name__    = "XHamsterCom" -    __type__    = "hoster" -    __version__ = "0.12" +    __name    = "XHamsterCom" +    __type    = "hoster" +    __version = "0.12" -    __pattern__ = r'http://(?:www\.)?xhamster\.com/movies/.+' -    __config__ = [("type", ".mp4;.flv", "Preferred type", ".mp4")] +    __pattern = r'http://(?:www\.)?xhamster\.com/movies/.+' +    __config = [("type", ".mp4;.flv", "Preferred type", ".mp4")] -    __description__ = """XHamster.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [] +    __description = """XHamster.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = []      def process(self, pyfile): diff --git a/pyload/plugin/hoster/XVideosCom.py b/pyload/plugin/hoster/XVideosCom.py index c5e2921cb..ae4d0637f 100644 --- a/pyload/plugin/hoster/XVideosCom.py +++ b/pyload/plugin/hoster/XVideosCom.py @@ -8,21 +8,21 @@ from pyload.plugin.Hoster import Hoster  class XVideosCom(Hoster): -    __name__    = "XVideos.com" -    __type__    = "hoster" -    __version__ = "0.10" +    __name    = "XVideos.com" +    __type    = "hoster" +    __version = "0.10" -    __pattern__ = r'http://(?:www\.)?xvideos\.com/video(\d+)' +    __pattern = r'http://(?:www\.)?xvideos\.com/video(\d+)' -    __description__ = """XVideos.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [] +    __description = """XVideos.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = []      def process(self, pyfile):          site = self.load(pyfile.url)          pyfile.name = "%s (%s).flv" % (              re.search(r"<h2>([^<]+)<span", site).group(1), -            re.match(self.__pattern__, pyfile.url).group(1), +            re.match(self.__pattern, pyfile.url).group(1),          )          self.download(unquote(re.search(r"flv_url=([^&]+)&", site).group(1))) diff --git a/pyload/plugin/hoster/XdadevelopersCom.py b/pyload/plugin/hoster/XdadevelopersCom.py index 386973a94..01733b309 100644 --- a/pyload/plugin/hoster/XdadevelopersCom.py +++ b/pyload/plugin/hoster/XdadevelopersCom.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class XdadevelopersCom(SimpleHoster): -    __name__    = "XdadevelopersCom" -    __type__    = "hoster" -    __version__ = "0.03" +    __name    = "XdadevelopersCom" +    __type    = "hoster" +    __version = "0.03" -    __pattern__ = r'https?://(?:www\.)?forum\.xda-developers\.com/devdb/project/dl/\?id=\d+' +    __pattern = r'https?://(?:www\.)?forum\.xda-developers\.com/devdb/project/dl/\?id=\d+' -    __description__ = """Xda-developers.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description = """Xda-developers.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]      NAME_PATTERN    = r'<label>Filename:</label>\s*<div>\s*(?P<N>.*?)\n' diff --git a/pyload/plugin/hoster/Xdcc.py b/pyload/plugin/hoster/Xdcc.py index 277b7ad0c..5276cbdc2 100644 --- a/pyload/plugin/hoster/Xdcc.py +++ b/pyload/plugin/hoster/Xdcc.py @@ -15,17 +15,17 @@ from pyload.utils import safe_join  class Xdcc(Hoster): -    __name__    = "Xdcc" -    __type__    = "hoster" -    __version__ = "0.32" +    __name    = "Xdcc" +    __type    = "hoster" +    __version = "0.32" -    __config__ = [("nick", "str", "Nickname", "pyload"), +    __config = [("nick", "str", "Nickname", "pyload"),                  ("ident", "str", "Ident", "pyloadident"),                  ("realname", "str", "Realname", "pyloadreal")] -    __description__ = """Download from IRC XDCC bot""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.com")] +    __description = """Download from IRC XDCC bot""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.com")]      def setup(self): @@ -36,7 +36,7 @@ class Xdcc(Hoster):      def process(self, pyfile):          # change request type -        self.req = pyfile.m.core.requestFactory.getRequest(self.__name__, type="XDCC") +        self.req = pyfile.m.core.requestFactory.getRequest(self.__name, type="XDCC")          self.pyfile = pyfile          for _i in xrange(0, 3): diff --git a/pyload/plugin/hoster/YibaishiwuCom.py b/pyload/plugin/hoster/YibaishiwuCom.py index a53acdaf5..ad7a4a4b4 100644 --- a/pyload/plugin/hoster/YibaishiwuCom.py +++ b/pyload/plugin/hoster/YibaishiwuCom.py @@ -7,15 +7,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class YibaishiwuCom(SimpleHoster): -    __name__    = "YibaishiwuCom" -    __type__    = "hoster" -    __version__ = "0.14" +    __name    = "YibaishiwuCom" +    __type    = "hoster" +    __version = "0.14" -    __pattern__ = r'http://(?:www\.)?(?:u\.)?115\.com/file/(?P<ID>\w+)' +    __pattern = r'http://(?:www\.)?(?:u\.)?115\.com/file/(?P<ID>\w+)' -    __description__ = """115.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """115.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN = r'file_name: \'(?P<N>.+?)\'' diff --git a/pyload/plugin/hoster/YoupornCom.py b/pyload/plugin/hoster/YoupornCom.py index 75606935d..8f77a15dd 100644 --- a/pyload/plugin/hoster/YoupornCom.py +++ b/pyload/plugin/hoster/YoupornCom.py @@ -6,15 +6,15 @@ from pyload.plugin.Hoster import Hoster  class YoupornCom(Hoster): -    __name__    = "YoupornCom" -    __type__    = "hoster" -    __version__ = "0.20" +    __name    = "YoupornCom" +    __type    = "hoster" +    __version = "0.20" -    __pattern__ = r'http://(?:www\.)?youporn\.com/watch/.+' +    __pattern = r'http://(?:www\.)?youporn\.com/watch/.+' -    __description__ = """Youporn.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("willnix", "willnix@pyload.org")] +    __description = """Youporn.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("willnix", "willnix@pyload.org")]      def process(self, pyfile): diff --git a/pyload/plugin/hoster/YourfilesTo.py b/pyload/plugin/hoster/YourfilesTo.py index a600d822f..640d67173 100644 --- a/pyload/plugin/hoster/YourfilesTo.py +++ b/pyload/plugin/hoster/YourfilesTo.py @@ -8,15 +8,15 @@ from pyload.plugin.Hoster import Hoster  class YourfilesTo(Hoster): -    __name__    = "YourfilesTo" -    __type__    = "hoster" -    __version__ = "0.22" +    __name    = "YourfilesTo" +    __type    = "hoster" +    __version = "0.22" -    __pattern__ = r'http://(?:www\.)?yourfiles\.(to|biz)/\?d=\w+' +    __pattern = r'http://(?:www\.)?yourfiles\.(to|biz)/\?d=\w+' -    __description__ = """Youfiles.to hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("jeix", "jeix@hasnomail.de"), +    __description = """Youfiles.to hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("jeix", "jeix@hasnomail.de"),                         ("skydancer", "skydancer@hasnomail.de")] diff --git a/pyload/plugin/hoster/YoutubeCom.py b/pyload/plugin/hoster/YoutubeCom.py index bf8785022..252eb3c30 100644 --- a/pyload/plugin/hoster/YoutubeCom.py +++ b/pyload/plugin/hoster/YoutubeCom.py @@ -31,12 +31,12 @@ def which(program):  class YoutubeCom(Hoster): -    __name__    = "YoutubeCom" -    __type__    = "hoster" -    __version__ = "0.41" +    __name    = "YoutubeCom" +    __type    = "hoster" +    __version = "0.41" -    __pattern__ = r'https?://(?:[^/]*\.)?(youtube\.com|youtu\.be)/watch\?(?:.*&)?v=.+' -    __config__ = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting"             , "hd" ), +    __pattern = r'https?://(?:[^/]*\.)?(youtube\.com|youtu\.be)/watch\?(?:.*&)?v=.+' +    __config = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting"             , "hd" ),                    ("fmt"    , "int"                                         , "FMT/ITAG Number (0 for auto)", 0    ),                    (".mp4"   , "bool"                                        , "Allow .mp4"                  , True ),                    (".flv"   , "bool"                                        , "Allow .flv"                  , True ), @@ -44,9 +44,9 @@ class YoutubeCom(Hoster):                    (".3gp"   , "bool"                                        , "Allow .3gp"                  , False),                    ("3d"     , "bool"                                        , "Prefer 3D"                   , False)] -    __description__ = """Youtube.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("spoob", "spoob@pyload.org"), +    __description = """Youtube.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("spoob", "spoob@pyload.org"),                         ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/ZDF.py b/pyload/plugin/hoster/ZDF.py index da6d6448e..c02eadc23 100644 --- a/pyload/plugin/hoster/ZDF.py +++ b/pyload/plugin/hoster/ZDF.py @@ -9,15 +9,15 @@ from pyload.plugin.Hoster import Hoster  # Based on zdfm by Roland Beermann (http://github.com/enkore/zdfm/)  class ZDF(Hoster): -    __name__    = "ZDF Mediathek" -    __type__    = "hoster" -    __version__ = "0.80" +    __name    = "ZDF Mediathek" +    __type    = "hoster" +    __version = "0.80" -    __pattern__ = r'http://(?:www\.)?zdf\.de/ZDFmediathek/\D*(\d+)\D*' +    __pattern = r'http://(?:www\.)?zdf\.de/ZDFmediathek/\D*(\d+)\D*' -    __description__ = """ZDF.de hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [] +    __description = """ZDF.de hoster plugin""" +    __license     = "GPLv3" +    __authors     = []      XML_API = "http://www.zdf.de/ZDFmediathek/xmlservice/web/beitragsDetails?id=%i" diff --git a/pyload/plugin/hoster/ZShareNet.py b/pyload/plugin/hoster/ZShareNet.py index 12c65b206..fdc49a360 100644 --- a/pyload/plugin/hoster/ZShareNet.py +++ b/pyload/plugin/hoster/ZShareNet.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class ZShareNet(DeadHoster): -    __name__    = "ZShareNet" -    __type__    = "hoster" -    __version__ = "0.21" +    __name    = "ZShareNet" +    __type    = "hoster" +    __version = "0.21" -    __pattern__ = r'https?://(?:ww[2w]\.)?zshares?\.net/.+' +    __pattern = r'https?://(?:ww[2w]\.)?zshares?\.net/.+' -    __description__ = """ZShare.net hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("espes", ""), +    __description = """ZShare.net hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("espes", ""),                         ("Cptn Sandwich", "")] diff --git a/pyload/plugin/hoster/ZeveraCom.py b/pyload/plugin/hoster/ZeveraCom.py index 264a62a7d..6690835a1 100644 --- a/pyload/plugin/hoster/ZeveraCom.py +++ b/pyload/plugin/hoster/ZeveraCom.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class ZeveraCom(MultiHoster): -    __name__    = "ZeveraCom" -    __type__    = "hoster" -    __version__ = "0.28" +    __name    = "ZeveraCom" +    __type    = "hoster" +    __version = "0.28" -    __pattern__ = r'https?://(?:www\.)zevera\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' +    __pattern = r'https?://(?:www\.)zevera\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' -    __description__ = """Zevera.com multi-hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Zevera.com multi-hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/ZippyshareCom.py b/pyload/plugin/hoster/ZippyshareCom.py index 0aa59fdaa..9ba673c39 100644 --- a/pyload/plugin/hoster/ZippyshareCom.py +++ b/pyload/plugin/hoster/ZippyshareCom.py @@ -7,15 +7,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class ZippyshareCom(SimpleHoster): -    __name__    = "ZippyshareCom" -    __type__    = "hoster" -    __version__ = "0.72" +    __name    = "ZippyshareCom" +    __type    = "hoster" +    __version = "0.72" -    __pattern__ = r'http://www\d{0,2}\.zippyshare\.com/v(/|iew\.jsp.*key=)(?P<KEY>[\w^_]+)' +    __pattern = r'http://www\d{0,2}\.zippyshare\.com/v(/|iew\.jsp.*key=)(?P<KEY>[\w^_]+)' -    __description__ = """Zippyshare.com hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Zippyshare.com hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      COOKIES = [("zippyshare.com", "ziplocale", "en")] diff --git a/pyload/plugin/internal/BasePlugin.py b/pyload/plugin/internal/BasePlugin.py index 103e0d5cb..0b9e31ec0 100644 --- a/pyload/plugin/internal/BasePlugin.py +++ b/pyload/plugin/internal/BasePlugin.py @@ -11,15 +11,15 @@ from pyload.plugin.Hoster import Hoster  class BasePlugin(Hoster): -    __name__    = "BasePlugin" -    __type__    = "hoster" -    __version__ = "0.34" +    __name    = "BasePlugin" +    __type    = "hoster" +    __version = "0.34" -    __pattern__ = r'^unmatchable$' +    __pattern = r'^unmatchable$' -    __description__ = """Base plugin when any other didnt fit""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org"), +    __description = """Base plugin when any other didnt fit""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/internal/DeadCrypter.py b/pyload/plugin/internal/DeadCrypter.py index ddeb0431d..daa7e1a0d 100644 --- a/pyload/plugin/internal/DeadCrypter.py +++ b/pyload/plugin/internal/DeadCrypter.py @@ -4,15 +4,15 @@ from pyload.plugin.Crypter import Crypter as _Crypter  class DeadCrypter(_Crypter): -    __name__    = "DeadCrypter" -    __type__    = "crypter" -    __version__ = "0.04" +    __name    = "DeadCrypter" +    __type    = "crypter" +    __version = "0.04" -    __pattern__ = r'^unmatchable$' +    __pattern = r'^unmatchable$' -    __description__ = """Crypter is no longer available""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it")] +    __description = """Crypter is no longer available""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it")]      @classmethod diff --git a/pyload/plugin/internal/DeadHoster.py b/pyload/plugin/internal/DeadHoster.py index 1596943ae..2e57decdb 100644 --- a/pyload/plugin/internal/DeadHoster.py +++ b/pyload/plugin/internal/DeadHoster.py @@ -4,15 +4,15 @@ from pyload.plugin.Hoster import Hoster as _Hoster  class DeadHoster(_Hoster): -    __name__    = "DeadHoster" -    __type__    = "hoster" -    __version__ = "0.14" +    __name    = "DeadHoster" +    __type    = "hoster" +    __version = "0.14" -    __pattern__ = r'^unmatchable$' +    __pattern = r'^unmatchable$' -    __description__ = """Hoster is no longer available""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description = """Hoster is no longer available""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]      @classmethod diff --git a/pyload/plugin/internal/MultiHook.py b/pyload/plugin/internal/MultiHook.py index 2beccfcc5..f33442f5f 100644 --- a/pyload/plugin/internal/MultiHook.py +++ b/pyload/plugin/internal/MultiHook.py @@ -9,11 +9,11 @@ from pyload.utils import decode, remove_chars  class MultiHook(Hook): -    __name__    = "MultiHook" -    __type__    = "hook" -    __version__ = "0.37" +    __name    = "MultiHook" +    __type    = "hook" +    __version = "0.37" -    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"), +    __config = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),                    ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),                    ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),                    ("retry"         , "int"                , "Number of retries before revert"     , 10   ), @@ -21,9 +21,9 @@ class MultiHook(Hook):                    ("reload"        , "bool"               , "Reload plugin list"                  , True ),                    ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )] -    __description__ = """Hook plugin for multi hoster/crypter""" -    __license__     = "GPLv3" -    __authors__     = [("pyLoad Team", "admin@pyload.org"), +    __description = """Hook plugin for multi hoster/crypter""" +    __license     = "GPLv3" +    __authors     = [("pyLoad Team", "admin@pyload.org"),                         ("Walter Purcaro", "vuolter@gmail.com")] @@ -66,16 +66,16 @@ class MultiHook(Hook):      def _initPlugin(self): -        plugin, type = self.core.pluginManager.findPlugin(self.__name__) +        plugin, type = self.core.pluginManager.findPlugin(self.__name)          if not plugin:              self.logWarning("Hook plugin will be deactivated due missing plugin reference")              self.setConfig('activated', False)          else: -            self.pluginname   = self.__name__ +            self.pluginname   = self.__name              self.plugintype   = type -            self.pluginmodule = self.core.pluginManager.loadModule(type, self.__name__) -            self.pluginclass  = getattr(self.pluginmodule, self.__name__) +            self.pluginmodule = self.core.pluginManager.loadModule(type, self.__name) +            self.pluginclass  = getattr(self.pluginmodule, self.__name)      def _loadAccount(self): @@ -250,8 +250,8 @@ class MultiHook(Hook):              # create new regexp              regexp = r'.*(?P<DOMAIN>%s).*' % "|".join([x.replace(".", "\.") for x in plugins]) -            if hasattr(self.pluginclass, "__pattern__") and isinstance(self.pluginclass.__pattern__, basestring) and '://' in self.pluginclass.__pattern__: -                regexp = r'%s|%s' % (self.pluginclass.__pattern__, regexp) +            if hasattr(self.pluginclass, "__pattern") and isinstance(self.pluginclass.__pattern, basestring) and '://' in self.pluginclass.__pattern: +                regexp = r'%s|%s' % (self.pluginclass.__pattern, regexp)              self.logDebug("Regexp: %s" % regexp) @@ -278,7 +278,7 @@ class MultiHook(Hook):          # reset pattern          hdict = self.core.pluginManager.plugins[self.plugintype][self.pluginname] -        hdict['pattern'] = getattr(self.pluginclass, "__pattern__", r'^unmatchable$') +        hdict['pattern'] = getattr(self.pluginclass, "__pattern", r'^unmatchable$')          hdict['re']      = re.compile(hdict['pattern']) diff --git a/pyload/plugin/internal/MultiHoster.py b/pyload/plugin/internal/MultiHoster.py index ed425ffaa..ff80b1982 100644 --- a/pyload/plugin/internal/MultiHoster.py +++ b/pyload/plugin/internal/MultiHoster.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, replace_patterns,  class MultiHoster(SimpleHoster): -    __name__    = "MultiHoster" -    __type__    = "hoster" -    __version__ = "0.37" +    __name    = "MultiHoster" +    __type    = "hoster" +    __version = "0.37" -    __pattern__ = r'^unmatchable$' +    __pattern = r'^unmatchable$' -    __description__ = """Multi hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Multi hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      LOGIN_ACCOUNT = True @@ -41,7 +41,7 @@ class MultiHoster(SimpleHoster):              set_cookies(self.req.cj, self.COOKIES)          if self.DIRECT_LINK is None: -            self.directDL = self.__pattern__ != r'^unmatchable$' and re.match(self.__pattern__, self.pyfile.url) +            self.directDL = self.__pattern != r'^unmatchable$' and re.match(self.__pattern, self.pyfile.url)          else:              self.directDL = self.DIRECT_LINK diff --git a/pyload/plugin/internal/SimpleCrypter.py b/pyload/plugin/internal/SimpleCrypter.py index e4b8874f3..3e1215264 100644 --- a/pyload/plugin/internal/SimpleCrypter.py +++ b/pyload/plugin/internal/SimpleCrypter.py @@ -10,17 +10,17 @@ from pyload.utils import fixup  class SimpleCrypter(Crypter, SimpleHoster): -    __name__    = "SimpleCrypter" -    __type__    = "crypter" -    __version__ = "0.43" +    __name    = "SimpleCrypter" +    __type    = "crypter" +    __version = "0.43" -    __pattern__ = r'^unmatchable$' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package'] +    __pattern = r'^unmatchable$' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Simple decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("stickell", "l.stickell@yahoo.it"), +    __description = """Simple decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("stickell", "l.stickell@yahoo.it"),                         ("zoidberg", "zoidberg@mujmail.cz"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/internal/SimpleDereferer.py b/pyload/plugin/internal/SimpleDereferer.py index 6d323b4b0..683e5f81d 100644 --- a/pyload/plugin/internal/SimpleDereferer.py +++ b/pyload/plugin/internal/SimpleDereferer.py @@ -9,17 +9,17 @@ from pyload.plugin.internal.SimpleHoster import fileUrl, set_cookies  class SimpleDereferer(Crypter): -    __name__    = "SimpleDereferer" -    __type__    = "crypter" -    __version__ = "0.07" +    __name    = "SimpleDereferer" +    __type    = "crypter" +    __version = "0.07" -    __pattern__ = r'^unmatchable$' -    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True), +    __pattern = r'^unmatchable$' +    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),                     ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] -    __description__ = """Simple dereferer plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Simple dereferer plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      """ @@ -49,7 +49,7 @@ class SimpleDereferer(Crypter):          if not link:              try: -                link = unquote(re.match(self.__pattern__, pyfile.url).group('LINK')) +                link = unquote(re.match(self.__pattern, pyfile.url).group('LINK'))              except Exception:                  self.prepare() diff --git a/pyload/plugin/internal/SimpleHoster.py b/pyload/plugin/internal/SimpleHoster.py index ac7f5aa4d..77d21f2d7 100644 --- a/pyload/plugin/internal/SimpleHoster.py +++ b/pyload/plugin/internal/SimpleHoster.py @@ -244,15 +244,15 @@ def secondsToMidnight(gmt=0):  class SimpleHoster(Hoster): -    __name__    = "SimpleHoster" -    __type__    = "hoster" -    __version__ = "1.15" +    __name    = "SimpleHoster" +    __type    = "hoster" +    __version = "1.15" -    __pattern__ = r'^unmatchable$' +    __pattern = r'^unmatchable$' -    __description__ = """Simple hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """Simple hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] @@ -339,7 +339,7 @@ class SimpleHoster(Hoster):          online = False if info['status'] != 2 else True          try: -            info['pattern'] = re.match(cls.__pattern__, url).groupdict()  #: pattern groups will be saved here +            info['pattern'] = re.match(cls.__pattern, url).groupdict()  #: pattern groups will be saved here          except Exception:              info['pattern'] = {} @@ -435,8 +435,8 @@ class SimpleHoster(Hoster):              set_cookies(self.req.cj, self.COOKIES)          if (self.MULTI_HOSTER -            and (self.__pattern__ != self.core.pluginManager.hosterPlugins[self.__name__]['pattern'] -                 or re.match(self.__pattern__, self.pyfile.url) is None)): +            and (self.__pattern != self.core.pluginManager.hosterPlugins[self.__name]['pattern'] +                 or re.match(self.__pattern, self.pyfile.url) is None)):              self.multihost = True              return diff --git a/pyload/plugin/internal/UpdateManager.py b/pyload/plugin/internal/UpdateManager.py index ff692b4ae..d84ccebdf 100644 --- a/pyload/plugin/internal/UpdateManager.py +++ b/pyload/plugin/internal/UpdateManager.py @@ -14,26 +14,26 @@ from pyload.utils import safe_join  class UpdateManager(Addon): -    __name__    = "UpdateManager" -    __type__    = "addon" -    __version__ = "0.43" +    __name    = "UpdateManager" +    __type    = "addon" +    __version = "0.43" -    __config__ = [("activated"    , "bool"                         , "Activated"                                     , True              ), +    __config = [("activated"    , "bool"                         , "Activated"                                     , True              ),                  ("mode"         , "pyLoad + plugins;plugins only", "Check updates for"                             , "pyLoad + plugins"),                  ("interval"     , "int"                          , "Check interval in hours"                       , 8                 ),                  ("autorestart"  , "bool"                         , "Automatically restart pyLoad when required"    , True              ),                  ("reloadplugins", "bool"                         , "Monitor plugins for code changes in debug mode", True              ),                  ("nodebugupdate", "bool"                         , "Don't check for updates in debug mode"         , False             )] -    __description__ = """Check for updates""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """Check for updates""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      # event_list = ["pluginConfigChanged"]      SERVER_URL   = "http://updatemanager.pyload.org" -    VERSION      = re.compile(r'__version__.*=.*("|\')([\d.]+)') +    VERSION      = re.compile(r'__version.*=.*("|\')([\d.]+)')      MIN_INTERVAL = 3 * 60 * 60  #: 3h minimum check interval (value is in seconds) @@ -55,13 +55,13 @@ class UpdateManager(Addon):      def activate(self): -        self.pluginConfigChanged(self.__name__, "interval", self.getConfig("interval")) -        x = lambda: self.pluginConfigChanged(self.__name__, "reloadplugins", self.getConfig("reloadplugins")) +        self.pluginConfigChanged(self.__name, "interval", self.getConfig("interval")) +        x = lambda: self.pluginConfigChanged(self.__name, "reloadplugins", self.getConfig("reloadplugins"))          self.core.scheduler.addJob(10, x, threaded=False)      def deactivate(self): -        self.pluginConfigChanged(self.__name__, "reloadplugins", False) +        self.pluginConfigChanged(self.__name, "reloadplugins", False)      def setup(self): @@ -83,15 +83,15 @@ class UpdateManager(Addon):      def autoreloadPlugins(self):          """ reload and reindex all modified plugins """          modules = filter( -            lambda m: m and (m.__name__.startswith("pyload.plugin.") or -                             m.__name__.startswith("userplugins.")) and -                             m.__name__.count(".") >= 2, sys.modules.itervalues() +            lambda m: m and (m.__name.startswith("pyload.plugin.") or +                             m.__name.startswith("userplugins.")) and +                             m.__name.count(".") >= 2, sys.modules.itervalues()          )          reloads = []          for m in modules: -            root, type, name = m.__name__.rsplit(".", 2) +            root, type, name = m.__name.rsplit(".", 2)              id = (type, name)              if type in self.core.pluginManager.plugins:                  f = m.__file__.replace(".pyc", ".py") diff --git a/pyload/plugin/internal/XFSAccount.py b/pyload/plugin/internal/XFSAccount.py index 2e6b7dc50..b9f5eec3a 100644 --- a/pyload/plugin/internal/XFSAccount.py +++ b/pyload/plugin/internal/XFSAccount.py @@ -10,13 +10,13 @@ from pyload.plugin.internal.SimpleHoster import parseHtmlForm, set_cookies  class XFSAccount(Account): -    __name__    = "XFSAccount" -    __type__    = "account" -    __version__ = "0.36" +    __name    = "XFSAccount" +    __type    = "account" +    __version = "0.36" -    __description__ = """XFileSharing account plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """XFileSharing account plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/internal/XFSCrypter.py b/pyload/plugin/internal/XFSCrypter.py index 1a03b69d0..44b4ed724 100644 --- a/pyload/plugin/internal/XFSCrypter.py +++ b/pyload/plugin/internal/XFSCrypter.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter  class XFSCrypter(SimpleCrypter): -    __name__    = "XFSCrypter" -    __type__    = "crypter" -    __version__ = "0.06" +    __name    = "XFSCrypter" +    __type    = "crypter" +    __version = "0.06" -    __pattern__ = r'^unmatchable$' +    __pattern = r'^unmatchable$' -    __description__ = """XFileSharing decrypter plugin""" -    __license__     = "GPLv3" -    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description = """XFileSharing decrypter plugin""" +    __license     = "GPLv3" +    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]      HOSTER_DOMAIN = None @@ -31,7 +31,7 @@ class XFSCrypter(SimpleCrypter):              if self.account:                  account      = self.account              else: -                account_name = (self.__name__ + ".py").replace("Folder.py", "").replace(".py", "") +                account_name = (self.__name + ".py").replace("Folder.py", "").replace(".py", "")                  account      = self.pyfile.m.core.accountManager.getAccountPlugin(account_name)              if account and hasattr(account, "HOSTER_DOMAIN") and account.HOSTER_DOMAIN: diff --git a/pyload/plugin/internal/XFSHoster.py b/pyload/plugin/internal/XFSHoster.py index b0a5aff0f..6c98a36e7 100644 --- a/pyload/plugin/internal/XFSHoster.py +++ b/pyload/plugin/internal/XFSHoster.py @@ -12,15 +12,15 @@ from pyload.utils import html_unescape  class XFSHoster(SimpleHoster): -    __name__    = "XFSHoster" -    __type__    = "hoster" -    __version__ = "0.44" +    __name    = "XFSHoster" +    __type    = "hoster" +    __version = "0.44" -    __pattern__ = r'^unmatchable$' +    __pattern = r'^unmatchable$' -    __description__ = """XFileSharing hoster plugin""" -    __license__     = "GPLv3" -    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description = """XFileSharing hoster plugin""" +    __license     = "GPLv3" +    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] @@ -64,7 +64,7 @@ class XFSHoster(SimpleHoster):              if self.account:                  account = self.account              else: -                account = self.pyfile.m.core.accountManager.getAccountPlugin(self.__name__) +                account = self.pyfile.m.core.accountManager.getAccountPlugin(self.__name)              if account and hasattr(account, "HOSTER_DOMAIN") and account.HOSTER_DOMAIN:                  self.HOSTER_DOMAIN = account.HOSTER_DOMAIN diff --git a/pyload/plugin/ocr/GigasizeCom.py b/pyload/plugin/ocr/GigasizeCom.py index 6982e6ca9..f818cdb41 100644 --- a/pyload/plugin/ocr/GigasizeCom.py +++ b/pyload/plugin/ocr/GigasizeCom.py @@ -4,13 +4,13 @@ from pyload.plugin.OCR import OCR  class GigasizeCom(OCR): -    __name__    = "GigasizeCom" -    __type__    = "ocr" -    __version__ = "0.10" +    __name    = "GigasizeCom" +    __type    = "ocr" +    __version = "0.10" -    __description__ = """Gigasize.com ocr plugin""" -    __license__     = "GPLv3" -    __authors__     = [("pyLoad Team", "admin@pyload.org")] +    __description = """Gigasize.com ocr plugin""" +    __license     = "GPLv3" +    __authors     = [("pyLoad Team", "admin@pyload.org")]      def __init__(self): diff --git a/pyload/plugin/ocr/LinksaveIn.py b/pyload/plugin/ocr/LinksaveIn.py index 7ced74f4b..cd0fe96f2 100644 --- a/pyload/plugin/ocr/LinksaveIn.py +++ b/pyload/plugin/ocr/LinksaveIn.py @@ -13,13 +13,13 @@ from pyload.plugin.OCR import OCR  class LinksaveIn(OCR): -    __name__    = "LinksaveIn" -    __type__    = "ocr" -    __version__ = "0.10" +    __name    = "LinksaveIn" +    __type    = "ocr" +    __version = "0.10" -    __description__ = """Linksave.in ocr plugin""" -    __license__     = "GPLv3" -    __authors__     = [("pyLoad Team", "admin@pyload.org")] +    __description = """Linksave.in ocr plugin""" +    __license     = "GPLv3" +    __authors     = [("pyLoad Team", "admin@pyload.org")]      def __init__(self): diff --git a/pyload/plugin/ocr/NetloadIn.py b/pyload/plugin/ocr/NetloadIn.py index 8939b5318..f15ab4449 100644 --- a/pyload/plugin/ocr/NetloadIn.py +++ b/pyload/plugin/ocr/NetloadIn.py @@ -4,13 +4,13 @@ from pyload.plugin.OCR import OCR  class NetloadIn(OCR): -    __name__    = "NetloadIn" -    __type__    = "ocr" -    __version__ = "0.10" +    __name    = "NetloadIn" +    __type    = "ocr" +    __version = "0.10" -    __description__ = """Netload.in ocr plugin""" -    __license__     = "GPLv3" -    __authors__     = [("pyLoad Team", "admin@pyload.org")] +    __description = """Netload.in ocr plugin""" +    __license     = "GPLv3" +    __authors     = [("pyLoad Team", "admin@pyload.org")]      def __init__(self): diff --git a/pyload/plugin/ocr/ShareonlineBiz.py b/pyload/plugin/ocr/ShareonlineBiz.py index bbc3d1762..103a9f96f 100644 --- a/pyload/plugin/ocr/ShareonlineBiz.py +++ b/pyload/plugin/ocr/ShareonlineBiz.py @@ -4,13 +4,13 @@ from pyload.plugin.OCR import OCR  class ShareonlineBiz(OCR): -    __name__    = "ShareonlineBiz" -    __type__    = "ocr" -    __version__ = "0.10" +    __name    = "ShareonlineBiz" +    __type    = "ocr" +    __version = "0.10" -    __description__ = """Shareonline.biz ocr plugin""" -    __license__     = "GPLv3" -    __authors__     = [("RaNaN", "RaNaN@pyload.org")] +    __description = """Shareonline.biz ocr plugin""" +    __license     = "GPLv3" +    __authors     = [("RaNaN", "RaNaN@pyload.org")]      def __init__(self): | 
