diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-12-10 19:07:53 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-12-10 19:07:53 +0100 |
| commit | 2439bc22671dde697817291b721bfddb792a93b4 (patch) | |
| tree | dad4615b7f1d664263af6a85392282329aa0b8e0 | |
| parent | Revert plugin directory structure (diff) | |
| download | pyload-2439bc22671dde697817291b721bfddb792a93b4.tar.xz | |
Fix plugins key attributes
432 files changed, 3345 insertions, 3345 deletions
diff --git a/pyload/plugins/Account.py b/pyload/plugins/Account.py index b5125d61c..79502df3a 100644 --- a/pyload/plugins/Account.py +++ b/pyload/plugins/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/plugins/Addon.py b/pyload/plugins/Addon.py index ed5a72af8..ebfb121f9 100644 --- a/pyload/plugins/Addon.py +++ b/pyload/plugins/Addon.py @@ -24,15 +24,15 @@ class Addon(Base): """ Base class for addon plugins. """ - __name__ = "Addon" - __type__ = "addon" - __version__ = "0.03" + __name = "Addon" + __type = "addon" + __version = "0.03" - __config__ = [] #: [("name", "type", "desc", "default")] + __config = [] #: [("name", "type", "desc", "default")] - __description__ = """Base addon/hook plugin""" - __license__ = "GPLv3" - __authors__ = [("mkaay", "mkaay@mkaay.de"), + __description = """Base addon/hook plugin""" + __license = "GPLv3" + __authors = [("mkaay", "mkaay@mkaay.de"), ("RaNaN", "RaNaN@pyload.org")] @@ -101,7 +101,7 @@ class Addon(Base): def __repr__(self): - return "<Addon %s>" % self.__name__ + return "<Addon %s>" % self.__name def setup(self): @@ -116,7 +116,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/plugins/Captcha.py b/pyload/plugins/Captcha.py index 7197c390e..2bf115de4 100644 --- a/pyload/plugins/Captcha.py +++ b/pyload/plugins/Captcha.py @@ -6,13 +6,13 @@ from pyload.plugins.Plugin import Plugin class Captcha(Plugin): - __name__ = "Captcha" - __type__ = "captcha" - __version__ = "0.14" + __name = "Captcha" + __type = "captcha" + __version = "0.14" - __description__ = """Base captcha service plugin""" - __license__ = "GPLv3" - __authors__ = [("pyLoad Team", "admin@pyload.org")] + __description = """Base captcha service plugin""" + __license = "GPLv3" + __authors = [("pyLoad Team", "admin@pyload.org")] KEY_PATTERN = None @@ -29,17 +29,17 @@ class Captcha(Plugin): if hasattr(self.plugin, "html") and self.plugin.html: html = self.plugin.html else: - errmsg = _("%s html not found") % self.__name__ + errmsg = _("%s html not found") % self.__name self.plugin.error(errmsg) raise TypeError(errmsg) m = re.search(self.KEY_PATTERN, html) if m: self.key = m.group("KEY") - self.plugin.logDebug("%s key: %s" % (self.__name__, self.key)) + self.plugin.logDebug("%s key: %s" % (self.__name, self.key)) return self.key else: - self.plugin.logDebug("%s key not found" % self.__name__) + self.plugin.logDebug("%s key not found" % self.__name) return None diff --git a/pyload/plugins/Container.py b/pyload/plugins/Container.py index 3320217ae..bcdb433b8 100644 --- a/pyload/plugins/Container.py +++ b/pyload/plugins/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/plugins/Crypter.py b/pyload/plugins/Crypter.py index 8580def61..badc77282 100644 --- a/pyload/plugins/Crypter.py +++ b/pyload/plugins/Crypter.py @@ -7,17 +7,17 @@ from pyload.utils import decode, html_unescape, 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/plugins/Hoster.py b/pyload/plugins/Hoster.py index ea225262e..feb2ae714 100644 --- a/pyload/plugins/Hoster.py +++ b/pyload/plugins/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/plugins/OCR.py b/pyload/plugins/OCR.py index 8e60737b6..9e8d49d70 100644 --- a/pyload/plugins/OCR.py +++ b/pyload/plugins/OCR.py @@ -14,13 +14,13 @@ from os.path import abspath, join class OCR(object): - __name__ = "OCR" - __type__ = "ocr" - __version__ = "0.10" + __name = "OCR" + __type = "ocr" + __version = "0.10" - __description__ = """Base OCR plugin""" - __license__ = "GPLv3" - __authors__ = [("pyLoad Team", "admin@pyload.org")] + __description = """Base OCR plugin""" + __license = "GPLv3" + __authors = [("pyLoad Team", "admin@pyload.org")] def __init__(self): @@ -56,11 +56,11 @@ class OCR(object): def run_tesser(self, subset=False, digits=True, lowercase=True, uppercase=True): #tmpTif = tempfile.NamedTemporaryFile(suffix=".tif") try: - tmpTif = open(join("tmp", "tmpTif_%s.tif" % self.__name__), "wb") + tmpTif = open(join("tmp", "tmpTif_%s.tif" % self.__name), "wb") tmpTif.close() #tmpTxt = tempfile.NamedTemporaryFile(suffix=".txt") - tmpTxt = open(join("tmp", "tmpTxt_%s.txt" % self.__name__), "wb") + tmpTxt = open(join("tmp", "tmpTxt_%s.txt" % self.__name), "wb") tmpTxt.close() except IOError, e: @@ -79,7 +79,7 @@ class OCR(object): if subset and (digits or lowercase or uppercase): #tmpSub = tempfile.NamedTemporaryFile(suffix=".subset") - with open(join("tmp", "tmpSub_%s.subset" % self.__name__), "wb") as tmpSub: + with open(join("tmp", "tmpSub_%s.subset" % self.__name), "wb") as tmpSub: tmpSub.write("tessedit_char_whitelist ") if digits: diff --git a/pyload/plugins/Plugin.py b/pyload/plugins/Plugin.py index ec13c54f4..77ae50123 100644 --- a/pyload/plugins/Plugin.py +++ b/pyload/plugins/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/plugins/account/AlldebridCom.py b/pyload/plugins/account/AlldebridCom.py index 701e81fe1..78a4318ac 100644 --- a/pyload/plugins/account/AlldebridCom.py +++ b/pyload/plugins/account/AlldebridCom.py @@ -12,13 +12,13 @@ from pyload.plugins.Account import Account class AlldebridCom(Account): - __name__ = "AlldebridCom" - __type__ = "account" - __version__ = "0.22" + __name = "AlldebridCom" + __type = "account" + __version = "0.22" - __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/plugins/account/BayfilesCom.py b/pyload/plugins/account/BayfilesCom.py index 30e8e66b3..d75b55151 100644 --- a/pyload/plugins/account/BayfilesCom.py +++ b/pyload/plugins/account/BayfilesCom.py @@ -7,13 +7,13 @@ from pyload.utils import json_loads class BayfilesCom(Account): - __name__ = "BayfilesCom" - __type__ = "account" - __version__ = "0.03" + __name = "BayfilesCom" + __type = "account" + __version = "0.03" - __description__ = """Bayfiles.com account plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Bayfiles.com account plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] def loadAccountInfo(self, user, req): diff --git a/pyload/plugins/account/BillionuploadsCom.py b/pyload/plugins/account/BillionuploadsCom.py index b1f621ecb..c0c6ef313 100644 --- a/pyload/plugins/account/BillionuploadsCom.py +++ b/pyload/plugins/account/BillionuploadsCom.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/BitshareCom.py b/pyload/plugins/account/BitshareCom.py index cd28ec677..cf0098b4f 100644 --- a/pyload/plugins/account/BitshareCom.py +++ b/pyload/plugins/account/BitshareCom.py @@ -4,13 +4,13 @@ from pyload.plugins.Account import Account class BitshareCom(Account): - __name__ = "BitshareCom" - __type__ = "account" - __version__ = "0.12" + __name = "BitshareCom" + __type = "account" + __version = "0.12" - __description__ = """Bitshare account plugin""" - __license__ = "GPLv3" - __authors__ = [("Paul King", None)] + __description = """Bitshare account plugin""" + __license = "GPLv3" + __authors = [("Paul King", None)] def loadAccountInfo(self, user, req): diff --git a/pyload/plugins/account/CatShareNet.py b/pyload/plugins/account/CatShareNet.py index bb0cc9771..28fb8fe3d 100644 --- a/pyload/plugins/account/CatShareNet.py +++ b/pyload/plugins/account/CatShareNet.py @@ -8,13 +8,13 @@ from pyload.plugins.Account import Account class CatShareNet(Account): - __name__ = "CatShareNet" - __type__ = "account" - __version__ = "0.01" + __name = "CatShareNet" + __type = "account" + __version = "0.01" - __description__ = """CatShareNet account plugin""" - __license__ = "GPLv3" - __authors__ = [("prOq", None)] + __description = """CatShareNet account plugin""" + __license = "GPLv3" + __authors = [("prOq", None)] PREMIUM_PATTERN = r'class="nav-collapse collapse pull-right">[\s\w<>=-."/:]*\sz.</a></li>\s*<li><a href="/premium">.*\s*<span style="color: red">(.*?)</span>[\s\w<>/]*href="/logout"' diff --git a/pyload/plugins/account/CramitIn.py b/pyload/plugins/account/CramitIn.py index 42b7cc7b2..6b8b5eead 100644 --- a/pyload/plugins/account/CramitIn.py +++ b/pyload/plugins/account/CramitIn.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/CzshareCom.py b/pyload/plugins/account/CzshareCom.py index ad9644150..5e94b1516 100644 --- a/pyload/plugins/account/CzshareCom.py +++ b/pyload/plugins/account/CzshareCom.py @@ -7,13 +7,13 @@ from pyload.plugins.Account import Account class CzshareCom(Account): - __name__ = "CzshareCom" - __type__ = "account" - __version__ = "0.14" + __name = "CzshareCom" + __type = "account" + __version = "0.14" - __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/plugins/account/DebridItaliaCom.py b/pyload/plugins/account/DebridItaliaCom.py index faef46c6b..e0173fc8e 100644 --- a/pyload/plugins/account/DebridItaliaCom.py +++ b/pyload/plugins/account/DebridItaliaCom.py @@ -8,13 +8,13 @@ from pyload.plugins.Account import Account class DebridItaliaCom(Account): - __name__ = "DebridItaliaCom" - __type__ = "account" - __version__ = "0.11" + __name = "DebridItaliaCom" + __type = "account" + __version = "0.11" - __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/plugins/account/DepositfilesCom.py b/pyload/plugins/account/DepositfilesCom.py index 264e55c5a..fba6111f0 100644 --- a/pyload/plugins/account/DepositfilesCom.py +++ b/pyload/plugins/account/DepositfilesCom.py @@ -8,13 +8,13 @@ from pyload.plugins.Account import Account class DepositfilesCom(Account): - __name__ = "DepositfilesCom" - __type__ = "account" - __version__ = "0.30" + __name = "DepositfilesCom" + __type = "account" + __version = "0.30" - __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/plugins/account/DevhostSt.py b/pyload/plugins/account/DevhostSt.py index 07eaf339a..5be211809 100644 --- a/pyload/plugins/account/DevhostSt.py +++ b/pyload/plugins/account/DevhostSt.py @@ -9,15 +9,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DevhostSt(SimpleHoster): - __name__ = "DevhostSt" - __type__ = "hoster" - __version__ = "0.03" + __name = "DevhostSt" + __type = "hoster" + __version = "0.03" - __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'>Filename:</span> <div title="(?P<N>.+?)"' diff --git a/pyload/plugins/account/DevhostStFolder.py b/pyload/plugins/account/DevhostStFolder.py index 51142fde9..942dc6b59 100644 --- a/pyload/plugins/account/DevhostStFolder.py +++ b/pyload/plugins/account/DevhostStFolder.py @@ -11,17 +11,17 @@ from pyload.plugins.internal.SimpleCrypter import SimpleCrypter class DevhostStFolder(SimpleCrypter): - __name__ = "DevhostStFolder" - __type__ = "crypter" - __version__ = "0.03" + __name = "DevhostStFolder" + __type = "crypter" + __version = "0.03" - __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 DevhostStFolder(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,7 +49,7 @@ class DevhostStFolder(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/plugins/account/DropboxCom.py b/pyload/plugins/account/DropboxCom.py index 40d5584a4..30c26bc20 100644 --- a/pyload/plugins/account/DropboxCom.py +++ b/pyload/plugins/account/DropboxCom.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DropboxCom(SimpleHoster): - __name__ = "DropboxCom" - __type__ = "hoster" - __version__ = "0.03" + __name = "DropboxCom" + __type = "hoster" + __version = "0.03" - __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/plugins/account/EasybytezCom.py b/pyload/plugins/account/EasybytezCom.py index 64b59413c..1491b8a80 100644 --- a/pyload/plugins/account/EasybytezCom.py +++ b/pyload/plugins/account/EasybytezCom.py @@ -6,13 +6,13 @@ from pyload.plugins.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/plugins/account/EuroshareEu.py b/pyload/plugins/account/EuroshareEu.py index ccb213997..667718651 100644 --- a/pyload/plugins/account/EuroshareEu.py +++ b/pyload/plugins/account/EuroshareEu.py @@ -7,13 +7,13 @@ from pyload.plugins.Account import Account class EuroshareEu(Account): - __name__ = "EuroshareEu" - __type__ = "account" - __version__ = "0.01" + __name = "EuroshareEu" + __type = "account" + __version = "0.01" - __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/plugins/account/FastixRu.py b/pyload/plugins/account/FastixRu.py index a2d21d5fd..40b567b92 100644 --- a/pyload/plugins/account/FastixRu.py +++ b/pyload/plugins/account/FastixRu.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class FastixRu(Account): - __name__ = "FastixRu" - __type__ = "account" - __version__ = "0.02" + __name = "FastixRu" + __type = "account" + __version = "0.02" - __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/plugins/account/FastshareCz.py b/pyload/plugins/account/FastshareCz.py index 1c8f6fd48..46f4c304c 100644 --- a/pyload/plugins/account/FastshareCz.py +++ b/pyload/plugins/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/plugins/account/File4safeCom.py b/pyload/plugins/account/File4safeCom.py index 42b67e08f..555e9f4ea 100644 --- a/pyload/plugins/account/File4safeCom.py +++ b/pyload/plugins/account/File4safeCom.py @@ -4,13 +4,13 @@ from pyload.plugins.internal.XFSAccount import XFSAccount class File4safeCom(XFSAccount): - __name__ = "File4safeCom" - __type__ = "account" - __version__ = "0.04" + __name = "File4safeCom" + __type = "account" + __version = "0.04" - __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/plugins/account/FileParadoxIn.py b/pyload/plugins/account/FileParadoxIn.py index cee7bec2f..b0090bb27 100644 --- a/pyload/plugins/account/FileParadoxIn.py +++ b/pyload/plugins/account/FileParadoxIn.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/FilecloudIo.py b/pyload/plugins/account/FilecloudIo.py index 83faee226..ce0cc2d34 100644 --- a/pyload/plugins/account/FilecloudIo.py +++ b/pyload/plugins/account/FilecloudIo.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class FilecloudIo(Account): - __name__ = "FilecloudIo" - __type__ = "account" - __version__ = "0.02" + __name = "FilecloudIo" + __type = "account" + __version = "0.02" - __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/plugins/account/FilefactoryCom.py b/pyload/plugins/account/FilefactoryCom.py index b157dc058..21a6db6fb 100644 --- a/pyload/plugins/account/FilefactoryCom.py +++ b/pyload/plugins/account/FilefactoryCom.py @@ -9,13 +9,13 @@ from pyload.plugins.Account import Account class FilefactoryCom(Account): - __name__ = "FilefactoryCom" - __type__ = "account" - __version__ = "0.14" + __name = "FilefactoryCom" + __type = "account" + __version = "0.14" - __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/plugins/account/FilejungleCom.py b/pyload/plugins/account/FilejungleCom.py index 8a7f843cd..d3dbcd603 100644 --- a/pyload/plugins/account/FilejungleCom.py +++ b/pyload/plugins/account/FilejungleCom.py @@ -7,13 +7,13 @@ from pyload.plugins.Account import Account class FilejungleCom(Account): - __name__ = "FilejungleCom" - __type__ = "account" - __version__ = "0.11" + __name = "FilejungleCom" + __type = "account" + __version = "0.11" - __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/plugins/account/FileomCom.py b/pyload/plugins/account/FileomCom.py index 04f503b3b..583b81d8a 100644 --- a/pyload/plugins/account/FileomCom.py +++ b/pyload/plugins/account/FileomCom.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/FilerNet.py b/pyload/plugins/account/FilerNet.py index 9c70ff56a..36758f37d 100644 --- a/pyload/plugins/account/FilerNet.py +++ b/pyload/plugins/account/FilerNet.py @@ -7,13 +7,13 @@ from pyload.plugins.Account import Account class FilerNet(Account): - __name__ = "FilerNet" - __type__ = "account" - __version__ = "0.02" + __name = "FilerNet" + __type = "account" + __version = "0.02" - __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/plugins/account/FilerioCom.py b/pyload/plugins/account/FilerioCom.py index 27d8df13f..87a633dff 100644 --- a/pyload/plugins/account/FilerioCom.py +++ b/pyload/plugins/account/FilerioCom.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/FilesMailRu.py b/pyload/plugins/account/FilesMailRu.py index 0635e185e..4a829be89 100644 --- a/pyload/plugins/account/FilesMailRu.py +++ b/pyload/plugins/account/FilesMailRu.py @@ -4,13 +4,13 @@ from pyload.plugins.Account import Account class FilesMailRu(Account): - __name__ = "FilesMailRu" - __type__ = "account" - __version__ = "0.10" + __name = "FilesMailRu" + __type = "account" + __version = "0.10" - __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/plugins/account/FileserveCom.py b/pyload/plugins/account/FileserveCom.py index 0b234513d..80be1db70 100644 --- a/pyload/plugins/account/FileserveCom.py +++ b/pyload/plugins/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/plugins/account/FourSharedCom.py b/pyload/plugins/account/FourSharedCom.py index 338e5ca4c..5565cbfc0 100644 --- a/pyload/plugins/account/FourSharedCom.py +++ b/pyload/plugins/account/FourSharedCom.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class FourSharedCom(Account): - __name__ = "FourSharedCom" - __type__ = "account" - __version__ = "0.03" + __name = "FourSharedCom" + __type = "account" + __version = "0.03" - __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/plugins/account/FreakshareCom.py b/pyload/plugins/account/FreakshareCom.py index 165d7a5cc..4a7bf5b59 100644 --- a/pyload/plugins/account/FreakshareCom.py +++ b/pyload/plugins/account/FreakshareCom.py @@ -8,13 +8,13 @@ from pyload.plugins.Account import Account class FreakshareCom(Account): - __name__ = "FreakshareCom" - __type__ = "account" - __version__ = "0.11" + __name = "FreakshareCom" + __type = "account" + __version = "0.11" - __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/plugins/account/FreeWayMe.py b/pyload/plugins/account/FreeWayMe.py index 4d1e68348..efc4b28fc 100644 --- a/pyload/plugins/account/FreeWayMe.py +++ b/pyload/plugins/account/FreeWayMe.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class FreeWayMe(Account): - __name__ = "FreeWayMe" - __type__ = "account" - __version__ = "0.11" + __name = "FreeWayMe" + __type = "account" + __version = "0.11" - __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/plugins/account/FshareVn.py b/pyload/plugins/account/FshareVn.py index 547c2b500..00ad9711c 100644 --- a/pyload/plugins/account/FshareVn.py +++ b/pyload/plugins/account/FshareVn.py @@ -8,13 +8,13 @@ from pyload.plugins.Account import Account class FshareVn(Account): - __name__ = "FshareVn" - __type__ = "account" - __version__ = "0.07" + __name = "FshareVn" + __type = "account" + __version = "0.07" - __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/plugins/account/Ftp.py b/pyload/plugins/account/Ftp.py index bdad58d2b..cdc4d46cb 100644 --- a/pyload/plugins/account/Ftp.py +++ b/pyload/plugins/account/Ftp.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/HellshareCz.py b/pyload/plugins/account/HellshareCz.py index ede621b1d..964511383 100644 --- a/pyload/plugins/account/HellshareCz.py +++ b/pyload/plugins/account/HellshareCz.py @@ -7,13 +7,13 @@ from pyload.plugins.Account import Account class HellshareCz(Account): - __name__ = "HellshareCz" - __type__ = "account" - __version__ = "0.14" + __name = "HellshareCz" + __type = "account" + __version = "0.14" - __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/plugins/account/Http.py b/pyload/plugins/account/Http.py index 97e8e9e7b..141443e27 100644 --- a/pyload/plugins/account/Http.py +++ b/pyload/plugins/account/Http.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/HugefilesNet.py b/pyload/plugins/account/HugefilesNet.py index 242ae118c..475d50295 100644 --- a/pyload/plugins/account/HugefilesNet.py +++ b/pyload/plugins/account/HugefilesNet.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/HundredEightyUploadCom.py b/pyload/plugins/account/HundredEightyUploadCom.py index 89d779e52..6a22285cb 100644 --- a/pyload/plugins/account/HundredEightyUploadCom.py +++ b/pyload/plugins/account/HundredEightyUploadCom.py @@ -4,13 +4,13 @@ from pyload.plugins.internal.XFSAccount import XFSAccount class HundredEightyUploadCom(XFSAccount): - __name__ = "HundredEightyUploadCom" - __type__ = "account" - __version__ = "0.02" + __name = "HundredEightyUploadCom" + __type = "account" + __version = "0.02" - __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/plugins/account/JunocloudMe.py b/pyload/plugins/account/JunocloudMe.py index 14fe8ddd7..547aec47a 100644 --- a/pyload/plugins/account/JunocloudMe.py +++ b/pyload/plugins/account/JunocloudMe.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/Keep2shareCc.py b/pyload/plugins/account/Keep2shareCc.py index 9636c456f..cbbf75548 100644 --- a/pyload/plugins/account/Keep2shareCc.py +++ b/pyload/plugins/account/Keep2shareCc.py @@ -8,13 +8,13 @@ from pyload.plugins.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/plugins/account/KingfilesNet.py b/pyload/plugins/account/KingfilesNet.py index b2d7d122a..b8002741f 100644 --- a/pyload/plugins/account/KingfilesNet.py +++ b/pyload/plugins/account/KingfilesNet.py @@ -7,15 +7,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class KingfilesNet(SimpleHoster): - __name__ = "KingfilesNet" - __type__ = "hoster" - __version__ = "0.05" + __name = "KingfilesNet" + __type = "hoster" + __version = "0.05" - __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/plugins/account/LetitbitNet.py b/pyload/plugins/account/LetitbitNet.py index 75b0a8264..5a3d2ea90 100644 --- a/pyload/plugins/account/LetitbitNet.py +++ b/pyload/plugins/account/LetitbitNet.py @@ -5,13 +5,13 @@ from pyload.plugins.Account import Account class LetitbitNet(Account): - __name__ = "LetitbitNet" - __type__ = "account" - __version__ = "0.01" + __name = "LetitbitNet" + __type = "account" + __version = "0.01" - __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/plugins/account/LinestorageCom.py b/pyload/plugins/account/LinestorageCom.py index 351d66d48..f94ee8fa0 100644 --- a/pyload/plugins/account/LinestorageCom.py +++ b/pyload/plugins/account/LinestorageCom.py @@ -4,13 +4,13 @@ from pyload.plugins.internal.XFSAccount import XFSAccount class LinestorageCom(XFSAccount): - __name__ = "LinestorageCom" - __type__ = "account" - __version__ = "0.02" + __name = "LinestorageCom" + __type = "account" + __version = "0.02" - __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/plugins/account/LinksnappyCom.py b/pyload/plugins/account/LinksnappyCom.py index f1eba5646..cf3d7a6e2 100644 --- a/pyload/plugins/account/LinksnappyCom.py +++ b/pyload/plugins/account/LinksnappyCom.py @@ -7,13 +7,13 @@ from pyload.utils import json_loads class LinksnappyCom(Account): - __name__ = "LinksnappyCom" - __type__ = "account" - __version__ = "0.02" + __name = "LinksnappyCom" + __type = "account" + __version = "0.02" - __description__ = """Linksnappy.com account plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Linksnappy.com account plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] def loadAccountInfo(self, user, req): diff --git a/pyload/plugins/account/LomafileCom.py b/pyload/plugins/account/LomafileCom.py index 937b24fae..fdf0bd528 100644 --- a/pyload/plugins/account/LomafileCom.py +++ b/pyload/plugins/account/LomafileCom.py @@ -4,13 +4,13 @@ from pyload.plugins.internal.XFSAccount import XFSAccount class LomafileCom(XFSAccount): - __name__ = "LomafileCom" - __type__ = "account" - __version__ = "0.02" + __name = "LomafileCom" + __type = "account" + __version = "0.02" - __description__ = """Lomafile.com account plugin""" - __license__ = "GPLv3" - __authors__ = [("guidobelix", "guidobelix@hotmail.it")] + __description = """Lomafile.com account plugin""" + __license = "GPLv3" + __authors = [("guidobelix", "guidobelix@hotmail.it")] HOSTER_DOMAIN = "lomafile.com" diff --git a/pyload/plugins/account/MegaDebridEu.py b/pyload/plugins/account/MegaDebridEu.py index 555481c74..7b0e6f3f4 100644 --- a/pyload/plugins/account/MegaDebridEu.py +++ b/pyload/plugins/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/plugins/account/MegaRapidCz.py b/pyload/plugins/account/MegaRapidCz.py index 3fa687a6e..ffe08319f 100644 --- a/pyload/plugins/account/MegaRapidCz.py +++ b/pyload/plugins/account/MegaRapidCz.py @@ -7,13 +7,13 @@ from pyload.plugins.Account import Account class MegaRapidCz(Account): - __name__ = "MegaRapidCz" - __type__ = "account" - __version__ = "0.34" + __name = "MegaRapidCz" + __type = "account" + __version = "0.34" - __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/plugins/account/MegasharesCom.py b/pyload/plugins/account/MegasharesCom.py index ca90e0354..d55e6c3a4 100644 --- a/pyload/plugins/account/MegasharesCom.py +++ b/pyload/plugins/account/MegasharesCom.py @@ -7,13 +7,13 @@ from pyload.plugins.Account import Account class MegasharesCom(Account): - __name__ = "MegasharesCom" - __type__ = "account" - __version__ = "0.02" + __name = "MegasharesCom" + __type = "account" + __version = "0.02" - __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/plugins/account/MovReelCom.py b/pyload/plugins/account/MovReelCom.py index 7a00af5d3..7e41693e0 100644 --- a/pyload/plugins/account/MovReelCom.py +++ b/pyload/plugins/account/MovReelCom.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/MultishareCz.py b/pyload/plugins/account/MultishareCz.py index 69deef8f4..cb2f6a1d4 100644 --- a/pyload/plugins/account/MultishareCz.py +++ b/pyload/plugins/account/MultishareCz.py @@ -6,13 +6,13 @@ from pyload.plugins.Account import Account class MultishareCz(Account): - __name__ = "MultishareCz" - __type__ = "account" - __version__ = "0.03" + __name = "MultishareCz" + __type = "account" + __version = "0.03" - __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/plugins/account/MyfastfileCom.py b/pyload/plugins/account/MyfastfileCom.py index a99522fa7..3aa16ee80 100644 --- a/pyload/plugins/account/MyfastfileCom.py +++ b/pyload/plugins/account/MyfastfileCom.py @@ -7,13 +7,13 @@ from pyload.utils import json_loads class MyfastfileCom(Account): - __name__ = "MyfastfileCom" - __type__ = "account" - __version__ = "0.02" + __name = "MyfastfileCom" + __type = "account" + __version = "0.02" - __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/plugins/account/NetloadIn.py b/pyload/plugins/account/NetloadIn.py index 3b5a65f92..e2cb03b91 100644 --- a/pyload/plugins/account/NetloadIn.py +++ b/pyload/plugins/account/NetloadIn.py @@ -7,13 +7,13 @@ from pyload.plugins.Account import Account class NetloadIn(Account): - __name__ = "NetloadIn" - __type__ = "account" - __version__ = "0.22" + __name = "NetloadIn" + __type = "account" + __version = "0.22" - __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/plugins/account/NosuploadCom.py b/pyload/plugins/account/NosuploadCom.py index 9c11699ec..d839827ed 100644 --- a/pyload/plugins/account/NosuploadCom.py +++ b/pyload/plugins/account/NosuploadCom.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/NovafileCom.py b/pyload/plugins/account/NovafileCom.py index cb3a639f5..b244139bc 100644 --- a/pyload/plugins/account/NovafileCom.py +++ b/pyload/plugins/account/NovafileCom.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/NowVideoAt.py b/pyload/plugins/account/NowVideoAt.py index b18c28b62..0926dc03b 100644 --- a/pyload/plugins/account/NowVideoAt.py +++ b/pyload/plugins/account/NowVideoAt.py @@ -8,13 +8,13 @@ from pyload.plugins.Account import Account class NowVideoAt(Account): - __name__ = "NowVideoAt" - __type__ = "account" - __version__ = "0.01" + __name = "NowVideoAt" + __type = "account" + __version = "0.01" - __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/plugins/account/OboomCom.py b/pyload/plugins/account/OboomCom.py index 265424602..4ea2483aa 100644 --- a/pyload/plugins/account/OboomCom.py +++ b/pyload/plugins/account/OboomCom.py @@ -9,13 +9,13 @@ from pyload.plugins.Account import Account class OboomCom(Account): - __name__ = "OboomCom" - __type__ = "account" - __version__ = "0.21" + __name = "OboomCom" + __type = "account" + __version = "0.21" - __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/plugins/account/OneFichierCom.py b/pyload/plugins/account/OneFichierCom.py index 55583f3ad..3ee602202 100644 --- a/pyload/plugins/account/OneFichierCom.py +++ b/pyload/plugins/account/OneFichierCom.py @@ -10,13 +10,13 @@ from pyload.plugins.Account import Account class OneFichierCom(Account): - __name__ = "OneFichierCom" - __type__ = "account" - __version__ = "0.11" + __name = "OneFichierCom" + __type = "account" + __version = "0.11" - __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/plugins/account/OverLoadMe.py b/pyload/plugins/account/OverLoadMe.py index 201598b26..2bedb496a 100644 --- a/pyload/plugins/account/OverLoadMe.py +++ b/pyload/plugins/account/OverLoadMe.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class OverLoadMe(Account): - __name__ = "OverLoadMe" - __type__ = "account" - __version__ = "0.01" + __name = "OverLoadMe" + __type = "account" + __version = "0.01" - __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/plugins/account/PremiumTo.py b/pyload/plugins/account/PremiumTo.py index 96fdf859b..191678434 100644 --- a/pyload/plugins/account/PremiumTo.py +++ b/pyload/plugins/account/PremiumTo.py @@ -4,13 +4,13 @@ from pyload.plugins.Account import Account class PremiumTo(Account): - __name__ = "PremiumTo" - __type__ = "account" - __version__ = "0.04" + __name = "PremiumTo" + __type = "account" + __version = "0.04" - __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/plugins/account/PremiumizeMe.py b/pyload/plugins/account/PremiumizeMe.py index 68c9a599b..96dd67b98 100644 --- a/pyload/plugins/account/PremiumizeMe.py +++ b/pyload/plugins/account/PremiumizeMe.py @@ -6,13 +6,13 @@ from pyload.utils import json_loads class PremiumizeMe(Account): - __name__ = "PremiumizeMe" - __type__ = "account" - __version__ = "0.11" + __name = "PremiumizeMe" + __type = "account" + __version = "0.11" - __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/plugins/account/QuickshareCz.py b/pyload/plugins/account/QuickshareCz.py index 21af09589..c4da516fb 100644 --- a/pyload/plugins/account/QuickshareCz.py +++ b/pyload/plugins/account/QuickshareCz.py @@ -6,13 +6,13 @@ from pyload.plugins.Account import Account class QuickshareCz(Account): - __name__ = "QuickshareCz" - __type__ = "account" - __version__ = "0.02" + __name = "QuickshareCz" + __type = "account" + __version = "0.02" - __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/plugins/account/RPNetBiz.py b/pyload/plugins/account/RPNetBiz.py index 2073452df..b652b377c 100644 --- a/pyload/plugins/account/RPNetBiz.py +++ b/pyload/plugins/account/RPNetBiz.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class RPNetBiz(Account): - __name__ = "RPNetBiz" - __type__ = "account" - __version__ = "0.10" + __name = "RPNetBiz" + __type = "account" + __version = "0.10" - __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/plugins/account/RapidfileshareNet.py b/pyload/plugins/account/RapidfileshareNet.py index 503c731fe..1c055ea19 100644 --- a/pyload/plugins/account/RapidfileshareNet.py +++ b/pyload/plugins/account/RapidfileshareNet.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/RapidgatorNet.py b/pyload/plugins/account/RapidgatorNet.py index fc0c50ca1..3dd8cf3d2 100644 --- a/pyload/plugins/account/RapidgatorNet.py +++ b/pyload/plugins/account/RapidgatorNet.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class RapidgatorNet(Account): - __name__ = "RapidgatorNet" - __type__ = "account" - __version__ = "0.04" + __name = "RapidgatorNet" + __type = "account" + __version = "0.04" - __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/plugins/account/RapiduNet.py b/pyload/plugins/account/RapiduNet.py index 4bc418069..127aceb3b 100644 --- a/pyload/plugins/account/RapiduNet.py +++ b/pyload/plugins/account/RapiduNet.py @@ -7,13 +7,13 @@ from pyload.utils import json_loads class RapiduNet(Account): - __name__ = "RapiduNet" - __type__ = "account" - __version__ = "0.01" + __name = "RapiduNet" + __type = "account" + __version = "0.01" - __description__ = """Rapidu.net account plugin""" - __license__ = "GPLv3" - __authors__ = [("prOq", None)] + __description = """Rapidu.net account plugin""" + __license = "GPLv3" + __authors = [("prOq", None)] ACCOUNT_INFO_PATTERN = '<a href="premium/" style="padding-left: 0px;">Account: <b>(.*?)</b></a>' diff --git a/pyload/plugins/account/RarefileNet.py b/pyload/plugins/account/RarefileNet.py index 0d5547e57..c0b855373 100644 --- a/pyload/plugins/account/RarefileNet.py +++ b/pyload/plugins/account/RarefileNet.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/RealdebridCom.py b/pyload/plugins/account/RealdebridCom.py index bee51de31..c181a1343 100644 --- a/pyload/plugins/account/RealdebridCom.py +++ b/pyload/plugins/account/RealdebridCom.py @@ -6,13 +6,13 @@ from pyload.plugins.Account import Account class RealdebridCom(Account): - __name__ = "RealdebridCom" - __type__ = "account" - __version__ = "0.43" + __name = "RealdebridCom" + __type = "account" + __version = "0.43" - __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/plugins/account/RehostTo.py b/pyload/plugins/account/RehostTo.py index e613dec06..1a7ea9577 100644 --- a/pyload/plugins/account/RehostTo.py +++ b/pyload/plugins/account/RehostTo.py @@ -4,13 +4,13 @@ from pyload.plugins.Account import Account class RehostTo(Account): - __name__ = "RehostTo" - __type__ = "account" - __version__ = "0.10" + __name = "RehostTo" + __type = "account" + __version = "0.10" - __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/plugins/account/RyushareCom.py b/pyload/plugins/account/RyushareCom.py index 47ec32c76..57f04f862 100644 --- a/pyload/plugins/account/RyushareCom.py +++ b/pyload/plugins/account/RyushareCom.py @@ -4,13 +4,13 @@ from pyload.plugins.internal.XFSAccount import XFSAccount class RyushareCom(XFSAccount): - __name__ = "RyushareCom" - __type__ = "account" - __version__ = "0.05" + __name = "RyushareCom" + __type = "account" + __version = "0.05" - __description__ = """Ryushare.com account plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + __description = """Ryushare.com account plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz"), ("trance4us", None)] diff --git a/pyload/plugins/account/SafesharingEu.py b/pyload/plugins/account/SafesharingEu.py index bdc43bec7..a48ce86b3 100644 --- a/pyload/plugins/account/SafesharingEu.py +++ b/pyload/plugins/account/SafesharingEu.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/SecureUploadEu.py b/pyload/plugins/account/SecureUploadEu.py index c98ab2de9..38c7f9646 100644 --- a/pyload/plugins/account/SecureUploadEu.py +++ b/pyload/plugins/account/SecureUploadEu.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/SendmywayCom.py b/pyload/plugins/account/SendmywayCom.py index 6749e6215..fefbcba4b 100644 --- a/pyload/plugins/account/SendmywayCom.py +++ b/pyload/plugins/account/SendmywayCom.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/ShareonlineBiz.py b/pyload/plugins/account/ShareonlineBiz.py index 42bced626..1cf6fd3c8 100644 --- a/pyload/plugins/account/ShareonlineBiz.py +++ b/pyload/plugins/account/ShareonlineBiz.py @@ -4,13 +4,13 @@ from pyload.plugins.Account import Account class ShareonlineBiz(Account): - __name__ = "ShareonlineBiz" - __type__ = "account" - __version__ = "0.24" + __name = "ShareonlineBiz" + __type = "account" + __version = "0.24" - __description__ = """Share-online.biz account plugin""" - __license__ = "GPLv3" - __authors__ = [("mkaay", "mkaay@mkaay.de"), + __description = """Share-online.biz account plugin""" + __license = "GPLv3" + __authors = [("mkaay", "mkaay@mkaay.de"), ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugins/account/SimplyPremiumCom.py b/pyload/plugins/account/SimplyPremiumCom.py index 2dafb12d0..2fabe6ce8 100644 --- a/pyload/plugins/account/SimplyPremiumCom.py +++ b/pyload/plugins/account/SimplyPremiumCom.py @@ -5,13 +5,13 @@ from pyload.plugins.Account import Account class SimplyPremiumCom(Account): - __name__ = "SimplyPremiumCom" - __type__ = "account" - __version__ = "0.01" + __name = "SimplyPremiumCom" + __type = "account" + __version = "0.01" - __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/plugins/account/SimplydebridCom.py b/pyload/plugins/account/SimplydebridCom.py index 5cf148d4d..4930eaea5 100644 --- a/pyload/plugins/account/SimplydebridCom.py +++ b/pyload/plugins/account/SimplydebridCom.py @@ -6,13 +6,13 @@ from pyload.plugins.Account import Account class SimplydebridCom(Account): - __name__ = "SimplydebridCom" - __type__ = "account" - __version__ = "0.10" + __name = "SimplydebridCom" + __type = "account" + __version = "0.10" - __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/plugins/account/StahnuTo.py b/pyload/plugins/account/StahnuTo.py index c08b26b49..d2358191a 100644 --- a/pyload/plugins/account/StahnuTo.py +++ b/pyload/plugins/account/StahnuTo.py @@ -6,13 +6,13 @@ from pyload.plugins.Account import Account class StahnuTo(Account): - __name__ = "StahnuTo" - __type__ = "account" - __version__ = "0.03" + __name = "StahnuTo" + __type = "account" + __version = "0.03" - __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/plugins/account/StreamcloudEu.py b/pyload/plugins/account/StreamcloudEu.py index a2a333dd5..49768bc6f 100644 --- a/pyload/plugins/account/StreamcloudEu.py +++ b/pyload/plugins/account/StreamcloudEu.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/TurbobitNet.py b/pyload/plugins/account/TurbobitNet.py index 7370f4f33..b60c89a61 100644 --- a/pyload/plugins/account/TurbobitNet.py +++ b/pyload/plugins/account/TurbobitNet.py @@ -7,13 +7,13 @@ from pyload.plugins.Account import Account class TurbobitNet(Account): - __name__ = "TurbobitNet" - __type__ = "account" - __version__ = "0.01" + __name = "TurbobitNet" + __type = "account" + __version = "0.01" - __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/plugins/account/TusfilesNet.py b/pyload/plugins/account/TusfilesNet.py index 9aa8ed543..c665c608e 100644 --- a/pyload/plugins/account/TusfilesNet.py +++ b/pyload/plugins/account/TusfilesNet.py @@ -8,13 +8,13 @@ from pyload.plugins.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/plugins/account/UlozTo.py b/pyload/plugins/account/UlozTo.py index 1c27182b6..32966bd28 100644 --- a/pyload/plugins/account/UlozTo.py +++ b/pyload/plugins/account/UlozTo.py @@ -8,13 +8,13 @@ from pyload.plugins.Account import Account class UlozTo(Account): - __name__ = "UlozTo" - __type__ = "account" - __version__ = "0.07" + __name = "UlozTo" + __type = "account" + __version = "0.07" - __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", None)] diff --git a/pyload/plugins/account/UnrestrictLi.py b/pyload/plugins/account/UnrestrictLi.py index dae1b0779..8ecfc50eb 100644 --- a/pyload/plugins/account/UnrestrictLi.py +++ b/pyload/plugins/account/UnrestrictLi.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class UnrestrictLi(Account): - __name__ = "UnrestrictLi" - __type__ = "account" - __version__ = "0.03" + __name = "UnrestrictLi" + __type = "account" + __version = "0.03" - __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/plugins/account/UploadcCom.py b/pyload/plugins/account/UploadcCom.py index 8f437eb01..df3d89a13 100644 --- a/pyload/plugins/account/UploadcCom.py +++ b/pyload/plugins/account/UploadcCom.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/UploadedTo.py b/pyload/plugins/account/UploadedTo.py index 82b95694e..2db549802 100644 --- a/pyload/plugins/account/UploadedTo.py +++ b/pyload/plugins/account/UploadedTo.py @@ -7,13 +7,13 @@ from pyload.plugins.Account import Account class UploadedTo(Account): - __name__ = "UploadedTo" - __type__ = "account" - __version__ = "0.27" + __name = "UploadedTo" + __type = "account" + __version = "0.27" - __description__ = """Uploaded.to account plugin""" - __license__ = "GPLv3" - __authors__ = [("mkaay", "mkaay@mkaay.de")] + __description = """Uploaded.to account plugin""" + __license = "GPLv3" + __authors = [("mkaay", "mkaay@mkaay.de")] PREMIUM_PATTERN = r'<em>Premium</em>' diff --git a/pyload/plugins/account/UploadheroCom.py b/pyload/plugins/account/UploadheroCom.py index 02863b736..5fce73ff1 100644 --- a/pyload/plugins/account/UploadheroCom.py +++ b/pyload/plugins/account/UploadheroCom.py @@ -8,13 +8,13 @@ from pyload.plugins.Account import Account class UploadheroCom(Account): - __name__ = "UploadheroCom" - __type__ = "account" - __version__ = "0.20" + __name = "UploadheroCom" + __type = "account" + __version = "0.20" - __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/plugins/account/UploadingCom.py b/pyload/plugins/account/UploadingCom.py index 979f73d21..b7eecd6b6 100644 --- a/pyload/plugins/account/UploadingCom.py +++ b/pyload/plugins/account/UploadingCom.py @@ -9,13 +9,13 @@ from pyload.plugins.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/plugins/account/UptoboxCom.py b/pyload/plugins/account/UptoboxCom.py index 9438888e3..869ddf214 100644 --- a/pyload/plugins/account/UptoboxCom.py +++ b/pyload/plugins/account/UptoboxCom.py @@ -4,13 +4,13 @@ from pyload.plugins.internal.XFSAccount import XFSAccount class UptoboxCom(XFSAccount): - __name__ = "UptoboxCom" - __type__ = "account" - __version__ = "0.07" + __name = "UptoboxCom" + __type = "account" + __version = "0.07" - __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/plugins/account/VidPlayNet.py b/pyload/plugins/account/VidPlayNet.py index 4393b3a82..f3c7f0d4a 100644 --- a/pyload/plugins/account/VidPlayNet.py +++ b/pyload/plugins/account/VidPlayNet.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/account/XFileSharingPro.py b/pyload/plugins/account/XFileSharingPro.py index aa16d5045..834fb9735 100644 --- a/pyload/plugins/account/XFileSharingPro.py +++ b/pyload/plugins/account/XFileSharingPro.py @@ -4,13 +4,13 @@ from pyload.plugins.internal.XFSAccount import XFSAccount class XFileSharingPro(XFSAccount): - __name__ = "XFileSharingPro" - __type__ = "account" - __version__ = "0.05" + __name = "XFileSharingPro" + __type = "account" + __version = "0.05" - __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/plugins/account/YibaishiwuCom.py b/pyload/plugins/account/YibaishiwuCom.py index 1bdb12886..fd9382f0d 100644 --- a/pyload/plugins/account/YibaishiwuCom.py +++ b/pyload/plugins/account/YibaishiwuCom.py @@ -6,13 +6,13 @@ from pyload.plugins.Account import Account class YibaishiwuCom(Account): - __name__ = "YibaishiwuCom" - __type__ = "account" - __version__ = "0.01" + __name = "YibaishiwuCom" + __type = "account" + __version = "0.01" - __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/plugins/account/ZeveraCom.py b/pyload/plugins/account/ZeveraCom.py index 198434643..f748bef17 100644 --- a/pyload/plugins/account/ZeveraCom.py +++ b/pyload/plugins/account/ZeveraCom.py @@ -6,13 +6,13 @@ from pyload.plugins.Account import Account class ZeveraCom(Account): - __name__ = "ZeveraCom" - __type__ = "account" - __version__ = "0.21" + __name = "ZeveraCom" + __type = "account" + __version = "0.21" - __description__ = """Zevera.com account plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Zevera.com account plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] def loadAccountInfo(self, user, req): diff --git a/pyload/plugins/addon/Checksum.py b/pyload/plugins/addon/Checksum.py index d6b10d7e2..adf542197 100644 --- a/pyload/plugins/addon/Checksum.py +++ b/pyload/plugins/addon/Checksum.py @@ -38,20 +38,20 @@ def computeChecksum(local_file, algorithm): class Checksum(Addon): - __name__ = "Checksum" - __type__ = "addon" - __version__ = "0.15" - - __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"), + __name = "Checksum" + __type = "addon" + __version = "0.15" + + __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"), ("Walter Purcaro", "vuolter@gmail.com"), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugins/addon/ClickAndLoad.py b/pyload/plugins/addon/ClickAndLoad.py index f4a6314be..3da2b2220 100644 --- a/pyload/plugins/addon/ClickAndLoad.py +++ b/pyload/plugins/addon/ClickAndLoad.py @@ -18,17 +18,17 @@ def forward(source, destination): class ClickAndLoad(Addon): - __name__ = "ClickAndLoad" - __type__ = "addon" - __version__ = "0.23" + __name = "ClickAndLoad" + __type = "addon" + __version = "0.23" - __config__ = [("activated", "bool", "Activated" , True ), - ("port" , "int" , "Port" , 9666 ), - ("extern" , "bool", "Allow external link adding", False)] + __config = [("activated", "bool", "Activated" , True ), + ("port" , "int" , "Port" , 9666 ), + ("extern" , "bool", "Allow external link adding", False)] - __description__ = """Click'N'Load hook plugin""" - __license__ = "GPLv3" - __authors__ = [("RaNaN", "RaNaN@pyload.de"), + __description = """Click'N'Load hook plugin""" + __license = "GPLv3" + __authors = [("RaNaN", "RaNaN@pyload.de"), ("mkaay", "mkaay@mkaay.de"), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugins/addon/DeleteFinished.py b/pyload/plugins/addon/DeleteFinished.py index 3a966dcd6..327b63f4c 100644 --- a/pyload/plugins/addon/DeleteFinished.py +++ b/pyload/plugins/addon/DeleteFinished.py @@ -5,16 +5,16 @@ from pyload.plugins.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' ), - ('deloffline', 'bool', 'Delete packages with offline links', 'False')] + __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 coreReady(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/plugins/addon/DownloadScheduler.py b/pyload/plugins/addon/DownloadScheduler.py index ea58b3d01..5adbdc33e 100644 --- a/pyload/plugins/addon/DownloadScheduler.py +++ b/pyload/plugins/addon/DownloadScheduler.py @@ -8,16 +8,16 @@ from pyload.plugins.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"), - ("abort" , "bool", "Abort active downloads when start period with speed 0", False )] + __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/plugins/addon/ExternalScripts.py b/pyload/plugins/addon/ExternalScripts.py index 531e2f275..e6ee6a765 100644 --- a/pyload/plugins/addon/ExternalScripts.py +++ b/pyload/plugins/addon/ExternalScripts.py @@ -11,15 +11,15 @@ from pyload.utils import safe_join class ExternalScripts(Addon): - __name__ = "ExternalScripts" - __type__ = "addon" - __version__ = "0.25" + __name = "ExternalScripts" + __type = "addon" + __version = "0.25" - __config__ = [("activated", "bool", "Activated", True)] + __config = [("activated", "bool", "Activated", True)] - __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/plugins/addon/ExtractArchive.py b/pyload/plugins/addon/ExtractArchive.py index 1a416f901..135e460c3 100644 --- a/pyload/plugins/addon/ExtractArchive.py +++ b/pyload/plugins/addon/ExtractArchive.py @@ -57,25 +57,25 @@ from pyload.utils import safe_join, fs_encode class ExtractArchive(Addon): - __name__ = "ExtractArchive" - __type__ = "addon" - __version__ = "0.19" - - __config__ = [("activated" , "bool" , "Activated" , True ), - ("fullpath" , "bool" , "Extract full path" , True ), - ("overwrite" , "bool" , "Overwrite files" , True ), - ("passwordfile" , "file" , "password file" , "archive_password.txt"), - ("deletearchive", "bool" , "Delete archives when done" , False ), - ("subfolder" , "bool" , "Create subfolder for each package" , False ), - ("destination" , "folder", "Extract files to" , "" ), - ("excludefiles" , "str" , "Exclude files from unpacking (seperated by ;)", "" ), - ("recursive" , "bool" , "Extract archives in archvies" , True ), - ("queue" , "bool" , "Wait for all downloads to be finished" , True ), - ("renice" , "int" , "CPU Priority" , 0 )] - - __description__ = """Extract different kind of archives""" - __license__ = "GPLv3" - __authors__ = [("RaNaN", "ranan@pyload.org"), + __name = "ExtractArchive" + __type = "addon" + __version = "0.19" + + __config = [("activated" , "bool" , "Activated" , True ), + ("fullpath" , "bool" , "Extract full path" , True ), + ("overwrite" , "bool" , "Overwrite files" , True ), + ("passwordfile" , "file" , "password file" , "archive_password.txt"), + ("deletearchive", "bool" , "Delete archives when done" , False ), + ("subfolder" , "bool" , "Create subfolder for each package" , False ), + ("destination" , "folder", "Extract files to" , "" ), + ("excludefiles" , "str" , "Exclude files from unpacking (seperated by ;)", "" ), + ("recursive" , "bool" , "Extract archives in archvies" , True ), + ("queue" , "bool" , "Wait for all downloads to be finished" , True ), + ("renice" , "int" , "CPU Priority" , 0 )] + + __description = """Extract different kind of archives""" + __license = "GPLv3" + __authors = [("RaNaN", "ranan@pyload.org"), ("AndroKev", None), ("Walter Purcaro", "vuolter@gmail.com")] @@ -189,7 +189,7 @@ class ExtractArchive(Addon): for plugin in self.plugins: targets = plugin.getTargets(files_ids) if targets: - self.logDebug("Targets for %s: %s" % (plugin.__name__, targets)) + self.logDebug("Targets for %s: %s" % (plugin.__name, targets)) matched = True for target, fid in targets: if target in processed: diff --git a/pyload/plugins/addon/HotFolder.py b/pyload/plugins/addon/HotFolder.py index 801ed7bef..61e1acf81 100644 --- a/pyload/plugins/addon/HotFolder.py +++ b/pyload/plugins/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" - - __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")] + __name = "HotFolder" + __type = "addon" + __version = "0.12" + + __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")] def setup(self): diff --git a/pyload/plugins/addon/IRCInterface.py b/pyload/plugins/addon/IRCInterface.py index 2e0919caa..3ac018094 100644 --- a/pyload/plugins/addon/IRCInterface.py +++ b/pyload/plugins/addon/IRCInterface.py @@ -18,24 +18,24 @@ from pyload.utils import formatSize class IRCInterface(Thread, Addon): - __name__ = "IRCInterface" - __type__ = "addon" - __version__ = "0.13" - - __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" ), - ("ssl" , "bool", "Use SSL" , False ), - ("nick" , "str" , "Nickname the Client will take" , "pyLoad-IRC" ), - ("owner" , "str" , "Nickname the Client will accept commands from", "Enter your nick here!" ), - ("info_file", "bool", "Inform about every file finished" , False ), - ("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")] + __name = "IRCInterface" + __type = "addon" + __version = "0.13" + + __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" ), + ("ssl" , "bool", "Use SSL" , False ), + ("nick" , "str" , "Nickname the Client will take" , "pyLoad-IRC" ), + ("owner" , "str" , "Nickname the Client will accept commands from", "Enter your nick here!" ), + ("info_file", "bool", "Inform about every file finished" , False ), + ("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")] def __init__(self, core, manager): diff --git a/pyload/plugins/addon/MergeFiles.py b/pyload/plugins/addon/MergeFiles.py index 8a2573409..71ad7a39d 100644 --- a/pyload/plugins/addon/MergeFiles.py +++ b/pyload/plugins/addon/MergeFiles.py @@ -12,15 +12,15 @@ from pyload.utils import safe_join, fs_encode class MergeFiles(Addon): - __name__ = "MergeFiles" - __type__ = "addon" - __version__ = "0.13" + __name = "MergeFiles" + __type = "addon" + __version = "0.13" - __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/plugins/addon/MultiHome.py b/pyload/plugins/addon/MultiHome.py index 0db1df1bf..d9cc3fd6d 100644 --- a/pyload/plugins/addon/MultiHome.py +++ b/pyload/plugins/addon/MultiHome.py @@ -6,15 +6,15 @@ from pyload.plugins.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/plugins/addon/RestartFailed.py b/pyload/plugins/addon/RestartFailed.py index 0fe0b4af6..caf69869b 100644 --- a/pyload/plugins/addon/RestartFailed.py +++ b/pyload/plugins/addon/RestartFailed.py @@ -4,16 +4,16 @@ from pyload.plugins.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), - ("interval" , "int" , "Check interval in minutes", 90 )] + __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 coreReady(self): - self.pluginConfigChanged(self.__name__, "interval", self.getConfig("interval")) + self.pluginConfigChanged(self.__name, "interval", self.getConfig("interval")) diff --git a/pyload/plugins/addon/RestartSlow.py b/pyload/plugins/addon/RestartSlow.py index acf2852cd..2f1657154 100644 --- a/pyload/plugins/addon/RestartSlow.py +++ b/pyload/plugins/addon/RestartSlow.py @@ -6,19 +6,19 @@ from pyload.plugins.Addon import Addon class RestartSlow(Addon): - __name__ = "RestartSlow" - __type__ = "addon" - __version__ = "0.02" - - __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")] + __name = "RestartSlow" + __type = "addon" + __version = "0.02" + + __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")] event_list = ["downloadStarts"] diff --git a/pyload/plugins/addon/SkipRev.py b/pyload/plugins/addon/SkipRev.py index 4a69d8e09..5bef21d94 100644 --- a/pyload/plugins/addon/SkipRev.py +++ b/pyload/plugins/addon/SkipRev.py @@ -8,15 +8,15 @@ from pyload.plugins.Plugin import SkipDownload class SkipRev(Adoon): - __name__ = "SkipRev" - __type__ = "addon" - __version__ = "0.14" + __name = "SkipRev" + __type = "addon" + __version = "0.14" - __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 _setup(self): diff --git a/pyload/plugins/addon/UnSkipOnFail.py b/pyload/plugins/addon/UnSkipOnFail.py index a148f8f13..008af0c5b 100644 --- a/pyload/plugins/addon/UnSkipOnFail.py +++ b/pyload/plugins/addon/UnSkipOnFail.py @@ -8,15 +8,15 @@ from pyload.utils import fs_encode class UnSkipOnFail(Addon): - __name__ = "UnSkipOnFail" - __type__ = "addon" - __version__ = "0.02" + __name = "UnSkipOnFail" + __type = "addon" + __version = "0.02" - __config__ = [("activated", "bool", "Activated", True)] + __config = [("activated", "bool", "Activated", True)] - __description__ = """When a download fails, restart skipped duplicates""" - __license__ = "GPLv3" - __authors__ = [("hagg", None)] + __description = """When a download fails, restart skipped duplicates""" + __license = "GPLv3" + __authors = [("hagg", None)] def downloadFailed(self, pyfile): diff --git a/pyload/plugins/addon/UpdateManager.py b/pyload/plugins/addon/UpdateManager.py index b4818c943..18b96256b 100644 --- a/pyload/plugins/addon/UpdateManager.py +++ b/pyload/plugins/addon/UpdateManager.py @@ -14,26 +14,26 @@ from pyload.utils import safe_join class UpdateManager(Addon): - __name__ = "UpdateManager" - __type__ = "addon" - __version__ = "0.42" + __name = "UpdateManager" + __type = "addon" + __version = "0.42" - __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" , 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" , True )] - __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 coreReady(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 unload(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.plugins.") or - m.__name__.startswith("userplugins.")) and - m.__name__.count(".") >= 2, sys.modules.itervalues() + lambda m: m and (m.__name.startswith("pyload.plugins.") 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/plugins/addon/WindowsPhoneToastNotify.py b/pyload/plugins/addon/WindowsPhoneToastNotify.py index a6da7cd20..6b7c85980 100644 --- a/pyload/plugins/addon/WindowsPhoneToastNotify.py +++ b/pyload/plugins/addon/WindowsPhoneToastNotify.py @@ -7,18 +7,18 @@ from pyload.plugins.Addon import Addon class WindowsPhoneToastNotify(Addon): - __name__ = "WindowsPhoneToastNotify" - __type__ = "addon" - __version__ = "0.03" - - __config__ = [("force" , "bool", "Force even if client is connected" , False), - ("pushId" , "str" , "pushId" , "" ), - ("pushUrl" , "str" , "pushUrl" , "" ), - ("pushTimeout", "int" , "Timeout between notifications in seconds", 0 )] - - __description__ = """Send push notifications to Windows Phone""" - __license__ = "GPLv3" - __authors__ = [("Andy Voigt", "phone-support@hotmail.de")] + __name = "WindowsPhoneToastNotify" + __type = "addon" + __version = "0.03" + + __config = [("force" , "bool", "Force even if client is connected" , False), + ("pushId" , "str" , "pushId" , "" ), + ("pushUrl" , "str" , "pushUrl" , "" ), + ("pushTimeout", "int" , "Timeout between notifications in seconds", 0 )] + + __description = """Send push notifications to Windows Phone""" + __license = "GPLv3" + __authors = [("Andy Voigt", "phone-support@hotmail.de")] def getXmlData(self): diff --git a/pyload/plugins/addon/XMPPInterface.py b/pyload/plugins/addon/XMPPInterface.py index 7f91befd3..d634d3f9f 100644 --- a/pyload/plugins/addon/XMPPInterface.py +++ b/pyload/plugins/addon/XMPPInterface.py @@ -10,21 +10,21 @@ from pyload.plugins.addon.IRCInterface import IRCInterface class XMPPInterface(IRCInterface, JabberClient): - __name__ = "XMPPInterface" - __type__ = "addon" - __version__ = "0.11" - - __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"), - ("info_file", "bool", "Inform about every file finished" , False ), - ("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")] + __name = "XMPPInterface" + __type = "addon" + __version = "0.11" + + __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"), + ("info_file", "bool", "Inform about every file finished" , False ), + ("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")] implements(IMessageHandlersProvider) diff --git a/pyload/plugins/captcha/AdYouLike.py b/pyload/plugins/captcha/AdYouLike.py index fdfb18479..9c74e9348 100644 --- a/pyload/plugins/captcha/AdYouLike.py +++ b/pyload/plugins/captcha/AdYouLike.py @@ -7,13 +7,13 @@ from pyload.utils import json_loads class AdYouLike(Captcha): - __name__ = "AdYouLike" - __type__ = "captcha" - __version__ = "0.02" + __name = "AdYouLike" + __type = "captcha" + __version = "0.02" - __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/plugins/captcha/AdsCaptcha.py b/pyload/plugins/captcha/AdsCaptcha.py index cc9e54350..239d61a19 100644 --- a/pyload/plugins/captcha/AdsCaptcha.py +++ b/pyload/plugins/captcha/AdsCaptcha.py @@ -8,13 +8,13 @@ from pyload.plugins.Captcha import Captcha class AdsCaptcha(Captcha): - __name__ = "AdsCaptcha" - __type__ = "captcha" - __version__ = "0.06" + __name = "AdsCaptcha" + __type = "captcha" + __version = "0.06" - __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/plugins/captcha/ReCaptcha.py b/pyload/plugins/captcha/ReCaptcha.py index d954ceeb0..7a2ba9362 100644 --- a/pyload/plugins/captcha/ReCaptcha.py +++ b/pyload/plugins/captcha/ReCaptcha.py @@ -6,13 +6,13 @@ from pyload.plugins.Captcha import Captcha class ReCaptcha(Captcha): - __name__ = "ReCaptcha" - __type__ = "captcha" - __version__ = "0.08" + __name = "ReCaptcha" + __type = "captcha" + __version = "0.08" - __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")] KEY_PATTERN = r'recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=([\w-]+)' diff --git a/pyload/plugins/captcha/SolveMedia.py b/pyload/plugins/captcha/SolveMedia.py index 130b374b5..63db60627 100644 --- a/pyload/plugins/captcha/SolveMedia.py +++ b/pyload/plugins/captcha/SolveMedia.py @@ -6,13 +6,13 @@ from pyload.plugins.Captcha import Captcha class SolveMedia(Captcha): - __name__ = "SolveMedia" - __type__ = "captcha" - __version__ = "0.06" + __name = "SolveMedia" + __type = "captcha" + __version = "0.06" - __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/plugins/container/CCF.py b/pyload/plugins/container/CCF.py index 1c3991c44..9488d75f9 100644 --- a/pyload/plugins/container/CCF.py +++ b/pyload/plugins/container/CCF.py @@ -15,14 +15,14 @@ from pyload.utils import safe_join class CCF(Container): - __name__ = "CCF" - __version__ = "0.20" + __name = "CCF" + __version = "0.20" - __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")] def decrypt(self, pyfile): diff --git a/pyload/plugins/container/LinkList.py b/pyload/plugins/container/LinkList.py index 292920630..f80eecd4d 100644 --- a/pyload/plugins/container/LinkList.py +++ b/pyload/plugins/container/LinkList.py @@ -7,16 +7,16 @@ from pyload.utils import fs_encode class LinkList(Container): - __name__ = "LinkList" - __version__ = "0.12" + __name = "LinkList" + __version = "0.12" - __pattern__ = r'.+\.txt' - __config__ = [("clear", "bool", "Clear Linklist after adding", False), - ("encoding", "string", "File encoding (default utf-8)", "")] + __pattern = r'.+\.txt' + __config = [("clear", "bool", "Clear Linklist after adding", False), + ("encoding", "string", "File encoding (default utf-8)", "")] - __description__ = """Read link lists in txt format""" - __license__ = "GPLv3" - __authors__ = [("spoob", "spoob@pyload.org"), + __description = """Read link lists in txt format""" + __license = "GPLv3" + __authors = [("spoob", "spoob@pyload.org"), ("jeix", "jeix@hasnomail.com")] diff --git a/pyload/plugins/container/RSDF.py b/pyload/plugins/container/RSDF.py index a9d0b72c9..001b64bbc 100644 --- a/pyload/plugins/container/RSDF.py +++ b/pyload/plugins/container/RSDF.py @@ -11,14 +11,14 @@ from pyload.utils import fs_encode class RSDF(Container): - __name__ = "RSDF" - __version__ = "0.24" + __name = "RSDF" + __version = "0.24" - __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")] diff --git a/pyload/plugins/crypter/BitshareCom.py b/pyload/plugins/crypter/BitshareCom.py index 723faf594..226cd043f 100644 --- a/pyload/plugins/crypter/BitshareCom.py +++ b/pyload/plugins/crypter/BitshareCom.py @@ -4,17 +4,17 @@ from pyload.plugins.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/plugins/crypter/C1neonCom.py b/pyload/plugins/crypter/C1neonCom.py index c650d444b..39eac5ee7 100644 --- a/pyload/plugins/crypter/C1neonCom.py +++ b/pyload/plugins/crypter/C1neonCom.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(C1neonCom) diff --git a/pyload/plugins/crypter/ChipDe.py b/pyload/plugins/crypter/ChipDe.py index 41653bbe3..6bb879f35 100644 --- a/pyload/plugins/crypter/ChipDe.py +++ b/pyload/plugins/crypter/ChipDe.py @@ -5,17 +5,17 @@ from pyload.plugins.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/plugins/crypter/CrockoCom.py b/pyload/plugins/crypter/CrockoCom.py index c959fa70a..c8268173a 100644 --- a/pyload/plugins/crypter/CrockoCom.py +++ b/pyload/plugins/crypter/CrockoCom.py @@ -4,17 +4,17 @@ from pyload.plugins.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/plugins/crypter/CryptItCom.py b/pyload/plugins/crypter/CryptItCom.py index c420a25bc..c82cb3f0a 100644 --- a/pyload/plugins/crypter/CryptItCom.py +++ b/pyload/plugins/crypter/CryptItCom.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(CryptItCom) diff --git a/pyload/plugins/crypter/CzshareCom.py b/pyload/plugins/crypter/CzshareCom.py index cd77f118d..4b8646fb6 100644 --- a/pyload/plugins/crypter/CzshareCom.py +++ b/pyload/plugins/crypter/CzshareCom.py @@ -5,17 +5,17 @@ from pyload.plugins.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/plugins/crypter/DDLMusicOrg.py b/pyload/plugins/crypter/DDLMusicOrg.py index 0a07b5427..6500fe5e6 100644 --- a/pyload/plugins/crypter/DDLMusicOrg.py +++ b/pyload/plugins/crypter/DDLMusicOrg.py @@ -8,17 +8,17 @@ from pyload.plugins.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/plugins/crypter/DailymotionBatch.py b/pyload/plugins/crypter/DailymotionBatch.py index d1233f58c..3ea59bc75 100644 --- a/pyload/plugins/crypter/DailymotionBatch.py +++ b/pyload/plugins/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/plugins/crypter/DataHu.py b/pyload/plugins/crypter/DataHu.py index 2a02e03c8..9ec98d705 100644 --- a/pyload/plugins/crypter/DataHu.py +++ b/pyload/plugins/crypter/DataHu.py @@ -6,17 +6,17 @@ from pyload.plugins.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", None), + __description = """Data.hu folder decrypter plugin""" + __license = "GPLv3" + __authors = [("crash", None), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugins/crypter/DdlstorageCom.py b/pyload/plugins/crypter/DdlstorageCom.py index 95f771c9e..a7b69da1d 100644 --- a/pyload/plugins/crypter/DdlstorageCom.py +++ b/pyload/plugins/crypter/DdlstorageCom.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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/plugins/crypter/DepositfilesCom.py b/pyload/plugins/crypter/DepositfilesCom.py index 9ba211607..c2aa14239 100644 --- a/pyload/plugins/crypter/DepositfilesCom.py +++ b/pyload/plugins/crypter/DepositfilesCom.py @@ -4,17 +4,17 @@ from pyload.plugins.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/plugins/crypter/Dereferer.py b/pyload/plugins/crypter/Dereferer.py index b4217217f..325bfa912 100644 --- a/pyload/plugins/crypter/Dereferer.py +++ b/pyload/plugins/crypter/Dereferer.py @@ -8,19 +8,19 @@ from pyload.plugins.Crypter import Crypter class Dereferer(Crypter): - __name__ = "Dereferer" - __type__ = "crypter" - __version__ = "0.10" + __name = "Dereferer" + __type = "crypter" + __version = "0.10" - __pattern__ = r'https?://([^/]+)/.*?(?P<url>(ht|f)tps?(://|%3A%2F%2F).*)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'https?://([^/]+)/.*?(?P<url>(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")] def decrypt(self, pyfile): - link = re.match(self.__pattern__, pyfile.url).group('url') + link = re.match(self.__pattern, pyfile.url).group('url') self.urls = [unquote(link).rstrip('+')] diff --git a/pyload/plugins/crypter/DlProtectCom.py b/pyload/plugins/crypter/DlProtectCom.py index 4f96a1d13..b386caa3f 100644 --- a/pyload/plugins/crypter/DlProtectCom.py +++ b/pyload/plugins/crypter/DlProtectCom.py @@ -9,17 +9,17 @@ from pyload.plugins.internal.SimpleCrypter import SimpleCrypter class DlProtectCom(SimpleCrypter): - __name__ = "DlProtectCom" - __type__ = "crypter" - __version__ = "0.01" + __name = "DlProtectCom" + __type = "crypter" + __version = "0.01" - __pattern__ = r'http://(?:www\.)?dl-protect\.com/((en|fr)/)?(?P<ID>\w+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?dl-protect\.com/((en|fr)/)?(?P<ID>\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")] OFFLINE_PATTERN = r'>Unfortunately, the link you are looking for is not found' @@ -30,7 +30,7 @@ class DlProtectCom(SimpleCrypter): if not re.match(r"http://(?:www\.)?dl-protect\.com", self.req.http.lastEffectiveURL): return [self.req.http.lastEffectiveURL] - #id = re.match(self.__pattern__, self.pyfile.url).group("ID") + #id = re.match(self.__pattern, self.pyfile.url).group("ID") key = re.search(r'name="id_key" value="(.+?)"', self.html).group(1) post_req = {"id_key": key, "submitform": ""} diff --git a/pyload/plugins/crypter/DontKnowMe.py b/pyload/plugins/crypter/DontKnowMe.py index 6ef47dcee..d1ee0f724 100644 --- a/pyload/plugins/crypter/DontKnowMe.py +++ b/pyload/plugins/crypter/DontKnowMe.py @@ -8,17 +8,17 @@ from pyload.plugins.Crypter import Crypter class DontKnowMe(Crypter): - __name__ = "DontKnowMe" - __type__ = "crypter" - __version__ = "0.10" + __name = "DontKnowMe" + __type = "crypter" + __version = "0.10" - __pattern__ = r'http://(?:www\.)?dontknow\.me/at/\?.+$' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?dontknow\.me/at/\?.+$' + __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", None)] + __description = """DontKnow.me decrypter plugin""" + __license = "GPLv3" + __authors = [("selaux", None)] LINK_PATTERN = r'http://dontknow\.me/at/\?(.+)$' diff --git a/pyload/plugins/crypter/DuckCryptInfo.py b/pyload/plugins/crypter/DuckCryptInfo.py index fc6f95589..2188949bb 100644 --- a/pyload/plugins/crypter/DuckCryptInfo.py +++ b/pyload/plugins/crypter/DuckCryptInfo.py @@ -8,17 +8,17 @@ from pyload.plugins.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/plugins/crypter/DuploadOrg.py b/pyload/plugins/crypter/DuploadOrg.py index 209c98dc9..0365cbe8a 100644 --- a/pyload/plugins/crypter/DuploadOrg.py +++ b/pyload/plugins/crypter/DuploadOrg.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(DuploadOrg) diff --git a/pyload/plugins/crypter/EasybytezCom.py b/pyload/plugins/crypter/EasybytezCom.py index 4cd86e9b6..2f0d29ec7 100644 --- a/pyload/plugins/crypter/EasybytezCom.py +++ b/pyload/plugins/crypter/EasybytezCom.py @@ -4,17 +4,17 @@ from pyload.plugins.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")] HOSTER_DOMAIN = "easybytez.com" diff --git a/pyload/plugins/crypter/EmbeduploadCom.py b/pyload/plugins/crypter/EmbeduploadCom.py index 6e298f8bb..9b37417be 100644 --- a/pyload/plugins/crypter/EmbeduploadCom.py +++ b/pyload/plugins/crypter/EmbeduploadCom.py @@ -6,19 +6,19 @@ from pyload.network.HTTPRequest import BadHeader class EmbeduploadCom(Crypter): - __name__ = "EmbeduploadCom" - __type__ = "crypter" - __version__ = "0.02" - - __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")] + __name = "EmbeduploadCom" + __type = "crypter" + __version = "0.02" + + __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")] LINK_PATTERN = r'<div id="([^"]+)"[^>]*>\s*<a href="([^"]+)" target="_blank" (?:class="DownloadNow"|style="color:red")>' diff --git a/pyload/plugins/crypter/FilebeerInfo.py b/pyload/plugins/crypter/FilebeerInfo.py index 514559f86..51925a3ad 100644 --- a/pyload/plugins/crypter/FilebeerInfo.py +++ b/pyload/plugins/crypter/FilebeerInfo.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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).*' - __config__ = [] + __pattern = r'http://(?:www\.)?filebeer\.info/(\d+~f).*' + __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")] getInfo = create_getInfo(FilebeerInfo) diff --git a/pyload/plugins/crypter/FilecloudIo.py b/pyload/plugins/crypter/FilecloudIo.py index 6c8369925..a637eefdd 100644 --- a/pyload/plugins/crypter/FilecloudIo.py +++ b/pyload/plugins/crypter/FilecloudIo.py @@ -4,17 +4,17 @@ from pyload.plugins.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/plugins/crypter/FilecryptCc.py b/pyload/plugins/crypter/FilecryptCc.py index 6db43bb36..ca81c8fa2 100644 --- a/pyload/plugins/crypter/FilecryptCc.py +++ b/pyload/plugins/crypter/FilecryptCc.py @@ -10,15 +10,15 @@ from pyload.plugins.Crypter import Crypter class FilecryptCc(Crypter): - __name__ = "FilecryptCc" - __type__ = "crypter" - __version__ = "0.05" + __name = "FilecryptCc" + __type = "crypter" + __version = "0.05" - __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/plugins/crypter/FilefactoryCom.py b/pyload/plugins/crypter/FilefactoryCom.py index cc9563ed9..21f958fa4 100644 --- a/pyload/plugins/crypter/FilefactoryCom.py +++ b/pyload/plugins/crypter/FilefactoryCom.py @@ -4,17 +4,17 @@ from pyload.plugins.internal.SimpleCrypter import SimpleCrypter class FilefactoryCom(SimpleCrypter): - __name__ = "FilefactoryCom" - __type__ = "crypter" - __version__ = "0.31" + __name = "FilefactoryCom" + __type = "crypter" + __version = "0.31" - __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")] LINK_PATTERN = r'<td><a href="([^"]+)">' diff --git a/pyload/plugins/crypter/FilerNet.py b/pyload/plugins/crypter/FilerNet.py index 4d28dc0da..d6f2b48de 100644 --- a/pyload/plugins/crypter/FilerNet.py +++ b/pyload/plugins/crypter/FilerNet.py @@ -4,17 +4,17 @@ from pyload.plugins.internal.SimpleCrypter import SimpleCrypter class FilerNet(SimpleCrypter): - __name__ = "FilerNet" - __type__ = "crypter" - __version__ = "0.41" + __name = "FilerNet" + __type = "crypter" + __version = "0.41" - __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/plugins/crypter/FileserveCom.py b/pyload/plugins/crypter/FileserveCom.py index 822362c56..17753c38c 100644 --- a/pyload/plugins/crypter/FileserveCom.py +++ b/pyload/plugins/crypter/FileserveCom.py @@ -6,17 +6,17 @@ from pyload.plugins.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/plugins/crypter/FilesonicCom.py b/pyload/plugins/crypter/FilesonicCom.py index 0f07147bb..0f6c92ee0 100644 --- a/pyload/plugins/crypter/FilesonicCom.py +++ b/pyload/plugins/crypter/FilesonicCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(FilesonicCom) diff --git a/pyload/plugins/crypter/FilestubeCom.py b/pyload/plugins/crypter/FilestubeCom.py index 5c97bca9e..ca315f1d4 100644 --- a/pyload/plugins/crypter/FilestubeCom.py +++ b/pyload/plugins/crypter/FilestubeCom.py @@ -4,17 +4,17 @@ from pyload.plugins.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/plugins/crypter/FiletramCom.py b/pyload/plugins/crypter/FiletramCom.py index 289642494..340b7f02a 100644 --- a/pyload/plugins/crypter/FiletramCom.py +++ b/pyload/plugins/crypter/FiletramCom.py @@ -4,17 +4,17 @@ from pyload.plugins.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/plugins/crypter/FiredriveCom.py b/pyload/plugins/crypter/FiredriveCom.py index dfc85c957..019555c2b 100644 --- a/pyload/plugins/crypter/FiredriveCom.py +++ b/pyload/plugins/crypter/FiredriveCom.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(FiredriveCom) diff --git a/pyload/plugins/crypter/FourChanOrg.py b/pyload/plugins/crypter/FourChanOrg.py index 8d24188cb..79e7a9548 100644 --- a/pyload/plugins/crypter/FourChanOrg.py +++ b/pyload/plugins/crypter/FourChanOrg.py @@ -8,17 +8,17 @@ from pyload.plugins.Crypter import Crypter class FourChanOrg(Crypter): - __name__ = "FourChanOrg" - __type__ = "crypter" - __version__ = "0.30" + __name = "FourChanOrg" + __type = "crypter" + __version = "0.30" - __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/plugins/crypter/FreakhareCom.py b/pyload/plugins/crypter/FreakhareCom.py index 792badeb4..a73b2fed7 100644 --- a/pyload/plugins/crypter/FreakhareCom.py +++ b/pyload/plugins/crypter/FreakhareCom.py @@ -6,17 +6,17 @@ from pyload.plugins.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/plugins/crypter/FreetexthostCom.py b/pyload/plugins/crypter/FreetexthostCom.py index 13cb33f84..48365e304 100644 --- a/pyload/plugins/crypter/FreetexthostCom.py +++ b/pyload/plugins/crypter/FreetexthostCom.py @@ -6,17 +6,17 @@ from pyload.plugins.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/plugins/crypter/FshareVn.py b/pyload/plugins/crypter/FshareVn.py index 8b22b8bf2..06ae307fc 100644 --- a/pyload/plugins/crypter/FshareVn.py +++ b/pyload/plugins/crypter/FshareVn.py @@ -4,17 +4,17 @@ from pyload.plugins.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/plugins/crypter/Go4UpCom.py b/pyload/plugins/crypter/Go4UpCom.py index f63695912..cab32eb61 100644 --- a/pyload/plugins/crypter/Go4UpCom.py +++ b/pyload/plugins/crypter/Go4UpCom.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo 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/plugins/crypter/GooGl.py b/pyload/plugins/crypter/GooGl.py index aa9793e2e..928034f5c 100644 --- a/pyload/plugins/crypter/GooGl.py +++ b/pyload/plugins/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/plugins/crypter/HoerbuchIn.py b/pyload/plugins/crypter/HoerbuchIn.py index a9d11575e..83f174b58 100644 --- a/pyload/plugins/crypter/HoerbuchIn.py +++ b/pyload/plugins/crypter/HoerbuchIn.py @@ -8,17 +8,17 @@ from pyload.plugins.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/plugins/crypter/HotfileCom.py b/pyload/plugins/crypter/HotfileCom.py index f64968e15..4cc522022 100644 --- a/pyload/plugins/crypter/HotfileCom.py +++ b/pyload/plugins/crypter/HotfileCom.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(HotfileCom) diff --git a/pyload/plugins/crypter/ILoadTo.py b/pyload/plugins/crypter/ILoadTo.py index 2a58a57d0..b63a5bc30 100644 --- a/pyload/plugins/crypter/ILoadTo.py +++ b/pyload/plugins/crypter/ILoadTo.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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", None)] + __description = """Iload.to decrypter plugin""" + __license = "GPLv3" + __authors = [("hzpz", None)] getInfo = create_getInfo(ILoadTo) diff --git a/pyload/plugins/crypter/ImgurComAlbum.py b/pyload/plugins/crypter/ImgurComAlbum.py index 1dc717ca9..b1e7d3c37 100644 --- a/pyload/plugins/crypter/ImgurComAlbum.py +++ b/pyload/plugins/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/plugins/crypter/JunocloudMe.py b/pyload/plugins/crypter/JunocloudMe.py index 3036be616..b737fc86a 100644 --- a/pyload/plugins/crypter/JunocloudMe.py +++ b/pyload/plugins/crypter/JunocloudMe.py @@ -4,17 +4,17 @@ from pyload.plugins.internal.XFSCrypter import XFSCrypter class JunocloudMe(XFSCrypter): - __name__ = "JunocloudMe" - __type__ = "crypter" - __version__ = "0.03" + __name = "JunocloudMe" + __type = "crypter" + __version = "0.03" - __pattern__ = r'http://(?:www\.)?junocloud\.me/folders/(?P<ID>\d+/\w+)' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?junocloud\.me/folders/(?P<ID>\d+/\w+)' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Junocloud.me folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("guidobelix", "guidobelix@hotmail.it")] + __description = """Junocloud.me folder decrypter plugin""" + __license = "GPLv3" + __authors = [("guidobelix", "guidobelix@hotmail.it")] HOSTER_DOMAIN = "junocloud.me" diff --git a/pyload/plugins/crypter/LetitbitNet.py b/pyload/plugins/crypter/LetitbitNet.py index 58e9ff31c..04ad5c1ea 100644 --- a/pyload/plugins/crypter/LetitbitNet.py +++ b/pyload/plugins/crypter/LetitbitNet.py @@ -5,17 +5,17 @@ from pyload.plugins.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/plugins/crypter/LinkCryptWs.py b/pyload/plugins/crypter/LinkCryptWs.py index 287e2d6a9..b20ab5780 100644 --- a/pyload/plugins/crypter/LinkCryptWs.py +++ b/pyload/plugins/crypter/LinkCryptWs.py @@ -13,15 +13,15 @@ from pyload.utils import html_unescape class LinkCryptWs(Crypter): - __name__ = "LinkCryptWs" - __type__ = "crypter" - __version__ = "0.07" + __name = "LinkCryptWs" + __type = "crypter" + __version = "0.07" - __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", None), ("Gummibaer", None)] @@ -38,7 +38,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/plugins/crypter/LinkSaveIn.py b/pyload/plugins/crypter/LinkSaveIn.py index e39d1a13d..53ed008d8 100644 --- a/pyload/plugins/crypter/LinkSaveIn.py +++ b/pyload/plugins/crypter/LinkSaveIn.py @@ -14,17 +14,17 @@ from pyload.utils import html_unescape class LinkSaveIn(SimpleCrypter): - __name__ = "LinkSaveIn" - __type__ = "crypter" - __version__ = "2.02" + __name = "LinkSaveIn" + __type = "crypter" + __version = "2.02" - __pattern__ = r'http://(?:www\.)?linksave\.in/(?P<id>\w+)$' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?linksave\.in/(?P<id>\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__ = [("fragonib", "fragonib[AT]yahoo[DOT]es")] + __description = """LinkSave.in decrypter plugin""" + __license = "GPLv3" + __authors = [("fragonib", "fragonib[AT]yahoo[DOT]es")] COOKIES = [("linksave.in", "Linksave_Language", "english")] @@ -44,7 +44,7 @@ class LinkSaveIn(SimpleCrypter): def decrypt(self, pyfile): # Init self.package = pyfile.package() - self.fileid = re.match(self.__pattern__, pyfile.url).group('id') + self.fileid = re.match(self.__pattern, pyfile.url).group('id') # Request package self.html = self.load(pyfile.url) diff --git a/pyload/plugins/crypter/LinkdecrypterCom.py b/pyload/plugins/crypter/LinkdecrypterCom.py index 61e02e9da..d2b954fed 100644 --- a/pyload/plugins/crypter/LinkdecrypterCom.py +++ b/pyload/plugins/crypter/LinkdecrypterCom.py @@ -5,17 +5,17 @@ from pyload.plugins.Crypter import Crypter class LinkdecrypterCom(Crypter): - __name__ = "LinkdecrypterCom" - __type__ = "crypter" - __version__ = "0.27" + __name = "LinkdecrypterCom" + __type = "crypter" + __version = "0.27" - __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""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + __description = """Linkdecrypter.com""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz"), ("flowlee", None)] diff --git a/pyload/plugins/crypter/LixIn.py b/pyload/plugins/crypter/LixIn.py index 82c23a558..ffd741cdf 100644 --- a/pyload/plugins/crypter/LixIn.py +++ b/pyload/plugins/crypter/LixIn.py @@ -6,17 +6,17 @@ from pyload.plugins.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="(?P<image>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/plugins/crypter/LofCc.py b/pyload/plugins/crypter/LofCc.py index 89e34d58b..dbe785179 100644 --- a/pyload/plugins/crypter/LofCc.py +++ b/pyload/plugins/crypter/LofCc.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(LofCc) diff --git a/pyload/plugins/crypter/MBLinkInfo.py b/pyload/plugins/crypter/MBLinkInfo.py index efd9ade8a..5f8ae30c2 100644 --- a/pyload/plugins/crypter/MBLinkInfo.py +++ b/pyload/plugins/crypter/MBLinkInfo.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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/plugins/crypter/MediafireCom.py b/pyload/plugins/crypter/MediafireCom.py index 4cf3bb88e..32c4a0726 100644 --- a/pyload/plugins/crypter/MediafireCom.py +++ b/pyload/plugins/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/plugins/crypter/MegaRapidCz.py b/pyload/plugins/crypter/MegaRapidCz.py index da797965e..f9b7a3e38 100644 --- a/pyload/plugins/crypter/MegaRapidCz.py +++ b/pyload/plugins/crypter/MegaRapidCz.py @@ -4,17 +4,17 @@ from pyload.plugins.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/plugins/crypter/MegauploadCom.py b/pyload/plugins/crypter/MegauploadCom.py index af4ebf5c4..455e90b52 100644 --- a/pyload/plugins/crypter/MegauploadCom.py +++ b/pyload/plugins/crypter/MegauploadCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(MegauploadCom) diff --git a/pyload/plugins/crypter/Movie2kTo.py b/pyload/plugins/crypter/Movie2kTo.py index cd2138d9a..534ac767e 100644 --- a/pyload/plugins/crypter/Movie2kTo.py +++ b/pyload/plugins/crypter/Movie2kTo.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(Movie2kTo) diff --git a/pyload/plugins/crypter/MultiUpOrg.py b/pyload/plugins/crypter/MultiUpOrg.py index ba5549683..bb2768ad3 100644 --- a/pyload/plugins/crypter/MultiUpOrg.py +++ b/pyload/plugins/crypter/MultiUpOrg.py @@ -7,24 +7,24 @@ from pyload.plugins.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/plugins/crypter/MultiloadCz.py b/pyload/plugins/crypter/MultiloadCz.py index df94a80f6..c1d33bd14 100644 --- a/pyload/plugins/crypter/MultiloadCz.py +++ b/pyload/plugins/crypter/MultiloadCz.py @@ -5,19 +5,19 @@ from pyload.plugins.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), - ("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)", "")] + __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/plugins/crypter/MultiuploadCom.py b/pyload/plugins/crypter/MultiuploadCom.py index 55bb39cc9..19daef3d8 100644 --- a/pyload/plugins/crypter/MultiuploadCom.py +++ b/pyload/plugins/crypter/MultiuploadCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(MultiuploadCom) diff --git a/pyload/plugins/crypter/NCryptIn.py b/pyload/plugins/crypter/NCryptIn.py index 6e4af461c..d209102f6 100644 --- a/pyload/plugins/crypter/NCryptIn.py +++ b/pyload/plugins/crypter/NCryptIn.py @@ -11,17 +11,17 @@ from pyload.plugins.internal.captcha import ReCaptcha class NCryptIn(Crypter): - __name__ = "NCryptIn" - __type__ = "crypter" - __version__ = "1.33" + __name = "NCryptIn" + __type = "crypter" + __version = "1.33" - __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")] @@ -80,7 +80,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/plugins/crypter/NetfolderIn.py b/pyload/plugins/crypter/NetfolderIn.py index bba72c047..cc1a64f99 100644 --- a/pyload/plugins/crypter/NetfolderIn.py +++ b/pyload/plugins/crypter/NetfolderIn.py @@ -6,17 +6,17 @@ from pyload.plugins.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/((?P<id1>\w+)/\w+|folder\.php\?folder_id=(?P<id2>\w+))' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?netfolder\.in/((?P<id1>\w+)/\w+|folder\.php\?folder_id=(?P<id2>\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 = max(m.group('id1'), m.group('id2')) except AttributeError: self.logDebug("Unable to get package id from url [%s]" % self.pyfile.url) diff --git a/pyload/plugins/crypter/NosvideoCom.py b/pyload/plugins/crypter/NosvideoCom.py index 5bd3b16a0..02c279a57 100644 --- a/pyload/plugins/crypter/NosvideoCom.py +++ b/pyload/plugins/crypter/NosvideoCom.py @@ -4,17 +4,17 @@ from pyload.plugins.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/plugins/crypter/OneKhDe.py b/pyload/plugins/crypter/OneKhDe.py index 48df7481b..9966df35b 100644 --- a/pyload/plugins/crypter/OneKhDe.py +++ b/pyload/plugins/crypter/OneKhDe.py @@ -7,17 +7,17 @@ from pyload.plugins.Crypter import Crypter class OneKhDe(Crypter): - __name__ = "OneKhDe" - __type__ = "crypter" - __version__ = "0.10" + __name = "OneKhDe" + __type = "crypter" + __version = "0.10" - __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/plugins/crypter/OronCom.py b/pyload/plugins/crypter/OronCom.py index ae695ef34..96fbac7e5 100644 --- a/pyload/plugins/crypter/OronCom.py +++ b/pyload/plugins/crypter/OronCom.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(OronCom) diff --git a/pyload/plugins/crypter/PastebinCom.py b/pyload/plugins/crypter/PastebinCom.py index e47698752..d9a6238b0 100644 --- a/pyload/plugins/crypter/PastebinCom.py +++ b/pyload/plugins/crypter/PastebinCom.py @@ -4,17 +4,17 @@ from pyload.plugins.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/plugins/crypter/QuickshareCz.py b/pyload/plugins/crypter/QuickshareCz.py index ac86daec7..c850e124f 100644 --- a/pyload/plugins/crypter/QuickshareCz.py +++ b/pyload/plugins/crypter/QuickshareCz.py @@ -5,17 +5,17 @@ from pyload.plugins.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/plugins/crypter/RSLayerCom.py b/pyload/plugins/crypter/RSLayerCom.py index 400c190d5..3bf63f2e8 100644 --- a/pyload/plugins/crypter/RSLayerCom.py +++ b/pyload/plugins/crypter/RSLayerCom.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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", None)] + __description = """RS-Layer.com decrypter plugin""" + __license = "GPLv3" + __authors = [("hzpz", None)] getInfo = create_getInfo(RSLayerCom) diff --git a/pyload/plugins/crypter/RapidfileshareNet.py b/pyload/plugins/crypter/RapidfileshareNet.py index bc318a01e..8ce212afe 100644 --- a/pyload/plugins/crypter/RapidfileshareNet.py +++ b/pyload/plugins/crypter/RapidfileshareNet.py @@ -4,17 +4,17 @@ from pyload.plugins.internal.XFSCrypter import XFSCrypter class RapidfileshareNet(XFSCrypter): - __name__ = "RapidfileshareNet" - __type__ = "crypter" - __version__ = "0.03" + __name = "RapidfileshareNet" + __type = "crypter" + __version = "0.03" - __pattern__ = r'http://(?:www\.)?rapidfileshare\.net/users/\w+/\d+/\w+' - __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern = r'http://(?:www\.)?rapidfileshare\.net/users/\w+/\d+/\w+' + __config = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description__ = """Rapidfileshare.net folder decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("guidobelix", "guidobelix@hotmail.it")] + __description = """Rapidfileshare.net folder decrypter plugin""" + __license = "GPLv3" + __authors = [("guidobelix", "guidobelix@hotmail.it")] HOSTER_DOMAIN = "rapidfileshare.net" diff --git a/pyload/plugins/crypter/RelinkUs.py b/pyload/plugins/crypter/RelinkUs.py index 2cc7874ee..c995a1f7d 100644 --- a/pyload/plugins/crypter/RelinkUs.py +++ b/pyload/plugins/crypter/RelinkUs.py @@ -12,17 +12,17 @@ from pyload.plugins.Crypter import Crypter class RelinkUs(Crypter): - __name__ = "RelinkUs" - __type__ = "crypter" - __version__ = "3.11" + __name = "RelinkUs" + __type = "crypter" + __version = "3.11" - __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")] @@ -100,7 +100,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() self.password = self.getPassword() diff --git a/pyload/plugins/crypter/SafelinkingNet.py b/pyload/plugins/crypter/SafelinkingNet.py index 324fd42a2..ef1110823 100644 --- a/pyload/plugins/crypter/SafelinkingNet.py +++ b/pyload/plugins/crypter/SafelinkingNet.py @@ -12,17 +12,17 @@ from pyload.plugins.internal.captcha import SolveMedia class SafelinkingNet(Crypter): - __name__ = "SafelinkingNet" - __type__ = "crypter" - __version__ = "0.11" + __name = "SafelinkingNet" + __type = "crypter" + __version = "0.11" - __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.-]+)';" @@ -31,7 +31,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/plugins/crypter/SecuredIn.py b/pyload/plugins/crypter/SecuredIn.py index cea23a53c..b959d741f 100644 --- a/pyload/plugins/crypter/SecuredIn.py +++ b/pyload/plugins/crypter/SecuredIn.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(SecuredIn) diff --git a/pyload/plugins/crypter/SexuriaCom.py b/pyload/plugins/crypter/SexuriaCom.py index 92428352d..7f8df5283 100644 --- a/pyload/plugins/crypter/SexuriaCom.py +++ b/pyload/plugins/crypter/SexuriaCom.py @@ -6,17 +6,17 @@ from pyload.plugins.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/plugins/crypter/ShareLinksBiz.py b/pyload/plugins/crypter/ShareLinksBiz.py index 7572cdadd..0a8eeacbd 100644 --- a/pyload/plugins/crypter/ShareLinksBiz.py +++ b/pyload/plugins/crypter/ShareLinksBiz.py @@ -9,17 +9,17 @@ from pyload.plugins.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): @@ -68,8 +68,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/plugins/crypter/SharingmatrixCom.py b/pyload/plugins/crypter/SharingmatrixCom.py index 3ada25537..72b268173 100644 --- a/pyload/plugins/crypter/SharingmatrixCom.py +++ b/pyload/plugins/crypter/SharingmatrixCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(SharingmatrixCom) diff --git a/pyload/plugins/crypter/SpeedLoadOrg.py b/pyload/plugins/crypter/SpeedLoadOrg.py index 5819c78c9..5c88931b4 100644 --- a/pyload/plugins/crypter/SpeedLoadOrg.py +++ b/pyload/plugins/crypter/SpeedLoadOrg.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(SpeedLoadOrg) diff --git a/pyload/plugins/crypter/StealthTo.py b/pyload/plugins/crypter/StealthTo.py index c5236c3e9..1fdf1fd3b 100644 --- a/pyload/plugins/crypter/StealthTo.py +++ b/pyload/plugins/crypter/StealthTo.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(StealthTo) diff --git a/pyload/plugins/crypter/TnyCz.py b/pyload/plugins/crypter/TnyCz.py index b2a777da2..435601acc 100644 --- a/pyload/plugins/crypter/TnyCz.py +++ b/pyload/plugins/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/plugins/crypter/TrailerzoneInfo.py b/pyload/plugins/crypter/TrailerzoneInfo.py index a1a7e8477..67d494301 100644 --- a/pyload/plugins/crypter/TrailerzoneInfo.py +++ b/pyload/plugins/crypter/TrailerzoneInfo.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(TrailerzoneInfo) diff --git a/pyload/plugins/crypter/TurbobitNet.py b/pyload/plugins/crypter/TurbobitNet.py index e038b9a34..065876d3c 100644 --- a/pyload/plugins/crypter/TurbobitNet.py +++ b/pyload/plugins/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/plugins/crypter/TusfilesNet.py b/pyload/plugins/crypter/TusfilesNet.py index ef00ba440..fbd5de8d3 100644 --- a/pyload/plugins/crypter/TusfilesNet.py +++ b/pyload/plugins/crypter/TusfilesNet.py @@ -8,17 +8,17 @@ from pyload.plugins.internal.XFSCrypter import XFSCrypter class TusfilesNet(XFSCrypter): - __name__ = "TusfilesNet" - __type__ = "crypter" - __version__ = "0.07" + __name = "TusfilesNet" + __type = "crypter" + __version = "0.07" - __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")] @@ -26,7 +26,7 @@ class TusfilesNet(XFSCrypter): 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/plugins/crypter/UlozTo.py b/pyload/plugins/crypter/UlozTo.py index e369f338a..1d8575c18 100644 --- a/pyload/plugins/crypter/UlozTo.py +++ b/pyload/plugins/crypter/UlozTo.py @@ -5,17 +5,17 @@ from pyload.plugins.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/plugins/crypter/UploadableCh.py b/pyload/plugins/crypter/UploadableCh.py index 4edc08846..cff7f2c73 100644 --- a/pyload/plugins/crypter/UploadableCh.py +++ b/pyload/plugins/crypter/UploadableCh.py @@ -4,17 +4,17 @@ from pyload.plugins.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/plugins/crypter/UploadedTo.py b/pyload/plugins/crypter/UploadedTo.py index 1fbed5f86..bce34f743 100644 --- a/pyload/plugins/crypter/UploadedTo.py +++ b/pyload/plugins/crypter/UploadedTo.py @@ -8,17 +8,17 @@ from pyload.plugins.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="(?P<plain>[\w/]+)" onclick=' diff --git a/pyload/plugins/crypter/WiiReloadedOrg.py b/pyload/plugins/crypter/WiiReloadedOrg.py index d80a03940..f185cab49 100644 --- a/pyload/plugins/crypter/WiiReloadedOrg.py +++ b/pyload/plugins/crypter/WiiReloadedOrg.py @@ -4,16 +4,16 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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", None)] + __description = """Wii-Reloaded.org decrypter plugin""" + __license = "GPLv3" + __authors = [("hzpz", None)] getInfo = create_getInfo(WiiReloadedOrg) diff --git a/pyload/plugins/crypter/WuploadCom.py b/pyload/plugins/crypter/WuploadCom.py index f64b9afb6..f8b695fee 100644 --- a/pyload/plugins/crypter/WuploadCom.py +++ b/pyload/plugins/crypter/WuploadCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadCrypter import DeadCrypter, create_getInfo 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")] getInfo = create_getInfo(WuploadCom) diff --git a/pyload/plugins/crypter/XFileSharingPro.py b/pyload/plugins/crypter/XFileSharingPro.py index 27de7f997..616bdb193 100644 --- a/pyload/plugins/crypter/XFileSharingPro.py +++ b/pyload/plugins/crypter/XFileSharingPro.py @@ -6,31 +6,31 @@ from pyload.plugins.internal.XFSCrypter import XFSCrypter class XFileSharingPro(XFSCrypter): - __name__ = "XFileSharingPro" - __type__ = "crypter" - __version__ = "0.03" + __name = "XFileSharingPro" + __type = "crypter" + __version = "0.03" - __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(1).lower() + self.HOSTER_DOMAIN = re.match(self.__pattern, self.pyfile.url).group(1).lower() self.HOSTER_NAME = "".join([str.capitalize() for str in self.HOSTER_DOMAIN.split('.')]) account = self.core.accountManager.getAccountPlugin(self.HOSTER_NAME) diff --git a/pyload/plugins/crypter/XupPl.py b/pyload/plugins/crypter/XupPl.py index 7742dc816..0a01a6c36 100644 --- a/pyload/plugins/crypter/XupPl.py +++ b/pyload/plugins/crypter/XupPl.py @@ -4,17 +4,17 @@ from pyload.plugins.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/plugins/crypter/YoutubeBatch.py b/pyload/plugins/crypter/YoutubeBatch.py index 365517e29..c7758982a 100644 --- a/pyload/plugins/crypter/YoutubeBatch.py +++ b/pyload/plugins/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), - ("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)] + __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/plugins/hook/AlldebridCom.py b/pyload/plugins/hook/AlldebridCom.py index cf79af917..a5312345b 100644 --- a/pyload/plugins/hook/AlldebridCom.py +++ b/pyload/plugins/hook/AlldebridCom.py @@ -5,19 +5,19 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class AlldebridCom(MultiHoster): - __name__ = "AlldebridCom" - __type__ = "hook" - __version__ = "0.13" - - __config__ = [("https", "bool", "Enable HTTPS", False), - ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), - ("hosterList", "str", "Hoster list (comma separated)", ""), - ("unloadFailing", "bool", "Revert to stanard download if download fails", False), - ("interval", "int", "Reload interval in hours (0 to disable)", 24)] - - __description__ = """Alldebrid.com hook plugin""" - __license__ = "GPLv3" - __authors__ = [("Andy Voigt", "spamsales@online.de")] + __name = "AlldebridCom" + __type = "hook" + __version = "0.13" + + __config = [("https", "bool", "Enable HTTPS", False), + ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to stanard download if download fails", False), + ("interval", "int", "Reload interval in hours (0 to disable)", 24)] + + __description = """Alldebrid.com hook plugin""" + __license = "GPLv3" + __authors = [("Andy Voigt", "spamsales@online.de")] def getHoster(self): diff --git a/pyload/plugins/hook/BypassCaptcha.py b/pyload/plugins/hook/BypassCaptcha.py index 610cfac64..e5c455276 100644 --- a/pyload/plugins/hook/BypassCaptcha.py +++ b/pyload/plugins/hook/BypassCaptcha.py @@ -26,16 +26,16 @@ class BypassCaptchaException(Exception): class BypassCaptcha(Addon): - __name__ = "BypassCaptcha" - __type__ = "hook" - __version__ = "0.05" + __name = "BypassCaptcha" + __type = "hook" + __version = "0.05" - __config__ = [("force", "bool", "Force BC even if client is connected", False), - ("passkey", "password", "Passkey", "")] + __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,20 +104,20 @@ class BypassCaptcha(Addon): 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/plugins/hook/Captcha9kw.py b/pyload/plugins/hook/Captcha9kw.py index f3f086adf..5d04a6481 100644 --- a/pyload/plugins/hook/Captcha9kw.py +++ b/pyload/plugins/hook/Captcha9kw.py @@ -14,25 +14,25 @@ from pyload.plugins.Addon import Addon class Captcha9kw(Addon): - __name__ = "Captcha9kw" - __type__ = "hook" - __version__ = "0.26" - - __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" ), - ("captchapermin" , "int" , "Captcha per minute" , "9999" ), - ("prio" , "int" , "Priority (max 10)(cost +0 -> +10 credits)" , "0" ), - ("queue" , "int" , "Max. Queue (max 999)" , "50" ), - ("hoster_options", "string" , "Hoster options (format: pluginname:prio=1:selfsolfe=1:confirm=1:timeout=900|...)", "ShareonlineBiz:prio=0:timeout=999 | UploadedTo:prio=0:timeout=999"), - ("selfsolve" , "bool" , "Selfsolve (manually solve your captcha in your 9kw client if active)" , "0" ), - ("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"), + __name = "Captcha9kw" + __type = "hook" + __version = "0.26" + + __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" ), + ("captchapermin" , "int" , "Captcha per minute" , "9999" ), + ("prio" , "int" , "Priority (max 10)(cost +0 -> +10 credits)" , "0" ), + ("queue" , "int" , "Max. Queue (max 999)" , "50" ), + ("hoster_options", "string" , "Hoster options (format: pluginname:prio=1:selfsolfe=1:confirm=1:timeout=900|...)", "ShareonlineBiz:prio=0:timeout=999 | UploadedTo:prio=0:timeout=999"), + ("selfsolve" , "bool" , "Selfsolve (manually solve your captcha in your 9kw client if active)" , "0" ), + ("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"), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugins/hook/CaptchaBrotherhood.py b/pyload/plugins/hook/CaptchaBrotherhood.py index 333c0be85..b5e5f34ca 100644 --- a/pyload/plugins/hook/CaptchaBrotherhood.py +++ b/pyload/plugins/hook/CaptchaBrotherhood.py @@ -36,17 +36,17 @@ class CaptchaBrotherhoodException(Exception): class CaptchaBrotherhood(Addon): - __name__ = "CaptchaBrotherhood" - __type__ = "hook" - __version__ = "0.06" + __name = "CaptchaBrotherhood" + __type = "hook" + __version = "0.06" - __config__ = [("username", "str", "Username", ""), - ("force", "bool", "Force CT even if client is connected", False), - ("passkey", "password", "Password", "")] + __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(Addon): 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(Addon): 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.get_api("complainCaptcha", task.data['ticket']) diff --git a/pyload/plugins/hook/DeathByCaptcha.py b/pyload/plugins/hook/DeathByCaptcha.py index f2ccb383b..240f9a5ce 100644 --- a/pyload/plugins/hook/DeathByCaptcha.py +++ b/pyload/plugins/hook/DeathByCaptcha.py @@ -49,17 +49,17 @@ class DeathByCaptchaException(Exception): class DeathByCaptcha(Addon): - __name__ = "DeathByCaptcha" - __type__ = "hook" - __version__ = "0.04" + __name = "DeathByCaptcha" + __type = "hook" + __version = "0.04" - __config__ = [("username", "str", "Username", ""), - ("passkey", "password", "Password", ""), - ("force", "bool", "Force DBC even if client is connected", False)] + __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(Addon): 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.call_api("captcha/%d/report" % task.data['ticket'], True) diff --git a/pyload/plugins/hook/DebridItaliaCom.py b/pyload/plugins/hook/DebridItaliaCom.py index 01e085ad2..ee00fc375 100644 --- a/pyload/plugins/hook/DebridItaliaCom.py +++ b/pyload/plugins/hook/DebridItaliaCom.py @@ -7,18 +7,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class DebridItaliaCom(MultiHoster): - __name__ = "DebridItaliaCom" - __type__ = "hook" - __version__ = "0.08" - - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), - ("hosterList", "str", "Hoster list (comma separated)", ""), - ("unloadFailing", "bool", "Revert to standard download if download fails", False), - ("interval", "int", "Reload interval in hours (0 to disable)", 24)] - - __description__ = """Debriditalia.com hook plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it"), + __name = "DebridItaliaCom" + __type = "hook" + __version = "0.08" + + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to standard download if download fails", False), + ("interval", "int", "Reload interval in hours (0 to disable)", 24)] + + __description = """Debriditalia.com hook plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it"), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugins/hook/EasybytezCom.py b/pyload/plugins/hook/EasybytezCom.py index 9d92b96f7..e24c82a9f 100644 --- a/pyload/plugins/hook/EasybytezCom.py +++ b/pyload/plugins/hook/EasybytezCom.py @@ -6,20 +6,20 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class EasybytezCom(MultiHoster): - __name__ = "EasybytezCom" - __type__ = "hook" - __version__ = "0.03" + __name = "EasybytezCom" + __type = "hook" + __version = "0.03" - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), - ("hosterList", "str", "Hoster list (comma separated)", "")] + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("hosterList", "str", "Hoster list (comma separated)", "")] - __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 getHoster(self): - self.account = self.core.accountManager.getAccountPlugin(self.__name__) + self.account = self.core.accountManager.getAccountPlugin(self.__name) user = self.account.selectAccount()[0] try: diff --git a/pyload/plugins/hook/ExpertDecoders.py b/pyload/plugins/hook/ExpertDecoders.py index a9b9bdf2c..d4d125b2a 100644 --- a/pyload/plugins/hook/ExpertDecoders.py +++ b/pyload/plugins/hook/ExpertDecoders.py @@ -12,16 +12,16 @@ from pyload.plugins.Addon import Addon class ExpertDecoders(Addon): - __name__ = "ExpertDecoders" - __type__ = "hook" - __version__ = "0.02" + __name = "ExpertDecoders" + __type = "hook" + __version = "0.02" - __config__ = [("force", "bool", "Force CT even if client is connected", False), - ("passkey", "password", "Access key", "")] + __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/plugins/hook/FastixRu.py b/pyload/plugins/hook/FastixRu.py index 0ae853544..bd3994243 100644 --- a/pyload/plugins/hook/FastixRu.py +++ b/pyload/plugins/hook/FastixRu.py @@ -6,17 +6,17 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class FastixRu(MultiHoster): - __name__ = "FastixRu" - __type__ = "hook" - __version__ = "0.02" + __name = "FastixRu" + __type = "hook" + __version = "0.02" - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), - ("unloadFailing", "bool", "Revert to standard download if download fails", False), - ("interval", "int", "Reload interval in hours (0 to disable)", 24)] + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("unloadFailing", "bool", "Revert to standard download if download fails", False), + ("interval", "int", "Reload interval in hours (0 to disable)", 24)] - __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 getHoster(self): diff --git a/pyload/plugins/hook/FreeWayMe.py b/pyload/plugins/hook/FreeWayMe.py index 5d955e156..27297f77a 100644 --- a/pyload/plugins/hook/FreeWayMe.py +++ b/pyload/plugins/hook/FreeWayMe.py @@ -5,18 +5,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class FreeWayMe(MultiHoster): - __name__ = "FreeWayMe" - __type__ = "hook" - __version__ = "0.11" + __name = "FreeWayMe" + __type = "hook" + __version = "0.11" - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), - ("hosterList", "str", "Hoster list (comma separated)", ""), - ("unloadFailing", "bool", "Revert to stanard download if download fails", False), - ("interval", "int", "Reload interval in hours (0 to disable)", 24)] + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to stanard download if download fails", False), + ("interval", "int", "Reload interval in hours (0 to disable)", 24)] - __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 getHoster(self): diff --git a/pyload/plugins/hook/ImageTyperz.py b/pyload/plugins/hook/ImageTyperz.py index 2432dce7d..9a9fc0eef 100644 --- a/pyload/plugins/hook/ImageTyperz.py +++ b/pyload/plugins/hook/ImageTyperz.py @@ -30,17 +30,17 @@ class ImageTyperzException(Exception): class ImageTyperz(Addon): - __name__ = "ImageTyperz" - __type__ = "hook" - __version__ = "0.05" + __name = "ImageTyperz" + __type = "hook" + __version = "0.05" - __config__ = [("username", "str", "Username", ""), - ("passkey", "password", "Password", ""), - ("force", "bool", "Force IT even if client is connected", False)] + __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,15 +118,15 @@ class ImageTyperz(Addon): 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/plugins/hook/LinkdecrypterCom.py b/pyload/plugins/hook/LinkdecrypterCom.py index 0e8ec7554..41aa434d4 100644 --- a/pyload/plugins/hook/LinkdecrypterCom.py +++ b/pyload/plugins/hook/LinkdecrypterCom.py @@ -8,13 +8,13 @@ from pyload.utils import remove_chars class LinkdecrypterCom(Addon): - __name__ = "LinkdecrypterCom" - __type__ = "hook" - __version__ = "0.21" + __name = "LinkdecrypterCom" + __type = "hook" + __version = "0.21" - __description__ = """Linkdecrypter.com hook plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Linkdecrypter.com hook plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] def coreReady(self): @@ -53,7 +53,7 @@ class LinkdecrypterCom(Addon): regexp = r'https?://([^.]+\.)*?(%s)/.*' % '|'.join(online) - dict = self.core.pluginManager.crypterPlugins[self.__name__] + dict = self.core.pluginManager.crypterPlugins[self.__name] dict['pattern'] = regexp dict['re'] = re.compile(regexp) diff --git a/pyload/plugins/hook/LinksnappyCom.py b/pyload/plugins/hook/LinksnappyCom.py index 381eb6a2a..d34188987 100644 --- a/pyload/plugins/hook/LinksnappyCom.py +++ b/pyload/plugins/hook/LinksnappyCom.py @@ -6,18 +6,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class LinksnappyCom(MultiHoster): - __name__ = "LinksnappyCom" - __type__ = "hook" - __version__ = "0.01" - - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), - ("hosterList", "str", "Hoster list (comma separated)", ""), - ("unloadFailing", "bool", "Revert to standard download if download fails", False), - ("interval", "int", "Reload interval in hours (0 to disable)", 24)] - - __description__ = """Linksnappy.com hook plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __name = "LinksnappyCom" + __type = "hook" + __version = "0.01" + + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to standard download if download fails", False), + ("interval", "int", "Reload interval in hours (0 to disable)", 24)] + + __description = """Linksnappy.com hook plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] def getHoster(self): diff --git a/pyload/plugins/hook/MegaDebridEu.py b/pyload/plugins/hook/MegaDebridEu.py index 5a52dbf41..4fff41a51 100644 --- a/pyload/plugins/hook/MegaDebridEu.py +++ b/pyload/plugins/hook/MegaDebridEu.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class MegaDebridEu(MultiHoster): - __name__ = "MegaDebridEu" - __type__ = "hook" - __version__ = "0.02" + __name = "MegaDebridEu" + __type = "hook" + __version = "0.02" - __config__ = [("unloadFailing", "bool", "Revert to standard download if download fails", False)] + __config = [("unloadFailing", "bool", "Revert to standard download if download fails", False)] - __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 getHoster(self): diff --git a/pyload/plugins/hook/MultishareCz.py b/pyload/plugins/hook/MultishareCz.py index f1a12acb8..13906734f 100644 --- a/pyload/plugins/hook/MultishareCz.py +++ b/pyload/plugins/hook/MultishareCz.py @@ -7,16 +7,16 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class MultishareCz(MultiHoster): - __name__ = "MultishareCz" - __type__ = "hook" - __version__ = "0.04" + __name = "MultishareCz" + __type = "hook" + __version = "0.04" - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), - ("hosterList", "str", "Hoster list (comma separated)", "uloz.to")] + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("hosterList", "str", "Hoster list (comma separated)", "uloz.to")] - __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/plugins/hook/MyfastfileCom.py b/pyload/plugins/hook/MyfastfileCom.py index 07988d2b9..bf07992f5 100644 --- a/pyload/plugins/hook/MyfastfileCom.py +++ b/pyload/plugins/hook/MyfastfileCom.py @@ -6,19 +6,19 @@ from pyload.utils import json_loads class MyfastfileCom(MultiHoster): - __name__ = "MyfastfileCom" - __type__ = "hook" - __version__ = "0.02" + __name = "MyfastfileCom" + __type = "hook" + __version = "0.02" - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), - ("hosterList", "str", "Hoster list (comma separated)", ""), - ("unloadFailing", "bool", "Revert to standard download if download fails", False), - ("interval", "int", "Reload interval in hours (0 to disable)", 24)] + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to standard download if download fails", False), + ("interval", "int", "Reload interval in hours (0 to disable)", 24)] - __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")] diff --git a/pyload/plugins/hook/OverLoadMe.py b/pyload/plugins/hook/OverLoadMe.py index 83ce3e842..caa9ef14c 100644 --- a/pyload/plugins/hook/OverLoadMe.py +++ b/pyload/plugins/hook/OverLoadMe.py @@ -5,19 +5,19 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class OverLoadMe(MultiHoster): - __name__ = "OverLoadMe" - __type__ = "hook" - __version__ = "0.01" - - __config__ = [("https", "bool", "Enable HTTPS", True), - ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), - ("hosterList", "str", "Hoster list (comma separated)", ""), - ("unloadFailing", "bool", "Revert to standard download if download fails", False), - ("interval", "int", "Reload interval in hours (0 to disable)", 12)] - - __description__ = """Over-Load.me hook plugin""" - __license__ = "GPLv3" - __authors__ = [("marley", "marley@over-load.me")] + __name = "OverLoadMe" + __type = "hook" + __version = "0.01" + + __config = [("https", "bool", "Enable HTTPS", True), + ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to standard download if download fails", False), + ("interval", "int", "Reload interval in hours (0 to disable)", 12)] + + __description = """Over-Load.me hook plugin""" + __license = "GPLv3" + __authors = [("marley", "marley@over-load.me")] def getHoster(self): diff --git a/pyload/plugins/hook/PremiumTo.py b/pyload/plugins/hook/PremiumTo.py index e3c9823f6..31858f8dd 100644 --- a/pyload/plugins/hook/PremiumTo.py +++ b/pyload/plugins/hook/PremiumTo.py @@ -5,16 +5,16 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class PremiumTo(MultiHoster): - __name__ = "PremiumTo" - __type__ = "hook" - __version__ = "0.04" + __name = "PremiumTo" + __type = "hook" + __version = "0.04" - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for downloads from supported hosters:", "all"), - ("hosterList", "str", "Hoster list (comma separated)", "")] + __config = [("hosterListMode", "all;listed;unlisted", "Use for downloads from supported hosters:", "all"), + ("hosterList", "str", "Hoster list (comma separated)", "")] - __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/plugins/hook/PremiumizeMe.py b/pyload/plugins/hook/PremiumizeMe.py index 5824115b6..34f46f6ca 100644 --- a/pyload/plugins/hook/PremiumizeMe.py +++ b/pyload/plugins/hook/PremiumizeMe.py @@ -6,18 +6,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class PremiumizeMe(MultiHoster): - __name__ = "PremiumizeMe" - __type__ = "hook" - __version__ = "0.12" - - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), - ("hosterList", "str", "Hoster list (comma separated)", ""), - ("unloadFailing", "bool", "Revert to stanard download if download fails", False), - ("interval", "int", "Reload interval in hours (0 to disable)", 24)] - - __description__ = """Premiumize.me hook plugin""" - __license__ = "GPLv3" - __authors__ = [("Florian Franzen", "FlorianFranzen@gmail.com")] + __name = "PremiumizeMe" + __type = "hook" + __version = "0.12" + + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to stanard download if download fails", False), + ("interval", "int", "Reload interval in hours (0 to disable)", 24)] + + __description = """Premiumize.me hook plugin""" + __license = "GPLv3" + __authors = [("Florian Franzen", "FlorianFranzen@gmail.com")] def getHoster(self): diff --git a/pyload/plugins/hook/RPNetBiz.py b/pyload/plugins/hook/RPNetBiz.py index ed8835ce8..25355520b 100644 --- a/pyload/plugins/hook/RPNetBiz.py +++ b/pyload/plugins/hook/RPNetBiz.py @@ -6,18 +6,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class RPNetBiz(MultiHoster): - __name__ = "RPNetBiz" - __type__ = "hook" - __version__ = "0.10" - - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), - ("hosterList", "str", "Hoster list (comma separated)", ""), - ("unloadFailing", "bool", "Revert to stanard download if download fails", False), - ("interval", "int", "Reload interval in hours (0 to disable)", 24)] - - __description__ = """RPNet.biz hook plugin""" - __license__ = "GPLv3" - __authors__ = [("Dman", "dmanugm@gmail.com")] + __name = "RPNetBiz" + __type = "hook" + __version = "0.10" + + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to stanard download if download fails", False), + ("interval", "int", "Reload interval in hours (0 to disable)", 24)] + + __description = """RPNet.biz hook plugin""" + __license = "GPLv3" + __authors = [("Dman", "dmanugm@gmail.com")] def getHoster(self): diff --git a/pyload/plugins/hook/RealdebridCom.py b/pyload/plugins/hook/RealdebridCom.py index a6f79a97d..01f7c4fad 100644 --- a/pyload/plugins/hook/RealdebridCom.py +++ b/pyload/plugins/hook/RealdebridCom.py @@ -5,19 +5,19 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class RealdebridCom(MultiHoster): - __name__ = "RealdebridCom" - __type__ = "hook" - __version__ = "0.43" - - __config__ = [("https", "bool", "Enable HTTPS", False), - ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), - ("hosterList", "str", "Hoster list (comma separated)", ""), - ("unloadFailing", "bool", "Revert to stanard download if download fails", False), - ("interval", "int", "Reload interval in hours (0 to disable)", 24)] - - __description__ = """Real-Debrid.com hook plugin""" - __license__ = "GPLv3" - __authors__ = [("Devirex Hazzard", "naibaf_11@yahoo.de")] + __name = "RealdebridCom" + __type = "hook" + __version = "0.43" + + __config = [("https", "bool", "Enable HTTPS", False), + ("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to stanard download if download fails", False), + ("interval", "int", "Reload interval in hours (0 to disable)", 24)] + + __description = """Real-Debrid.com hook plugin""" + __license = "GPLv3" + __authors = [("Devirex Hazzard", "naibaf_11@yahoo.de")] def getHoster(self): diff --git a/pyload/plugins/hook/RehostTo.py b/pyload/plugins/hook/RehostTo.py index 6c334bf06..ce1dee59c 100644 --- a/pyload/plugins/hook/RehostTo.py +++ b/pyload/plugins/hook/RehostTo.py @@ -5,18 +5,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class RehostTo(MultiHoster): - __name__ = "RehostTo" - __type__ = "hook" - __version__ = "0.43" - - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), - ("hosterList", "str", "Hoster list (comma separated)", ""), - ("unloadFailing", "bool", "Revert to stanard download if download fails", False), - ("interval", "int", "Reload interval in hours (0 to disable)", 24)] - - __description__ = """Rehost.to hook plugin""" - __license__ = "GPLv3" - __authors__ = [("RaNaN", "RaNaN@pyload.org")] + __name = "RehostTo" + __type = "hook" + __version = "0.43" + + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to stanard download if download fails", False), + ("interval", "int", "Reload interval in hours (0 to disable)", 24)] + + __description = """Rehost.to hook plugin""" + __license = "GPLv3" + __authors = [("RaNaN", "RaNaN@pyload.org")] def getHoster(self): diff --git a/pyload/plugins/hook/SimplyPremiumCom.py b/pyload/plugins/hook/SimplyPremiumCom.py index 8c32cbf7a..b4e173521 100644 --- a/pyload/plugins/hook/SimplyPremiumCom.py +++ b/pyload/plugins/hook/SimplyPremiumCom.py @@ -6,18 +6,18 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class SimplyPremiumCom(MultiHoster): - __name__ = "SimplyPremiumCom" - __type__ = "hook" - __version__ = "0.02" - - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), - ("hosterList", "str", "Hoster list (comma separated)", ""), - ("unloadFailing", "bool", "Revert to standard download if download fails", "False"), - ("interval", "int", "Reload interval in hours (0 to disable)", "24")] - - __description__ = """Simply-Premium.com hook plugin""" - __license__ = "GPLv3" - __authors__ = [("EvolutionClip", "evolutionclip@live.de")] + __name = "SimplyPremiumCom" + __type = "hook" + __version = "0.02" + + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to standard download if download fails", "False"), + ("interval", "int", "Reload interval in hours (0 to disable)", "24")] + + __description = """Simply-Premium.com hook plugin""" + __license = "GPLv3" + __authors = [("EvolutionClip", "evolutionclip@live.de")] def getHoster(self): diff --git a/pyload/plugins/hook/SimplydebridCom.py b/pyload/plugins/hook/SimplydebridCom.py index 89d8cb752..a6e00aae0 100644 --- a/pyload/plugins/hook/SimplydebridCom.py +++ b/pyload/plugins/hook/SimplydebridCom.py @@ -5,16 +5,16 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class SimplydebridCom(MultiHoster): - __name__ = "SimplydebridCom" - __type__ = "hook" - __version__ = "0.01" + __name = "SimplydebridCom" + __type = "hook" + __version = "0.01" - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), - ("hosterList", "str", "Hoster list (comma separated)", "")] + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("hosterList", "str", "Hoster list (comma separated)", "")] - __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 getHoster(self): diff --git a/pyload/plugins/hook/UnrestrictLi.py b/pyload/plugins/hook/UnrestrictLi.py index 255cee43d..d48e8587e 100644 --- a/pyload/plugins/hook/UnrestrictLi.py +++ b/pyload/plugins/hook/UnrestrictLi.py @@ -6,19 +6,19 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class UnrestrictLi(MultiHoster): - __name__ = "UnrestrictLi" - __type__ = "hook" - __version__ = "0.02" - - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), - ("hosterList", "str", "Hoster list (comma separated)", ""), - ("unloadFailing", "bool", "Revert to standard download if download fails", False), - ("interval", "int", "Reload interval in hours (0 to disable)", 24), - ("history", "bool", "Delete History", False)] - - __description__ = """Unrestrict.li hook plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __name = "UnrestrictLi" + __type = "hook" + __version = "0.02" + + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("hosterList", "str", "Hoster list (comma separated)", ""), + ("unloadFailing", "bool", "Revert to standard download if download fails", False), + ("interval", "int", "Reload interval in hours (0 to disable)", 24), + ("history", "bool", "Delete History", False)] + + __description = """Unrestrict.li hook plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] def getHoster(self): diff --git a/pyload/plugins/hook/XFileSharingPro.py b/pyload/plugins/hook/XFileSharingPro.py index cc4fc760d..698da482f 100644 --- a/pyload/plugins/hook/XFileSharingPro.py +++ b/pyload/plugins/hook/XFileSharingPro.py @@ -6,20 +6,20 @@ from pyload.plugins.Addon import Addon class XFileSharingPro(Addon): - __name__ = "XFileSharingPro" - __type__ = "hook" - __version__ = "0.26" + __name = "XFileSharingPro" + __type = "hook" + __version = "0.26" - __config__ = [("activated" , "bool", "Activated" , True ), - ("use_hoster_list" , "bool", "Load listed hosters only" , True ), - ("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)", "" )] + __config = [("activated" , "bool", "Activated" , True ), + ("use_hoster_list" , "bool", "Load listed hosters only" , True ), + ("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"] @@ -40,7 +40,7 @@ class XFileSharingPro(Addon): CRYPTER_LIST = [] - # def pluginConfigChanged(self.__name__, plugin, name, value): + # def pluginConfigChanged(self.__name, plugin, name, value): # self.loadPattern() diff --git a/pyload/plugins/hook/ZeveraCom.py b/pyload/plugins/hook/ZeveraCom.py index 21fdf6c92..6ff99b142 100644 --- a/pyload/plugins/hook/ZeveraCom.py +++ b/pyload/plugins/hook/ZeveraCom.py @@ -5,16 +5,16 @@ from pyload.plugins.internal.MultiHoster import MultiHoster class ZeveraCom(MultiHoster): - __name__ = "ZeveraCom" - __type__ = "hook" - __version__ = "0.02" + __name = "ZeveraCom" + __type = "hook" + __version = "0.02" - __config__ = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), - ("hosterList", "str", "Hoster list (comma separated)", "")] + __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + ("hosterList", "str", "Hoster list (comma separated)", "")] - __description__ = """Real-Debrid.com hook plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Real-Debrid.com hook plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] def getHoster(self): diff --git a/pyload/plugins/hoster/AlldebridCom.py b/pyload/plugins/hoster/AlldebridCom.py index d2ce331d3..c2894f86b 100644 --- a/pyload/plugins/hoster/AlldebridCom.py +++ b/pyload/plugins/hoster/AlldebridCom.py @@ -11,15 +11,15 @@ from pyload.utils import parseFileSize class AlldebridCom(Hoster): - __name__ = "AlldebridCom" - __type__ = "hoster" - __version__ = "0.34" + __name = "AlldebridCom" + __type = "hoster" + __version = "0.34" - __pattern__ = r'https?://(?:[^/]*\.)?alldebrid\..*' + __pattern = r'https?://(?:[^/]*\.)?alldebrid\..*' - __description__ = """Alldebrid.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("Andy Voigt", "spamsales@online.de")] + __description = """Alldebrid.com hoster plugin""" + __license = "GPLv3" + __authors = [("Andy Voigt", "spamsales@online.de")] def getFilename(self, url): @@ -38,7 +38,7 @@ class AlldebridCom(Hoster): def process(self, pyfile): - if re.match(self.__pattern__, pyfile.url): + if re.match(self.__pattern, pyfile.url): new_url = pyfile.url elif not self.account: self.logError(_("Please enter your %s account or deactivate this plugin") % "AllDebrid") diff --git a/pyload/plugins/hoster/BayfilesCom.py b/pyload/plugins/hoster/BayfilesCom.py index f3fa87d89..d51119284 100644 --- a/pyload/plugins/hoster/BayfilesCom.py +++ b/pyload/plugins/hoster/BayfilesCom.py @@ -9,15 +9,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class BayfilesCom(SimpleHoster): - __name__ = "BayfilesCom" - __type__ = "hoster" - __version__ = "0.08" + __name = "BayfilesCom" + __type = "hoster" + __version = "0.08" - __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__ = [("zoidberg", "zoidberg@mujmail.cz"), + __description = """Bayfiles.com hoster plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz"), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugins/hoster/BezvadataCz.py b/pyload/plugins/hoster/BezvadataCz.py index 431fbfbeb..6d34b5067 100644 --- a/pyload/plugins/hoster/BezvadataCz.py +++ b/pyload/plugins/hoster/BezvadataCz.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class BezvadataCz(SimpleHoster): - __name__ = "BezvadataCz" - __type__ = "hoster" - __version__ = "0.25" + __name = "BezvadataCz" + __type = "hoster" + __version = "0.25" - __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/plugins/hoster/BillionuploadsCom.py b/pyload/plugins/hoster/BillionuploadsCom.py index d5d8c6c0f..87d6f1bce 100644 --- a/pyload/plugins/hoster/BillionuploadsCom.py +++ b/pyload/plugins/hoster/BillionuploadsCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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")] HOSTER_DOMAIN = "billionuploads.com" diff --git a/pyload/plugins/hoster/BitshareCom.py b/pyload/plugins/hoster/BitshareCom.py index 9fd98643c..ef22e9435 100644 --- a/pyload/plugins/hoster/BitshareCom.py +++ b/pyload/plugins/hoster/BitshareCom.py @@ -9,15 +9,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class BitshareCom(SimpleHoster): - __name__ = "BitshareCom" - __type__ = "hoster" - __version__ = "0.51" + __name = "BitshareCom" + __type = "hoster" + __version = "0.51" - __pattern__ = r'http://(?:www\.)?bitshare\.com/(files/(?P<id1>\w+)(/(?P<name>.*?)\.html)?|\?f=(?P<id2>\w+))' + __pattern = r'http://(?:www\.)?bitshare\.com/(files/(?P<id1>\w+)(/(?P<name>.*?)\.html)?|\?f=(?P<id2>\w+))' - __description__ = """Bitshare.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("Paul King", None), + __description = """Bitshare.com hoster plugin""" + __license = "GPLv3" + __authors = [("Paul King", None), ("fragonib", "fragonib[AT]yahoo[DOT]es")] @@ -42,7 +42,7 @@ class BitshareCom(SimpleHoster): self.pyfile = pyfile # 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) @@ -60,7 +60,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) name2 = m.group('N') if m else None diff --git a/pyload/plugins/hoster/BoltsharingCom.py b/pyload/plugins/hoster/BoltsharingCom.py index 4726fc769..0eea35b8c 100644 --- a/pyload/plugins/hoster/BoltsharingCom.py +++ b/pyload/plugins/hoster/BoltsharingCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(BoltsharingCom) diff --git a/pyload/plugins/hoster/CatShareNet.py b/pyload/plugins/hoster/CatShareNet.py index 146b639de..da4b89950 100644 --- a/pyload/plugins/hoster/CatShareNet.py +++ b/pyload/plugins/hoster/CatShareNet.py @@ -7,15 +7,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class CatShareNet(SimpleHoster): - __name__ = "CatShareNet" - __type__ = "hoster" - __version__ = "0.08" + __name = "CatShareNet" + __type = "hoster" + __version = "0.08" - __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", None), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugins/hoster/CloudzerNet.py b/pyload/plugins/hoster/CloudzerNet.py index ce16f6fce..1056df232 100644 --- a/pyload/plugins/hoster/CloudzerNet.py +++ b/pyload/plugins/hoster/CloudzerNet.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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/plugins/hoster/CramitIn.py b/pyload/plugins/hoster/CramitIn.py index 2d2c0cbbc..dafe2e5ed 100644 --- a/pyload/plugins/hoster/CramitIn.py +++ b/pyload/plugins/hoster/CramitIn.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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")] HOSTER_DOMAIN = "cramit.in" diff --git a/pyload/plugins/hoster/CrockoCom.py b/pyload/plugins/hoster/CrockoCom.py index ea87cce6d..dcce3973f 100644 --- a/pyload/plugins/hoster/CrockoCom.py +++ b/pyload/plugins/hoster/CrockoCom.py @@ -7,15 +7,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class CrockoCom(SimpleHoster): - __name__ = "CrockoCom" - __type__ = "hoster" - __version__ = "0.17" + __name = "CrockoCom" + __type = "hoster" + __version = "0.17" - __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/plugins/hoster/CyberlockerCh.py b/pyload/plugins/hoster/CyberlockerCh.py index 48109101d..f4c7aaa57 100644 --- a/pyload/plugins/hoster/CyberlockerCh.py +++ b/pyload/plugins/hoster/CyberlockerCh.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(CyberlockerCh) diff --git a/pyload/plugins/hoster/CzshareCom.py b/pyload/plugins/hoster/CzshareCom.py index 92a38f49d..5821da1fd 100644 --- a/pyload/plugins/hoster/CzshareCom.py +++ b/pyload/plugins/hoster/CzshareCom.py @@ -10,15 +10,15 @@ from pyload.utils import parseFileSize class CzshareCom(SimpleHoster): - __name__ = "CzshareCom" - __type__ = "hoster" - __version__ = "0.95" + __name = "CzshareCom" + __type = "hoster" + __version = "0.95" - __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/plugins/hoster/DailymotionCom.py b/pyload/plugins/hoster/DailymotionCom.py index f8489552f..abc282295 100644 --- a/pyload/plugins/hoster/DailymotionCom.py +++ b/pyload/plugins/hoster/DailymotionCom.py @@ -10,7 +10,7 @@ from pyload.plugins.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/plugins/hoster/DataHu.py b/pyload/plugins/hoster/DataHu.py index 6210f18f4..1b09ea2f5 100644 --- a/pyload/plugins/hoster/DataHu.py +++ b/pyload/plugins/hoster/DataHu.py @@ -9,15 +9,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DataHu(SimpleHoster): - __name__ = "DataHu" - __type__ = "hoster" - __version__ = "0.02" + __name = "DataHu" + __type = "hoster" + __version = "0.02" - __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", None), + __description = """Data.hu hoster plugin""" + __license = "GPLv3" + __authors = [("crash", None), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugins/hoster/DataportCz.py b/pyload/plugins/hoster/DataportCz.py index 65ae38ff1..fe01a1bda 100644 --- a/pyload/plugins/hoster/DataportCz.py +++ b/pyload/plugins/hoster/DataportCz.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DataportCz(SimpleHoster): - __name__ = "DataportCz" - __type__ = "hoster" - __version__ = "0.40" + __name = "DataportCz" + __type = "hoster" + __version = "0.40" - __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/plugins/hoster/DateiTo.py b/pyload/plugins/hoster/DateiTo.py index bcd99ab0c..4ab4ce6a2 100644 --- a/pyload/plugins/hoster/DateiTo.py +++ b/pyload/plugins/hoster/DateiTo.py @@ -7,15 +7,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DateiTo(SimpleHoster): - __name__ = "DateiTo" - __type__ = "hoster" - __version__ = "0.05" + __name = "DateiTo" + __type = "hoster" + __version = "0.05" - __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/plugins/hoster/DdlstorageCom.py b/pyload/plugins/hoster/DdlstorageCom.py index 4a46c4541..e2f4c87dc 100644 --- a/pyload/plugins/hoster/DdlstorageCom.py +++ b/pyload/plugins/hoster/DdlstorageCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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/plugins/hoster/DebridItaliaCom.py b/pyload/plugins/hoster/DebridItaliaCom.py index cc33b9f46..34379ce69 100644 --- a/pyload/plugins/hoster/DebridItaliaCom.py +++ b/pyload/plugins/hoster/DebridItaliaCom.py @@ -7,15 +7,15 @@ from pyload.plugins.internal.SimpleHoster import replace_patterns class DebridItaliaCom(Hoster): - __name__ = "DebridItaliaCom" - __type__ = "hoster" - __version__ = "0.07" + __name = "DebridItaliaCom" + __type = "hoster" + __version = "0.07" - __pattern__ = r'http://s\d+\.debriditalia\.com/dl/\d+' + __pattern = r'http://s\d+\.debriditalia\.com/dl/\d+' - __description__ = """Debriditalia.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it"), + __description = """Debriditalia.com hoster plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it"), ("Walter Purcaro", "vuolter@gmail.com")] @@ -30,7 +30,7 @@ class DebridItaliaCom(Hoster): def process(self, pyfile): pyfile.url = replace_patterns(pyfile.url, cls.URL_REPLACEMENTS) - if re.match(self.__pattern__, pyfile.url): + if re.match(self.__pattern, pyfile.url): link = pyfile.url elif not self.account: diff --git a/pyload/plugins/hoster/DepositfilesCom.py b/pyload/plugins/hoster/DepositfilesCom.py index e78e0bb27..39a0a8745 100644 --- a/pyload/plugins/hoster/DepositfilesCom.py +++ b/pyload/plugins/hoster/DepositfilesCom.py @@ -9,15 +9,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DepositfilesCom(SimpleHoster): - __name__ = "DepositfilesCom" - __type__ = "hoster" - __version__ = "0.51" + __name = "DepositfilesCom" + __type = "hoster" + __version = "0.51" - __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/plugins/hoster/DlFreeFr.py b/pyload/plugins/hoster/DlFreeFr.py index 050fa0442..dc5adeec9 100644 --- a/pyload/plugins/hoster/DlFreeFr.py +++ b/pyload/plugins/hoster/DlFreeFr.py @@ -35,15 +35,15 @@ class CustomBrowser(Browser): class DlFreeFr(SimpleHoster): - __name__ = "DlFreeFr" - __type__ = "hoster" - __version__ = "0.26" + __name = "DlFreeFr" + __type = "hoster" + __version = "0.26" - __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")] @@ -99,7 +99,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/plugins/hoster/DodanePl.py b/pyload/plugins/hoster/DodanePl.py index 3f1ea3d6d..b9c903f6d 100644 --- a/pyload/plugins/hoster/DodanePl.py +++ b/pyload/plugins/hoster/DodanePl.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(DodanePl) diff --git a/pyload/plugins/hoster/DuploadOrg.py b/pyload/plugins/hoster/DuploadOrg.py index dae4c847e..dcd74a02c 100644 --- a/pyload/plugins/hoster/DuploadOrg.py +++ b/pyload/plugins/hoster/DuploadOrg.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(DuploadOrg) diff --git a/pyload/plugins/hoster/EasybytezCom.py b/pyload/plugins/hoster/EasybytezCom.py index d02cb371b..f1083a624 100644 --- a/pyload/plugins/hoster/EasybytezCom.py +++ b/pyload/plugins/hoster/EasybytezCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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/plugins/hoster/EdiskCz.py b/pyload/plugins/hoster/EdiskCz.py index 3b256a89a..17c903c1c 100644 --- a/pyload/plugins/hoster/EdiskCz.py +++ b/pyload/plugins/hoster/EdiskCz.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class EdiskCz(SimpleHoster): - __name__ = "EdiskCz" - __type__ = "hoster" - __version__ = "0.22" + __name = "EdiskCz" + __type = "hoster" + __version = "0.22" - __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/plugins/hoster/EgoFilesCom.py b/pyload/plugins/hoster/EgoFilesCom.py index 20176751a..204273299 100644 --- a/pyload/plugins/hoster/EgoFilesCom.py +++ b/pyload/plugins/hoster/EgoFilesCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(EgoFilesCom) diff --git a/pyload/plugins/hoster/EnteruploadCom.py b/pyload/plugins/hoster/EnteruploadCom.py index c535d6f48..b013d511a 100644 --- a/pyload/plugins/hoster/EnteruploadCom.py +++ b/pyload/plugins/hoster/EnteruploadCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(EnteruploadCom) diff --git a/pyload/plugins/hoster/EpicShareNet.py b/pyload/plugins/hoster/EpicShareNet.py index a06b4f1dc..a0f8fa8f8 100644 --- a/pyload/plugins/hoster/EpicShareNet.py +++ b/pyload/plugins/hoster/EpicShareNet.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(EpicShareNet) diff --git a/pyload/plugins/hoster/EuroshareEu.py b/pyload/plugins/hoster/EuroshareEu.py index e170facca..815aaec26 100644 --- a/pyload/plugins/hoster/EuroshareEu.py +++ b/pyload/plugins/hoster/EuroshareEu.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class EuroshareEu(SimpleHoster): - __name__ = "EuroshareEu" - __type__ = "hoster" - __version__ = "0.26" + __name = "EuroshareEu" + __type = "hoster" + __version = "0.26" - __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/plugins/hoster/ExtabitCom.py b/pyload/plugins/hoster/ExtabitCom.py index 04f78dafb..104b3d580 100644 --- a/pyload/plugins/hoster/ExtabitCom.py +++ b/pyload/plugins/hoster/ExtabitCom.py @@ -10,15 +10,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class ExtabitCom(SimpleHoster): - __name__ = "ExtabitCom" - __type__ = "hoster" - __version__ = "0.62" + __name = "ExtabitCom" + __type = "hoster" + __version = "0.62" - __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>[^"]+)">' @@ -41,7 +41,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('ID') m = re.search(r'recaptcha/api/challenge\?k=(\w+)', self.html) diff --git a/pyload/plugins/hoster/FastixRu.py b/pyload/plugins/hoster/FastixRu.py index eead00f28..47bfa4035 100644 --- a/pyload/plugins/hoster/FastixRu.py +++ b/pyload/plugins/hoster/FastixRu.py @@ -10,15 +10,15 @@ from pyload.plugins.Hoster import Hoster class FastixRu(Hoster): - __name__ = "FastixRu" - __type__ = "hoster" - __version__ = "0.04" + __name = "FastixRu" + __type = "hoster" + __version = "0.04" - __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/(?P<ID>\w{24})' + __pattern = r'http://(?:www\.)?fastix\.(ru|it)/file/(?P<ID>\w{24})' - __description__ = """Fastix hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("Massimo Rosamilia", "max@spiritix.eu")] + __description = """Fastix hoster plugin""" + __license = "GPLv3" + __authors = [("Massimo Rosamilia", "max@spiritix.eu")] def getFilename(self, url): @@ -37,7 +37,7 @@ class FastixRu(Hoster): def process(self, pyfile): - if re.match(self.__pattern__, pyfile.url): + if re.match(self.__pattern, pyfile.url): new_url = pyfile.url elif not self.account: self.logError(_("Please enter your %s account or deactivate this plugin") % "Fastix") diff --git a/pyload/plugins/hoster/FastshareCz.py b/pyload/plugins/hoster/FastshareCz.py index 11ae4ca42..4e2da7f76 100644 --- a/pyload/plugins/hoster/FastshareCz.py +++ b/pyload/plugins/hoster/FastshareCz.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FastshareCz(SimpleHoster): - __name__ = "FastshareCz" - __type__ = "hoster" - __version__ = "0.24" + __name = "FastshareCz" + __type = "hoster" + __version = "0.24" - __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/plugins/hoster/FileApeCom.py b/pyload/plugins/hoster/FileApeCom.py index 307e0df8d..088ba71b3 100644 --- a/pyload/plugins/hoster/FileApeCom.py +++ b/pyload/plugins/hoster/FileApeCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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", None)] + __description = """FileApe.com hoster plugin""" + __license = "GPLv3" + __authors = [("espes", None)] getInfo = create_getInfo(FileApeCom) diff --git a/pyload/plugins/hoster/FileParadoxIn.py b/pyload/plugins/hoster/FileParadoxIn.py index 174aa7211..eee67fa80 100644 --- a/pyload/plugins/hoster/FileParadoxIn.py +++ b/pyload/plugins/hoster/FileParadoxIn.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class FileParadoxIn(XFSHoster): - __name__ = "FileParadoxIn" - __type__ = "hoster" - __version__ = "0.04" + __name = "FileParadoxIn" + __type = "hoster" + __version = "0.04" - __pattern__ = r'https?://(?:www\.)?fileparadox\.in/\w{12}' + __pattern = r'https?://(?:www\.)?fileparadox\.in/\w{12}' - __description__ = """FileParadox.in hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("RazorWing", "muppetuk1@hotmail.com")] + __description = """FileParadox.in hoster plugin""" + __license = "GPLv3" + __authors = [("RazorWing", "muppetuk1@hotmail.com")] HOSTER_DOMAIN = "fileparadox.in" diff --git a/pyload/plugins/hoster/FileSharkPl.py b/pyload/plugins/hoster/FileSharkPl.py index ad8321d2d..98d31a1fc 100644 --- a/pyload/plugins/hoster/FileSharkPl.py +++ b/pyload/plugins/hoster/FileSharkPl.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FileSharkPl(SimpleHoster): - __name__ = "FileSharkPl" - __type__ = "hoster" - __version__ = "0.03" + __name = "FileSharkPl" + __type = "hoster" + __version = "0.03" - __pattern__ = r'http://(?:www\.)?fileshark\.pl/pobierz/\d{6}/\w{5}' + __pattern = r'http://(?:www\.)?fileshark\.pl/pobierz/\d{6}/\w{5}' - __description__ = """FileShark.pl hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("prOq", None), + __description = """FileShark.pl hoster plugin""" + __license = "GPLv3" + __authors = [("prOq", None), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugins/hoster/FileStoreTo.py b/pyload/plugins/hoster/FileStoreTo.py index f08474d28..e1e23f378 100644 --- a/pyload/plugins/hoster/FileStoreTo.py +++ b/pyload/plugins/hoster/FileStoreTo.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FileStoreTo(SimpleHoster): - __name__ = "FileStoreTo" - __type__ = "hoster" - __version__ = "0.01" + __name = "FileStoreTo" + __type = "hoster" + __version = "0.01" - __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/plugins/hoster/FilebeerInfo.py b/pyload/plugins/hoster/FilebeerInfo.py index dcc6d1513..66d6626be 100644 --- a/pyload/plugins/hoster/FilebeerInfo.py +++ b/pyload/plugins/hoster/FilebeerInfo.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(FilebeerInfo) diff --git a/pyload/plugins/hoster/FilecloudIo.py b/pyload/plugins/hoster/FilecloudIo.py index deca28007..751542caf 100644 --- a/pyload/plugins/hoster/FilecloudIo.py +++ b/pyload/plugins/hoster/FilecloudIo.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FilecloudIo(SimpleHoster): - __name__ = "FilecloudIo" - __type__ = "hoster" - __version__ = "0.05" + __name = "FilecloudIo" + __type = "hoster" + __version = "0.05" - __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/plugins/hoster/FilefactoryCom.py b/pyload/plugins/hoster/FilefactoryCom.py index ac7899ec5..a161e1e40 100644 --- a/pyload/plugins/hoster/FilefactoryCom.py +++ b/pyload/plugins/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.52" + __name = "FilefactoryCom" + __type = "hoster" + __version = "0.52" - __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/plugins/hoster/FilejungleCom.py b/pyload/plugins/hoster/FilejungleCom.py index 1cfa4c29e..e582277b6 100644 --- a/pyload/plugins/hoster/FilejungleCom.py +++ b/pyload/plugins/hoster/FilejungleCom.py @@ -5,15 +5,15 @@ from pyload.plugins.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/plugins/hoster/FileomCom.py b/pyload/plugins/hoster/FileomCom.py index 128039c2e..458efec42 100644 --- a/pyload/plugins/hoster/FileomCom.py +++ b/pyload/plugins/hoster/FileomCom.py @@ -7,15 +7,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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")] HOSTER_DOMAIN = "fileom.com" diff --git a/pyload/plugins/hoster/FilepostCom.py b/pyload/plugins/hoster/FilepostCom.py index e80ec56bc..4db034a8b 100644 --- a/pyload/plugins/hoster/FilepostCom.py +++ b/pyload/plugins/hoster/FilepostCom.py @@ -10,15 +10,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FilepostCom(SimpleHoster): - __name__ = "FilepostCom" - __type__ = "hoster" - __version__ = "0.30" + __name = "FilepostCom" + __type = "hoster" + __version = "0.30" - __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/plugins/hoster/FilepupNet.py b/pyload/plugins/hoster/FilepupNet.py index 0b1247bf4..27b3acb44 100644 --- a/pyload/plugins/hoster/FilepupNet.py +++ b/pyload/plugins/hoster/FilepupNet.py @@ -10,15 +10,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FilepupNet(SimpleHoster): - __name__ = "FilepupNet" - __type__ = "hoster" - __version__ = "0.02" + __name = "FilepupNet" + __type = "hoster" + __version = "0.02" - __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/plugins/hoster/FilerNet.py b/pyload/plugins/hoster/FilerNet.py index 04b04219f..b17898cd9 100644 --- a/pyload/plugins/hoster/FilerNet.py +++ b/pyload/plugins/hoster/FilerNet.py @@ -13,15 +13,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FilerNet(SimpleHoster): - __name__ = "FilerNet" - __type__ = "hoster" - __version__ = "0.09" + __name = "FilerNet" + __type = "hoster" + __version = "0.09" - __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/plugins/hoster/FilerioCom.py b/pyload/plugins/hoster/FilerioCom.py index afa1356fc..b865ff3f3 100644 --- a/pyload/plugins/hoster/FilerioCom.py +++ b/pyload/plugins/hoster/FilerioCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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")] HOSTER_DOMAIN = "filerio.in" diff --git a/pyload/plugins/hoster/FilesMailRu.py b/pyload/plugins/hoster/FilesMailRu.py index 23f03f5c9..b2147a993 100644 --- a/pyload/plugins/hoster/FilesMailRu.py +++ b/pyload/plugins/hoster/FilesMailRu.py @@ -30,15 +30,15 @@ def getInfo(urls): class FilesMailRu(Hoster): - __name__ = "FilesMailRu" - __type__ = "hoster" - __version__ = "0.31" + __name = "FilesMailRu" + __type = "hoster" + __version = "0.31" - __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/plugins/hoster/FileserveCom.py b/pyload/plugins/hoster/FileserveCom.py index 5c94d42fa..1b59750f2 100644 --- a/pyload/plugins/hoster/FileserveCom.py +++ b/pyload/plugins/hoster/FileserveCom.py @@ -31,15 +31,15 @@ def checkFile(plugin, urls): class FileserveCom(Hoster): - __name__ = "FileserveCom" - __type__ = "hoster" - __version__ = "0.52" + __name = "FileserveCom" + __type = "hoster" + __version = "0.52" - __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", None), ("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)) @@ -142,7 +142,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")) @@ -182,7 +182,7 @@ class FileserveCom(Hoster): def handlePremium(self): 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/plugins/hoster/FileshareInUa.py b/pyload/plugins/hoster/FileshareInUa.py index 8bb1a72c5..ef528b69b 100644 --- a/pyload/plugins/hoster/FileshareInUa.py +++ b/pyload/plugins/hoster/FileshareInUa.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(FileshareInUa) diff --git a/pyload/plugins/hoster/FilesonicCom.py b/pyload/plugins/hoster/FilesonicCom.py index 323983169..d12ec18ed 100644 --- a/pyload/plugins/hoster/FilesonicCom.py +++ b/pyload/plugins/hoster/FilesonicCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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", None)] diff --git a/pyload/plugins/hoster/FilezyNet.py b/pyload/plugins/hoster/FilezyNet.py index f36ecd51e..3e4efa372 100644 --- a/pyload/plugins/hoster/FilezyNet.py +++ b/pyload/plugins/hoster/FilezyNet.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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 = [] getInfo = create_getInfo(FilezyNet) diff --git a/pyload/plugins/hoster/FiredriveCom.py b/pyload/plugins/hoster/FiredriveCom.py index 3c7ec25f2..449c24874 100644 --- a/pyload/plugins/hoster/FiredriveCom.py +++ b/pyload/plugins/hoster/FiredriveCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(FiredriveCom) diff --git a/pyload/plugins/hoster/FlyFilesNet.py b/pyload/plugins/hoster/FlyFilesNet.py index 6a9a3d63f..3853cc309 100644 --- a/pyload/plugins/hoster/FlyFilesNet.py +++ b/pyload/plugins/hoster/FlyFilesNet.py @@ -9,15 +9,15 @@ from pyload.plugins.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/plugins/hoster/FourSharedCom.py b/pyload/plugins/hoster/FourSharedCom.py index 79e99aee4..c1066454a 100644 --- a/pyload/plugins/hoster/FourSharedCom.py +++ b/pyload/plugins/hoster/FourSharedCom.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FourSharedCom(SimpleHoster): - __name__ = "FourSharedCom" - __type__ = "hoster" - __version__ = "0.30" + __name = "FourSharedCom" + __type = "hoster" + __version = "0.30" - __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/plugins/hoster/FreakshareCom.py b/pyload/plugins/hoster/FreakshareCom.py index c2e45e857..4741f1938 100644 --- a/pyload/plugins/hoster/FreakshareCom.py +++ b/pyload/plugins/hoster/FreakshareCom.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.captcha import ReCaptcha class FreakshareCom(Hoster): - __name__ = "FreakshareCom" - __type__ = "hoster" - __version__ = "0.39" + __name = "FreakshareCom" + __type = "hoster" + __version = "0.39" - __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/plugins/hoster/FreeWayMe.py b/pyload/plugins/hoster/FreeWayMe.py index c940fe094..fe44de8ee 100644 --- a/pyload/plugins/hoster/FreeWayMe.py +++ b/pyload/plugins/hoster/FreeWayMe.py @@ -4,15 +4,15 @@ from pyload.plugins.Hoster import Hoster class FreeWayMe(Hoster): - __name__ = "FreeWayMe" - __type__ = "hoster" - __version__ = "0.11" + __name = "FreeWayMe" + __type = "hoster" + __version = "0.11" - __pattern__ = r'https://(?:www\.)?free-way\.me/.*' + __pattern = r'https://(?:www\.)?free-way\.me/.*' - __description__ = """FreeWayMe hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("Nicolas Giese", "james@free-way.me")] + __description = """FreeWayMe hoster plugin""" + __license = "GPLv3" + __authors = [("Nicolas Giese", "james@free-way.me")] def setup(self): diff --git a/pyload/plugins/hoster/FreevideoCz.py b/pyload/plugins/hoster/FreevideoCz.py index ad6d4c336..3fc4a45bd 100644 --- a/pyload/plugins/hoster/FreevideoCz.py +++ b/pyload/plugins/hoster/FreevideoCz.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(FreevideoCz)
\ No newline at end of file diff --git a/pyload/plugins/hoster/FshareVn.py b/pyload/plugins/hoster/FshareVn.py index d851209a2..3879c1607 100644 --- a/pyload/plugins/hoster/FshareVn.py +++ b/pyload/plugins/hoster/FshareVn.py @@ -22,15 +22,15 @@ def doubleDecode(m): class FshareVn(SimpleHoster): - __name__ = "FshareVn" - __type__ = "hoster" - __version__ = "0.17" + __name = "FshareVn" + __type = "hoster" + __version = "0.17" - __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/plugins/hoster/Ftp.py b/pyload/plugins/hoster/Ftp.py index c7fb856eb..8256c7464 100644 --- a/pyload/plugins/hoster/Ftp.py +++ b/pyload/plugins/hoster/Ftp.py @@ -10,15 +10,15 @@ from pyload.plugins.Hoster import Hoster class Ftp(Hoster): - __name__ = "Ftp" - __type__ = "hoster" - __version__ = "0.43" + __name = "Ftp" + __type = "hoster" + __version = "0.43" - __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/plugins/hoster/GamefrontCom.py b/pyload/plugins/hoster/GamefrontCom.py index 91c63fc62..354a6c974 100644 --- a/pyload/plugins/hoster/GamefrontCom.py +++ b/pyload/plugins/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/plugins/hoster/GigapetaCom.py b/pyload/plugins/hoster/GigapetaCom.py index 419a97558..9bcd54dbc 100644 --- a/pyload/plugins/hoster/GigapetaCom.py +++ b/pyload/plugins/hoster/GigapetaCom.py @@ -9,15 +9,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class GigapetaCom(SimpleHoster): - __name__ = "GigapetaCom" - __type__ = "hoster" - __version__ = "0.02" + __name = "GigapetaCom" + __type = "hoster" + __version = "0.02" - __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/plugins/hoster/GooIm.py b/pyload/plugins/hoster/GooIm.py index f3626cc57..db214c6fa 100644 --- a/pyload/plugins/hoster/GooIm.py +++ b/pyload/plugins/hoster/GooIm.py @@ -9,15 +9,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class GooIm(SimpleHoster): - __name__ = "GooIm" - __type__ = "hoster" - __version__ = "0.03" + __name = "GooIm" + __type = "hoster" + __version = "0.03" - __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/plugins/hoster/HellshareCz.py b/pyload/plugins/hoster/HellshareCz.py index 90dfb4dd6..0601aabbd 100644 --- a/pyload/plugins/hoster/HellshareCz.py +++ b/pyload/plugins/hoster/HellshareCz.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class HellshareCz(SimpleHoster): - __name__ = "HellshareCz" - __type__ = "hoster" - __version__ = "0.83" + __name = "HellshareCz" + __type = "hoster" + __version = "0.83" - __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")] NAME_PATTERN = r'<h1 id="filename"[^>]*>(?P<N>[^<]+)</h1>' @@ -31,7 +31,7 @@ class HellshareCz(SimpleHoster): def process(self, pyfile): if not self.account: self.fail(_("User not logged in")) - pyfile.url = re.match(self.__pattern__, pyfile.url).group(1) + pyfile.url = re.match(self.__pattern, pyfile.url).group(1) self.html = self.load(pyfile.url, decode=True) self.getFileInfo() if not self.checkTrafficLeft(): diff --git a/pyload/plugins/hoster/HellspyCz.py b/pyload/plugins/hoster/HellspyCz.py index f3578c0f3..178970fc4 100644 --- a/pyload/plugins/hoster/HellspyCz.py +++ b/pyload/plugins/hoster/HellspyCz.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(HellspyCz) diff --git a/pyload/plugins/hoster/HotfileCom.py b/pyload/plugins/hoster/HotfileCom.py index bede362e5..f7351bc6c 100644 --- a/pyload/plugins/hoster/HotfileCom.py +++ b/pyload/plugins/hoster/HotfileCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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/plugins/hoster/HugefilesNet.py b/pyload/plugins/hoster/HugefilesNet.py index 1c32b7378..1833d8114 100644 --- a/pyload/plugins/hoster/HugefilesNet.py +++ b/pyload/plugins/hoster/HugefilesNet.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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")] HOSTER_DOMAIN = "hugefiles.net" diff --git a/pyload/plugins/hoster/HundredEightyUploadCom.py b/pyload/plugins/hoster/HundredEightyUploadCom.py index 717344efa..54cf46bdd 100644 --- a/pyload/plugins/hoster/HundredEightyUploadCom.py +++ b/pyload/plugins/hoster/HundredEightyUploadCom.py @@ -7,15 +7,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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")] HOSTER_DOMAIN = "180upload.com" diff --git a/pyload/plugins/hoster/IFileWs.py b/pyload/plugins/hoster/IFileWs.py index d92ec087d..223460793 100644 --- a/pyload/plugins/hoster/IFileWs.py +++ b/pyload/plugins/hoster/IFileWs.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(IFileWs) diff --git a/pyload/plugins/hoster/IcyFilesCom.py b/pyload/plugins/hoster/IcyFilesCom.py index 126b9208d..57fcd13e3 100644 --- a/pyload/plugins/hoster/IcyFilesCom.py +++ b/pyload/plugins/hoster/IcyFilesCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(IcyFilesCom) diff --git a/pyload/plugins/hoster/IfileIt.py b/pyload/plugins/hoster/IfileIt.py index 884bf8582..309acdec3 100644 --- a/pyload/plugins/hoster/IfileIt.py +++ b/pyload/plugins/hoster/IfileIt.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class IfileIt(SimpleHoster): - __name__ = "IfileIt" - __type__ = "hoster" - __version__ = "0.28" + __name = "IfileIt" + __type = "hoster" + __version = "0.28" - __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")] LINK_PATTERN = r'</span> If it doesn\'t, <a target="_blank" href="([^"]+)">' @@ -27,7 +27,7 @@ class IfileIt(SimpleHoster): def handleFree(self): - ukey = re.match(self.__pattern__, self.pyfile.url).group(1) + ukey = re.match(self.__pattern, self.pyfile.url).group(1) json_url = 'http://ifile.it/new_download-request.json' post_data = {"ukey": ukey, "ab": "0"} res = json_loads(self.load(json_url, post=post_data)) diff --git a/pyload/plugins/hoster/IfolderRu.py b/pyload/plugins/hoster/IfolderRu.py index 2a961f780..49f04dfcb 100644 --- a/pyload/plugins/hoster/IfolderRu.py +++ b/pyload/plugins/hoster/IfolderRu.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class IfolderRu(SimpleHoster): - __name__ = "IfolderRu" - __type__ = "hoster" - __version__ = "0.38" + __name = "IfolderRu" + __type = "hoster" + __version = "0.38" - __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')] @@ -35,7 +35,7 @@ class IfolderRu(SimpleHoster): def process(self, pyfile): - file_id = re.match(self.__pattern__, pyfile.url).group('ID') + file_id = re.match(self.__pattern, pyfile.url).group('ID') self.html = self.load("http://rusfolder.com/%s" % file_id, cookies=True, decode=True) self.getFileInfo() diff --git a/pyload/plugins/hoster/JumbofilesCom.py b/pyload/plugins/hoster/JumbofilesCom.py index 6b8611a45..90190f0ff 100644 --- a/pyload/plugins/hoster/JumbofilesCom.py +++ b/pyload/plugins/hoster/JumbofilesCom.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class JumbofilesCom(SimpleHoster): - __name__ = "JumbofilesCom" - __type__ = "hoster" - __version__ = "0.02" + __name = "JumbofilesCom" + __type = "hoster" + __version = "0.02" - __pattern__ = r'http://(?:www\.)?jumbofiles\.com/(\w{12}).*' + __pattern = r'http://(?:www\.)?jumbofiles\.com/(\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^_]+)' @@ -28,7 +28,7 @@ class JumbofilesCom(SimpleHoster): def handleFree(self): - ukey = re.match(self.__pattern__, self.pyfile.url).group(1) + ukey = re.match(self.__pattern, self.pyfile.url).group(1) post_data = {"id": ukey, "op": "download3", "rand": ""} html = self.load(self.pyfile.url, post=post_data, decode=True) url = re.search(self.LINK_PATTERN, html).group(1) diff --git a/pyload/plugins/hoster/JunocloudMe.py b/pyload/plugins/hoster/JunocloudMe.py index cef475c1b..6aaf81844 100644 --- a/pyload/plugins/hoster/JunocloudMe.py +++ b/pyload/plugins/hoster/JunocloudMe.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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")] HOSTER_DOMAIN = "junocloud.me" diff --git a/pyload/plugins/hoster/Keep2shareCc.py b/pyload/plugins/hoster/Keep2shareCc.py index 44587c946..25d92e273 100644 --- a/pyload/plugins/hoster/Keep2shareCc.py +++ b/pyload/plugins/hoster/Keep2shareCc.py @@ -9,19 +9,19 @@ from pyload.plugins.internal.SimpleHoster import _isDirectLink, SimpleHoster, cr class Keep2shareCc(SimpleHoster): - __name__ = "Keep2shareCc" - __type__ = "hoster" - __version__ = "0.16" + __name = "Keep2shareCc" + __type = "hoster" + __version = "0.16" - __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>")] CONTENT_DISPOSITION = True diff --git a/pyload/plugins/hoster/KickloadCom.py b/pyload/plugins/hoster/KickloadCom.py index 88c84390c..70c0bb1ce 100644 --- a/pyload/plugins/hoster/KickloadCom.py +++ b/pyload/plugins/hoster/KickloadCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(KickloadCom) diff --git a/pyload/plugins/hoster/LemUploadsCom.py b/pyload/plugins/hoster/LemUploadsCom.py index 0ef739a56..c2fb63fd8 100644 --- a/pyload/plugins/hoster/LemUploadsCom.py +++ b/pyload/plugins/hoster/LemUploadsCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(LemUploadsCom) diff --git a/pyload/plugins/hoster/LetitbitNet.py b/pyload/plugins/hoster/LetitbitNet.py index e13fe8a66..8d79fd92c 100644 --- a/pyload/plugins/hoster/LetitbitNet.py +++ b/pyload/plugins/hoster/LetitbitNet.py @@ -35,15 +35,15 @@ def getInfo(urls): class LetitbitNet(SimpleHoster): - __name__ = "LetitbitNet" - __type__ = "hoster" - __version__ = "0.26" + __name = "LetitbitNet" + __type = "hoster" + __version = "0.26" - __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/plugins/hoster/LinksnappyCom.py b/pyload/plugins/hoster/LinksnappyCom.py index 392aa78ca..f45eba428 100644 --- a/pyload/plugins/hoster/LinksnappyCom.py +++ b/pyload/plugins/hoster/LinksnappyCom.py @@ -9,15 +9,15 @@ from pyload.plugins.Hoster import Hoster class LinksnappyCom(Hoster): - __name__ = "LinksnappyCom" - __type__ = "hoster" - __version__ = "0.02" + __name = "LinksnappyCom" + __type = "hoster" + __version = "0.02" - __pattern__ = r'https?://(?:[^/]*\.)?linksnappy\.com' + __pattern = r'https?://(?:[^/]*\.)?linksnappy\.com' - __description__ = """Linksnappy.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Linksnappy.com hoster plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] SINGLE_CHUNK_HOSTERS = ('easybytez.com') @@ -29,7 +29,7 @@ class LinksnappyCom(Hoster): def process(self, pyfile): - if re.match(self.__pattern__, pyfile.url): + if re.match(self.__pattern, pyfile.url): new_url = pyfile.url elif not self.account: self.logError(_("Please enter your %s account or deactivate this plugin") % "Linksnappy.com") diff --git a/pyload/plugins/hoster/LoadTo.py b/pyload/plugins/hoster/LoadTo.py index adf951ed9..e5e19d3c6 100644 --- a/pyload/plugins/hoster/LoadTo.py +++ b/pyload/plugins/hoster/LoadTo.py @@ -11,15 +11,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class LoadTo(SimpleHoster): - __name__ = "LoadTo" - __type__ = "hoster" - __version__ = "0.18" + __name = "LoadTo" + __type = "hoster" + __version = "0.18" - __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/plugins/hoster/LomafileCom.py b/pyload/plugins/hoster/LomafileCom.py index 2c4bd37a2..5c16711c0 100644 --- a/pyload/plugins/hoster/LomafileCom.py +++ b/pyload/plugins/hoster/LomafileCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class LomafileCom(XFSHoster): - __name__ = "LomafileCom" - __type__ = "hoster" - __version__ = "0.51" + __name = "LomafileCom" + __type = "hoster" + __version = "0.51" - __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/plugins/hoster/LuckyShareNet.py b/pyload/plugins/hoster/LuckyShareNet.py index a32ac6be9..156e66f21 100644 --- a/pyload/plugins/hoster/LuckyShareNet.py +++ b/pyload/plugins/hoster/LuckyShareNet.py @@ -9,15 +9,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class LuckyShareNet(SimpleHoster): - __name__ = "LuckyShareNet" - __type__ = "hoster" - __version__ = "0.04" + __name = "LuckyShareNet" + __type = "hoster" + __version = "0.04" - __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/plugins/hoster/MediafireCom.py b/pyload/plugins/hoster/MediafireCom.py index c9ab49643..2f75c61dd 100644 --- a/pyload/plugins/hoster/MediafireCom.py +++ b/pyload/plugins/hoster/MediafireCom.py @@ -47,15 +47,15 @@ def getInfo(urls): class MediafireCom(SimpleHoster): - __name__ = "MediafireCom" - __type__ = "hoster" - __version__ = "0.80" + __name = "MediafireCom" + __type = "hoster" + __version = "0.80" - __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/plugins/hoster/MegaCoNz.py b/pyload/plugins/hoster/MegaCoNz.py index f17760abb..d3af1b72e 100644 --- a/pyload/plugins/hoster/MegaCoNz.py +++ b/pyload/plugins/hoster/MegaCoNz.py @@ -44,15 +44,15 @@ from pyload.plugins.Hoster import Hoster class MegaCoNz(Hoster): - __name__ = "MegaCoNz" - __type__ = "hoster" - __version__ = "0.16" + __name = "MegaCoNz" + __type = "hoster" + __version = "0.16" - __pattern__ = r'https?://(\w+\.)?mega\.co\.nz/#!([\w!-]+)' + __pattern = r'https?://(\w+\.)?mega\.co\.nz/#!([\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")] API_URL = "https://g.api.mega.co.nz/cs" FILE_SUFFIX = ".crypted" @@ -133,7 +133,7 @@ class MegaCoNz(Hoster): key = None # match is guaranteed because plugin was chosen to handle url - node = re.match(self.__pattern__, pyfile.url).group(2) + node = re.match(self.__pattern, pyfile.url).group(2) if "!" in node: node, key = node.split("!") diff --git a/pyload/plugins/hoster/MegaDebridEu.py b/pyload/plugins/hoster/MegaDebridEu.py index 848651d1f..5eac2a41d 100644 --- a/pyload/plugins/hoster/MegaDebridEu.py +++ b/pyload/plugins/hoster/MegaDebridEu.py @@ -9,15 +9,15 @@ from pyload.plugins.Hoster import Hoster class MegaDebridEu(Hoster): - __name__ = "MegaDebridEu" - __type__ = "hoster" - __version__ = "0.40" + __name = "MegaDebridEu" + __type = "hoster" + __version = "0.40" - __pattern__ = r'^https?://(?:w{3}\d+\.mega-debrid\.eu|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/download/file/[^/]+/.+$' + __pattern = r'^https?://(?:w{3}\d+\.mega-debrid\.eu|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/download/file/[^/]+/.+$' - __description__ = """mega-debrid.eu hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("D.Ducatel", "dducatel@je-geek.fr")] + __description = """mega-debrid.eu hoster plugin""" + __license = "GPLv3" + __authors = [("D.Ducatel", "dducatel@je-geek.fr")] API_URL = "https://www.mega-debrid.eu/api.php" @@ -31,7 +31,7 @@ class MegaDebridEu(Hoster): def process(self, pyfile): - if re.match(self.__pattern__, pyfile.url): + if re.match(self.__pattern, pyfile.url): new_url = pyfile.url elif not self.account: self.exitOnFail("Please enter your %s account or deactivate this plugin" % "Mega-debrid.eu") diff --git a/pyload/plugins/hoster/MegaFilesSe.py b/pyload/plugins/hoster/MegaFilesSe.py index 4bcaa22fb..d9a2b31b9 100644 --- a/pyload/plugins/hoster/MegaFilesSe.py +++ b/pyload/plugins/hoster/MegaFilesSe.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(MegaFilesSe) diff --git a/pyload/plugins/hoster/MegaRapidCz.py b/pyload/plugins/hoster/MegaRapidCz.py index f49d0e1ec..ed0798f78 100644 --- a/pyload/plugins/hoster/MegaRapidCz.py +++ b/pyload/plugins/hoster/MegaRapidCz.py @@ -20,15 +20,15 @@ def getInfo(urls): class MegaRapidCz(SimpleHoster): - __name__ = "MegaRapidCz" - __type__ = "hoster" - __version__ = "0.54" + __name = "MegaRapidCz" + __type = "hoster" + __version = "0.54" - __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/plugins/hoster/MegacrypterCom.py b/pyload/plugins/hoster/MegacrypterCom.py index 1ebd167f3..0397437ec 100644 --- a/pyload/plugins/hoster/MegacrypterCom.py +++ b/pyload/plugins/hoster/MegacrypterCom.py @@ -8,15 +8,15 @@ from pyload.plugins.hoster.MegaCoNz import MegaCoNz class MegacrypterCom(MegaCoNz): - __name__ = "MegacrypterCom" - __type__ = "hoster" - __version__ = "0.21" + __name = "MegacrypterCom" + __type = "hoster" + __version = "0.21" - __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(1) + node = re.match(self.__pattern, pyfile.url).group(1) # get Mega.co.nz link info info = self.callApi(link=node, m="info") diff --git a/pyload/plugins/hoster/MegareleaseOrg.py b/pyload/plugins/hoster/MegareleaseOrg.py index 7f978c94e..c38396ef9 100644 --- a/pyload/plugins/hoster/MegareleaseOrg.py +++ b/pyload/plugins/hoster/MegareleaseOrg.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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/plugins/hoster/MegasharesCom.py b/pyload/plugins/hoster/MegasharesCom.py index 45bd01ffd..e04f8f8dc 100644 --- a/pyload/plugins/hoster/MegasharesCom.py +++ b/pyload/plugins/hoster/MegasharesCom.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class MegasharesCom(SimpleHoster): - __name__ = "MegasharesCom" - __type__ = "hoster" - __version__ = "0.27" + __name = "MegasharesCom" + __type = "hoster" + __version = "0.27" - __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/plugins/hoster/MegauploadCom.py b/pyload/plugins/hoster/MegauploadCom.py index 20700a3d0..16c5b80b0 100644 --- a/pyload/plugins/hoster/MegauploadCom.py +++ b/pyload/plugins/hoster/MegauploadCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(MegauploadCom) diff --git a/pyload/plugins/hoster/MegavideoCom.py b/pyload/plugins/hoster/MegavideoCom.py index aa458fa2c..ef4adab13 100644 --- a/pyload/plugins/hoster/MegavideoCom.py +++ b/pyload/plugins/hoster/MegavideoCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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/plugins/hoster/MovReelCom.py b/pyload/plugins/hoster/MovReelCom.py index 39216a295..a3989b965 100644 --- a/pyload/plugins/hoster/MovReelCom.py +++ b/pyload/plugins/hoster/MovReelCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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")] HOSTER_DOMAIN = "movreel.com" diff --git a/pyload/plugins/hoster/MultishareCz.py b/pyload/plugins/hoster/MultishareCz.py index 28a536089..0a3f78cea 100644 --- a/pyload/plugins/hoster/MultishareCz.py +++ b/pyload/plugins/hoster/MultishareCz.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class MultishareCz(SimpleHoster): - __name__ = "MultishareCz" - __type__ = "hoster" - __version__ = "0.35" + __name = "MultishareCz" + __type = "hoster" + __version = "0.35" - __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 = [(' ', '')] @@ -28,7 +28,7 @@ class MultishareCz(SimpleHoster): def process(self, pyfile): - msurl = re.match(self.__pattern__, pyfile.url) + msurl = re.match(self.__pattern, pyfile.url) if msurl: self.fileID = msurl.group('ID') self.html = self.load(pyfile.url, decode=True) diff --git a/pyload/plugins/hoster/MyfastfileCom.py b/pyload/plugins/hoster/MyfastfileCom.py index 6bdc9a108..ebb9b19a4 100644 --- a/pyload/plugins/hoster/MyfastfileCom.py +++ b/pyload/plugins/hoster/MyfastfileCom.py @@ -7,15 +7,15 @@ from pyload.utils import json_loads class MyfastfileCom(Hoster): - __name__ = "MyfastfileCom" - __type__ = "hoster" - __version__ = "0.04" + __name = "MyfastfileCom" + __type = "hoster" + __version = "0.04" - __pattern__ = r'http://(?:www\.)?\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/' + __pattern = r'http://(?:www\.)?\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/' - __description__ = """Myfastfile.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Myfastfile.com hoster plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] @@ -25,7 +25,7 @@ class MyfastfileCom(Hoster): def process(self, pyfile): - if re.match(self.__pattern__, pyfile.url): + if re.match(self.__pattern, pyfile.url): new_url = pyfile.url elif not self.account: self.logError(_("Please enter your %s account or deactivate this plugin") % "Myfastfile.com") diff --git a/pyload/plugins/hoster/MyvideoDe.py b/pyload/plugins/hoster/MyvideoDe.py index 84841b1a4..5a8747dce 100644 --- a/pyload/plugins/hoster/MyvideoDe.py +++ b/pyload/plugins/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/plugins/hoster/NahrajCz.py b/pyload/plugins/hoster/NahrajCz.py index 188e2b1e4..df77d04ef 100644 --- a/pyload/plugins/hoster/NahrajCz.py +++ b/pyload/plugins/hoster/NahrajCz.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(NahrajCz) diff --git a/pyload/plugins/hoster/NarodRu.py b/pyload/plugins/hoster/NarodRu.py index 67d940519..9ef0a82c6 100644 --- a/pyload/plugins/hoster/NarodRu.py +++ b/pyload/plugins/hoster/NarodRu.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class NarodRu(SimpleHoster): - __name__ = "NarodRu" - __type__ = "hoster" - __version__ = "0.11" + __name = "NarodRu" + __type = "hoster" + __version = "0.11" - __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/plugins/hoster/NetloadIn.py b/pyload/plugins/hoster/NetloadIn.py index 785d2f465..9437e1c11 100644 --- a/pyload/plugins/hoster/NetloadIn.py +++ b/pyload/plugins/hoster/NetloadIn.py @@ -15,7 +15,7 @@ def getInfo(urls): ## returns list of tupels (name, size (in bytes), status (see FileDatabase), 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.47" + __name = "NetloadIn" + __type = "hoster" + __version = "0.47" - __pattern__ = r'https?://(?:[^/]*\.)?netload\.in/(?:datei(.*?)(?:\.htm|/)|index\.php?id=10&file_id=)' + __pattern = r'https?://(?:[^/]*\.)?netload\.in/(?:datei(.*?)(?:\.htm|/)|index\.php?id=10&file_id=)' - __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")] @@ -113,7 +113,7 @@ class NetloadIn(Hoster): def download_api_data(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/plugins/hoster/NosuploadCom.py b/pyload/plugins/hoster/NosuploadCom.py index f70d64551..60b2b5b4e 100644 --- a/pyload/plugins/hoster/NosuploadCom.py +++ b/pyload/plugins/hoster/NosuploadCom.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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")] HOSTER_DOMAIN = "nosupload.com" diff --git a/pyload/plugins/hoster/NovafileCom.py b/pyload/plugins/hoster/NovafileCom.py index 8d0677ec8..b51ffce01 100644 --- a/pyload/plugins/hoster/NovafileCom.py +++ b/pyload/plugins/hoster/NovafileCom.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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/plugins/hoster/NowDownloadSx.py b/pyload/plugins/hoster/NowDownloadSx.py index 1574de012..225b74f32 100644 --- a/pyload/plugins/hoster/NowDownloadSx.py +++ b/pyload/plugins/hoster/NowDownloadSx.py @@ -7,15 +7,15 @@ from pyload.utils import fixup class NowDownloadSx(SimpleHoster): - __name__ = "NowDownloadSx" - __type__ = "hoster" - __version__ = "0.05" + __name = "NowDownloadSx" + __type = "hoster" + __version = "0.05" - __pattern__ = r'http://(?:www\.)?nowdownload\.(at|ch|co|eu|sx)/(dl/|download\.php\?id=)\w+' + __pattern = r'http://(?:www\.)?nowdownload\.(at|ch|co|eu|sx)/(dl/|download\.php\?id=)\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/plugins/hoster/NowVideoSx.py b/pyload/plugins/hoster/NowVideoSx.py index 4de1bfad7..83a97e7ef 100644 --- a/pyload/plugins/hoster/NowVideoSx.py +++ b/pyload/plugins/hoster/NowVideoSx.py @@ -6,18 +6,18 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class NowVideoSx(SimpleHoster): - __name__ = "NowVideoSx" - __type__ = "hoster" - __version__ = "0.07" + __name = "NowVideoSx" + __type = "hoster" + __version = "0.07" - __pattern__ = r'http://(?:www\.)?nowvideo\.(at|ch|co|eu|sx)/(video|mobile/#/videos)/(?P<ID>\w+)' + __pattern = r'http://(?:www\.)?nowvideo\.(at|ch|co|eu|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.at/video/\g<ID>')] + URL_REPLACEMENTS = [(__pattern + ".*", r'http://www.nowvideo.at/video/\g<ID>')] NAME_PATTERN = r'<h4>(?P<N>.+?)<' OFFLINE_PATTERN = r'>This file no longer exists' diff --git a/pyload/plugins/hoster/OboomCom.py b/pyload/plugins/hoster/OboomCom.py index f78e98b91..aa22ba41a 100644 --- a/pyload/plugins/hoster/OboomCom.py +++ b/pyload/plugins/hoster/OboomCom.py @@ -11,15 +11,15 @@ from pyload.plugins.internal.captcha import ReCaptcha class OboomCom(Hoster): - __name__ = "OboomCom" - __type__ = "hoster" - __version__ = "0.30" + __name = "OboomCom" + __type = "hoster" + __version = "0.30" - __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/plugins/hoster/OneFichierCom.py b/pyload/plugins/hoster/OneFichierCom.py index 0e1016b0a..1c75b1ca9 100644 --- a/pyload/plugins/hoster/OneFichierCom.py +++ b/pyload/plugins/hoster/OneFichierCom.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class OneFichierCom(SimpleHoster): - __name__ = "OneFichierCom" - __type__ = "hoster" - __version__ = "0.74" + __name = "OneFichierCom" + __type = "hoster" + __version = "0.74" - __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", None), diff --git a/pyload/plugins/hoster/OronCom.py b/pyload/plugins/hoster/OronCom.py index 22d6e65b3..1b546ff54 100644 --- a/pyload/plugins/hoster/OronCom.py +++ b/pyload/plugins/hoster/OronCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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/plugins/hoster/OverLoadMe.py b/pyload/plugins/hoster/OverLoadMe.py index eda3e1848..68f254a2e 100644 --- a/pyload/plugins/hoster/OverLoadMe.py +++ b/pyload/plugins/hoster/OverLoadMe.py @@ -11,15 +11,15 @@ from pyload.utils import parseFileSize class OverLoadMe(Hoster): - __name__ = "OverLoadMe" - __type__ = "hoster" - __version__ = "0.02" + __name = "OverLoadMe" + __type = "hoster" + __version = "0.02" - __pattern__ = r'https?://.*overload\.me.*' + __pattern = r'https?://.*overload\.me.*' - __description__ = """Over-Load.me hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("marley", "marley@over-load.me")] + __description = """Over-Load.me hoster plugin""" + __license = "GPLv3" + __authors = [("marley", "marley@over-load.me")] def getFilename(self, url): @@ -38,7 +38,7 @@ class OverLoadMe(Hoster): def process(self, pyfile): - if re.match(self.__pattern__, pyfile.url): + if re.match(self.__pattern, pyfile.url): new_url = pyfile.url elif not self.account: self.logError(_("Please enter your %s account or deactivate this plugin") % "Over-Load") diff --git a/pyload/plugins/hoster/PandaplaNet.py b/pyload/plugins/hoster/PandaplaNet.py index f3124aaae..d5dcf7ab3 100644 --- a/pyload/plugins/hoster/PandaplaNet.py +++ b/pyload/plugins/hoster/PandaplaNet.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(PandaplaNet) diff --git a/pyload/plugins/hoster/PornhostCom.py b/pyload/plugins/hoster/PornhostCom.py index 00d316ef1..ce4de1844 100644 --- a/pyload/plugins/hoster/PornhostCom.py +++ b/pyload/plugins/hoster/PornhostCom.py @@ -6,15 +6,15 @@ from pyload.plugins.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/plugins/hoster/PornhubCom.py b/pyload/plugins/hoster/PornhubCom.py index df070b618..74c3895db 100644 --- a/pyload/plugins/hoster/PornhubCom.py +++ b/pyload/plugins/hoster/PornhubCom.py @@ -6,15 +6,15 @@ from pyload.plugins.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/plugins/hoster/PotloadCom.py b/pyload/plugins/hoster/PotloadCom.py index 19da16b33..2d2f9c71c 100644 --- a/pyload/plugins/hoster/PotloadCom.py +++ b/pyload/plugins/hoster/PotloadCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(PotloadCom) diff --git a/pyload/plugins/hoster/PremiumTo.py b/pyload/plugins/hoster/PremiumTo.py index b4b05126b..64d6513d0 100644 --- a/pyload/plugins/hoster/PremiumTo.py +++ b/pyload/plugins/hoster/PremiumTo.py @@ -11,15 +11,15 @@ from pyload.utils import fs_encode class PremiumTo(Hoster): - __name__ = "PremiumTo" - __type__ = "hoster" - __version__ = "0.11" + __name = "PremiumTo" + __type = "hoster" + __version = "0.11" - __pattern__ = r'https?://(?:www\.)?premium\.to/.+' + __pattern = r'https?://(?:www\.)?premium\.to/.+' - __description__ = """Premium.to hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("RaNaN", "RaNaN@pyload.org"), + __description = """Premium.to hoster plugin""" + __license = "GPLv3" + __authors = [("RaNaN", "RaNaN@pyload.org"), ("zoidberg", "zoidberg@mujmail.cz"), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugins/hoster/PremiumizeMe.py b/pyload/plugins/hoster/PremiumizeMe.py index 641f587f1..f167882b2 100644 --- a/pyload/plugins/hoster/PremiumizeMe.py +++ b/pyload/plugins/hoster/PremiumizeMe.py @@ -5,15 +5,15 @@ from pyload.plugins.Hoster import Hoster class PremiumizeMe(Hoster): - __name__ = "PremiumizeMe" - __type__ = "hoster" - __version__ = "0.12" + __name = "PremiumizeMe" + __type = "hoster" + __version = "0.12" - __pattern__ = r'^unmatchable$' #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady + __pattern = r'^unmatchable$' #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.coreReady - __description__ = """Premiumize.me hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("Florian Franzen", "FlorianFranzen@gmail.com")] + __description = """Premiumize.me hoster plugin""" + __license = "GPLv3" + __authors = [("Florian Franzen", "FlorianFranzen@gmail.com")] def process(self, pyfile): diff --git a/pyload/plugins/hoster/PromptfileCom.py b/pyload/plugins/hoster/PromptfileCom.py index 027f57505..e408116ba 100644 --- a/pyload/plugins/hoster/PromptfileCom.py +++ b/pyload/plugins/hoster/PromptfileCom.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class PromptfileCom(SimpleHoster): - __name__ = "PromptfileCom" - __type__ = "hoster" - __version__ = "0.12" + __name = "PromptfileCom" + __type = "hoster" + __version = "0.12" - __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/plugins/hoster/PrzeklejPl.py b/pyload/plugins/hoster/PrzeklejPl.py index 5e6056adb..fa37caf3a 100644 --- a/pyload/plugins/hoster/PrzeklejPl.py +++ b/pyload/plugins/hoster/PrzeklejPl.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(PrzeklejPl) diff --git a/pyload/plugins/hoster/QuickshareCz.py b/pyload/plugins/hoster/QuickshareCz.py index 21dc7aa11..effbb24fb 100644 --- a/pyload/plugins/hoster/QuickshareCz.py +++ b/pyload/plugins/hoster/QuickshareCz.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class QuickshareCz(SimpleHoster): - __name__ = "QuickshareCz" - __type__ = "hoster" - __version__ = "0.55" + __name = "QuickshareCz" + __type = "hoster" + __version = "0.55" - __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/plugins/hoster/RPNetBiz.py b/pyload/plugins/hoster/RPNetBiz.py index 6ab7b7066..85e31c1dd 100644 --- a/pyload/plugins/hoster/RPNetBiz.py +++ b/pyload/plugins/hoster/RPNetBiz.py @@ -7,15 +7,15 @@ from pyload.utils import json_loads class RPNetBiz(Hoster): - __name__ = "RPNetBiz" - __type__ = "hoster" - __version__ = "0.10" + __name = "RPNetBiz" + __type = "hoster" + __version = "0.10" - __description__ = """RPNet.biz hoster plugin""" - __license__ = "GPLv3" + __description = """RPNet.biz 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): @@ -24,7 +24,7 @@ class RPNetBiz(Hoster): def process(self, pyfile): - if re.match(self.__pattern__, pyfile.url): + if re.match(self.__pattern, pyfile.url): link_status = {'generated': pyfile.url} elif not self.account: # Check account diff --git a/pyload/plugins/hoster/RapidfileshareNet.py b/pyload/plugins/hoster/RapidfileshareNet.py index 849ac2b68..328628e38 100644 --- a/pyload/plugins/hoster/RapidfileshareNet.py +++ b/pyload/plugins/hoster/RapidfileshareNet.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class RapidfileshareNet(XFSHoster): - __name__ = "RapidfileshareNet" - __type__ = "hoster" - __version__ = "0.02" + __name = "RapidfileshareNet" + __type = "hoster" + __version = "0.02" - __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")] HOSTER_DOMAIN = "rapidfileshare.net" diff --git a/pyload/plugins/hoster/RapidgatorNet.py b/pyload/plugins/hoster/RapidgatorNet.py index 7ba629c4d..efb7985a8 100644 --- a/pyload/plugins/hoster/RapidgatorNet.py +++ b/pyload/plugins/hoster/RapidgatorNet.py @@ -12,15 +12,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class RapidgatorNet(SimpleHoster): - __name__ = "RapidgatorNet" - __type__ = "hoster" - __version__ = "0.26" + __name = "RapidgatorNet" + __type = "hoster" + __version = "0.26" - __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", None), ("stickell", "l.stickell@yahoo.it"), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugins/hoster/RapiduNet.py b/pyload/plugins/hoster/RapiduNet.py index 3b66d3c3f..8be8647a8 100644 --- a/pyload/plugins/hoster/RapiduNet.py +++ b/pyload/plugins/hoster/RapiduNet.py @@ -11,15 +11,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class RapiduNet(SimpleHoster): - __name__ = "RapiduNet" - __type__ = "hoster" - __version__ = "0.02" + __name = "RapiduNet" + __type = "hoster" + __version = "0.02" - __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", None)] + __description = """Rapidu.net hoster plugin""" + __license = "GPLv3" + __authors = [("prOq", None)] COOKIES = [("rapidu.net", "rapidu_lang", "en")] diff --git a/pyload/plugins/hoster/RarefileNet.py b/pyload/plugins/hoster/RarefileNet.py index ce54b4dc7..599327be9 100644 --- a/pyload/plugins/hoster/RarefileNet.py +++ b/pyload/plugins/hoster/RarefileNet.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class RarefileNet(XFSHoster): - __name__ = "RarefileNet" - __type__ = "hoster" - __version__ = "0.08" + __name = "RarefileNet" + __type = "hoster" + __version = "0.08" - __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")] HOSTER_DOMAIN = "rarefile.net" diff --git a/pyload/plugins/hoster/RealdebridCom.py b/pyload/plugins/hoster/RealdebridCom.py index b5ce0e44f..711bea60b 100644 --- a/pyload/plugins/hoster/RealdebridCom.py +++ b/pyload/plugins/hoster/RealdebridCom.py @@ -12,15 +12,15 @@ from pyload.utils import parseFileSize class RealdebridCom(Hoster): - __name__ = "RealdebridCom" - __type__ = "hoster" - __version__ = "0.53" + __name = "RealdebridCom" + __type = "hoster" + __version = "0.53" - __pattern__ = r'https?://(?:[^/]*\.)?real-debrid\..*' + __pattern = r'https?://(?:[^/]*\.)?real-debrid\..*' - __description__ = """Real-Debrid.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("Devirex Hazzard", "naibaf_11@yahoo.de")] + __description = """Real-Debrid.com hoster plugin""" + __license = "GPLv3" + __authors = [("Devirex Hazzard", "naibaf_11@yahoo.de")] def getFilename(self, url): @@ -39,7 +39,7 @@ class RealdebridCom(Hoster): def process(self, pyfile): - if re.match(self.__pattern__, pyfile.url): + if re.match(self.__pattern, pyfile.url): new_url = pyfile.url elif not self.account: self.logError(_("Please enter your %s account or deactivate this plugin") % "Real-debrid") diff --git a/pyload/plugins/hoster/RedtubeCom.py b/pyload/plugins/hoster/RedtubeCom.py index 86264d9de..ef6db08ca 100644 --- a/pyload/plugins/hoster/RedtubeCom.py +++ b/pyload/plugins/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/plugins/hoster/RehostTo.py b/pyload/plugins/hoster/RehostTo.py index 88da33c23..8fd63238c 100644 --- a/pyload/plugins/hoster/RehostTo.py +++ b/pyload/plugins/hoster/RehostTo.py @@ -6,15 +6,15 @@ from pyload.plugins.Hoster import Hoster class RehostTo(Hoster): - __name__ = "RehostTo" - __type__ = "hoster" - __version__ = "0.13" + __name = "RehostTo" + __type = "hoster" + __version = "0.13" - __pattern__ = r'https?://.*rehost\.to\..*' + __pattern = r'https?://.*rehost\.to\..*' - __description__ = """Rehost.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("RaNaN", "RaNaN@pyload.org")] + __description = """Rehost.com hoster plugin""" + __license = "GPLv3" + __authors = [("RaNaN", "RaNaN@pyload.org")] def getFilename(self, url): diff --git a/pyload/plugins/hoster/RemixshareCom.py b/pyload/plugins/hoster/RemixshareCom.py index b3aaee1e8..d6b623620 100644 --- a/pyload/plugins/hoster/RemixshareCom.py +++ b/pyload/plugins/hoster/RemixshareCom.py @@ -14,15 +14,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class RemixshareCom(SimpleHoster): - __name__ = "RemixshareCom" - __type__ = "hoster" - __version__ = "0.02" + __name = "RemixshareCom" + __type = "hoster" + __version = "0.02" - __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/plugins/hoster/RgHostNet.py b/pyload/plugins/hoster/RgHostNet.py index 353e62696..0101802e0 100644 --- a/pyload/plugins/hoster/RgHostNet.py +++ b/pyload/plugins/hoster/RgHostNet.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo 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/plugins/hoster/RyushareCom.py b/pyload/plugins/hoster/RyushareCom.py index 8b08c9f51..f1258dd8a 100644 --- a/pyload/plugins/hoster/RyushareCom.py +++ b/pyload/plugins/hoster/RyushareCom.py @@ -10,15 +10,15 @@ from pyload.plugins.internal.captcha import SolveMedia class RyushareCom(XFSHoster): - __name__ = "RyushareCom" - __type__ = "hoster" - __version__ = "0.20" + __name = "RyushareCom" + __type = "hoster" + __version = "0.20" - __pattern__ = r'http://(?:www\.)?ryushare\.com/\w+' + __pattern = r'http://(?:www\.)?ryushare\.com/\w+' - __description__ = """Ryushare.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + __description = """Ryushare.com hoster plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz"), ("stickell", "l.stickell@yahoo.it"), ("quareevo", "quareevo@arcor.de")] diff --git a/pyload/plugins/hoster/SafesharingEu.py b/pyload/plugins/hoster/SafesharingEu.py index 730bfc692..86922a0f5 100644 --- a/pyload/plugins/hoster/SafesharingEu.py +++ b/pyload/plugins/hoster/SafesharingEu.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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")] HOSTER_DOMAIN = "safesharing.eu" diff --git a/pyload/plugins/hoster/SecureUploadEu.py b/pyload/plugins/hoster/SecureUploadEu.py index 6939e4f6d..fbd530679 100644 --- a/pyload/plugins/hoster/SecureUploadEu.py +++ b/pyload/plugins/hoster/SecureUploadEu.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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")] HOSTER_DOMAIN = "secureupload.eu" diff --git a/pyload/plugins/hoster/SendmywayCom.py b/pyload/plugins/hoster/SendmywayCom.py index cb82fb19d..bd4c2d5b5 100644 --- a/pyload/plugins/hoster/SendmywayCom.py +++ b/pyload/plugins/hoster/SendmywayCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class SendmywayCom(XFSHoster): - __name__ = "SendmywayCom" - __type__ = "hoster" - __version__ = "0.04" + __name = "SendmywayCom" + __type = "hoster" + __version = "0.04" - __pattern__ = r'http://(?:www\.)?sendmyway\.com/\w{12}' + __pattern = r'http://(?:www\.)?sendmyway\.com/\w{12}' - __description__ = """SendMyWay hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """SendMyWay hoster plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] HOSTER_DOMAIN = "sendmyway.com" diff --git a/pyload/plugins/hoster/SendspaceCom.py b/pyload/plugins/hoster/SendspaceCom.py index 2915d47c0..199f6f7a7 100644 --- a/pyload/plugins/hoster/SendspaceCom.py +++ b/pyload/plugins/hoster/SendspaceCom.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class SendspaceCom(SimpleHoster): - __name__ = "SendspaceCom" - __type__ = "hoster" - __version__ = "0.14" + __name = "SendspaceCom" + __type = "hoster" + __version = "0.14" - __pattern__ = r'http://(?:www\.)?sendspace\.com/file/.*' + __pattern = r'http://(?:www\.)?sendspace\.com/file/.*' - __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/plugins/hoster/Share4webCom.py b/pyload/plugins/hoster/Share4webCom.py index 9449ec959..3389001e1 100644 --- a/pyload/plugins/hoster/Share4webCom.py +++ b/pyload/plugins/hoster/Share4webCom.py @@ -5,15 +5,15 @@ from pyload.plugins.internal.SimpleHoster import create_getInfo 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/plugins/hoster/Share76Com.py b/pyload/plugins/hoster/Share76Com.py index fb6fc041f..7801aa7d6 100644 --- a/pyload/plugins/hoster/Share76Com.py +++ b/pyload/plugins/hoster/Share76Com.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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 = [] getInfo = create_getInfo(Share76Com) diff --git a/pyload/plugins/hoster/ShareFilesCo.py b/pyload/plugins/hoster/ShareFilesCo.py index db51c2024..764c0f235 100644 --- a/pyload/plugins/hoster/ShareFilesCo.py +++ b/pyload/plugins/hoster/ShareFilesCo.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(ShareFilesCo) diff --git a/pyload/plugins/hoster/SharebeesCom.py b/pyload/plugins/hoster/SharebeesCom.py index 07f0e8bfd..9d1e2d516 100644 --- a/pyload/plugins/hoster/SharebeesCom.py +++ b/pyload/plugins/hoster/SharebeesCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(SharebeesCom) diff --git a/pyload/plugins/hoster/ShareonlineBiz.py b/pyload/plugins/hoster/ShareonlineBiz.py index df89f7bed..af20a1761 100644 --- a/pyload/plugins/hoster/ShareonlineBiz.py +++ b/pyload/plugins/hoster/ShareonlineBiz.py @@ -12,21 +12,21 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class ShareonlineBiz(SimpleHoster): - __name__ = "ShareonlineBiz" - __type__ = "hoster" - __version__ = "0.44" + __name = "ShareonlineBiz" + __type = "hoster" + __version = "0.44" - __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>")] RECAPTCHA_KEY = "6LdatrsSAAAAAHZrB70txiV5p-8Iv8BtVxlTtjKX" @@ -38,7 +38,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/plugins/hoster/ShareplaceCom.py b/pyload/plugins/hoster/ShareplaceCom.py index ae3f60a0b..466600ff6 100644 --- a/pyload/plugins/hoster/ShareplaceCom.py +++ b/pyload/plugins/hoster/ShareplaceCom.py @@ -8,15 +8,15 @@ from pyload.plugins.Hoster import Hoster class ShareplaceCom(Hoster): - __name__ = "ShareplaceCom" - __type__ = "hoster" - __version__ = "0.11" + __name = "ShareplaceCom" + __type = "hoster" + __version = "0.11" - __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", None)] + __description = """Shareplace.com hoster plugin""" + __license = "GPLv3" + __authors = [("ACCakut", None)] def process(self, pyfile): diff --git a/pyload/plugins/hoster/SharingmatrixCom.py b/pyload/plugins/hoster/SharingmatrixCom.py index 7459c12b6..2729ad5d5 100644 --- a/pyload/plugins/hoster/SharingmatrixCom.py +++ b/pyload/plugins/hoster/SharingmatrixCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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", None)] diff --git a/pyload/plugins/hoster/ShragleCom.py b/pyload/plugins/hoster/ShragleCom.py index 792457bbc..19c0a596d 100644 --- a/pyload/plugins/hoster/ShragleCom.py +++ b/pyload/plugins/hoster/ShragleCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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/plugins/hoster/SimplyPremiumCom.py b/pyload/plugins/hoster/SimplyPremiumCom.py index 271d05849..e3871dfb3 100644 --- a/pyload/plugins/hoster/SimplyPremiumCom.py +++ b/pyload/plugins/hoster/SimplyPremiumCom.py @@ -9,15 +9,15 @@ from pyload.plugins.hoster.UnrestrictLi import secondsToMidnight class SimplyPremiumCom(Hoster): - __name__ = "SimplyPremiumCom" - __type__ = "hoster" - __version__ = "0.03" + __name = "SimplyPremiumCom" + __type = "hoster" + __version = "0.03" - __pattern__ = r'https?://.*(simply-premium)\.com' + __pattern = r'https?://.*(simply-premium)\.com' - __description__ = """Simply-Premium.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("EvolutionClip", "evolutionclip@live.de")] + __description = """Simply-Premium.com hoster plugin""" + __license = "GPLv3" + __authors = [("EvolutionClip", "evolutionclip@live.de")] def setup(self): @@ -26,7 +26,7 @@ class SimplyPremiumCom(Hoster): def process(self, pyfile): - if re.match(self.__pattern__, pyfile.url): + if re.match(self.__pattern, pyfile.url): new_url = pyfile.url elif not self.account: self.logError(_("Please enter your %s account or deactivate this plugin") % "Simply-Premium.com") diff --git a/pyload/plugins/hoster/SimplydebridCom.py b/pyload/plugins/hoster/SimplydebridCom.py index 4e187ee0d..4022a7764 100644 --- a/pyload/plugins/hoster/SimplydebridCom.py +++ b/pyload/plugins/hoster/SimplydebridCom.py @@ -6,15 +6,15 @@ from pyload.plugins.Hoster import Hoster class SimplydebridCom(Hoster): - __name__ = "SimplydebridCom" - __type__ = "hoster" - __version__ = "0.10" + __name = "SimplydebridCom" + __type = "hoster" + __version = "0.10" - __pattern__ = r'http://(?:www\.)?\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd\.php/*' + __pattern = r'http://(?:www\.)?\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd\.php/*' - __description__ = """Simply-debrid.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("Kagenoshin", "kagenoshin@gmx.ch")] + __description = """Simply-debrid.com hoster plugin""" + __license = "GPLv3" + __authors = [("Kagenoshin", "kagenoshin@gmx.ch")] def setup(self): @@ -41,12 +41,12 @@ class SimplydebridCom(Hoster): if('fileparadox' in new_url): new_url = new_url.replace("http://", "https://") - if re.match(self.__pattern__, new_url): + if re.match(self.__pattern, new_url): new_url = new_url self.logDebug("New URL: %s" % new_url) - if not re.match(self.__pattern__, new_url): + if not re.match(self.__pattern, new_url): page = self.load("http://simply-debrid.com/api.php", get={'dl': new_url}) # +'&u='+self.user+'&p='+self.account.getAccountData(self.user)['password']) if 'tiger Link' in page or 'Invalid Link' in page or ('API' in page and 'ERROR' in page): self.fail(_("Unable to unrestrict link")) diff --git a/pyload/plugins/hoster/SockshareCom.py b/pyload/plugins/hoster/SockshareCom.py index d28041893..33b3f2e36 100644 --- a/pyload/plugins/hoster/SockshareCom.py +++ b/pyload/plugins/hoster/SockshareCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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/plugins/hoster/SoundcloudCom.py b/pyload/plugins/hoster/SoundcloudCom.py index faed23439..0934a2d76 100644 --- a/pyload/plugins/hoster/SoundcloudCom.py +++ b/pyload/plugins/hoster/SoundcloudCom.py @@ -7,15 +7,15 @@ from pyload.plugins.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 page = self.load("https://api.sndcdn.com/i1/tracks/%s/streams" % songId, get={"client_id": clientId}) diff --git a/pyload/plugins/hoster/SpeedLoadOrg.py b/pyload/plugins/hoster/SpeedLoadOrg.py index 35bd84803..068348ab8 100644 --- a/pyload/plugins/hoster/SpeedLoadOrg.py +++ b/pyload/plugins/hoster/SpeedLoadOrg.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(SpeedLoadOrg) diff --git a/pyload/plugins/hoster/SpeedfileCz.py b/pyload/plugins/hoster/SpeedfileCz.py index 549a146d4..fe57ce96d 100644 --- a/pyload/plugins/hoster/SpeedfileCz.py +++ b/pyload/plugins/hoster/SpeedfileCz.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(SpeedfileCz) diff --git a/pyload/plugins/hoster/SpeedyshareCom.py b/pyload/plugins/hoster/SpeedyshareCom.py index 5128e42e7..0c1d2848a 100644 --- a/pyload/plugins/hoster/SpeedyshareCom.py +++ b/pyload/plugins/hoster/SpeedyshareCom.py @@ -11,15 +11,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class SpeedyshareCom(SimpleHoster): - __name__ = "SpeedyshareCom" - __type__ = "hoster" - __version__ = "0.03" + __name = "SpeedyshareCom" + __type = "hoster" + __version = "0.03" - __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/plugins/hoster/StorageTo.py b/pyload/plugins/hoster/StorageTo.py index 5ba0c145b..adf467055 100644 --- a/pyload/plugins/hoster/StorageTo.py +++ b/pyload/plugins/hoster/StorageTo.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(StorageTo) diff --git a/pyload/plugins/hoster/StreamCz.py b/pyload/plugins/hoster/StreamCz.py index d8b5d9efd..ca42c8669 100644 --- a/pyload/plugins/hoster/StreamCz.py +++ b/pyload/plugins/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/plugins/hoster/StreamcloudEu.py b/pyload/plugins/hoster/StreamcloudEu.py index 5ae617095..0a6262387 100644 --- a/pyload/plugins/hoster/StreamcloudEu.py +++ b/pyload/plugins/hoster/StreamcloudEu.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class StreamcloudEu(XFSHoster): - __name__ = "StreamcloudEu" - __type__ = "hoster" - __version__ = "0.09" + __name = "StreamcloudEu" + __type = "hoster" + __version = "0.09" - __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")] HOSTER_DOMAIN = "streamcloud.eu" diff --git a/pyload/plugins/hoster/TurbobitNet.py b/pyload/plugins/hoster/TurbobitNet.py index adb9d21a7..ffb716887 100644 --- a/pyload/plugins/hoster/TurbobitNet.py +++ b/pyload/plugins/hoster/TurbobitNet.py @@ -15,19 +15,19 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, t class TurbobitNet(SimpleHoster): - __name__ = "TurbobitNet" - __type__ = "hoster" - __version__ = "0.16" + __name = "TurbobitNet" + __type = "hoster" + __version = "0.16" - __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", None)] - URL_REPLACEMENTS = [(__pattern__ + ".*", "http://turbobit.net/\g<ID>.html")] + URL_REPLACEMENTS = [(__pattern + ".*", "http://turbobit.net/\g<ID>.html")] COOKIES = [("turbobit.net", "user_lang", "en")] @@ -95,7 +95,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") @@ -107,7 +107,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/plugins/hoster/TurbouploadCom.py b/pyload/plugins/hoster/TurbouploadCom.py index 80ad6ef1f..23f66da8c 100644 --- a/pyload/plugins/hoster/TurbouploadCom.py +++ b/pyload/plugins/hoster/TurbouploadCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(TurbouploadCom) diff --git a/pyload/plugins/hoster/TusfilesNet.py b/pyload/plugins/hoster/TusfilesNet.py index 3b4d7f92c..f63d3ed8e 100644 --- a/pyload/plugins/hoster/TusfilesNet.py +++ b/pyload/plugins/hoster/TusfilesNet.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class TusfilesNet(XFSHoster): - __name__ = "TusfilesNet" - __type__ = "hoster" - __version__ = "0.07" + __name = "TusfilesNet" + __type = "hoster" + __version = "0.07" - __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/plugins/hoster/TwoSharedCom.py b/pyload/plugins/hoster/TwoSharedCom.py index ee50c8712..d73df4d0d 100644 --- a/pyload/plugins/hoster/TwoSharedCom.py +++ b/pyload/plugins/hoster/TwoSharedCom.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class TwoSharedCom(SimpleHoster): - __name__ = "TwoSharedCom" - __type__ = "hoster" - __version__ = "0.12" + __name = "TwoSharedCom" + __type = "hoster" + __version = "0.12" - __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/plugins/hoster/UlozTo.py b/pyload/plugins/hoster/UlozTo.py index b331dd4f1..ca832a3a9 100644 --- a/pyload/plugins/hoster/UlozTo.py +++ b/pyload/plugins/hoster/UlozTo.py @@ -13,15 +13,15 @@ def convertDecimalPrefix(m): class UlozTo(SimpleHoster): - __name__ = "UlozTo" - __type__ = "hoster" - __version__ = "1.00" + __name = "UlozTo" + __type = "hoster" + __version = "1.00" - __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/plugins/hoster/UloziskoSk.py b/pyload/plugins/hoster/UloziskoSk.py index e34f74a3f..1271053c0 100644 --- a/pyload/plugins/hoster/UloziskoSk.py +++ b/pyload/plugins/hoster/UloziskoSk.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UloziskoSk(SimpleHoster): - __name__ = "UloziskoSk" - __type__ = "hoster" - __version__ = "0.24" + __name = "UloziskoSk" + __type = "hoster" + __version = "0.24" - __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/plugins/hoster/UnibytesCom.py b/pyload/plugins/hoster/UnibytesCom.py index 6ed3805b1..1fcd1d89d 100644 --- a/pyload/plugins/hoster/UnibytesCom.py +++ b/pyload/plugins/hoster/UnibytesCom.py @@ -10,15 +10,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UnibytesCom(SimpleHoster): - __name__ = "UnibytesCom" - __type__ = "hoster" - __version__ = "0.11" + __name = "UnibytesCom" + __type = "hoster" + __version = "0.11" - __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/plugins/hoster/UnrestrictLi.py b/pyload/plugins/hoster/UnrestrictLi.py index b6cead4bb..2ac39eeb5 100644 --- a/pyload/plugins/hoster/UnrestrictLi.py +++ b/pyload/plugins/hoster/UnrestrictLi.py @@ -19,15 +19,15 @@ def secondsToMidnight(gmt=0): class UnrestrictLi(Hoster): - __name__ = "UnrestrictLi" - __type__ = "hoster" - __version__ = "0.12" + __name = "UnrestrictLi" + __type = "hoster" + __version = "0.12" - __pattern__ = r'https?://(?:[^/]*\.)?(unrestrict|unr)\.li' + __pattern = r'https?://(?:[^/]*\.)?(unrestrict|unr)\.li' - __description__ = """Unrestrict.li hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("stickell", "l.stickell@yahoo.it")] + __description = """Unrestrict.li hoster plugin""" + __license = "GPLv3" + __authors = [("stickell", "l.stickell@yahoo.it")] def setup(self): @@ -36,7 +36,7 @@ class UnrestrictLi(Hoster): def process(self, pyfile): - if re.match(self.__pattern__, pyfile.url): + if re.match(self.__pattern, pyfile.url): new_url = pyfile.url elif not self.account: self.logError(_("Please enter your %s account or deactivate this plugin") % "Unrestrict.li") diff --git a/pyload/plugins/hoster/UpleaCom.py b/pyload/plugins/hoster/UpleaCom.py index ca639a954..a1588c842 100644 --- a/pyload/plugins/hoster/UpleaCom.py +++ b/pyload/plugins/hoster/UpleaCom.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class UpleaCom(XFSHoster): - __name__ = "UpleaCom" - __type__ = "hoster" - __version__ = "0.05" + __name = "UpleaCom" + __type = "hoster" + __version = "0.05" - __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", None)] + __description = """Uplea.com hoster plugin""" + __license = "GPLv3" + __authors = [("Redleon", None)] HOSTER_DOMAIN = "uplea.com" diff --git a/pyload/plugins/hoster/UploadStationCom.py b/pyload/plugins/hoster/UploadStationCom.py index ad6779364..f29bcef50 100644 --- a/pyload/plugins/hoster/UploadStationCom.py +++ b/pyload/plugins/hoster/UploadStationCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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/plugins/hoster/UploadableCh.py b/pyload/plugins/hoster/UploadableCh.py index 0fafcb6e8..7c85ef486 100644 --- a/pyload/plugins/hoster/UploadableCh.py +++ b/pyload/plugins/hoster/UploadableCh.py @@ -9,15 +9,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UploadableCh(SimpleHoster): - __name__ = "UploadableCh" - __type__ = "hoster" - __version__ = "0.02" + __name = "UploadableCh" + __type = "hoster" + __version = "0.02" - __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")] @@ -28,7 +28,7 @@ class UploadableCh(SimpleHoster): WAIT_PATTERN = r'data-time="(\d+)" data-format' - FILE_URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://www.uploadable.ch/file/\g<ID>')] + FILE_URL_REPLACEMENTS = [(__pattern + ".*", r'http://www.uploadable.ch/file/\g<ID>')] def setup(self): diff --git a/pyload/plugins/hoster/UploadboxCom.py b/pyload/plugins/hoster/UploadboxCom.py index 89a525c67..b8cbf3963 100644 --- a/pyload/plugins/hoster/UploadboxCom.py +++ b/pyload/plugins/hoster/UploadboxCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(UploadboxCom) diff --git a/pyload/plugins/hoster/UploadedTo.py b/pyload/plugins/hoster/UploadedTo.py index 1bf4dc899..cfb92b0dd 100644 --- a/pyload/plugins/hoster/UploadedTo.py +++ b/pyload/plugins/hoster/UploadedTo.py @@ -20,7 +20,7 @@ key = "bGhGMkllZXByd2VEZnU5Y2NXbHhYVlZ5cEE1bkEzRUw=".decode('base64') def getID(url): """ returns id from file url""" - m = re.match(UploadedTo.__pattern__, url) + m = re.match(UploadedTo.__pattern, url) return m.group('ID') @@ -92,15 +92,15 @@ def getInfo(urls): class UploadedTo(Hoster): - __name__ = "UploadedTo" - __type__ = "hoster" - __version__ = "0.75" + __name = "UploadedTo" + __type = "hoster" + __version = "0.75" - __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__ = [("spoob", "spoob@pyload.org"), + __description = """Uploaded.net hoster plugin""" + __license = "GPLv3" + __authors = [("spoob", "spoob@pyload.org"), ("mkaay", "mkaay@mkaay.de"), ("zoidberg", "zoidberg@mujmail.cz"), ("netpok", "netpok@gmail.com"), @@ -163,7 +163,7 @@ class UploadedTo(Hoster): def handlePremium(self): info = self.account.getAccountInfo(self.user, True) - self.logDebug("%(name)s: Use Premium Account (%(left)sGB left)" % {"name": self.__name__, + self.logDebug("%(name)s: Use Premium Account (%(left)sGB left)" % {"name": self.__name, "left": info['trafficleft'] / 1024 / 1024}) if int(self.data[1]) / 1024 > info['trafficleft']: self.logInfo(_("Not enough traffic left")) diff --git a/pyload/plugins/hoster/UploadhereCom.py b/pyload/plugins/hoster/UploadhereCom.py index ba02ea07c..798b3d817 100644 --- a/pyload/plugins/hoster/UploadhereCom.py +++ b/pyload/plugins/hoster/UploadhereCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(UploadhereCom) diff --git a/pyload/plugins/hoster/UploadheroCom.py b/pyload/plugins/hoster/UploadheroCom.py index 857cf066d..74229a3a3 100644 --- a/pyload/plugins/hoster/UploadheroCom.py +++ b/pyload/plugins/hoster/UploadheroCom.py @@ -9,15 +9,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UploadheroCom(SimpleHoster): - __name__ = "UploadheroCom" - __type__ = "hoster" - __version__ = "0.16" + __name = "UploadheroCom" + __type = "hoster" + __version = "0.16" - __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")] @@ -60,7 +60,7 @@ class UploadheroCom(SimpleHoster): def handlePremium(self): - self.logDebug("%s: Use Premium Account" % self.__name__) + self.logDebug("%s: Use Premium Account" % self.__name) link = re.search(self.PREMIUM_URL_PATTERN, self.html).group(1) self.download(link) diff --git a/pyload/plugins/hoster/UploadingCom.py b/pyload/plugins/hoster/UploadingCom.py index bc409e1cb..a6a3b2774 100644 --- a/pyload/plugins/hoster/UploadingCom.py +++ b/pyload/plugins/hoster/UploadingCom.py @@ -9,15 +9,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, t class UploadingCom(SimpleHoster): - __name__ = "UploadingCom" - __type__ = "hoster" - __version__ = "0.39" + __name = "UploadingCom" + __type = "hoster" + __version = "0.39" - __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/plugins/hoster/UploadkingCom.py b/pyload/plugins/hoster/UploadkingCom.py index e9c536819..3db1e15c4 100644 --- a/pyload/plugins/hoster/UploadkingCom.py +++ b/pyload/plugins/hoster/UploadkingCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(UploadkingCom) diff --git a/pyload/plugins/hoster/UpstoreNet.py b/pyload/plugins/hoster/UpstoreNet.py index f7083f820..2594efe21 100644 --- a/pyload/plugins/hoster/UpstoreNet.py +++ b/pyload/plugins/hoster/UpstoreNet.py @@ -7,15 +7,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class UpstoreNet(SimpleHoster): - __name__ = "UpstoreNet" - __type__ = "hoster" - __version__ = "0.03" + __name = "UpstoreNet" + __type = "hoster" + __version = "0.03" - __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/plugins/hoster/UptoboxCom.py b/pyload/plugins/hoster/UptoboxCom.py index ad14307c2..a8ecbaf68 100644 --- a/pyload/plugins/hoster/UptoboxCom.py +++ b/pyload/plugins/hoster/UptoboxCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class UptoboxCom(XFSHoster): - __name__ = "UptoboxCom" - __type__ = "hoster" - __version__ = "0.16" + __name = "UptoboxCom" + __type = "hoster" + __version = "0.16" - __pattern__ = r'https?://(?:www\.)?uptobox\.com/\w{12}' + __pattern = r'https?://(?:www\.)?uptobox\.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")] HOSTER_DOMAIN = "uptobox.com" diff --git a/pyload/plugins/hoster/VeehdCom.py b/pyload/plugins/hoster/VeehdCom.py index 03ad789de..0eb6ba64a 100644 --- a/pyload/plugins/hoster/VeehdCom.py +++ b/pyload/plugins/hoster/VeehdCom.py @@ -6,17 +6,17 @@ from pyload.plugins.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), - ("replacement_char", "str", "Filename replacement character", "_")] + __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/plugins/hoster/VeohCom.py b/pyload/plugins/hoster/VeohCom.py index b2f8c69ed..25f109b2b 100644 --- a/pyload/plugins/hoster/VeohCom.py +++ b/pyload/plugins/hoster/VeohCom.py @@ -6,22 +6,22 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class VeohCom(SimpleHoster): - __name__ = "VeohCom" - __type__ = "hoster" - __version__ = "0.21" + __name = "VeohCom" + __type = "hoster" + __version = "0.21" - __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/plugins/hoster/VidPlayNet.py b/pyload/plugins/hoster/VidPlayNet.py index 3a5198973..829e61f07 100644 --- a/pyload/plugins/hoster/VidPlayNet.py +++ b/pyload/plugins/hoster/VidPlayNet.py @@ -7,15 +7,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo 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")] HOSTER_DOMAIN = "vidplay.net" diff --git a/pyload/plugins/hoster/VimeoCom.py b/pyload/plugins/hoster/VimeoCom.py index 8b4d5bafb..9a5f65ceb 100644 --- a/pyload/plugins/hoster/VimeoCom.py +++ b/pyload/plugins/hoster/VimeoCom.py @@ -6,24 +6,24 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class VimeoCom(SimpleHoster): - __name__ = "VimeoCom" - __type__ = "hoster" - __version__ = "0.03" + __name = "VimeoCom" + __type = "hoster" + __version = "0.03" - __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)] + __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")] @@ -41,7 +41,7 @@ class VimeoCom(SimpleHoster): html = self.js.eval(self.load(self.pyfile.url, get={'action': "download", 'password': password}, decode=True)) pattern = r'href="(?P<URL>http://vimeo\.com.+?)".*?\>(?P<QL>.+?) ' else: - id = re.match(self.__pattern__, self.pyfile.url).group("ID") + id = re.match(self.__pattern, self.pyfile.url).group("ID") html = self.load("https://player.vimeo.com/video/" + id, get={'password': password}) pattern = r'"(?P<QL>\w+)":{"profile".*?"(?P<URL>http://pdl\.vimeocdn\.com.+?)"' diff --git a/pyload/plugins/hoster/Vipleech4uCom.py b/pyload/plugins/hoster/Vipleech4uCom.py index c3627b914..471552170 100644 --- a/pyload/plugins/hoster/Vipleech4uCom.py +++ b/pyload/plugins/hoster/Vipleech4uCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(Vipleech4uCom) diff --git a/pyload/plugins/hoster/WarserverCz.py b/pyload/plugins/hoster/WarserverCz.py index cb6efeba6..c0e042620 100644 --- a/pyload/plugins/hoster/WarserverCz.py +++ b/pyload/plugins/hoster/WarserverCz.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(WarserverCz) diff --git a/pyload/plugins/hoster/WebshareCz.py b/pyload/plugins/hoster/WebshareCz.py index 0a6063062..4b26de627 100644 --- a/pyload/plugins/hoster/WebshareCz.py +++ b/pyload/plugins/hoster/WebshareCz.py @@ -8,7 +8,7 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster def getInfo(urls): for url in urls: - fid = re.search(WebshareCz.__pattern__, url).group('ID') + fid = re.search(WebshareCz.__pattern, url).group('ID') api_data = getURL("https://webshare.cz/api/file_info/", post={'ident': fid}) if 'File not found' in api_data: @@ -22,15 +22,15 @@ def getInfo(urls): class WebshareCz(SimpleHoster): - __name__ = "WebshareCz" - __type__ = "hoster" - __version__ = "0.14" + __name = "WebshareCz" + __type = "hoster" + __version = "0.14" - __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")] def handleFree(self): @@ -48,7 +48,7 @@ class WebshareCz(SimpleHoster): def getFileInfo(self): self.logDebug("URL: %s" % self.pyfile.url) - self.fid = re.match(self.__pattern__, self.pyfile.url).group('ID') + self.fid = re.match(self.__pattern, self.pyfile.url).group('ID') self.load(self.pyfile.url) api_data = self.load('https://webshare.cz/api/file_info/', post={'ident': self.fid}) diff --git a/pyload/plugins/hoster/WrzucTo.py b/pyload/plugins/hoster/WrzucTo.py index dbd09f138..1f9a19a5a 100644 --- a/pyload/plugins/hoster/WrzucTo.py +++ b/pyload/plugins/hoster/WrzucTo.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class WrzucTo(SimpleHoster): - __name__ = "WrzucTo" - __type__ = "hoster" - __version__ = "0.02" + __name = "WrzucTo" + __type = "hoster" + __version = "0.02" - __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/plugins/hoster/WuploadCom.py b/pyload/plugins/hoster/WuploadCom.py index d2c202849..2b2ca7eb9 100644 --- a/pyload/plugins/hoster/WuploadCom.py +++ b/pyload/plugins/hoster/WuploadCom.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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", None)] diff --git a/pyload/plugins/hoster/X7To.py b/pyload/plugins/hoster/X7To.py index 72e7d08db..471fc1695 100644 --- a/pyload/plugins/hoster/X7To.py +++ b/pyload/plugins/hoster/X7To.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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")] getInfo = create_getInfo(X7To) diff --git a/pyload/plugins/hoster/XFileSharingPro.py b/pyload/plugins/hoster/XFileSharingPro.py index f21ae34a4..7f352e781 100644 --- a/pyload/plugins/hoster/XFileSharingPro.py +++ b/pyload/plugins/hoster/XFileSharingPro.py @@ -6,15 +6,15 @@ from pyload.plugins.internal.XFSHoster import XFSHoster, create_getInfo class XFileSharingPro(XFSHoster): - __name__ = "XFileSharingPro" - __type__ = "hoster" - __version__ = "0.43" + __name = "XFileSharingPro" + __type = "hoster" + __version = "0.43" - __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(1).lower() + self.HOSTER_DOMAIN = re.match(self.__pattern, self.pyfile.url).group(1).lower() self.HOSTER_NAME = "".join([str.capitalize() for str in self.HOSTER_DOMAIN.split('.')]) account = self.core.accountManager.getAccountPlugin(self.HOSTER_NAME) diff --git a/pyload/plugins/hoster/XHamsterCom.py b/pyload/plugins/hoster/XHamsterCom.py index 9d2bc59ef..8b713a33b 100644 --- a/pyload/plugins/hoster/XHamsterCom.py +++ b/pyload/plugins/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/plugins/hoster/XVideosCom.py b/pyload/plugins/hoster/XVideosCom.py index c072d7edb..90aac5979 100644 --- a/pyload/plugins/hoster/XVideosCom.py +++ b/pyload/plugins/hoster/XVideosCom.py @@ -8,21 +8,21 @@ from pyload.plugins.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/plugins/hoster/Xdcc.py b/pyload/plugins/hoster/Xdcc.py index 15131bf60..b94c08df2 100644 --- a/pyload/plugins/hoster/Xdcc.py +++ b/pyload/plugins/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"), - ("ident", "str", "Ident", "pyloadident"), - ("realname", "str", "Realname", "pyloadreal")] + __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/plugins/hoster/YibaishiwuCom.py b/pyload/plugins/hoster/YibaishiwuCom.py index 82ba9e8dc..d1b6bf793 100644 --- a/pyload/plugins/hoster/YibaishiwuCom.py +++ b/pyload/plugins/hoster/YibaishiwuCom.py @@ -7,15 +7,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class YibaishiwuCom(SimpleHoster): - __name__ = "YibaishiwuCom" - __type__ = "hoster" - __version__ = "0.13" + __name = "YibaishiwuCom" + __type = "hoster" + __version = "0.13" - __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/plugins/hoster/YoupornCom.py b/pyload/plugins/hoster/YoupornCom.py index 1c14fce00..c9a2a0f12 100644 --- a/pyload/plugins/hoster/YoupornCom.py +++ b/pyload/plugins/hoster/YoupornCom.py @@ -6,15 +6,15 @@ from pyload.plugins.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/plugins/hoster/YourfilesTo.py b/pyload/plugins/hoster/YourfilesTo.py index 95c4e27f5..0a1e98cb5 100644 --- a/pyload/plugins/hoster/YourfilesTo.py +++ b/pyload/plugins/hoster/YourfilesTo.py @@ -8,15 +8,15 @@ from pyload.plugins.Hoster import Hoster class YourfilesTo(Hoster): - __name__ = "YourfilesTo" - __type__ = "hoster" - __version__ = "0.21" + __name = "YourfilesTo" + __type = "hoster" + __version = "0.21" - __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/plugins/hoster/YoutubeCom.py b/pyload/plugins/hoster/YoutubeCom.py index 37370c6be..612c37eb4 100644 --- a/pyload/plugins/hoster/YoutubeCom.py +++ b/pyload/plugins/hoster/YoutubeCom.py @@ -35,22 +35,22 @@ def which(program): class YoutubeCom(Hoster): - __name__ = "YoutubeCom" - __type__ = "hoster" - __version__ = "0.40" - - __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 (5-102, 0 for auto)", 0), - (".mp4", "bool", "Allow .mp4", True), - (".flv", "bool", "Allow .flv", True), - (".webm", "bool", "Allow .webm", False), - (".3gp", "bool", "Allow .3gp", False), - ("3d", "bool", "Prefer 3D", False)] - - __description__ = """Youtube.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("spoob", "spoob@pyload.org"), + __name = "YoutubeCom" + __type = "hoster" + __version = "0.40" + + __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 (5-102, 0 for auto)", 0), + (".mp4", "bool", "Allow .mp4", True), + (".flv", "bool", "Allow .flv", True), + (".webm", "bool", "Allow .webm", False), + (".3gp", "bool", "Allow .3gp", False), + ("3d", "bool", "Prefer 3D", False)] + + __description = """Youtube.com hoster plugin""" + __license = "GPLv3" + __authors = [("spoob", "spoob@pyload.org"), ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugins/hoster/ZDF.py b/pyload/plugins/hoster/ZDF.py index 2e63036b3..d5526d42a 100644 --- a/pyload/plugins/hoster/ZDF.py +++ b/pyload/plugins/hoster/ZDF.py @@ -9,15 +9,15 @@ from pyload.plugins.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/plugins/hoster/ZShareNet.py b/pyload/plugins/hoster/ZShareNet.py index 663377102..5392bfd94 100644 --- a/pyload/plugins/hoster/ZShareNet.py +++ b/pyload/plugins/hoster/ZShareNet.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.DeadHoster import DeadHoster, create_getInfo 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", None), + __description = """ZShare.net hoster plugin""" + __license = "GPLv3" + __authors = [("espes", None), ("Cptn Sandwich", None)] diff --git a/pyload/plugins/hoster/ZeveraCom.py b/pyload/plugins/hoster/ZeveraCom.py index aa574b405..9fcffadbc 100644 --- a/pyload/plugins/hoster/ZeveraCom.py +++ b/pyload/plugins/hoster/ZeveraCom.py @@ -4,15 +4,15 @@ from pyload.plugins.Hoster import Hoster class ZeveraCom(Hoster): - __name__ = "ZeveraCom" - __type__ = "hoster" - __version__ = "0.21" + __name = "ZeveraCom" + __type = "hoster" + __version = "0.21" - __pattern__ = r'http://(?:www\.)?zevera\.com/.*' + __pattern = r'http://(?:www\.)?zevera\.com/.*' - __description__ = """Zevera.com hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __description = """Zevera.com hoster plugin""" + __license = "GPLv3" + __authors = [("zoidberg", "zoidberg@mujmail.cz")] def setup(self): diff --git a/pyload/plugins/hoster/ZippyshareCom.py b/pyload/plugins/hoster/ZippyshareCom.py index 5850a6a6a..b6022e448 100644 --- a/pyload/plugins/hoster/ZippyshareCom.py +++ b/pyload/plugins/hoster/ZippyshareCom.py @@ -9,15 +9,15 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class ZippyshareCom(SimpleHoster): - __name__ = "ZippyshareCom" - __type__ = "hoster" - __version__ = "0.62" + __name = "ZippyshareCom" + __type = "hoster" + __version = "0.62" - __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)' + __pattern = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)' - __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")] NAME_PATTERN = r'("\d{6,}/"[ ]*\+.+?"/|<title>Zippyshare.com - )(?P<N>.+?)("|</title>)' diff --git a/pyload/plugins/internal/AbstractExtractor.py b/pyload/plugins/internal/AbstractExtractor.py index 5e09c6755..b4fd10895 100644 --- a/pyload/plugins/internal/AbstractExtractor.py +++ b/pyload/plugins/internal/AbstractExtractor.py @@ -13,12 +13,12 @@ class WrongPassword(Exception): class AbtractExtractor(object): - __name__ = "AbtractExtractor" - __version__ = "0.10" + __name = "AbtractExtractor" + __version = "0.10" - __description__ = """Abtract extractor plugin""" - __license__ = "GPLv3" - __authors__ = [("pyLoad Team", "admin@pyload.org")] + __description = """Abtract extractor plugin""" + __license = "GPLv3" + __authors = [("pyLoad Team", "admin@pyload.org")] @staticmethod diff --git a/pyload/plugins/internal/BasePlugin.py b/pyload/plugins/internal/BasePlugin.py index a3f22b344..7a29391b6 100644 --- a/pyload/plugins/internal/BasePlugin.py +++ b/pyload/plugins/internal/BasePlugin.py @@ -11,15 +11,15 @@ from pyload.plugins.Hoster import Hoster class BasePlugin(Hoster): - __name__ = "BasePlugin" - __type__ = "hoster" - __version__ = "0.25" + __name = "BasePlugin" + __type = "hoster" + __version = "0.25" - __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/plugins/internal/DeadCrypter.py b/pyload/plugins/internal/DeadCrypter.py index 427996e51..b1e963290 100644 --- a/pyload/plugins/internal/DeadCrypter.py +++ b/pyload/plugins/internal/DeadCrypter.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.SimpleCrypter import create_getInfo 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/plugins/internal/DeadHoster.py b/pyload/plugins/internal/DeadHoster.py index 3930908d3..b7f930fc5 100644 --- a/pyload/plugins/internal/DeadHoster.py +++ b/pyload/plugins/internal/DeadHoster.py @@ -8,15 +8,15 @@ from pyload.plugins.internal.SimpleHoster import create_getInfo 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/plugins/internal/MultiHoster.py b/pyload/plugins/internal/MultiHoster.py index e4783395d..7644d85ff 100644 --- a/pyload/plugins/internal/MultiHoster.py +++ b/pyload/plugins/internal/MultiHoster.py @@ -7,13 +7,13 @@ from pyload.utils import remove_chars class MultiHoster(Addon): - __name__ = "MultiHoster" - __type__ = "addon" - __version__ = "0.20" + __name = "MultiHoster" + __type = "addon" + __version = "0.20" - __description__ = """Base multi-hoster plugin""" - __license__ = "GPLv3" - __authors__ = [("pyLoad Team", "admin@pyload.org")] + __description = """Base multi-hoster plugin""" + __license = "GPLv3" + __authors = [("pyLoad Team", "admin@pyload.org")] HOSTER_REPLACEMENTS = [("1fichier.com", "onefichier.com"), ("2shared.com", "twoshared.com"), @@ -142,15 +142,15 @@ class MultiHoster(Addon): self.logError(_("No Hoster loaded")) return - module = self.core.pluginManager.getPlugin(self.__type__, self.__name__) - klass = getattr(module, self.__name__) + module = self.core.pluginManager.getPlugin(self.__type, self.__name) + klass = getattr(module, self.__name) # inject plugin plugin self.logDebug("Overwritten Hosters", ", ".join(sorted(self.supported))) for hoster in self.supported: dict = self.core.pluginManager.hosterPlugins[hoster] dict['new_module'] = module - dict['new_name'] = self.__name__ + dict['new_name'] = self.__name if excludedList: self.logInfo(_("The following hosters were not overwritten - account exists"), ", ".join(sorted(excludedList))) @@ -160,12 +160,12 @@ class MultiHoster(Addon): # create new regexp regexp = r'.*(%s).*' % "|".join([x.replace(".", "\.") for x in self.new_supported]) - if hasattr(klass, "__pattern__") and isinstance(klass.__pattern__, basestring) and '://' in klass.__pattern__: - regexp = r'%s|%s' % (klass.__pattern__, regexp) + if hasattr(klass, "__pattern") and isinstance(klass.__pattern, basestring) and '://' in klass.__pattern: + regexp = r'%s|%s' % (klass.__pattern, regexp) self.logDebug("Regexp", regexp) - dict = self.core.pluginManager.hosterPlugins[self.__name__] + dict = self.core.pluginManager.hosterPlugins[self.__name] dict['pattern'] = regexp dict['re'] = re.compile(regexp) @@ -186,9 +186,9 @@ class MultiHoster(Addon): self.unloadHoster(hoster) # reset pattern - klass = getattr(self.core.pluginManager.getPlugin(self.__type__, self.__name__), self.__name__) - dict = self.core.pluginManager.hosterPlugins[self.__name__] - dict['pattern'] = getattr(klass, "__pattern__", r'^unmatchable$') + klass = getattr(self.core.pluginManager.getPlugin(self.__type, self.__name), self.__name) + dict = self.core.pluginManager.hosterPlugins[self.__name] + dict['pattern'] = getattr(klass, "__pattern", r'^unmatchable$') dict['re'] = re.compile(dict['pattern']) @@ -196,7 +196,7 @@ class MultiHoster(Addon): """remove plugin override if download fails but not if file is offline/temp.offline""" if pyfile.hasStatus("failed") and self.getConfig("unloadFailing", True): hdict = self.core.pluginManager.hosterPlugins[pyfile.pluginname] - if "new_name" in hdict and hdict['new_name'] == self.__name__: + if "new_name" in hdict and hdict['new_name'] == self.__name: self.logDebug("Unload MultiHoster", pyfile.pluginname, hdict) self.unloadHoster(pyfile.pluginname) pyfile.setStatus("queued") diff --git a/pyload/plugins/internal/SimpleCrypter.py b/pyload/plugins/internal/SimpleCrypter.py index 405aff9c5..e9de95073 100644 --- a/pyload/plugins/internal/SimpleCrypter.py +++ b/pyload/plugins/internal/SimpleCrypter.py @@ -10,17 +10,17 @@ from pyload.utils import fixup class SimpleCrypter(Crypter, SimpleHoster): - __name__ = "SimpleCrypter" - __type__ = "crypter" - __version__ = "0.32" + __name = "SimpleCrypter" + __type = "crypter" + __version = "0.32" - __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/plugins/internal/SimpleHoster.py b/pyload/plugins/internal/SimpleHoster.py index aafbdc8bd..af8a53534 100644 --- a/pyload/plugins/internal/SimpleHoster.py +++ b/pyload/plugins/internal/SimpleHoster.py @@ -118,15 +118,15 @@ def _isDirectLink(self, url, resumable=True): class SimpleHoster(Hoster): - __name__ = "SimpleHoster" - __type__ = "hoster" - __version__ = "0.71" + __name = "SimpleHoster" + __type = "hoster" + __version = "0.71" - __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")] @@ -232,7 +232,7 @@ class SimpleHoster(Hoster): else: try: - info['pattern'] = re.match(cls.__pattern__, url).groupdict() #: pattern groups will be saved here, please save api stuff to info['api'] + info['pattern'] = re.match(cls.__pattern, url).groupdict() #: pattern groups will be saved here, please save api stuff to info['api'] except Exception: pass @@ -288,8 +288,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.logInfo("Multi hoster detected") diff --git a/pyload/plugins/internal/UnRar.py b/pyload/plugins/internal/UnRar.py index 90216222b..97785fa97 100644 --- a/pyload/plugins/internal/UnRar.py +++ b/pyload/plugins/internal/UnRar.py @@ -21,12 +21,12 @@ def renice(pid, value): class UnRar(AbtractExtractor): - __name__ = "UnRar" - __version__ = "0.19" + __name = "UnRar" + __version = "0.19" - __description__ = """Rar extractor plugin""" - __license__ = "GPLv3" - __authors__ = [("RaNaN", "RaNaN@pyload.org")] + __description = """Rar extractor plugin""" + __license = "GPLv3" + __authors = [("RaNaN", "RaNaN@pyload.org")] CMD = "unrar" diff --git a/pyload/plugins/internal/UnZip.py b/pyload/plugins/internal/UnZip.py index 17c321530..ea8bcc283 100644 --- a/pyload/plugins/internal/UnZip.py +++ b/pyload/plugins/internal/UnZip.py @@ -7,12 +7,12 @@ from pyload.plugins.internal.AbstractExtractor import AbtractExtractor class UnZip(AbtractExtractor): - __name__ = "UnZip" - __version__ = "0.10" + __name = "UnZip" + __version = "0.10" - __description__ = """Zip extractor plugin""" - __license__ = "GPLv3" - __authors__ = [("RaNaN", "RaNaN@pyload.org")] + __description = """Zip extractor plugin""" + __license = "GPLv3" + __authors = [("RaNaN", "RaNaN@pyload.org")] @staticmethod diff --git a/pyload/plugins/internal/UpdateManager.py b/pyload/plugins/internal/UpdateManager.py index ee45cf7a2..87e86f17f 100644 --- a/pyload/plugins/internal/UpdateManager.py +++ b/pyload/plugins/internal/UpdateManager.py @@ -12,19 +12,19 @@ from pyload.utils import safe_join class UpdateManager(Addon): - __name__ = "UpdateManager" - __type__ = "addon" - __version__ = "0.40" + __name = "UpdateManager" + __type = "addon" + __version = "0.40" - __config__ = [("activated" , "bool" , "Activated" , True ), - ("mode" , "pyLoad + plugins;plugins only", "Check updates for" , "pyLoad + plugins"), - ("interval" , "int" , "Check interval in hours" , 8 ), - ("reloadplugins", "bool" , "Monitor plugins for code changes (debug mode only)", True ), - ("nodebugupdate", "bool" , "Don't check for updates in debug mode" , True )] + __config = [("activated" , "bool" , "Activated" , True ), + ("mode" , "pyLoad + plugins;plugins only", "Check updates for" , "pyLoad + plugins"), + ("interval" , "int" , "Check interval in hours" , 8 ), + ("reloadplugins", "bool" , "Monitor plugins for code changes (debug mode only)", True ), + ("nodebugupdate", "bool" , "Don't check for updates in debug mode" , True )] - __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"] @@ -51,13 +51,13 @@ class UpdateManager(Addon): def coreReady(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 unload(self): - self.pluginConfigChanged(self.__name__, "reloadplugins", False) + self.pluginConfigChanged(self.__name, "reloadplugins", False) def setup(self): @@ -79,15 +79,15 @@ class UpdateManager(Addon): def autoreloadPlugins(self): """ reload and reindex all modified plugins """ modules = filter( - lambda m: m and (m.__name__.startswith("pyload.plugins.") or - m.__name__.startswith("userplugins.")) and - m.__name__.count(".") >= 2, sys.modules.itervalues() + lambda m: m and (m.__name.startswith("pyload.plugins.") 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") @@ -173,7 +173,7 @@ class UpdateManager(Addon): exitcode = 0 updated = [] - vre = re.compile(r'__version__.*=.*("|\')([\d.]+)') + vre = re.compile(r'__version.*=.*("|\')([\d.]+)') url = updates[0] schema = updates[1].split('|') diff --git a/pyload/plugins/internal/XFSAccount.py b/pyload/plugins/internal/XFSAccount.py index 7da060c4b..937ed1831 100644 --- a/pyload/plugins/internal/XFSAccount.py +++ b/pyload/plugins/internal/XFSAccount.py @@ -10,13 +10,13 @@ from pyload.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies class XFSAccount(Account): - __name__ = "XFSAccount" - __type__ = "account" - __version__ = "0.32" + __name = "XFSAccount" + __type = "account" + __version = "0.32" - __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/plugins/internal/XFSCrypter.py b/pyload/plugins/internal/XFSCrypter.py index 2de39f4bc..280f87654 100644 --- a/pyload/plugins/internal/XFSCrypter.py +++ b/pyload/plugins/internal/XFSCrypter.py @@ -4,15 +4,15 @@ from pyload.plugins.internal.SimpleCrypter import SimpleCrypter class XFSCrypter(SimpleCrypter): - __name__ = "XFSCrypter" - __type__ = "crypter" - __version__ = "0.04" + __name = "XFSCrypter" + __type = "crypter" + __version = "0.04" - __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 diff --git a/pyload/plugins/internal/XFSHoster.py b/pyload/plugins/internal/XFSHoster.py index b215b8211..1f9671402 100644 --- a/pyload/plugins/internal/XFSHoster.py +++ b/pyload/plugins/internal/XFSHoster.py @@ -14,15 +14,15 @@ from pyload.utils import html_unescape class XFSHoster(SimpleHoster): - __name__ = "XFSHoster" - __type__ = "hoster" - __version__ = "0.27" + __name = "XFSHoster" + __type = "hoster" + __version = "0.27" - __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")] diff --git a/pyload/plugins/ocr/GigasizeCom.py b/pyload/plugins/ocr/GigasizeCom.py index f83ac4e14..36d57d38f 100644 --- a/pyload/plugins/ocr/GigasizeCom.py +++ b/pyload/plugins/ocr/GigasizeCom.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/ocr/LinksaveIn.py b/pyload/plugins/ocr/LinksaveIn.py index d3e85c5c3..e2ec1b7de 100644 --- a/pyload/plugins/ocr/LinksaveIn.py +++ b/pyload/plugins/ocr/LinksaveIn.py @@ -13,13 +13,13 @@ from pyload.plugins.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/plugins/ocr/NetloadIn.py b/pyload/plugins/ocr/NetloadIn.py index a692b1df8..1ba710316 100644 --- a/pyload/plugins/ocr/NetloadIn.py +++ b/pyload/plugins/ocr/NetloadIn.py @@ -4,13 +4,13 @@ from pyload.plugins.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/plugins/ocr/ShareonlineBiz.py b/pyload/plugins/ocr/ShareonlineBiz.py index d7b910240..1ce359d38 100644 --- a/pyload/plugins/ocr/ShareonlineBiz.py +++ b/pyload/plugins/ocr/ShareonlineBiz.py @@ -4,13 +4,13 @@ from pyload.plugins.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): |