diff options
Diffstat (limited to 'pyload/plugin')
432 files changed, 3160 insertions, 3160 deletions
diff --git a/pyload/plugin/Account.py b/pyload/plugin/Account.py index b14615d3a..f8014908f 100644 --- a/pyload/plugin/Account.py +++ b/pyload/plugin/Account.py @@ -19,13 +19,13 @@ class Account(Base): Just overwrite `login` and cookies will be stored and account becomes accessible in\ associated hoster plugin. Plugin should also provide `loadAccountInfo` """ - __name = "Account" - __type = "account" - __version = "0.03" + __name__ = "Account" + __type__ = "account" + __version__ = "0.03" - __description = """Base account plugin""" - __license = "GPLv3" - __authors = [("mkaay", "mkaay@mkaay.de")] + __description__ = """Base account plugin""" + __license__ = "GPLv3" + __authors__ = [("mkaay", "mkaay@mkaay.de")] #: after that time (in minutes) pyload will relogin the account @@ -197,7 +197,7 @@ class Account(Base): "maxtraffic" : None, "premium" : None, "timestamp" : 0, #: time this info was retrieved - "type" : self.__name} + "type" : self.__name__} def getAllAccounts(self, force=False): @@ -210,7 +210,7 @@ class Account(Base): if not user: return None - req = self.core.requestFactory.getRequest(self.__name, user) + req = self.core.requestFactory.getRequest(self.__name__, user) return req @@ -220,7 +220,7 @@ class Account(Base): if not user: return None - cj = self.core.requestFactory.getCookieJar(self.__name, user) + cj = self.core.requestFactory.getCookieJar(self.__name__, user) return cj diff --git a/pyload/plugin/Addon.py b/pyload/plugin/Addon.py index bf8151027..ca36fe4ae 100644 --- a/pyload/plugin/Addon.py +++ b/pyload/plugin/Addon.py @@ -26,15 +26,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")] @@ -103,7 +103,7 @@ class Addon(Base): def __repr__(self): - return "<Addon %s>" % self.__name + return "<Addon %s>" % self.__name__ def setup(self): @@ -122,7 +122,7 @@ class Addon(Base): def isActivated(self): """ checks if addon is activated""" - return self.core.config.getPlugin(self.__name, "activated") + return self.core.config.getPlugin(self.__name__, "activated") # Event methods - overwrite these if needed diff --git a/pyload/plugin/Captcha.py b/pyload/plugin/Captcha.py index 1b3f34e33..ace488994 100644 --- a/pyload/plugin/Captcha.py +++ b/pyload/plugin/Captcha.py @@ -6,13 +6,13 @@ from pyload.plugin.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/plugin/Container.py b/pyload/plugin/Container.py index e2e0f2248..bfc5713a7 100644 --- a/pyload/plugin/Container.py +++ b/pyload/plugin/Container.py @@ -12,16 +12,16 @@ from pyload.utils import safe_join class Container(Crypter): - __name = "Container" - __type = "container" - __version = "0.01" + __name__ = "Container" + __type__ = "container" + __version__ = "0.01" - __pattern = r'^unmatchable$' - __config = [] #: [("name", "type", "desc", "default")] + __pattern__ = r'^unmatchable$' + __config__ = [] #: [("name", "type", "desc", "default")] - __description = """Base container decrypter plugin""" - __license = "GPLv3" - __authors = [("mkaay", "mkaay@mkaay.de")] + __description__ = """Base container decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("mkaay", "mkaay@mkaay.de")] def preprocessing(self, thread): diff --git a/pyload/plugin/Crypter.py b/pyload/plugin/Crypter.py index aa9966ab4..f93ee254a 100644 --- a/pyload/plugin/Crypter.py +++ b/pyload/plugin/Crypter.py @@ -7,17 +7,17 @@ from pyload.utils import decode, safe_filename class Crypter(Plugin): - __name = "Crypter" - __type = "crypter" - __version = "0.05" + __name__ = "Crypter" + __type__ = "crypter" + __version__ = "0.05" - __pattern = r'^unmatchable$' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), #: Overrides core.config['general']['folder_per_package'] + __pattern__ = r'^unmatchable$' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), #: Overrides core.config['general']['folder_per_package'] ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Base decrypter plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Base decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] html = None #: last html loaded diff --git a/pyload/plugin/Hoster.py b/pyload/plugin/Hoster.py index df778c72f..2d43ee845 100644 --- a/pyload/plugin/Hoster.py +++ b/pyload/plugin/Hoster.py @@ -9,13 +9,13 @@ def getInfo(self): class Hoster(Plugin): - __name = "Hoster" - __type = "hoster" - __version = "0.02" + __name__ = "Hoster" + __type__ = "hoster" + __version__ = "0.02" - __pattern = r'^unmatchable$' - __config = [] #: [("name", "type", "desc", "default")] + __pattern__ = r'^unmatchable$' + __config__ = [] #: [("name", "type", "desc", "default")] - __description = """Base hoster plugin""" - __license = "GPLv3" - __authors = [("mkaay", "mkaay@mkaay.de")] + __description__ = """Base hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("mkaay", "mkaay@mkaay.de")] diff --git a/pyload/plugin/OCR.py b/pyload/plugin/OCR.py index 9e8d49d70..8e60737b6 100644 --- a/pyload/plugin/OCR.py +++ b/pyload/plugin/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/plugin/Plugin.py b/pyload/plugin/Plugin.py index 07797e8c6..0a9c647fb 100644 --- a/pyload/plugin/Plugin.py +++ b/pyload/plugin/Plugin.py @@ -62,7 +62,7 @@ class Base(object): def _log(self, type, args): msg = " | ".join([encode(a).strip() for a in args if a]) logger = getattr(self.core.log, type) - logger("%s: %s" % (self.__name, msg or _("%s MARK" % type.upper()))) + logger("%s: %s" % (self.__name__, msg or _("%s MARK" % type.upper()))) def logDebug(self, *args): @@ -99,7 +99,7 @@ class Base(object): :param value: :return: """ - self.core.config.setPlugin(self.__name, option, value) + self.core.config.setPlugin(self.__name__, option, value) #: Deprecated method @@ -114,24 +114,24 @@ class Base(object): :param option: :return: """ - return self.core.config.getPlugin(self.__name, option) + return self.core.config.getPlugin(self.__name__, option) def setStorage(self, key, value): """ Saves a value persistently to the database """ - self.core.db.setStorage(self.__name, key, value) + self.core.db.setStorage(self.__name__, key, value) def store(self, key, value): """ same as `setStorage` """ - self.core.db.setStorage(self.__name, key, value) + self.core.db.setStorage(self.__name__, key, value) def getStorage(self, key=None, default=None): """ Retrieves saved value or dict of all saved entries if key is None """ if key: - return self.core.db.getStorage(self.__name, key) or default - return self.core.db.getStorage(self.__name, key) + return self.core.db.getStorage(self.__name__, key) or default + return self.core.db.getStorage(self.__name__, key) def retrieve(self, *args, **kwargs): @@ -141,7 +141,7 @@ class Base(object): def delStorage(self, key): """ Delete entry in db """ - self.core.db.delStorage(self.__name, key) + self.core.db.delStorage(self.__name__, key) class Plugin(Base): @@ -149,16 +149,16 @@ class Plugin(Base): Base plugin for hoster/crypter. Overwrite `process` / `decrypt` in your subclassed plugin. """ - __name = "Plugin" - __type = "hoster" - __version = "0.07" + __name__ = "Plugin" + __type__ = "hoster" + __version__ = "0.07" - __pattern = r'^unmatchable$' - __config = [] #: [("name", "type", "desc", "default")] + __pattern__ = r'^unmatchable$' + __config__ = [] #: [("name", "type", "desc", "default")] - __description = """Base plugin""" - __license = "GPLv3" - __authors = [("RaNaN", "RaNaN@pyload.org"), + __description__ = """Base plugin""" + __license__ = "GPLv3" + __authors__ = [("RaNaN", "RaNaN@pyload.org"), ("spoob", "spoob@pyload.org"), ("mkaay", "mkaay@mkaay.de")] @@ -188,7 +188,7 @@ class Plugin(Base): self.ocr = None #: account handler instance, see :py:class:`Account` - self.account = pyfile.m.core.accountManager.getAccountPlugin(self.__name) + self.account = pyfile.m.core.accountManager.getAccountPlugin(self.__name__) #: premium status self.premium = False @@ -209,7 +209,7 @@ class Plugin(Base): #: premium status self.premium = self.account.isPremium(self.user) else: - self.req = pyfile.m.core.requestFactory.getRequest(self.__name) + self.req = pyfile.m.core.requestFactory.getRequest(self.__name__) #: associated pyfile instance, see `PyFile` self.pyfile = pyfile @@ -240,7 +240,7 @@ class Plugin(Base): def __call__(self): - return self.__name + return self.__name__ def init(self): @@ -277,7 +277,7 @@ class Plugin(Base): def resetAccount(self): """ dont use account and retry download """ self.account = None - self.req = self.core.requestFactory.getRequest(self.__name) + self.req = self.core.requestFactory.getRequest(self.__name__) self.retry() @@ -451,13 +451,13 @@ class Plugin(Base): id = ("%.2f" % time())[-6:].replace(".", "") - with open(join("tmp", "tmpCaptcha_%s_%s.%s" % (self.__name, id, imgtype)), "wb") as tmpCaptcha: + with open(join("tmp", "tmpCaptcha_%s_%s.%s" % (self.__name__, id, imgtype)), "wb") as tmpCaptcha: tmpCaptcha.write(img) - has_plugin = self.__name in self.core.pluginManager.ocrPlugins + has_plugin = self.__name__ in self.core.pluginManager.ocrPlugins if self.core.captcha: - Ocr = self.core.pluginManager.loadClass("ocr", self.__name) + Ocr = self.core.pluginManager.loadClass("ocr", self.__name__) else: Ocr = None @@ -535,10 +535,10 @@ class Plugin(Base): from inspect import currentframe frame = currentframe() - framefile = safe_join("tmp", self.__name, "%s_line%s.dump.html" % (frame.f_back.f_code.co_name, frame.f_back.f_lineno)) + framefile = safe_join("tmp", self.__name__, "%s_line%s.dump.html" % (frame.f_back.f_code.co_name, frame.f_back.f_lineno)) try: - if not exists(join("tmp", self.__name)): - makedirs(join("tmp", self.__name)) + if not exists(join("tmp", self.__name__)): + makedirs(join("tmp", self.__name__)) with open(framefile, "wb") as f: del frame #: delete the frame or it wont be cleaned diff --git a/pyload/plugin/account/AlldebridCom.py b/pyload/plugin/account/AlldebridCom.py index 14b1755ca..f9906bd9d 100644 --- a/pyload/plugin/account/AlldebridCom.py +++ b/pyload/plugin/account/AlldebridCom.py @@ -12,13 +12,13 @@ from pyload.plugin.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/plugin/account/BayfilesCom.py b/pyload/plugin/account/BayfilesCom.py index 5ca04c86b..760c29d4e 100644 --- a/pyload/plugin/account/BayfilesCom.py +++ b/pyload/plugin/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/plugin/account/BillionuploadsCom.py b/pyload/plugin/account/BillionuploadsCom.py index 982a2cc34..a3325c427 100644 --- a/pyload/plugin/account/BillionuploadsCom.py +++ b/pyload/plugin/account/BillionuploadsCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class BillionuploadsCom(XFSAccount): - __name = "BillionuploadsCom" - __type = "account" - __version = "0.02" + __name__ = "BillionuploadsCom" + __type__ = "account" + __version__ = "0.02" - __description = """Billionuploads.com account plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Billionuploads.com account plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_DOMAIN = "billionuploads.com" diff --git a/pyload/plugin/account/BitshareCom.py b/pyload/plugin/account/BitshareCom.py index 591fe7f89..aabab9e19 100644 --- a/pyload/plugin/account/BitshareCom.py +++ b/pyload/plugin/account/BitshareCom.py @@ -4,13 +4,13 @@ from pyload.plugin.Account import Account class BitshareCom(Account): - __name = "BitshareCom" - __type = "account" - __version = "0.12" + __name__ = "BitshareCom" + __type__ = "account" + __version__ = "0.12" - __description = """Bitshare account plugin""" - __license = "GPLv3" - __authors = [("Paul King", "")] + __description__ = """Bitshare account plugin""" + __license__ = "GPLv3" + __authors__ = [("Paul King", "")] def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/CatShareNet.py b/pyload/plugin/account/CatShareNet.py index 8fe3d05cf..4c1cd00d7 100644 --- a/pyload/plugin/account/CatShareNet.py +++ b/pyload/plugin/account/CatShareNet.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account class CatShareNet(Account): - __name = "CatShareNet" - __type = "account" - __version = "0.01" + __name__ = "CatShareNet" + __type__ = "account" + __version__ = "0.01" - __description = """CatShareNet account plugin""" - __license = "GPLv3" - __authors = [("prOq", "")] + __description__ = """CatShareNet account plugin""" + __license__ = "GPLv3" + __authors__ = [("prOq", "")] 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/plugin/account/CramitIn.py b/pyload/plugin/account/CramitIn.py index ccd291776..21503f625 100644 --- a/pyload/plugin/account/CramitIn.py +++ b/pyload/plugin/account/CramitIn.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class CramitIn(XFSAccount): - __name = "CramitIn" - __type = "account" - __version = "0.03" + __name__ = "CramitIn" + __type__ = "account" + __version__ = "0.03" - __description = """Cramit.in account plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Cramit.in account plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] HOSTER_DOMAIN = "cramit.in" diff --git a/pyload/plugin/account/CzshareCom.py b/pyload/plugin/account/CzshareCom.py index f11d4efd4..6608efd90 100644 --- a/pyload/plugin/account/CzshareCom.py +++ b/pyload/plugin/account/CzshareCom.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account class CzshareCom(Account): - __name = "CzshareCom" - __type = "account" - __version = "0.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/plugin/account/DebridItaliaCom.py b/pyload/plugin/account/DebridItaliaCom.py index c895842f0..c8990f882 100644 --- a/pyload/plugin/account/DebridItaliaCom.py +++ b/pyload/plugin/account/DebridItaliaCom.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account class DebridItaliaCom(Account): - __name = "DebridItaliaCom" - __type = "account" - __version = "0.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/plugin/account/DepositfilesCom.py b/pyload/plugin/account/DepositfilesCom.py index ac1da7b0c..bce33777b 100644 --- a/pyload/plugin/account/DepositfilesCom.py +++ b/pyload/plugin/account/DepositfilesCom.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account class DepositfilesCom(Account): - __name = "DepositfilesCom" - __type = "account" - __version = "0.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/plugin/account/DropboxCom.py b/pyload/plugin/account/DropboxCom.py index 2c4c36c4a..341bb761d 100644 --- a/pyload/plugin/account/DropboxCom.py +++ b/pyload/plugin/account/DropboxCom.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/account/EasybytezCom.py b/pyload/plugin/account/EasybytezCom.py index c1f641669..c7d717474 100644 --- a/pyload/plugin/account/EasybytezCom.py +++ b/pyload/plugin/account/EasybytezCom.py @@ -6,13 +6,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class EasybytezCom(XFSAccount): - __name = "EasybytezCom" - __type = "account" - __version = "0.12" + __name__ = "EasybytezCom" + __type__ = "account" + __version__ = "0.12" - __description = """EasyBytez.com account plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz"), + __description__ = """EasyBytez.com account plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), ("guidobelix", "guidobelix@hotmail.it")] diff --git a/pyload/plugin/account/EuroshareEu.py b/pyload/plugin/account/EuroshareEu.py index 9e948816c..2d9288ba8 100644 --- a/pyload/plugin/account/EuroshareEu.py +++ b/pyload/plugin/account/EuroshareEu.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account class EuroshareEu(Account): - __name = "EuroshareEu" - __type = "account" - __version = "0.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/plugin/account/FastixRu.py b/pyload/plugin/account/FastixRu.py index b2ef7f685..0f2ac71ce 100644 --- a/pyload/plugin/account/FastixRu.py +++ b/pyload/plugin/account/FastixRu.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class FastixRu(Account): - __name = "FastixRu" - __type = "account" - __version = "0.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/plugin/account/FastshareCz.py b/pyload/plugin/account/FastshareCz.py index 4ce94be5e..8fe98438b 100644 --- a/pyload/plugin/account/FastshareCz.py +++ b/pyload/plugin/account/FastshareCz.py @@ -7,13 +7,13 @@ from pyload.utils import parseFileSize class FastshareCz(Account): - __name = "FastshareCz" - __type = "account" - __version = "0.05" + __name__ = "FastshareCz" + __type__ = "account" + __version__ = "0.05" - __description = """Fastshare.cz account plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz"), + __description__ = """Fastshare.cz account plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/account/File4safeCom.py b/pyload/plugin/account/File4safeCom.py index d7004b463..4f311aa4c 100644 --- a/pyload/plugin/account/File4safeCom.py +++ b/pyload/plugin/account/File4safeCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class File4safeCom(XFSAccount): - __name = "File4safeCom" - __type = "account" - __version = "0.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/plugin/account/FileParadoxIn.py b/pyload/plugin/account/FileParadoxIn.py index 0e103c4e7..02b923519 100644 --- a/pyload/plugin/account/FileParadoxIn.py +++ b/pyload/plugin/account/FileParadoxIn.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class FileParadoxIn(XFSAccount): - __name = "FileParadoxIn" - __type = "account" - __version = "0.02" + __name__ = "FileParadoxIn" + __type__ = "account" + __version__ = "0.02" - __description = """FileParadox.in account plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """FileParadox.in account plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_DOMAIN = "fileparadox.in" diff --git a/pyload/plugin/account/FilecloudIo.py b/pyload/plugin/account/FilecloudIo.py index c6638bb1f..8169bfdce 100644 --- a/pyload/plugin/account/FilecloudIo.py +++ b/pyload/plugin/account/FilecloudIo.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class FilecloudIo(Account): - __name = "FilecloudIo" - __type = "account" - __version = "0.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/plugin/account/FilefactoryCom.py b/pyload/plugin/account/FilefactoryCom.py index d79875423..6b7399db6 100644 --- a/pyload/plugin/account/FilefactoryCom.py +++ b/pyload/plugin/account/FilefactoryCom.py @@ -9,13 +9,13 @@ from pyload.plugin.Account import Account class FilefactoryCom(Account): - __name = "FilefactoryCom" - __type = "account" - __version = "0.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/plugin/account/FilejungleCom.py b/pyload/plugin/account/FilejungleCom.py index 5de4a244d..5734f1638 100644 --- a/pyload/plugin/account/FilejungleCom.py +++ b/pyload/plugin/account/FilejungleCom.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account class FilejungleCom(Account): - __name = "FilejungleCom" - __type = "account" - __version = "0.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/plugin/account/FileomCom.py b/pyload/plugin/account/FileomCom.py index 2868e49e6..36a11e411 100644 --- a/pyload/plugin/account/FileomCom.py +++ b/pyload/plugin/account/FileomCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class FileomCom(XFSAccount): - __name = "FileomCom" - __type = "account" - __version = "0.02" + __name__ = "FileomCom" + __type__ = "account" + __version__ = "0.02" - __description = """Fileom.com account plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Fileom.com account plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_DOMAIN = "fileom.com" diff --git a/pyload/plugin/account/FilerNet.py b/pyload/plugin/account/FilerNet.py index 9420a6e8e..679a9dc40 100644 --- a/pyload/plugin/account/FilerNet.py +++ b/pyload/plugin/account/FilerNet.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account class FilerNet(Account): - __name = "FilerNet" - __type = "account" - __version = "0.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/plugin/account/FilerioCom.py b/pyload/plugin/account/FilerioCom.py index d222fa78b..1d9f8744b 100644 --- a/pyload/plugin/account/FilerioCom.py +++ b/pyload/plugin/account/FilerioCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class FilerioCom(XFSAccount): - __name = "FilerioCom" - __type = "account" - __version = "0.03" + __name__ = "FilerioCom" + __type__ = "account" + __version__ = "0.03" - __description = """FileRio.in account plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """FileRio.in account plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] HOSTER_DOMAIN = "filerio.in" diff --git a/pyload/plugin/account/FilesMailRu.py b/pyload/plugin/account/FilesMailRu.py index 41433687f..bbff7311c 100644 --- a/pyload/plugin/account/FilesMailRu.py +++ b/pyload/plugin/account/FilesMailRu.py @@ -4,13 +4,13 @@ from pyload.plugin.Account import Account class FilesMailRu(Account): - __name = "FilesMailRu" - __type = "account" - __version = "0.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/plugin/account/FileserveCom.py b/pyload/plugin/account/FileserveCom.py index d0ef0cd62..7557450be 100644 --- a/pyload/plugin/account/FileserveCom.py +++ b/pyload/plugin/account/FileserveCom.py @@ -7,13 +7,13 @@ from pyload.utils import json_loads class FileserveCom(Account): - __name = "FileserveCom" - __type = "account" - __version = "0.20" + __name__ = "FileserveCom" + __type__ = "account" + __version__ = "0.20" - __description = """Fileserve.com account plugin""" - __license = "GPLv3" - __authors = [("mkaay", "mkaay@mkaay.de")] + __description__ = """Fileserve.com account plugin""" + __license__ = "GPLv3" + __authors__ = [("mkaay", "mkaay@mkaay.de")] def loadAccountInfo(self, user, req): diff --git a/pyload/plugin/account/FourSharedCom.py b/pyload/plugin/account/FourSharedCom.py index 84c062e84..3ef865a91 100644 --- a/pyload/plugin/account/FourSharedCom.py +++ b/pyload/plugin/account/FourSharedCom.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class FourSharedCom(Account): - __name = "FourSharedCom" - __type = "account" - __version = "0.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/plugin/account/FreakshareCom.py b/pyload/plugin/account/FreakshareCom.py index 76d094a8b..9905e3f55 100644 --- a/pyload/plugin/account/FreakshareCom.py +++ b/pyload/plugin/account/FreakshareCom.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account class FreakshareCom(Account): - __name = "FreakshareCom" - __type = "account" - __version = "0.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/plugin/account/FreeWayMe.py b/pyload/plugin/account/FreeWayMe.py index 90c504c70..7b57cc6a0 100644 --- a/pyload/plugin/account/FreeWayMe.py +++ b/pyload/plugin/account/FreeWayMe.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class FreeWayMe(Account): - __name = "FreeWayMe" - __type = "account" - __version = "0.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/plugin/account/FshareVn.py b/pyload/plugin/account/FshareVn.py index 130892490..c84ce6648 100644 --- a/pyload/plugin/account/FshareVn.py +++ b/pyload/plugin/account/FshareVn.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account class FshareVn(Account): - __name = "FshareVn" - __type = "account" - __version = "0.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/plugin/account/Ftp.py b/pyload/plugin/account/Ftp.py index c7983b0c2..67cde2cdd 100644 --- a/pyload/plugin/account/Ftp.py +++ b/pyload/plugin/account/Ftp.py @@ -4,13 +4,13 @@ from pyload.plugin.Account import Account class Ftp(Account): - __name = "Ftp" - __type = "account" - __version = "0.01" + __name__ = "Ftp" + __type__ = "account" + __version__ = "0.01" - __description = """Ftp dummy account plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Ftp dummy account plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] login_timeout = -1 #: Unlimited diff --git a/pyload/plugin/account/HellshareCz.py b/pyload/plugin/account/HellshareCz.py index 08d45bdda..6f160fa11 100644 --- a/pyload/plugin/account/HellshareCz.py +++ b/pyload/plugin/account/HellshareCz.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account class HellshareCz(Account): - __name = "HellshareCz" - __type = "account" - __version = "0.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/plugin/account/Http.py b/pyload/plugin/account/Http.py index aacdbf89f..2571ef712 100644 --- a/pyload/plugin/account/Http.py +++ b/pyload/plugin/account/Http.py @@ -4,13 +4,13 @@ from pyload.plugin.Account import Account class Http(Account): - __name = "Http" - __type = "account" - __version = "0.01" + __name__ = "Http" + __type__ = "account" + __version__ = "0.01" - __description = """Http dummy account plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Http dummy account plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] login_timeout = -1 #: Unlimited diff --git a/pyload/plugin/account/HugefilesNet.py b/pyload/plugin/account/HugefilesNet.py index b4cd6f8c4..eb383fb17 100644 --- a/pyload/plugin/account/HugefilesNet.py +++ b/pyload/plugin/account/HugefilesNet.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class HugefilesNet(XFSAccount): - __name = "HugefilesNet" - __type = "account" - __version = "0.02" + __name__ = "HugefilesNet" + __type__ = "account" + __version__ = "0.02" - __description = """Hugefiles.net account plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Hugefiles.net account plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_DOMAIN = "hugefiles.net" diff --git a/pyload/plugin/account/HundredEightyUploadCom.py b/pyload/plugin/account/HundredEightyUploadCom.py index 79af089ca..79b5ee033 100644 --- a/pyload/plugin/account/HundredEightyUploadCom.py +++ b/pyload/plugin/account/HundredEightyUploadCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class HundredEightyUploadCom(XFSAccount): - __name = "HundredEightyUploadCom" - __type = "account" - __version = "0.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/plugin/account/JunocloudMe.py b/pyload/plugin/account/JunocloudMe.py index 75307c6dd..0ffa92eb6 100644 --- a/pyload/plugin/account/JunocloudMe.py +++ b/pyload/plugin/account/JunocloudMe.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class JunocloudMe(XFSAccount): - __name = "JunocloudMe" - __type = "account" - __version = "0.02" + __name__ = "JunocloudMe" + __type__ = "account" + __version__ = "0.02" - __description = """Junocloud.me account plugin""" - __license = "GPLv3" - __authors = [("guidobelix", "guidobelix@hotmail.it")] + __description__ = """Junocloud.me account plugin""" + __license__ = "GPLv3" + __authors__ = [("guidobelix", "guidobelix@hotmail.it")] HOSTER_DOMAIN = "junocloud.me" diff --git a/pyload/plugin/account/Keep2shareCc.py b/pyload/plugin/account/Keep2shareCc.py index 1086d893f..7ed15dc62 100644 --- a/pyload/plugin/account/Keep2shareCc.py +++ b/pyload/plugin/account/Keep2shareCc.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account class Keep2shareCc(Account): - __name = "Keep2shareCc" - __type = "account" - __version = "0.02" + __name__ = "Keep2shareCc" + __type__ = "account" + __version__ = "0.02" - __description = """Keep2share.cc account plugin""" - __license = "GPLv3" - __authors = [("aeronaut", "aeronaut@pianoguy.de")] + __description__ = """Keep2share.cc account plugin""" + __license__ = "GPLv3" + __authors__ = [("aeronaut", "aeronaut@pianoguy.de")] VALID_UNTIL_PATTERN = r'Premium expires: <b>(.+?)</b>' diff --git a/pyload/plugin/account/LetitbitNet.py b/pyload/plugin/account/LetitbitNet.py index b014268ae..c7615dd56 100644 --- a/pyload/plugin/account/LetitbitNet.py +++ b/pyload/plugin/account/LetitbitNet.py @@ -5,13 +5,13 @@ from pyload.plugin.Account import Account class LetitbitNet(Account): - __name = "LetitbitNet" - __type = "account" - __version = "0.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/plugin/account/LinestorageCom.py b/pyload/plugin/account/LinestorageCom.py index 353c1e811..6a9991b17 100644 --- a/pyload/plugin/account/LinestorageCom.py +++ b/pyload/plugin/account/LinestorageCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class LinestorageCom(XFSAccount): - __name = "LinestorageCom" - __type = "account" - __version = "0.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/plugin/account/LinksnappyCom.py b/pyload/plugin/account/LinksnappyCom.py index a510a59ea..968271dd7 100644 --- a/pyload/plugin/account/LinksnappyCom.py +++ b/pyload/plugin/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/plugin/account/LomafileCom.py b/pyload/plugin/account/LomafileCom.py index c55c9538d..24f988ac1 100644 --- a/pyload/plugin/account/LomafileCom.py +++ b/pyload/plugin/account/LomafileCom.py @@ -4,13 +4,13 @@ from pyload.plugin.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/plugin/account/MegaDebridEu.py b/pyload/plugin/account/MegaDebridEu.py index 67af94541..c2e64bcc7 100644 --- a/pyload/plugin/account/MegaDebridEu.py +++ b/pyload/plugin/account/MegaDebridEu.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class MegaDebridEu(Account): - __name = "MegaDebridEu" - __type = "account" - __version = "0.20" + __name__ = "MegaDebridEu" + __type__ = "account" + __version__ = "0.20" - __description = """mega-debrid.eu account plugin""" - __license = "GPLv3" - __authors = [("D.Ducatel", "dducatel@je-geek.fr")] + __description__ = """mega-debrid.eu account plugin""" + __license__ = "GPLv3" + __authors__ = [("D.Ducatel", "dducatel@je-geek.fr")] # Define the base URL of MegaDebrid api diff --git a/pyload/plugin/account/MegaRapidCz.py b/pyload/plugin/account/MegaRapidCz.py index 9e9f5cb02..5ceee1301 100644 --- a/pyload/plugin/account/MegaRapidCz.py +++ b/pyload/plugin/account/MegaRapidCz.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account class MegaRapidCz(Account): - __name = "MegaRapidCz" - __type = "account" - __version = "0.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/plugin/account/MegasharesCom.py b/pyload/plugin/account/MegasharesCom.py index 95df5ad2d..352e0abd5 100644 --- a/pyload/plugin/account/MegasharesCom.py +++ b/pyload/plugin/account/MegasharesCom.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account class MegasharesCom(Account): - __name = "MegasharesCom" - __type = "account" - __version = "0.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/plugin/account/MovReelCom.py b/pyload/plugin/account/MovReelCom.py index 9eabd0a6d..4d2855de1 100644 --- a/pyload/plugin/account/MovReelCom.py +++ b/pyload/plugin/account/MovReelCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class MovReelCom(XFSAccount): - __name = "MovReelCom" - __type = "account" - __version = "0.03" + __name__ = "MovReelCom" + __type__ = "account" + __version__ = "0.03" - __description = """Movreel.com account plugin""" - __license = "GPLv3" - __authors = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] + __description__ = """Movreel.com account plugin""" + __license__ = "GPLv3" + __authors__ = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] login_timeout = 60 diff --git a/pyload/plugin/account/MultishareCz.py b/pyload/plugin/account/MultishareCz.py index 2f9b285b2..62b48c546 100644 --- a/pyload/plugin/account/MultishareCz.py +++ b/pyload/plugin/account/MultishareCz.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account class MultishareCz(Account): - __name = "MultishareCz" - __type = "account" - __version = "0.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/plugin/account/MyfastfileCom.py b/pyload/plugin/account/MyfastfileCom.py index 4e85c1a34..01caf5c69 100644 --- a/pyload/plugin/account/MyfastfileCom.py +++ b/pyload/plugin/account/MyfastfileCom.py @@ -7,13 +7,13 @@ from pyload.utils import json_loads class MyfastfileCom(Account): - __name = "MyfastfileCom" - __type = "account" - __version = "0.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/plugin/account/NetloadIn.py b/pyload/plugin/account/NetloadIn.py index 4cfc205ca..d0d48315a 100644 --- a/pyload/plugin/account/NetloadIn.py +++ b/pyload/plugin/account/NetloadIn.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account class NetloadIn(Account): - __name = "NetloadIn" - __type = "account" - __version = "0.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/plugin/account/NosuploadCom.py b/pyload/plugin/account/NosuploadCom.py index 10f9007a6..7fc8b49de 100644 --- a/pyload/plugin/account/NosuploadCom.py +++ b/pyload/plugin/account/NosuploadCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class NosuploadCom(XFSAccount): - __name = "NosuploadCom" - __type = "account" - __version = "0.02" + __name__ = "NosuploadCom" + __type__ = "account" + __version__ = "0.02" - __description = """Nosupload.com account plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Nosupload.com account plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_DOMAIN = "nosupload.com" diff --git a/pyload/plugin/account/NovafileCom.py b/pyload/plugin/account/NovafileCom.py index 8400cc267..71a7dc2dc 100644 --- a/pyload/plugin/account/NovafileCom.py +++ b/pyload/plugin/account/NovafileCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class NovafileCom(XFSAccount): - __name = "NovafileCom" - __type = "account" - __version = "0.02" + __name__ = "NovafileCom" + __type__ = "account" + __version__ = "0.02" - __description = """Novafile.com account plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Novafile.com account plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_DOMAIN = "novafile.com" diff --git a/pyload/plugin/account/NowVideoAt.py b/pyload/plugin/account/NowVideoAt.py index 84cec8974..d2527d635 100644 --- a/pyload/plugin/account/NowVideoAt.py +++ b/pyload/plugin/account/NowVideoAt.py @@ -8,13 +8,13 @@ from pyload.plugin.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/plugin/account/OboomCom.py b/pyload/plugin/account/OboomCom.py index cfb4e3e7e..a40783535 100644 --- a/pyload/plugin/account/OboomCom.py +++ b/pyload/plugin/account/OboomCom.py @@ -9,13 +9,13 @@ from pyload.plugin.Account import Account class OboomCom(Account): - __name = "OboomCom" - __type = "account" - __version = "0.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/plugin/account/OneFichierCom.py b/pyload/plugin/account/OneFichierCom.py index 7ecd5769e..5d4a037f0 100644 --- a/pyload/plugin/account/OneFichierCom.py +++ b/pyload/plugin/account/OneFichierCom.py @@ -10,13 +10,13 @@ from pyload.plugin.Account import Account class OneFichierCom(Account): - __name = "OneFichierCom" - __type = "account" - __version = "0.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/plugin/account/OverLoadMe.py b/pyload/plugin/account/OverLoadMe.py index 55dbfd1bb..27ed9eb98 100644 --- a/pyload/plugin/account/OverLoadMe.py +++ b/pyload/plugin/account/OverLoadMe.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class OverLoadMe(Account): - __name = "OverLoadMe" - __type = "account" - __version = "0.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/plugin/account/PremiumTo.py b/pyload/plugin/account/PremiumTo.py index 2fe95b135..7f15e8a86 100644 --- a/pyload/plugin/account/PremiumTo.py +++ b/pyload/plugin/account/PremiumTo.py @@ -4,13 +4,13 @@ from pyload.plugin.Account import Account class PremiumTo(Account): - __name = "PremiumTo" - __type = "account" - __version = "0.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/plugin/account/PremiumizeMe.py b/pyload/plugin/account/PremiumizeMe.py index 9ad728bf7..75fc22198 100644 --- a/pyload/plugin/account/PremiumizeMe.py +++ b/pyload/plugin/account/PremiumizeMe.py @@ -6,13 +6,13 @@ from pyload.utils import json_loads class PremiumizeMe(Account): - __name = "PremiumizeMe" - __type = "account" - __version = "0.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/plugin/account/QuickshareCz.py b/pyload/plugin/account/QuickshareCz.py index 216bf62f2..c3d69e0c3 100644 --- a/pyload/plugin/account/QuickshareCz.py +++ b/pyload/plugin/account/QuickshareCz.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account class QuickshareCz(Account): - __name = "QuickshareCz" - __type = "account" - __version = "0.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/plugin/account/RPNetBiz.py b/pyload/plugin/account/RPNetBiz.py index fe18e06c9..bb529b19c 100644 --- a/pyload/plugin/account/RPNetBiz.py +++ b/pyload/plugin/account/RPNetBiz.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class RPNetBiz(Account): - __name = "RPNetBiz" - __type = "account" - __version = "0.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/plugin/account/RapidfileshareNet.py b/pyload/plugin/account/RapidfileshareNet.py index 0b0ed210c..ec0bf8db4 100644 --- a/pyload/plugin/account/RapidfileshareNet.py +++ b/pyload/plugin/account/RapidfileshareNet.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class RapidfileshareNet(XFSAccount): - __name = "RapidfileshareNet" - __type = "account" - __version = "0.05" + __name__ = "RapidfileshareNet" + __type__ = "account" + __version__ = "0.05" - __description = """Rapidfileshare.net account plugin""" - __license = "GPLv3" - __authors = [("guidobelix", "guidobelix@hotmail.it")] + __description__ = """Rapidfileshare.net account plugin""" + __license__ = "GPLv3" + __authors__ = [("guidobelix", "guidobelix@hotmail.it")] HOSTER_DOMAIN = "rapidfileshare.net" diff --git a/pyload/plugin/account/RapidgatorNet.py b/pyload/plugin/account/RapidgatorNet.py index 66fe13f90..693b78547 100644 --- a/pyload/plugin/account/RapidgatorNet.py +++ b/pyload/plugin/account/RapidgatorNet.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class RapidgatorNet(Account): - __name = "RapidgatorNet" - __type = "account" - __version = "0.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/plugin/account/RapiduNet.py b/pyload/plugin/account/RapiduNet.py index dfb18d2c7..2c6fe04f8 100644 --- a/pyload/plugin/account/RapiduNet.py +++ b/pyload/plugin/account/RapiduNet.py @@ -7,13 +7,13 @@ from pyload.utils import json_loads class RapiduNet(Account): - __name = "RapiduNet" - __type = "account" - __version = "0.02" + __name__ = "RapiduNet" + __type__ = "account" + __version__ = "0.02" - __description = """Rapidu.net account plugin""" - __license = "GPLv3" - __authors = [("prOq", "")] + __description__ = """Rapidu.net account plugin""" + __license__ = "GPLv3" + __authors__ = [("prOq", "")] PREMIUM_PATTERN = r'<a href="premium/" style="padding-left: 0px;">Account: <b>Premium</b></a>' diff --git a/pyload/plugin/account/RarefileNet.py b/pyload/plugin/account/RarefileNet.py index fc736bafc..1dc93681c 100644 --- a/pyload/plugin/account/RarefileNet.py +++ b/pyload/plugin/account/RarefileNet.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class RarefileNet(XFSAccount): - __name = "RarefileNet" - __type = "account" - __version = "0.04" + __name__ = "RarefileNet" + __type__ = "account" + __version__ = "0.04" - __description = """RareFile.net account plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """RareFile.net account plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] HOSTER_DOMAIN = "rarefile.net" diff --git a/pyload/plugin/account/RealdebridCom.py b/pyload/plugin/account/RealdebridCom.py index c604fb108..d5aa2163c 100644 --- a/pyload/plugin/account/RealdebridCom.py +++ b/pyload/plugin/account/RealdebridCom.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account class RealdebridCom(Account): - __name = "RealdebridCom" - __type = "account" - __version = "0.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/plugin/account/RehostTo.py b/pyload/plugin/account/RehostTo.py index 956982186..bcc34d47f 100644 --- a/pyload/plugin/account/RehostTo.py +++ b/pyload/plugin/account/RehostTo.py @@ -4,13 +4,13 @@ from pyload.plugin.Account import Account class RehostTo(Account): - __name = "RehostTo" - __type = "account" - __version = "0.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/plugin/account/RyushareCom.py b/pyload/plugin/account/RyushareCom.py index d908e6442..fcef2d634 100644 --- a/pyload/plugin/account/RyushareCom.py +++ b/pyload/plugin/account/RyushareCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class RyushareCom(XFSAccount): - __name = "RyushareCom" - __type = "account" - __version = "0.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", "")] diff --git a/pyload/plugin/account/SafesharingEu.py b/pyload/plugin/account/SafesharingEu.py index eae8140fb..f5cbf050e 100644 --- a/pyload/plugin/account/SafesharingEu.py +++ b/pyload/plugin/account/SafesharingEu.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class SafesharingEu(XFSAccount): - __name = "SafesharingEu" - __type = "account" - __version = "0.02" + __name__ = "SafesharingEu" + __type__ = "account" + __version__ = "0.02" - __description = """Safesharing.eu account plugin""" - __license = "GPLv3" - __authors = [("guidobelix", "guidobelix@hotmail.it")] + __description__ = """Safesharing.eu account plugin""" + __license__ = "GPLv3" + __authors__ = [("guidobelix", "guidobelix@hotmail.it")] HOSTER_DOMAIN = "safesharing.eu" diff --git a/pyload/plugin/account/SecureUploadEu.py b/pyload/plugin/account/SecureUploadEu.py index b349e893f..bb47bcba3 100644 --- a/pyload/plugin/account/SecureUploadEu.py +++ b/pyload/plugin/account/SecureUploadEu.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class SecureUploadEu(XFSAccount): - __name = "SecureUploadEu" - __type = "account" - __version = "0.02" + __name__ = "SecureUploadEu" + __type__ = "account" + __version__ = "0.02" - __description = """SecureUpload.eu account plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """SecureUpload.eu account plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_DOMAIN = "secureupload.eu" diff --git a/pyload/plugin/account/SendmywayCom.py b/pyload/plugin/account/SendmywayCom.py index add0b2183..d64658de3 100644 --- a/pyload/plugin/account/SendmywayCom.py +++ b/pyload/plugin/account/SendmywayCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class SendmywayCom(XFSAccount): - __name = "SendmywayCom" - __type = "account" - __version = "0.02" + __name__ = "SendmywayCom" + __type__ = "account" + __version__ = "0.02" - __description = """Sendmyway.com account plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Sendmyway.com account plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_DOMAIN = "sendmyway.com" diff --git a/pyload/plugin/account/ShareonlineBiz.py b/pyload/plugin/account/ShareonlineBiz.py index 1b167a568..17425ac07 100644 --- a/pyload/plugin/account/ShareonlineBiz.py +++ b/pyload/plugin/account/ShareonlineBiz.py @@ -4,13 +4,13 @@ from pyload.plugin.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/plugin/account/SimplyPremiumCom.py b/pyload/plugin/account/SimplyPremiumCom.py index af8fc0730..0872e10f5 100644 --- a/pyload/plugin/account/SimplyPremiumCom.py +++ b/pyload/plugin/account/SimplyPremiumCom.py @@ -5,13 +5,13 @@ from pyload.plugin.Account import Account class SimplyPremiumCom(Account): - __name = "SimplyPremiumCom" - __type = "account" - __version = "0.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/plugin/account/SimplydebridCom.py b/pyload/plugin/account/SimplydebridCom.py index 24d0cb6bf..38ff90737 100644 --- a/pyload/plugin/account/SimplydebridCom.py +++ b/pyload/plugin/account/SimplydebridCom.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account class SimplydebridCom(Account): - __name = "SimplydebridCom" - __type = "account" - __version = "0.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/plugin/account/StahnuTo.py b/pyload/plugin/account/StahnuTo.py index b3ca3891a..adc7ab789 100644 --- a/pyload/plugin/account/StahnuTo.py +++ b/pyload/plugin/account/StahnuTo.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account class StahnuTo(Account): - __name = "StahnuTo" - __type = "account" - __version = "0.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/plugin/account/StreamcloudEu.py b/pyload/plugin/account/StreamcloudEu.py index f3eb6cce9..3ac74fbd0 100644 --- a/pyload/plugin/account/StreamcloudEu.py +++ b/pyload/plugin/account/StreamcloudEu.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class StreamcloudEu(XFSAccount): - __name = "StreamcloudEu" - __type = "account" - __version = "0.02" + __name__ = "StreamcloudEu" + __type__ = "account" + __version__ = "0.02" - __description = """Streamcloud.eu account plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Streamcloud.eu account plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_DOMAIN = "streamcloud.eu" diff --git a/pyload/plugin/account/TurbobitNet.py b/pyload/plugin/account/TurbobitNet.py index 8237ed34e..1086ede2a 100644 --- a/pyload/plugin/account/TurbobitNet.py +++ b/pyload/plugin/account/TurbobitNet.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account class TurbobitNet(Account): - __name = "TurbobitNet" - __type = "account" - __version = "0.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/plugin/account/TusfilesNet.py b/pyload/plugin/account/TusfilesNet.py index b951f8add..84e9ef9c6 100644 --- a/pyload/plugin/account/TusfilesNet.py +++ b/pyload/plugin/account/TusfilesNet.py @@ -8,13 +8,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class TusfilesNet(XFSAccount): - __name = "TusfilesNet" - __type = "account" - __version = "0.06" + __name__ = "TusfilesNet" + __type__ = "account" + __version__ = "0.06" - __description = """Tusfile.net account plugin""" - __license = "GPLv3" - __authors = [("guidobelix", "guidobelix@hotmail.it")] + __description__ = """Tusfile.net account plugin""" + __license__ = "GPLv3" + __authors__ = [("guidobelix", "guidobelix@hotmail.it")] HOSTER_DOMAIN = "tusfiles.net" diff --git a/pyload/plugin/account/UlozTo.py b/pyload/plugin/account/UlozTo.py index bba346874..57031ce1f 100644 --- a/pyload/plugin/account/UlozTo.py +++ b/pyload/plugin/account/UlozTo.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account class UlozTo(Account): - __name = "UlozTo" - __type = "account" - __version = "0.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", "")] diff --git a/pyload/plugin/account/UnrestrictLi.py b/pyload/plugin/account/UnrestrictLi.py index 943943cac..07e7d3e17 100644 --- a/pyload/plugin/account/UnrestrictLi.py +++ b/pyload/plugin/account/UnrestrictLi.py @@ -5,13 +5,13 @@ from pyload.utils import json_loads class UnrestrictLi(Account): - __name = "UnrestrictLi" - __type = "account" - __version = "0.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/plugin/account/UploadcCom.py b/pyload/plugin/account/UploadcCom.py index 01102168c..66863c456 100644 --- a/pyload/plugin/account/UploadcCom.py +++ b/pyload/plugin/account/UploadcCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class UploadcCom(XFSAccount): - __name = "UploadcCom" - __type = "account" - __version = "0.02" + __name__ = "UploadcCom" + __type__ = "account" + __version__ = "0.02" - __description = """Uploadc.com account plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Uploadc.com account plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_DOMAIN = "uploadc.com" diff --git a/pyload/plugin/account/UploadedTo.py b/pyload/plugin/account/UploadedTo.py index f25da8995..91cdba2c1 100644 --- a/pyload/plugin/account/UploadedTo.py +++ b/pyload/plugin/account/UploadedTo.py @@ -7,13 +7,13 @@ from pyload.plugin.Account import Account class UploadedTo(Account): - __name = "UploadedTo" - __type = "account" - __version = "0.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/plugin/account/UploadheroCom.py b/pyload/plugin/account/UploadheroCom.py index fa7af288e..c7b05bc94 100644 --- a/pyload/plugin/account/UploadheroCom.py +++ b/pyload/plugin/account/UploadheroCom.py @@ -8,13 +8,13 @@ from pyload.plugin.Account import Account class UploadheroCom(Account): - __name = "UploadheroCom" - __type = "account" - __version = "0.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/plugin/account/UploadingCom.py b/pyload/plugin/account/UploadingCom.py index 7ac1e52ff..6d54469e8 100644 --- a/pyload/plugin/account/UploadingCom.py +++ b/pyload/plugin/account/UploadingCom.py @@ -9,13 +9,13 @@ from pyload.plugin.internal.SimpleHoster import set_cookies class UploadingCom(Account): - __name = "UploadingCom" - __type = "account" - __version = "0.11" + __name__ = "UploadingCom" + __type__ = "account" + __version__ = "0.11" - __description = """Uploading.com account plugin""" - __license = "GPLv3" - __authors = [("mkaay", "mkaay@mkaay.de")] + __description__ = """Uploading.com account plugin""" + __license__ = "GPLv3" + __authors__ = [("mkaay", "mkaay@mkaay.de")] PREMIUM_PATTERN = r'UPGRADE TO PREMIUM' diff --git a/pyload/plugin/account/UptoboxCom.py b/pyload/plugin/account/UptoboxCom.py index 116721ebe..2d0b49957 100644 --- a/pyload/plugin/account/UptoboxCom.py +++ b/pyload/plugin/account/UptoboxCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class UptoboxCom(XFSAccount): - __name = "UptoboxCom" - __type = "account" - __version = "0.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/plugin/account/VidPlayNet.py b/pyload/plugin/account/VidPlayNet.py index c5d4e0b5a..390520a00 100644 --- a/pyload/plugin/account/VidPlayNet.py +++ b/pyload/plugin/account/VidPlayNet.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class VidPlayNet(XFSAccount): - __name = "VidPlayNet" - __type = "account" - __version = "0.02" + __name__ = "VidPlayNet" + __type__ = "account" + __version__ = "0.02" - __description = """VidPlay.net account plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """VidPlay.net account plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] HOSTER_DOMAIN = "vidplay.net" diff --git a/pyload/plugin/account/XFileSharingPro.py b/pyload/plugin/account/XFileSharingPro.py index 67679f2cc..9d938c4c5 100644 --- a/pyload/plugin/account/XFileSharingPro.py +++ b/pyload/plugin/account/XFileSharingPro.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount class XFileSharingPro(XFSAccount): - __name = "XFileSharingPro" - __type = "account" - __version = "0.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/plugin/account/YibaishiwuCom.py b/pyload/plugin/account/YibaishiwuCom.py index 6f149478e..e169a5901 100644 --- a/pyload/plugin/account/YibaishiwuCom.py +++ b/pyload/plugin/account/YibaishiwuCom.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account class YibaishiwuCom(Account): - __name = "YibaishiwuCom" - __type = "account" - __version = "0.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/plugin/account/ZeveraCom.py b/pyload/plugin/account/ZeveraCom.py index aab795e55..2eee62ac1 100644 --- a/pyload/plugin/account/ZeveraCom.py +++ b/pyload/plugin/account/ZeveraCom.py @@ -6,13 +6,13 @@ from pyload.plugin.Account import Account class ZeveraCom(Account): - __name = "ZeveraCom" - __type = "account" - __version = "0.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/plugin/addon/Checksum.py b/pyload/plugin/addon/Checksum.py index f3f98d0f8..0589bd55a 100644 --- a/pyload/plugin/addon/Checksum.py +++ b/pyload/plugin/addon/Checksum.py @@ -38,20 +38,20 @@ def computeChecksum(local_file, algorithm): class Checksum(Addon): - __name = "Checksum" - __type = "addon" - __version = "0.15" + __name__ = "Checksum" + __type__ = "addon" + __version__ = "0.15" - __config = [("activated" , "bool" , "Activated" , True ), + __config__ = [("activated" , "bool" , "Activated" , True ), ("check_checksum", "bool" , "Check checksum? (If False only size will be verified)", True ), ("check_action" , "fail;retry;nothing", "What to do if check fails?" , "retry"), ("max_tries" , "int" , "Number of retries" , 2 ), ("retry_action" , "fail;nothing" , "What to do if all retries fail?" , "fail" ), ("wait_time" , "int" , "Time to wait before each retry (seconds)" , 1 )] - __description = """Verify downloaded file size and checksum""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz"), + __description__ = """Verify downloaded file size and checksum""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), ("Walter Purcaro", "vuolter@gmail.com"), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/addon/ClickAndLoad.py b/pyload/plugin/addon/ClickAndLoad.py index 8a05ca85e..5fe6e4bec 100644 --- a/pyload/plugin/addon/ClickAndLoad.py +++ b/pyload/plugin/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 ), + __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/plugin/addon/DeleteFinished.py b/pyload/plugin/addon/DeleteFinished.py index 045f58d61..59f2e3321 100644 --- a/pyload/plugin/addon/DeleteFinished.py +++ b/pyload/plugin/addon/DeleteFinished.py @@ -5,16 +5,16 @@ from pyload.plugin.Addon import Addon class DeleteFinished(Addon): - __name = "DeleteFinished" - __type = "addon" - __version = "1.11" + __name__ = "DeleteFinished" + __type__ = "addon" + __version__ = "1.11" - __config = [('interval' , 'int' , 'Delete every (hours)' , '72' ), + __config__ = [('interval' , 'int' , 'Delete every (hours)' , '72' ), ('deloffline', 'bool', 'Delete packages with offline links', 'False')] - __description = """Automatically delete all finished packages from queue""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Automatically delete all finished packages from queue""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] # event_list = ["pluginConfigChanged"] @@ -45,7 +45,7 @@ class DeleteFinished(Addon): def activate(self): self.info = {'sleep': True} interval = self.getConfig('interval') - self.pluginConfigChanged(self.__name, 'interval', interval) + self.pluginConfigChanged(self.__name__, 'interval', interval) self.addEvent('packageFinished', self.wakeup) diff --git a/pyload/plugin/addon/DownloadScheduler.py b/pyload/plugin/addon/DownloadScheduler.py index 7f05d89f4..e5e25e389 100644 --- a/pyload/plugin/addon/DownloadScheduler.py +++ b/pyload/plugin/addon/DownloadScheduler.py @@ -8,16 +8,16 @@ from pyload.plugin.Addon import Addon class DownloadScheduler(Addon): - __name = "DownloadScheduler" - __type = "addon" - __version = "0.22" + __name__ = "DownloadScheduler" + __type__ = "addon" + __version__ = "0.22" - __config = [("timetable", "str" , "List time periods as hh:mm full or number(kB/s)" , "0:00 full, 7:00 250, 10:00 0, 17:00 150"), + __config__ = [("timetable", "str" , "List time periods as hh:mm full or number(kB/s)" , "0:00 full, 7:00 250, 10:00 0, 17:00 150"), ("abort" , "bool", "Abort active downloads when start period with speed 0", False )] - __description = """Download Scheduler""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz"), + __description__ = """Download Scheduler""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/addon/ExternalScripts.py b/pyload/plugin/addon/ExternalScripts.py index 030b44ae1..31283afc2 100644 --- a/pyload/plugin/addon/ExternalScripts.py +++ b/pyload/plugin/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/plugin/addon/ExtractArchive.py b/pyload/plugin/addon/ExtractArchive.py index 478fb954e..b24bb37a2 100644 --- a/pyload/plugin/addon/ExtractArchive.py +++ b/pyload/plugin/addon/ExtractArchive.py @@ -57,11 +57,11 @@ from pyload.utils import safe_join, fs_encode class ExtractArchive(Addon): - __name = "ExtractArchive" - __type = "addon" - __version = "0.19" + __name__ = "ExtractArchive" + __type__ = "addon" + __version__ = "0.19" - __config = [("activated" , "bool" , "Activated" , True ), + __config__ = [("activated" , "bool" , "Activated" , True ), ("fullpath" , "bool" , "Extract full path" , True ), ("overwrite" , "bool" , "Overwrite files" , True ), ("passwordfile" , "file" , "password file" , "archive_password.txt"), @@ -73,9 +73,9 @@ class ExtractArchive(Addon): ("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"), + __description__ = """Extract different kind of archives""" + __license__ = "GPLv3" + __authors__ = [("RaNaN", "ranan@pyload.org"), ("AndroKev", ""), ("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/plugin/addon/HotFolder.py b/pyload/plugin/addon/HotFolder.py index 5eb15ab4f..3bbafd5ed 100644 --- a/pyload/plugin/addon/HotFolder.py +++ b/pyload/plugin/addon/HotFolder.py @@ -13,18 +13,18 @@ from pyload.utils import fs_encode, safe_join class HotFolder(Addon): - __name = "HotFolder" - __type = "addon" - __version = "0.12" + __name__ = "HotFolder" + __type__ = "addon" + __version__ = "0.12" - __config = [("folder" , "str" , "Folder to observe" , "container"), + __config__ = [("folder" , "str" , "Folder to observe" , "container"), ("watch_file", "bool", "Observe link file" , False ), ("keep" , "bool", "Keep added containers", True ), ("file" , "str" , "Link file" , "links.txt")] - __description = """Observe folder and file for changes and add container and links""" - __license = "GPLv3" - __authors = [("RaNaN", "RaNaN@pyload.de")] + __description__ = """Observe folder and file for changes and add container and links""" + __license__ = "GPLv3" + __authors__ = [("RaNaN", "RaNaN@pyload.de")] def setup(self): diff --git a/pyload/plugin/addon/IRCInterface.py b/pyload/plugin/addon/IRCInterface.py index 3596b72ab..a4d466319 100644 --- a/pyload/plugin/addon/IRCInterface.py +++ b/pyload/plugin/addon/IRCInterface.py @@ -18,11 +18,11 @@ from pyload.utils import formatSize class IRCInterface(Thread, Addon): - __name = "IRCInterface" - __type = "addon" - __version = "0.13" + __name__ = "IRCInterface" + __type__ = "addon" + __version__ = "0.13" - __config = [("host" , "str" , "IRC-Server Address" , "Enter your server here!"), + __config__ = [("host" , "str" , "IRC-Server Address" , "Enter your server here!"), ("port" , "int" , "IRC-Server Port" , 6667 ), ("ident" , "str" , "Clients ident" , "pyload-irc" ), ("realname" , "str" , "Realname" , "pyload-irc" ), @@ -33,9 +33,9 @@ class IRCInterface(Thread, Addon): ("info_pack", "bool", "Inform about every package finished" , True ), ("captcha" , "bool", "Send captcha requests" , True )] - __description = """Connect to irc and let owner perform different tasks""" - __license = "GPLv3" - __authors = [("Jeix", "Jeix@hasnomail.com")] + __description__ = """Connect to irc and let owner perform different tasks""" + __license__ = "GPLv3" + __authors__ = [("Jeix", "Jeix@hasnomail.com")] def __init__(self, core, manager): diff --git a/pyload/plugin/addon/MergeFiles.py b/pyload/plugin/addon/MergeFiles.py index 72dfd583d..18836f6ac 100644 --- a/pyload/plugin/addon/MergeFiles.py +++ b/pyload/plugin/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/plugin/addon/MultiHome.py b/pyload/plugin/addon/MultiHome.py index 1bf78d2db..84b1e6ab7 100644 --- a/pyload/plugin/addon/MultiHome.py +++ b/pyload/plugin/addon/MultiHome.py @@ -6,15 +6,15 @@ from pyload.plugin.Addon import Addon class MultiHome(Addon): - __name = "MultiHome" - __type = "addon" - __version = "0.12" + __name__ = "MultiHome" + __type__ = "addon" + __version__ = "0.12" - __config = [("interfaces", "str", "Interfaces", "None")] + __config__ = [("interfaces", "str", "Interfaces", "None")] - __description = """Ip address changer""" - __license = "GPLv3" - __authors = [("mkaay", "mkaay@mkaay.de")] + __description__ = """Ip address changer""" + __license__ = "GPLv3" + __authors__ = [("mkaay", "mkaay@mkaay.de")] def setup(self): diff --git a/pyload/plugin/addon/RestartFailed.py b/pyload/plugin/addon/RestartFailed.py index 5611cc791..2fe5f13bf 100644 --- a/pyload/plugin/addon/RestartFailed.py +++ b/pyload/plugin/addon/RestartFailed.py @@ -4,16 +4,16 @@ from pyload.plugin.Addon import Addon class RestartFailed(Addon): - __name = "RestartFailed" - __type = "addon" - __version = "1.57" + __name__ = "RestartFailed" + __type__ = "addon" + __version__ = "1.57" - __config = [("activated", "bool", "Activated" , True), + __config__ = [("activated", "bool", "Activated" , True), ("interval" , "int" , "Check interval in minutes", 90 )] - __description = """Periodically restart all failed downloads in queue""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Periodically restart all failed downloads in queue""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] # event_list = ["pluginConfigChanged"] @@ -42,4 +42,4 @@ class RestartFailed(Addon): def activate(self): - self.pluginConfigChanged(self.__name, "interval", self.getConfig("interval")) + self.pluginConfigChanged(self.__name__, "interval", self.getConfig("interval")) diff --git a/pyload/plugin/addon/RestartSlow.py b/pyload/plugin/addon/RestartSlow.py index 8005abaea..8621ed80d 100644 --- a/pyload/plugin/addon/RestartSlow.py +++ b/pyload/plugin/addon/RestartSlow.py @@ -6,19 +6,19 @@ from pyload.plugin.Addon import Addon class RestartSlow(Addon): - __name = "RestartSlow" - __type = "addon" - __version = "0.02" + __name__ = "RestartSlow" + __type__ = "addon" + __version__ = "0.02" - __config = [("free_limit" , "int" , "Transfer speed threshold in kilobytes" , 100 ), + __config__ = [("free_limit" , "int" , "Transfer speed threshold in kilobytes" , 100 ), ("free_time" , "int" , "Sample interval in minutes" , 5 ), ("premium_limit", "int" , "Transfer speed threshold for premium download in kilobytes", 300 ), ("premium_time" , "int" , "Sample interval for premium download in minutes" , 2 ), ("safe_mode" , "bool", "Don't restart if download is not resumable" , True)] - __description = """Restart slow downloads""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Restart slow downloads""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] event_map = {'download-start': "downloadStarts"} diff --git a/pyload/plugin/addon/SkipRev.py b/pyload/plugin/addon/SkipRev.py index 6ff590792..d6908614d 100644 --- a/pyload/plugin/addon/SkipRev.py +++ b/pyload/plugin/addon/SkipRev.py @@ -8,15 +8,15 @@ from pyload.plugin.Plugin import SkipDownload class SkipRev(Adoon): - __name = "SkipRev" - __type = "addon" - __version = "0.15" + __name__ = "SkipRev" + __type__ = "addon" + __version__ = "0.15" - __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/plugin/addon/UnSkipOnFail.py b/pyload/plugin/addon/UnSkipOnFail.py index b640c7daa..bdbd4a5df 100644 --- a/pyload/plugin/addon/UnSkipOnFail.py +++ b/pyload/plugin/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", "")] + __description__ = """When a download fails, restart skipped duplicates""" + __license__ = "GPLv3" + __authors__ = [("hagg", "")] def downloadFailed(self, pyfile): diff --git a/pyload/plugin/addon/UpdateManager.py b/pyload/plugin/addon/UpdateManager.py index c5c34d1c8..e31612c23 100644 --- a/pyload/plugin/addon/UpdateManager.py +++ b/pyload/plugin/addon/UpdateManager.py @@ -14,26 +14,26 @@ from pyload.utils import safe_join class UpdateManager(Addon): - __name = "UpdateManager" - __type = "addon" - __version = "0.42" + __name__ = "UpdateManager" + __type__ = "addon" + __version__ = "0.42" - __config = [("activated" , "bool" , "Activated" , True ), + __config__ = [("activated" , "bool" , "Activated" , True ), ("mode" , "pyLoad + plugins;plugins only", "Check updates for" , "pyLoad + plugins"), ("interval" , "int" , "Check interval in hours" , 8 ), ("autorestart" , "bool" , "Automatically restart pyLoad when required" , True ), ("reloadplugins", "bool" , "Monitor plugins for code changes in debug mode", True ), ("nodebugupdate", "bool" , "Don't check for updates in debug mode" , 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 activate(self): - self.pluginConfigChanged(self.__name, "interval", self.getConfig("interval")) - x = lambda: self.pluginConfigChanged(self.__name, "reloadplugins", self.getConfig("reloadplugins")) + self.pluginConfigChanged(self.__name__, "interval", self.getConfig("interval")) + x = lambda: self.pluginConfigChanged(self.__name__, "reloadplugins", self.getConfig("reloadplugins")) self.core.scheduler.addJob(10, x, threaded=False) def deactivate(self): - self.pluginConfigChanged(self.__name, "reloadplugins", False) + self.pluginConfigChanged(self.__name__, "reloadplugins", False) def setup(self): @@ -83,15 +83,15 @@ class UpdateManager(Addon): def autoreloadPlugins(self): """ reload and reindex all modified plugins """ modules = filter( - lambda m: m and (m.__name.startswith("pyload.plugin.") or - m.__name.startswith("userplugins.")) and - m.__name.count(".") >= 2, sys.modules.itervalues() + lambda m: m and (m.__name__.startswith("pyload.plugin.") or + m.__name__.startswith("userplugins.")) and + m.__name__.count(".") >= 2, sys.modules.itervalues() ) reloads = [] for m in modules: - root, type, name = m.__name.rsplit(".", 2) + root, type, name = m.__name__.rsplit(".", 2) id = (type, name) if type in self.core.pluginManager.plugins: f = m.__file__.replace(".pyc", ".py") diff --git a/pyload/plugin/addon/WindowsPhoneToastNotify.py b/pyload/plugin/addon/WindowsPhoneToastNotify.py index fadc17d04..0ac6719e1 100644 --- a/pyload/plugin/addon/WindowsPhoneToastNotify.py +++ b/pyload/plugin/addon/WindowsPhoneToastNotify.py @@ -7,18 +7,18 @@ from pyload.plugin.Addon import Addon class WindowsPhoneToastNotify(Addon): - __name = "WindowsPhoneToastNotify" - __type = "addon" - __version = "0.03" + __name__ = "WindowsPhoneToastNotify" + __type__ = "addon" + __version__ = "0.03" - __config = [("force" , "bool", "Force even if client is connected" , False), + __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")] + __description__ = """Send push notifications to Windows Phone""" + __license__ = "GPLv3" + __authors__ = [("Andy Voigt", "phone-support@hotmail.de")] def getXmlData(self): diff --git a/pyload/plugin/addon/XMPPInterface.py b/pyload/plugin/addon/XMPPInterface.py index 8baffe284..77a49af6f 100644 --- a/pyload/plugin/addon/XMPPInterface.py +++ b/pyload/plugin/addon/XMPPInterface.py @@ -10,11 +10,11 @@ from pyload.plugin.addon.IRCInterface import IRCInterface class XMPPInterface(IRCInterface, JabberClient): - __name = "XMPPInterface" - __type = "addon" - __version = "0.11" + __name__ = "XMPPInterface" + __type__ = "addon" + __version__ = "0.11" - __config = [("jid" , "str" , "Jabber ID" , "user@exmaple-jabber-server.org" ), + __config__ = [("jid" , "str" , "Jabber ID" , "user@exmaple-jabber-server.org" ), ("pw" , "str" , "Password" , "" ), ("tls" , "bool", "Use TLS" , False ), ("owners" , "str" , "List of JIDs accepting commands from", "me@icq-gateway.org;some@msn-gateway.org"), @@ -22,9 +22,9 @@ class XMPPInterface(IRCInterface, JabberClient): ("info_pack", "bool", "Inform about every package finished" , True ), ("captcha" , "bool", "Send captcha requests" , True )] - __description = """Connect to jabber and let owner perform different tasks""" - __license = "GPLv3" - __authors = [("RaNaN", "RaNaN@pyload.org")] + __description__ = """Connect to jabber and let owner perform different tasks""" + __license__ = "GPLv3" + __authors__ = [("RaNaN", "RaNaN@pyload.org")] implements(IMessageHandlersProvider) diff --git a/pyload/plugin/captcha/AdYouLike.py b/pyload/plugin/captcha/AdYouLike.py index 9c32d0569..bfb8b5ccb 100644 --- a/pyload/plugin/captcha/AdYouLike.py +++ b/pyload/plugin/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/plugin/captcha/AdsCaptcha.py b/pyload/plugin/captcha/AdsCaptcha.py index f879151ff..5c01a422e 100644 --- a/pyload/plugin/captcha/AdsCaptcha.py +++ b/pyload/plugin/captcha/AdsCaptcha.py @@ -8,13 +8,13 @@ from pyload.plugin.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/plugin/captcha/ReCaptcha.py b/pyload/plugin/captcha/ReCaptcha.py index 076a30214..4b900c57b 100644 --- a/pyload/plugin/captcha/ReCaptcha.py +++ b/pyload/plugin/captcha/ReCaptcha.py @@ -6,13 +6,13 @@ from pyload.plugin.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/plugin/captcha/SolveMedia.py b/pyload/plugin/captcha/SolveMedia.py index c2b1ba7eb..6e2a6c362 100644 --- a/pyload/plugin/captcha/SolveMedia.py +++ b/pyload/plugin/captcha/SolveMedia.py @@ -6,13 +6,13 @@ from pyload.plugin.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/plugin/container/CCF.py b/pyload/plugin/container/CCF.py index 943c114c8..a27511358 100644 --- a/pyload/plugin/container/CCF.py +++ b/pyload/plugin/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/plugin/container/LinkList.py b/pyload/plugin/container/LinkList.py index f8134f03d..305da8a38 100644 --- a/pyload/plugin/container/LinkList.py +++ b/pyload/plugin/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), + __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/plugin/container/RSDF.py b/pyload/plugin/container/RSDF.py index 22670ce4f..17f304f50 100644 --- a/pyload/plugin/container/RSDF.py +++ b/pyload/plugin/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/plugin/crypter/BitshareCom.py b/pyload/plugin/crypter/BitshareCom.py index dfa7b71df..524307127 100644 --- a/pyload/plugin/crypter/BitshareCom.py +++ b/pyload/plugin/crypter/BitshareCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class BitshareCom(SimpleCrypter): - __name = "BitshareCom" - __type = "crypter" - __version = "0.03" + __name__ = "BitshareCom" + __type__ = "crypter" + __version__ = "0.03" - __pattern = r'http://(?:www\.)?bitshare\.com/\?d=\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?bitshare\.com/\?d=\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Bitshare.com folder decrypter plugin""" - __license = "GPLv3" - __authors = [("stickell", "l.stickell@yahoo.it")] + __description__ = """Bitshare.com folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it")] LINK_PATTERN = r'<a href="(http://bitshare\.com/files/.+)">.+</a></td>' diff --git a/pyload/plugin/crypter/C1neonCom.py b/pyload/plugin/crypter/C1neonCom.py index ad428f6dd..a7973b041 100644 --- a/pyload/plugin/crypter/C1neonCom.py +++ b/pyload/plugin/crypter/C1neonCom.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/ChipDe.py b/pyload/plugin/crypter/ChipDe.py index 36735fd13..3e00a7f66 100644 --- a/pyload/plugin/crypter/ChipDe.py +++ b/pyload/plugin/crypter/ChipDe.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter class ChipDe(Crypter): - __name = "ChipDe" - __type = "crypter" - __version = "0.10" + __name__ = "ChipDe" + __type__ = "crypter" + __version__ = "0.10" - __pattern = r'http://(?:www\.)?chip\.de/video/.*\.html' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?chip\.de/video/.*\.html' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Chip.de decrypter plugin""" - __license = "GPLv3" - __authors = [("4Christopher", "4Christopher@gmx.de")] + __description__ = """Chip.de decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("4Christopher", "4Christopher@gmx.de")] def decrypt(self, pyfile): diff --git a/pyload/plugin/crypter/CrockoCom.py b/pyload/plugin/crypter/CrockoCom.py index 8782c86e6..577433510 100644 --- a/pyload/plugin/crypter/CrockoCom.py +++ b/pyload/plugin/crypter/CrockoCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class CrockoCom(SimpleCrypter): - __name = "CrockoCom" - __type = "crypter" - __version = "0.01" + __name__ = "CrockoCom" + __type__ = "crypter" + __version__ = "0.01" - __pattern = r'http://(?:www\.)?crocko\.com/f/.*' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?crocko\.com/f/.*' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Crocko.com folder decrypter plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Crocko.com folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] LINK_PATTERN = r'<td class="last"><a href="([^"]+)">download</a>' diff --git a/pyload/plugin/crypter/CryptItCom.py b/pyload/plugin/crypter/CryptItCom.py index dfb6be954..cb3347f55 100644 --- a/pyload/plugin/crypter/CryptItCom.py +++ b/pyload/plugin/crypter/CryptItCom.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/CzshareCom.py b/pyload/plugin/crypter/CzshareCom.py index e36394426..71847ab48 100644 --- a/pyload/plugin/crypter/CzshareCom.py +++ b/pyload/plugin/crypter/CzshareCom.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter class CzshareCom(Crypter): - __name = "CzshareCom" - __type = "crypter" - __version = "0.20" + __name__ = "CzshareCom" + __type__ = "crypter" + __version__ = "0.20" - __pattern = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.*' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.*' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Czshare.com folder decrypter plugin, now Sdilej.cz""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Czshare.com folder decrypter plugin, now Sdilej.cz""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] FOLDER_PATTERN = r'<tr class="subdirectory">\s*<td>\s*<table>(.*?)</table>' diff --git a/pyload/plugin/crypter/DDLMusicOrg.py b/pyload/plugin/crypter/DDLMusicOrg.py index a24cac22d..2b6738799 100644 --- a/pyload/plugin/crypter/DDLMusicOrg.py +++ b/pyload/plugin/crypter/DDLMusicOrg.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter class DDLMusicOrg(Crypter): - __name = "DDLMusicOrg" - __type = "crypter" - __version = "0.30" + __name__ = "DDLMusicOrg" + __type__ = "crypter" + __version__ = "0.30" - __pattern = r'http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Ddl-music.org decrypter plugin""" - __license = "GPLv3" - __authors = [("mkaay", "mkaay@mkaay.de")] + __description__ = """Ddl-music.org decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("mkaay", "mkaay@mkaay.de")] def setup(self): diff --git a/pyload/plugin/crypter/DailymotionBatch.py b/pyload/plugin/crypter/DailymotionBatch.py index 4b5b7106c..a056c73a4 100644 --- a/pyload/plugin/crypter/DailymotionBatch.py +++ b/pyload/plugin/crypter/DailymotionBatch.py @@ -10,17 +10,17 @@ from pyload.utils import safe_join class DailymotionBatch(Crypter): - __name = "DailymotionBatch" - __type = "crypter" - __version = "0.01" + __name__ = "DailymotionBatch" + __type__ = "crypter" + __version__ = "0.01" - __pattern = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Dailymotion.com channel & playlist decrypter""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Dailymotion.com channel & playlist decrypter""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] def api_response(self, ref, req=None): @@ -83,7 +83,7 @@ class DailymotionBatch(Crypter): def decrypt(self, pyfile): - m = re.match(self.__pattern, pyfile.url) + m = re.match(self.__pattern__, pyfile.url) m_id = m.group("ID") m_type = m.group("TYPE") diff --git a/pyload/plugin/crypter/DataHu.py b/pyload/plugin/crypter/DataHu.py index bc677253a..f69d6ee3e 100644 --- a/pyload/plugin/crypter/DataHu.py +++ b/pyload/plugin/crypter/DataHu.py @@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class DataHu(SimpleCrypter): - __name = "DataHu" - __type = "crypter" - __version = "0.06" + __name__ = "DataHu" + __type__ = "crypter" + __version__ = "0.06" - __pattern = r'http://(?:www\.)?data\.hu/dir/\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?data\.hu/dir/\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Data.hu folder decrypter plugin""" - __license = "GPLv3" - __authors = [("crash", ""), + __description__ = """Data.hu folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("crash", ""), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/DdlstorageCom.py b/pyload/plugin/crypter/DdlstorageCom.py index c6f423bb6..1d87e975b 100644 --- a/pyload/plugin/crypter/DdlstorageCom.py +++ b/pyload/plugin/crypter/DdlstorageCom.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/DepositfilesCom.py b/pyload/plugin/crypter/DepositfilesCom.py index 8ecbb6f8d..24fa9134a 100644 --- a/pyload/plugin/crypter/DepositfilesCom.py +++ b/pyload/plugin/crypter/DepositfilesCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class DepositfilesCom(SimpleCrypter): - __name = "DepositfilesCom" - __type = "crypter" - __version = "0.01" + __name__ = "DepositfilesCom" + __type__ = "crypter" + __version__ = "0.01" - __pattern = r'http://(?:www\.)?depositfiles\.com/folders/\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?depositfiles\.com/folders/\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Depositfiles.com folder decrypter plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Depositfiles.com folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] LINK_PATTERN = r'<div class="progressName"[^>]*>\s*<a href="([^"]+)" title="[^"]*" target="_blank">' diff --git a/pyload/plugin/crypter/Dereferer.py b/pyload/plugin/crypter/Dereferer.py index ec7f48a52..598cba8bd 100644 --- a/pyload/plugin/crypter/Dereferer.py +++ b/pyload/plugin/crypter/Dereferer.py @@ -8,19 +8,19 @@ from pyload.plugin.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/plugin/crypter/DevhostStFolder.py b/pyload/plugin/crypter/DevhostStFolder.py index aa00fe60e..9c81879c6 100644 --- a/pyload/plugin/crypter/DevhostStFolder.py +++ b/pyload/plugin/crypter/DevhostStFolder.py @@ -11,17 +11,17 @@ from pyload.plugin.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/plugin/crypter/DlProtectCom.py b/pyload/plugin/crypter/DlProtectCom.py index 0a9f00cc4..539cdc21c 100644 --- a/pyload/plugin/crypter/DlProtectCom.py +++ b/pyload/plugin/crypter/DlProtectCom.py @@ -9,17 +9,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class DlProtectCom(SimpleCrypter): - __name = "DlProtectCom" - __type = "crypter" - __version = "0.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/plugin/crypter/DontKnowMe.py b/pyload/plugin/crypter/DontKnowMe.py index 7fc1c87e4..c2b9649ed 100644 --- a/pyload/plugin/crypter/DontKnowMe.py +++ b/pyload/plugin/crypter/DontKnowMe.py @@ -8,17 +8,17 @@ from pyload.plugin.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", "")] + __description__ = """DontKnow.me decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("selaux", "")] LINK_PATTERN = r'http://dontknow\.me/at/\?(.+)$' diff --git a/pyload/plugin/crypter/DuckCryptInfo.py b/pyload/plugin/crypter/DuckCryptInfo.py index 28f9a1505..55681fd5e 100644 --- a/pyload/plugin/crypter/DuckCryptInfo.py +++ b/pyload/plugin/crypter/DuckCryptInfo.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter class DuckCryptInfo(Crypter): - __name = "DuckCryptInfo" - __type = "crypter" - __version = "0.02" + __name__ = "DuckCryptInfo" + __type__ = "crypter" + __version__ = "0.02" - __pattern = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """DuckCrypt.info decrypter plugin""" - __license = "GPLv3" - __authors = [("godofdream", "soilfiction@gmail.com")] + __description__ = """DuckCrypt.info decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("godofdream", "soilfiction@gmail.com")] TIMER_PATTERN = r'<span id="timer">(.*)</span>' @@ -27,7 +27,7 @@ class DuckCryptInfo(Crypter): def decrypt(self, pyfile): url = pyfile.url - m = re.match(self.__pattern, url) + m = re.match(self.__pattern__, url) if m is None: self.fail(_("Weird error in link")) if str(m.group(1)) == "link": @@ -38,7 +38,7 @@ class DuckCryptInfo(Crypter): def handleFolder(self, m): html = self.load("http://duckcrypt.info/ajax/auth.php?hash=" + str(m.group(2))) - m = re.match(self.__pattern, html) + m = re.match(self.__pattern__, html) self.logDebug("Redirectet to " + str(m.group(0))) html = self.load(str(m.group(0))) soup = BeautifulSoup(html) diff --git a/pyload/plugin/crypter/DuploadOrg.py b/pyload/plugin/crypter/DuploadOrg.py index d5839bce0..70745b550 100644 --- a/pyload/plugin/crypter/DuploadOrg.py +++ b/pyload/plugin/crypter/DuploadOrg.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/EasybytezCom.py b/pyload/plugin/crypter/EasybytezCom.py index 2e7e37537..9a4fca74a 100644 --- a/pyload/plugin/crypter/EasybytezCom.py +++ b/pyload/plugin/crypter/EasybytezCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter class EasybytezCom(XFSCrypter): - __name = "EasybytezCom" - __type = "crypter" - __version = "0.10" + __name__ = "EasybytezCom" + __type__ = "crypter" + __version__ = "0.10" - __pattern = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Easybytez.com folder decrypter plugin""" - __license = "GPLv3" - __authors = [("stickell", "l.stickell@yahoo.it")] + __description__ = """Easybytez.com folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it")] HOSTER_DOMAIN = "easybytez.com" diff --git a/pyload/plugin/crypter/EmbeduploadCom.py b/pyload/plugin/crypter/EmbeduploadCom.py index 88f6db50b..3265a939e 100644 --- a/pyload/plugin/crypter/EmbeduploadCom.py +++ b/pyload/plugin/crypter/EmbeduploadCom.py @@ -6,19 +6,19 @@ from pyload.network.HTTPRequest import BadHeader class EmbeduploadCom(Crypter): - __name = "EmbeduploadCom" - __type = "crypter" - __version = "0.02" + __name__ = "EmbeduploadCom" + __type__ = "crypter" + __version__ = "0.02" - __pattern = r'http://(?:www\.)?embedupload\.com/\?d=.*' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?embedupload\.com/\?d=.*' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True), ("preferedHoster", "str", "Prefered hoster list (bar-separated)", "embedupload"), ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")] - __description = """EmbedUpload.com decrypter plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """EmbedUpload.com decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] LINK_PATTERN = r'<div id="([^"]+)"[^>]*>\s*<a href="([^"]+)" target="_blank" (?:class="DownloadNow"|style="color:red")>' diff --git a/pyload/plugin/crypter/FilebeerInfo.py b/pyload/plugin/crypter/FilebeerInfo.py index 294f57451..a6faa5cab 100644 --- a/pyload/plugin/crypter/FilebeerInfo.py +++ b/pyload/plugin/crypter/FilebeerInfo.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/FilecloudIo.py b/pyload/plugin/crypter/FilecloudIo.py index 1926d04bb..f4c967a07 100644 --- a/pyload/plugin/crypter/FilecloudIo.py +++ b/pyload/plugin/crypter/FilecloudIo.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FilecloudIo(SimpleCrypter): - __name = "FilecloudIo" - __type = "crypter" - __version = "0.03" + __name__ = "FilecloudIo" + __type__ = "crypter" + __version__ = "0.03" - __pattern = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Filecloud.io folder decrypter plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Filecloud.io folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] LINK_PATTERN = r'href="(http://filecloud\.io/\w+)" title' diff --git a/pyload/plugin/crypter/FilecryptCc.py b/pyload/plugin/crypter/FilecryptCc.py index 7db82f24c..475c1503f 100644 --- a/pyload/plugin/crypter/FilecryptCc.py +++ b/pyload/plugin/crypter/FilecryptCc.py @@ -10,15 +10,15 @@ from pyload.plugin.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/plugin/crypter/FilefactoryCom.py b/pyload/plugin/crypter/FilefactoryCom.py index 5b2d242cb..bdfeec46f 100644 --- a/pyload/plugin/crypter/FilefactoryCom.py +++ b/pyload/plugin/crypter/FilefactoryCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FilefactoryCom(SimpleCrypter): - __name = "FilefactoryCom" - __type = "crypter" - __version = "0.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/plugin/crypter/FilerNet.py b/pyload/plugin/crypter/FilerNet.py index 950012b46..069698bf1 100644 --- a/pyload/plugin/crypter/FilerNet.py +++ b/pyload/plugin/crypter/FilerNet.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FilerNet(SimpleCrypter): - __name = "FilerNet" - __type = "crypter" - __version = "0.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/plugin/crypter/FileserveCom.py b/pyload/plugin/crypter/FileserveCom.py index a9f766b81..ab0665fbd 100644 --- a/pyload/plugin/crypter/FileserveCom.py +++ b/pyload/plugin/crypter/FileserveCom.py @@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter class FileserveCom(Crypter): - __name = "FileserveCom" - __type = "crypter" - __version = "0.11" + __name__ = "FileserveCom" + __type__ = "crypter" + __version__ = "0.11" - __pattern = r'http://(?:www\.)?fileserve\.com/list/\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?fileserve\.com/list/\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """FileServe.com folder decrypter plugin""" - __license = "GPLv3" - __authors = [("fionnc", "fionnc@gmail.com")] + __description__ = """FileServe.com folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("fionnc", "fionnc@gmail.com")] FOLDER_PATTERN = r'<table class="file_list">(.*?)</table>' diff --git a/pyload/plugin/crypter/FilesonicCom.py b/pyload/plugin/crypter/FilesonicCom.py index 6dded6c04..b1722c1bb 100644 --- a/pyload/plugin/crypter/FilesonicCom.py +++ b/pyload/plugin/crypter/FilesonicCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/crypter/FilestubeCom.py b/pyload/plugin/crypter/FilestubeCom.py index 5238899b0..36e4a4caf 100644 --- a/pyload/plugin/crypter/FilestubeCom.py +++ b/pyload/plugin/crypter/FilestubeCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FilestubeCom(SimpleCrypter): - __name = "FilestubeCom" - __type = "crypter" - __version = "0.05" + __name__ = "FilestubeCom" + __type__ = "crypter" + __version__ = "0.05" - __pattern = r'http://(?:www\.)?filestube\.(?:com|to)/\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?filestube\.(?:com|to)/\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Filestube.com decrypter plugin""" - __license = "GPLv3" - __authors = [("stickell", "l.stickell@yahoo.it")] + __description__ = """Filestube.com decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it")] LINK_PATTERN = r'<a class=\"file-link-main(?: noref)?\" [^>]* href=\"(http://[^\"]+)' diff --git a/pyload/plugin/crypter/FiletramCom.py b/pyload/plugin/crypter/FiletramCom.py index 28e38e30e..700050a4b 100644 --- a/pyload/plugin/crypter/FiletramCom.py +++ b/pyload/plugin/crypter/FiletramCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FiletramCom(SimpleCrypter): - __name = "FiletramCom" - __type = "crypter" - __version = "0.03" + __name__ = "FiletramCom" + __type__ = "crypter" + __version__ = "0.03" - __pattern = r'http://(?:www\.)?filetram\.com/[^/]+/.+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?filetram\.com/[^/]+/.+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Filetram.com decrypter plugin""" - __license = "GPLv3" - __authors = [("igel", "igelkun@myopera.com"), + __description__ = """Filetram.com decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("igel", "igelkun@myopera.com"), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/crypter/FiredriveCom.py b/pyload/plugin/crypter/FiredriveCom.py index 27b81c006..bf315ad16 100644 --- a/pyload/plugin/crypter/FiredriveCom.py +++ b/pyload/plugin/crypter/FiredriveCom.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/FourChanOrg.py b/pyload/plugin/crypter/FourChanOrg.py index 97d21ddeb..e5f6cc0cf 100644 --- a/pyload/plugin/crypter/FourChanOrg.py +++ b/pyload/plugin/crypter/FourChanOrg.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter class FourChanOrg(Crypter): - __name = "FourChanOrg" - __type = "crypter" - __version = "0.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/plugin/crypter/FreakhareCom.py b/pyload/plugin/crypter/FreakhareCom.py index 9df8ef200..cb766361c 100644 --- a/pyload/plugin/crypter/FreakhareCom.py +++ b/pyload/plugin/crypter/FreakhareCom.py @@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FreakhareCom(SimpleCrypter): - __name = "FreakhareCom" - __type = "crypter" - __version = "0.03" + __name__ = "FreakhareCom" + __type__ = "crypter" + __version__ = "0.03" - __pattern = r'http://(?:www\.)?freakshare\.com/folder/.+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?freakshare\.com/folder/.+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Freakhare.com folder decrypter plugin""" - __license = "GPLv3" - __authors = [("stickell", "l.stickell@yahoo.it")] + __description__ = """Freakhare.com folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it")] LINK_PATTERN = r'<a href="(http://freakshare\.com/files/[^"]+)" target="_blank">' diff --git a/pyload/plugin/crypter/FreetexthostCom.py b/pyload/plugin/crypter/FreetexthostCom.py index db97a8003..3b082ef7d 100644 --- a/pyload/plugin/crypter/FreetexthostCom.py +++ b/pyload/plugin/crypter/FreetexthostCom.py @@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FreetexthostCom(SimpleCrypter): - __name = "FreetexthostCom" - __type = "crypter" - __version = "0.01" + __name__ = "FreetexthostCom" + __type__ = "crypter" + __version__ = "0.01" - __pattern = r'http://(?:www\.)?freetexthost\.com/\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?freetexthost\.com/\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Freetexthost.com decrypter plugin""" - __license = "GPLv3" - __authors = [("stickell", "l.stickell@yahoo.it")] + __description__ = """Freetexthost.com decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it")] def getLinks(self): diff --git a/pyload/plugin/crypter/FshareVn.py b/pyload/plugin/crypter/FshareVn.py index 895a4d258..9b552a957 100644 --- a/pyload/plugin/crypter/FshareVn.py +++ b/pyload/plugin/crypter/FshareVn.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class FshareVn(SimpleCrypter): - __name = "FshareVn" - __type = "crypter" - __version = "0.01" + __name__ = "FshareVn" + __type__ = "crypter" + __version__ = "0.01" - __pattern = r'http://(?:www\.)?fshare\.vn/folder/.*' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?fshare\.vn/folder/.*' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Fshare.vn folder decrypter plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Fshare.vn folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] LINK_PATTERN = r'<li class="w_80pc"><a href="([^"]+)" target="_blank">' diff --git a/pyload/plugin/crypter/Go4UpCom.py b/pyload/plugin/crypter/Go4UpCom.py index 8652c3825..ffd945737 100644 --- a/pyload/plugin/crypter/Go4UpCom.py +++ b/pyload/plugin/crypter/Go4UpCom.py @@ -8,15 +8,15 @@ from pyload.plugin.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/plugin/crypter/GooGl.py b/pyload/plugin/crypter/GooGl.py index d1c47935d..13ffce505 100644 --- a/pyload/plugin/crypter/GooGl.py +++ b/pyload/plugin/crypter/GooGl.py @@ -5,17 +5,17 @@ from pyload.utils import json_loads class GooGl(Crypter): - __name = "GooGl" - __type = "crypter" - __version = "0.01" + __name__ = "GooGl" + __type__ = "crypter" + __version__ = "0.01" - __pattern = r'https?://(?:www\.)?goo\.gl/\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'https?://(?:www\.)?goo\.gl/\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Goo.gl decrypter plugin""" - __license = "GPLv3" - __authors = [("stickell", "l.stickell@yahoo.it")] + __description__ = """Goo.gl decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it")] API_URL = "https://www.googleapis.com/urlshortener/v1/url" diff --git a/pyload/plugin/crypter/HoerbuchIn.py b/pyload/plugin/crypter/HoerbuchIn.py index a809e756c..a12d7c02a 100644 --- a/pyload/plugin/crypter/HoerbuchIn.py +++ b/pyload/plugin/crypter/HoerbuchIn.py @@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter class HoerbuchIn(Crypter): - __name = "HoerbuchIn" - __type = "crypter" - __version = "0.60" + __name__ = "HoerbuchIn" + __type__ = "crypter" + __version__ = "0.60" - __pattern = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Hoerbuch.in decrypter plugin""" - __license = "GPLv3" - __authors = [("spoob", "spoob@pyload.org"), + __description__ = """Hoerbuch.in decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("spoob", "spoob@pyload.org"), ("mkaay", "mkaay@mkaay.de")] diff --git a/pyload/plugin/crypter/HotfileCom.py b/pyload/plugin/crypter/HotfileCom.py index 11e0008c5..72eec8f93 100644 --- a/pyload/plugin/crypter/HotfileCom.py +++ b/pyload/plugin/crypter/HotfileCom.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/ILoadTo.py b/pyload/plugin/crypter/ILoadTo.py index d012c9bfd..d3e50630c 100644 --- a/pyload/plugin/crypter/ILoadTo.py +++ b/pyload/plugin/crypter/ILoadTo.py @@ -4,16 +4,16 @@ from pyload.plugin.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", "")] + __description__ = """Iload.to decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("hzpz", "")] getInfo = create_getInfo(ILoadTo) diff --git a/pyload/plugin/crypter/ImgurComAlbum.py b/pyload/plugin/crypter/ImgurComAlbum.py index e7df57cb6..d2ca38d40 100644 --- a/pyload/plugin/crypter/ImgurComAlbum.py +++ b/pyload/plugin/crypter/ImgurComAlbum.py @@ -5,17 +5,17 @@ from pyload.utils import uniqify class ImgurComAlbum(SimpleCrypter): - __name = "ImgurComAlbum" - __type = "crypter" - __version = "0.51" + __name__ = "ImgurComAlbum" + __type__ = "crypter" + __version__ = "0.51" - __pattern = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Imgur.com decrypter plugin""" - __license = "GPLv3" - __authors = [("nath_schwarz", "nathan.notwhite@gmail.com")] + __description__ = """Imgur.com decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("nath_schwarz", "nathan.notwhite@gmail.com")] NAME_PATTERN = r'(?P<N>.+?) - Imgur' diff --git a/pyload/plugin/crypter/JunocloudMe.py b/pyload/plugin/crypter/JunocloudMe.py index b47a5fc58..97b3c7e39 100644 --- a/pyload/plugin/crypter/JunocloudMe.py +++ b/pyload/plugin/crypter/JunocloudMe.py @@ -4,17 +4,17 @@ from pyload.plugin.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/plugin/crypter/LetitbitNet.py b/pyload/plugin/crypter/LetitbitNet.py index ca787e31a..24bc196b3 100644 --- a/pyload/plugin/crypter/LetitbitNet.py +++ b/pyload/plugin/crypter/LetitbitNet.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter class LetitbitNet(Crypter): - __name = "LetitbitNet" - __type = "crypter" - __version = "0.10" + __name__ = "LetitbitNet" + __type__ = "crypter" + __version__ = "0.10" - __pattern = r'http://(?:www\.)?letitbit\.net/folder/\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?letitbit\.net/folder/\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Letitbit.net folder decrypter plugin""" - __license = "GPLv3" - __authors = [("DHMH", "webmaster@pcProfil.de"), + __description__ = """Letitbit.net folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("DHMH", "webmaster@pcProfil.de"), ("z00nx", "z00nx0@gmail.com")] diff --git a/pyload/plugin/crypter/LinkCryptWs.py b/pyload/plugin/crypter/LinkCryptWs.py index 2bd7b4c17..1173d84cd 100644 --- a/pyload/plugin/crypter/LinkCryptWs.py +++ b/pyload/plugin/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", ""), ("Gummibaer", "")] @@ -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/plugin/crypter/LinkSaveIn.py b/pyload/plugin/crypter/LinkSaveIn.py index 3d5a989eb..9b4af05f2 100644 --- a/pyload/plugin/crypter/LinkSaveIn.py +++ b/pyload/plugin/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/plugin/crypter/LinkdecrypterCom.py b/pyload/plugin/crypter/LinkdecrypterCom.py index 349e8b2d3..ab9bdbdc7 100644 --- a/pyload/plugin/crypter/LinkdecrypterCom.py +++ b/pyload/plugin/crypter/LinkdecrypterCom.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter class LinkdecrypterCom(Crypter): - __name = "LinkdecrypterCom" - __type = "crypter" - __version = "0.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", "")] diff --git a/pyload/plugin/crypter/LixIn.py b/pyload/plugin/crypter/LixIn.py index f992d38fd..0b4329d35 100644 --- a/pyload/plugin/crypter/LixIn.py +++ b/pyload/plugin/crypter/LixIn.py @@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter class LixIn(Crypter): - __name = "LixIn" - __type = "crypter" - __version = "0.22" + __name__ = "LixIn" + __type__ = "crypter" + __version__ = "0.22" - __pattern = r'http://(?:www\.)?lix\.in/(?P<ID>.+)' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?lix\.in/(?P<ID>.+)' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Lix.in decrypter plugin""" - __license = "GPLv3" - __authors = [("spoob", "spoob@pyload.org")] + __description__ = """Lix.in decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("spoob", "spoob@pyload.org")] CAPTCHA_PATTERN = r'<img src="(?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/plugin/crypter/LofCc.py b/pyload/plugin/crypter/LofCc.py index f1f4d1680..05917b522 100644 --- a/pyload/plugin/crypter/LofCc.py +++ b/pyload/plugin/crypter/LofCc.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/MBLinkInfo.py b/pyload/plugin/crypter/MBLinkInfo.py index 64eb57167..7f1561756 100644 --- a/pyload/plugin/crypter/MBLinkInfo.py +++ b/pyload/plugin/crypter/MBLinkInfo.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/MediafireCom.py b/pyload/plugin/crypter/MediafireCom.py index 036c41233..a7360a6db 100644 --- a/pyload/plugin/crypter/MediafireCom.py +++ b/pyload/plugin/crypter/MediafireCom.py @@ -7,17 +7,17 @@ from pyload.utils import json_loads class MediafireCom(Crypter): - __name = "MediafireCom" - __type = "crypter" - __version = "0.14" + __name__ = "MediafireCom" + __type__ = "crypter" + __version__ = "0.14" - __pattern = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Mediafire.com folder decrypter plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Mediafire.com folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] FOLDER_KEY_PATTERN = r'var afI= \'(\w+)' diff --git a/pyload/plugin/crypter/MegaRapidCz.py b/pyload/plugin/crypter/MegaRapidCz.py index 2cedfec09..79900c08a 100644 --- a/pyload/plugin/crypter/MegaRapidCz.py +++ b/pyload/plugin/crypter/MegaRapidCz.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class MegaRapidCz(SimpleCrypter): - __name = "MegaRapidCz" - __type = "crypter" - __version = "0.02" + __name__ = "MegaRapidCz" + __type__ = "crypter" + __version__ = "0.02" - __pattern = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Share-Rapid.com folder decrypter plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Share-Rapid.com folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] LINK_PATTERN = r'<td class="soubor"[^>]*><a href="([^"]+)">' diff --git a/pyload/plugin/crypter/MegauploadCom.py b/pyload/plugin/crypter/MegauploadCom.py index 5a4b2349e..6981cebc8 100644 --- a/pyload/plugin/crypter/MegauploadCom.py +++ b/pyload/plugin/crypter/MegauploadCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/crypter/Movie2kTo.py b/pyload/plugin/crypter/Movie2kTo.py index b481ead73..16a9850d9 100644 --- a/pyload/plugin/crypter/Movie2kTo.py +++ b/pyload/plugin/crypter/Movie2kTo.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/MultiUpOrg.py b/pyload/plugin/crypter/MultiUpOrg.py index 1b3116ad5..9ecbf6d53 100644 --- a/pyload/plugin/crypter/MultiUpOrg.py +++ b/pyload/plugin/crypter/MultiUpOrg.py @@ -7,24 +7,24 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class MultiUpOrg(SimpleCrypter): - __name = "MultiUpOrg" - __type = "crypter" - __version = "0.03" + __name__ = "MultiUpOrg" + __type__ = "crypter" + __version__ = "0.03" - __pattern = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|miror)/\w+(/\w+)?' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|miror)/\w+(/\w+)?' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """MultiUp.org decrypter plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """MultiUp.org decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] NAME_PATTERN = r'<title>.*(?:Project|Projet|ownload|élécharger) (?P<N>.+?) (\(|- )' def getLinks(self): - m_type = re.match(self.__pattern, self.pyfile.url).group("TYPE") + m_type = re.match(self.__pattern__, self.pyfile.url).group("TYPE") if m_type == "project": pattern = r'\n(http://www\.multiup\.org/(?:en|fr)/download/.*)' diff --git a/pyload/plugin/crypter/MultiloadCz.py b/pyload/plugin/crypter/MultiloadCz.py index a94c53d42..4229caa6e 100644 --- a/pyload/plugin/crypter/MultiloadCz.py +++ b/pyload/plugin/crypter/MultiloadCz.py @@ -5,19 +5,19 @@ from pyload.plugin.Crypter import Crypter class MultiloadCz(Crypter): - __name = "MultiloadCz" - __type = "crypter" - __version = "0.40" + __name__ = "MultiloadCz" + __type__ = "crypter" + __version__ = "0.40" - __pattern = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.*' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.*' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True), ("usedHoster", "str", "Prefered hoster list (bar-separated)", ""), ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")] - __description = """Multiload.cz decrypter plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Multiload.cz decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] FOLDER_PATTERN = r'<form action="" method="get"><textarea[^>]*>([^>]*)</textarea></form>' @@ -27,7 +27,7 @@ class MultiloadCz(Crypter): def decrypt(self, pyfile): self.html = self.load(pyfile.url, decode=True) - if re.match(self.__pattern, pyfile.url).group(1) == "slozka": + if re.match(self.__pattern__, pyfile.url).group(1) == "slozka": m = re.search(self.FOLDER_PATTERN, self.html) if m: self.urls.extend(m.group(1).split()) diff --git a/pyload/plugin/crypter/MultiuploadCom.py b/pyload/plugin/crypter/MultiuploadCom.py index 44c449d72..98708bd95 100644 --- a/pyload/plugin/crypter/MultiuploadCom.py +++ b/pyload/plugin/crypter/MultiuploadCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/crypter/NCryptIn.py b/pyload/plugin/crypter/NCryptIn.py index 22d8020f2..415e2785a 100644 --- a/pyload/plugin/crypter/NCryptIn.py +++ b/pyload/plugin/crypter/NCryptIn.py @@ -11,17 +11,17 @@ from pyload.plugin.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/plugin/crypter/NetfolderIn.py b/pyload/plugin/crypter/NetfolderIn.py index 279c99d94..876b2093f 100644 --- a/pyload/plugin/crypter/NetfolderIn.py +++ b/pyload/plugin/crypter/NetfolderIn.py @@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class NetfolderIn(SimpleCrypter): - __name = "NetfolderIn" - __type = "crypter" - __version = "0.72" + __name__ = "NetfolderIn" + __type__ = "crypter" + __version__ = "0.72" - __pattern = r'http://(?:www\.)?netfolder\.in/((?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/plugin/crypter/NosvideoCom.py b/pyload/plugin/crypter/NosvideoCom.py index a9f29cf74..d048ec956 100644 --- a/pyload/plugin/crypter/NosvideoCom.py +++ b/pyload/plugin/crypter/NosvideoCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class NosvideoCom(SimpleCrypter): - __name = "NosvideoCom" - __type = "crypter" - __version = "0.03" + __name__ = "NosvideoCom" + __type__ = "crypter" + __version__ = "0.03" - __pattern = r'http://(?:www\.)?nosvideo\.com/\?v=\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?nosvideo\.com/\?v=\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Nosvideo.com decrypter plugin""" - __license = "GPLv3" - __authors = [("igel", "igelkun@myopera.com")] + __description__ = """Nosvideo.com decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("igel", "igelkun@myopera.com")] LINK_PATTERN = r'href="(http://(?:w{3}\.)?nosupload\.com/\?d=\w+)"' diff --git a/pyload/plugin/crypter/OneKhDe.py b/pyload/plugin/crypter/OneKhDe.py index c3e5a6a3b..aad7901aa 100644 --- a/pyload/plugin/crypter/OneKhDe.py +++ b/pyload/plugin/crypter/OneKhDe.py @@ -7,17 +7,17 @@ from pyload.plugin.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/plugin/crypter/OronCom.py b/pyload/plugin/crypter/OronCom.py index 24c941f19..42483c497 100644 --- a/pyload/plugin/crypter/OronCom.py +++ b/pyload/plugin/crypter/OronCom.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/PastebinCom.py b/pyload/plugin/crypter/PastebinCom.py index 95c925733..43a818cf1 100644 --- a/pyload/plugin/crypter/PastebinCom.py +++ b/pyload/plugin/crypter/PastebinCom.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class PastebinCom(SimpleCrypter): - __name = "PastebinCom" - __type = "crypter" - __version = "0.03" + __name__ = "PastebinCom" + __type__ = "crypter" + __version__ = "0.03" - __pattern = r'http://(?:www\.)?pastebin\.com/\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?pastebin\.com/\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Pastebin.com decrypter plugin""" - __license = "GPLv3" - __authors = [("stickell", "l.stickell@yahoo.it")] + __description__ = """Pastebin.com decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it")] LINK_PATTERN = r'<div class="de\d+">(https?://[^ <]+)(?:[^<]*)</div>' diff --git a/pyload/plugin/crypter/QuickshareCz.py b/pyload/plugin/crypter/QuickshareCz.py index 5bb68c960..05a85a29c 100644 --- a/pyload/plugin/crypter/QuickshareCz.py +++ b/pyload/plugin/crypter/QuickshareCz.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter class QuickshareCz(Crypter): - __name = "QuickshareCz" - __type = "crypter" - __version = "0.10" + __name__ = "QuickshareCz" + __type__ = "crypter" + __version__ = "0.10" - __pattern = r'http://(?:www\.)?quickshare\.cz/slozka-\d+.*' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?quickshare\.cz/slozka-\d+.*' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Quickshare.cz folder decrypter plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Quickshare.cz folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] FOLDER_PATTERN = r'<textarea[^>]*>(.*?)</textarea>' diff --git a/pyload/plugin/crypter/RSLayerCom.py b/pyload/plugin/crypter/RSLayerCom.py index 934b3cac8..ebd3c509c 100644 --- a/pyload/plugin/crypter/RSLayerCom.py +++ b/pyload/plugin/crypter/RSLayerCom.py @@ -4,16 +4,16 @@ from pyload.plugin.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", "")] + __description__ = """RS-Layer.com decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("hzpz", "")] getInfo = create_getInfo(RSLayerCom) diff --git a/pyload/plugin/crypter/RapidfileshareNet.py b/pyload/plugin/crypter/RapidfileshareNet.py index 7003f017e..1d149dae9 100644 --- a/pyload/plugin/crypter/RapidfileshareNet.py +++ b/pyload/plugin/crypter/RapidfileshareNet.py @@ -4,17 +4,17 @@ from pyload.plugin.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/plugin/crypter/RelinkUs.py b/pyload/plugin/crypter/RelinkUs.py index 1773f6a22..1e0f8e371 100644 --- a/pyload/plugin/crypter/RelinkUs.py +++ b/pyload/plugin/crypter/RelinkUs.py @@ -12,17 +12,17 @@ from pyload.plugin.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/plugin/crypter/SafelinkingNet.py b/pyload/plugin/crypter/SafelinkingNet.py index 1b5eeeb63..c466d8bb6 100644 --- a/pyload/plugin/crypter/SafelinkingNet.py +++ b/pyload/plugin/crypter/SafelinkingNet.py @@ -10,17 +10,17 @@ from pyload.plugin.internal.captcha import SolveMedia class SafelinkingNet(Crypter): - __name = "SafelinkingNet" - __type = "crypter" - __version = "0.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.-]+)';" @@ -29,7 +29,7 @@ class SafelinkingNet(Crypter): def decrypt(self, pyfile): url = pyfile.url - if re.match(self.__pattern, url).group(1) == "d": + if re.match(self.__pattern__, url).group(1) == "d": header = self.load(url, just_header=True) if 'location' in header: diff --git a/pyload/plugin/crypter/SecuredIn.py b/pyload/plugin/crypter/SecuredIn.py index a5e12a352..9aee9e52e 100644 --- a/pyload/plugin/crypter/SecuredIn.py +++ b/pyload/plugin/crypter/SecuredIn.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/SexuriaCom.py b/pyload/plugin/crypter/SexuriaCom.py index 08f289541..10101cd7a 100644 --- a/pyload/plugin/crypter/SexuriaCom.py +++ b/pyload/plugin/crypter/SexuriaCom.py @@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter class SexuriaCom(Crypter): - __name = "SexuriaCom" - __type = "crypter" - __version = "0.01" + __name__ = "SexuriaCom" + __type__ = "crypter" + __version__ = "0.01" - __pattern = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Sexuria.com decrypter plugin""" - __license = "GPLv3" - __authors = [("NETHead", "NETHead.AT.gmx.DOT.net")] + __description__ = """Sexuria.com decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("NETHead", "NETHead.AT.gmx.DOT.net")] PATTERN_SUPPORTED_MAIN = re.compile(r'http://(www\.)?sexuria\.com/(v1/)?Pornos_Kostenlos_.+?_(\d+)\.html', flags=re.I) diff --git a/pyload/plugin/crypter/ShareLinksBiz.py b/pyload/plugin/crypter/ShareLinksBiz.py index b3f8f8b75..333e2d8d8 100644 --- a/pyload/plugin/crypter/ShareLinksBiz.py +++ b/pyload/plugin/crypter/ShareLinksBiz.py @@ -9,17 +9,17 @@ from pyload.plugin.Crypter import Crypter class ShareLinksBiz(Crypter): - __name = "ShareLinksBiz" - __type = "crypter" - __version = "1.14" + __name__ = "ShareLinksBiz" + __type__ = "crypter" + __version__ = "1.14" - __pattern = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Share-Links.biz decrypter plugin""" - __license = "GPLv3" - __authors = [("fragonib", "fragonib[AT]yahoo[DOT]es")] + __description__ = """Share-Links.biz decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es")] def setup(self): @@ -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/plugin/crypter/SharingmatrixCom.py b/pyload/plugin/crypter/SharingmatrixCom.py index 53f1afa32..be23ada49 100644 --- a/pyload/plugin/crypter/SharingmatrixCom.py +++ b/pyload/plugin/crypter/SharingmatrixCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/crypter/SpeedLoadOrg.py b/pyload/plugin/crypter/SpeedLoadOrg.py index e40d321be..190ec66eb 100644 --- a/pyload/plugin/crypter/SpeedLoadOrg.py +++ b/pyload/plugin/crypter/SpeedLoadOrg.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/StealthTo.py b/pyload/plugin/crypter/StealthTo.py index 0d05c3c64..8513fb3f8 100644 --- a/pyload/plugin/crypter/StealthTo.py +++ b/pyload/plugin/crypter/StealthTo.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/TnyCz.py b/pyload/plugin/crypter/TnyCz.py index 19427b845..d73f6de63 100644 --- a/pyload/plugin/crypter/TnyCz.py +++ b/pyload/plugin/crypter/TnyCz.py @@ -6,17 +6,17 @@ import re class TnyCz(SimpleCrypter): - __name = "TnyCz" - __type = "crypter" - __version = "0.03" + __name__ = "TnyCz" + __type__ = "crypter" + __version__ = "0.03" - __pattern = r'http://(?:www\.)?tny\.cz/\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?tny\.cz/\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Tny.cz decrypter plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Tny.cz decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] NAME_PATTERN = r'<title>(?P<N>.+) - .+</title>' diff --git a/pyload/plugin/crypter/TrailerzoneInfo.py b/pyload/plugin/crypter/TrailerzoneInfo.py index 106524f1c..c19a5e693 100644 --- a/pyload/plugin/crypter/TrailerzoneInfo.py +++ b/pyload/plugin/crypter/TrailerzoneInfo.py @@ -4,16 +4,16 @@ from pyload.plugin.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/plugin/crypter/TurbobitNet.py b/pyload/plugin/crypter/TurbobitNet.py index 0ea49c694..a1309c083 100644 --- a/pyload/plugin/crypter/TurbobitNet.py +++ b/pyload/plugin/crypter/TurbobitNet.py @@ -7,17 +7,17 @@ from pyload.utils import json_loads class TurbobitNet(SimpleCrypter): - __name = "TurbobitNet" - __type = "crypter" - __version = "0.05" + __name__ = "TurbobitNet" + __type__ = "crypter" + __version__ = "0.05" - __pattern = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Turbobit.net folder decrypter plugin""" - __license = "GPLv3" - __authors = [("stickell", "l.stickell@yahoo.it"), + __description__ = """Turbobit.net folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it"), ("Walter Purcaro", "vuolter@gmail.com")] @@ -39,6 +39,6 @@ class TurbobitNet(SimpleCrypter): def getLinks(self): - id = re.match(self.__pattern, self.pyfile.url).group("ID") + id = re.match(self.__pattern__, self.pyfile.url).group("ID") fixurl = lambda id: "http://turbobit.net/%s.html" % id return map(fixurl, self._getLinks(id)) diff --git a/pyload/plugin/crypter/TusfilesNet.py b/pyload/plugin/crypter/TusfilesNet.py index 55b9c5deb..88ff941b2 100644 --- a/pyload/plugin/crypter/TusfilesNet.py +++ b/pyload/plugin/crypter/TusfilesNet.py @@ -8,17 +8,17 @@ from pyload.plugin.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/plugin/crypter/UlozTo.py b/pyload/plugin/crypter/UlozTo.py index d886c9d08..99956ef41 100644 --- a/pyload/plugin/crypter/UlozTo.py +++ b/pyload/plugin/crypter/UlozTo.py @@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter class UlozTo(Crypter): - __name = "UlozTo" - __type = "crypter" - __version = "0.20" + __name__ = "UlozTo" + __type__ = "crypter" + __version__ = "0.20" - __pattern = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.*' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.*' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Uloz.to folder decrypter plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Uloz.to folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] FOLDER_PATTERN = r'<ul class="profile_files">(.*?)</ul>' diff --git a/pyload/plugin/crypter/UploadableCh.py b/pyload/plugin/crypter/UploadableCh.py index bf6bd09eb..f5fb0c3bc 100644 --- a/pyload/plugin/crypter/UploadableCh.py +++ b/pyload/plugin/crypter/UploadableCh.py @@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class UploadableCh(SimpleCrypter): - __name = "UploadableCh" - __type = "crypter" - __version = "0.03" + __name__ = "UploadableCh" + __type__ = "crypter" + __version__ = "0.03" - __pattern = r'http://(?:www\.)?uploadable\.ch/list/\w+' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?uploadable\.ch/list/\w+' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Uploadable.ch folder decrypter plugin""" - __license = "GPLv3" - __authors = [("guidobelix", "guidobelix@hotmail.it"), + __description__ = """Uploadable.ch folder decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("guidobelix", "guidobelix@hotmail.it"), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/crypter/UploadedTo.py b/pyload/plugin/crypter/UploadedTo.py index fbae7e7d6..1223d32fe 100644 --- a/pyload/plugin/crypter/UploadedTo.py +++ b/pyload/plugin/crypter/UploadedTo.py @@ -8,17 +8,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class UploadedTo(SimpleCrypter): - __name = "UploadedTo" - __type = "crypter" - __version = "0.42" + __name__ = "UploadedTo" + __type__ = "crypter" + __version__ = "0.42" - __pattern = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<id>\w+)' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<id>\w+)' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """UploadedTo decrypter plugin""" - __license = "GPLv3" - __authors = [("stickell", "l.stickell@yahoo.it")] + __description__ = """UploadedTo decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it")] PLAIN_PATTERN = r'<small class="date"><a href="(?P<plain>[\w/]+)" onclick=' diff --git a/pyload/plugin/crypter/WiiReloadedOrg.py b/pyload/plugin/crypter/WiiReloadedOrg.py index 66ef764e4..7b4270e65 100644 --- a/pyload/plugin/crypter/WiiReloadedOrg.py +++ b/pyload/plugin/crypter/WiiReloadedOrg.py @@ -4,16 +4,16 @@ from pyload.plugin.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", "")] + __description__ = """Wii-Reloaded.org decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("hzpz", "")] getInfo = create_getInfo(WiiReloadedOrg) diff --git a/pyload/plugin/crypter/WuploadCom.py b/pyload/plugin/crypter/WuploadCom.py index ad1a789a0..0a098a40c 100644 --- a/pyload/plugin/crypter/WuploadCom.py +++ b/pyload/plugin/crypter/WuploadCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/crypter/XFileSharingPro.py b/pyload/plugin/crypter/XFileSharingPro.py index eedf7ab26..7cf3cde57 100644 --- a/pyload/plugin/crypter/XFileSharingPro.py +++ b/pyload/plugin/crypter/XFileSharingPro.py @@ -6,31 +6,31 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter class XFileSharingPro(XFSCrypter): - __name = "XFileSharingPro" - __type = "crypter" - __version = "0.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/plugin/crypter/XupPl.py b/pyload/plugin/crypter/XupPl.py index 233d96534..b5c8fd6e2 100644 --- a/pyload/plugin/crypter/XupPl.py +++ b/pyload/plugin/crypter/XupPl.py @@ -4,17 +4,17 @@ from pyload.plugin.Crypter import Crypter class XupPl(Crypter): - __name = "XupPl" - __type = "crypter" - __version = "0.10" + __name__ = "XupPl" + __type__ = "crypter" + __version__ = "0.10" - __pattern = r'https?://(?:[^/]*\.)?xup\.pl/.*' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'https?://(?:[^/]*\.)?xup\.pl/.*' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] - __description = """Xup.pl decrypter plugin""" - __license = "GPLv3" - __authors = [("z00nx", "z00nx0@gmail.com")] + __description__ = """Xup.pl decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("z00nx", "z00nx0@gmail.com")] def decrypt(self, pyfile): diff --git a/pyload/plugin/crypter/YoutubeBatch.py b/pyload/plugin/crypter/YoutubeBatch.py index 8f23b0149..2bc1b799e 100644 --- a/pyload/plugin/crypter/YoutubeBatch.py +++ b/pyload/plugin/crypter/YoutubeBatch.py @@ -10,20 +10,20 @@ from pyload.utils import safe_join class YoutubeBatch(Crypter): - __name = "YoutubeBatch" - __type = "crypter" - __version = "1.01" + __name__ = "YoutubeBatch" + __type__ = "crypter" + __version__ = "1.01" - __pattern = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w-]+)' - __config = [("use_subfolder", "bool", "Save package to subfolder", True), + __pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w-]+)' + __config__ = [("use_subfolder", "bool", "Save package to subfolder", True), ("subfolder_per_package", "bool", "Create a subfolder for each package", True), ("likes", "bool", "Grab user (channel) liked videos", False), ("favorites", "bool", "Grab user (channel) favorite videos", False), ("uploads", "bool", "Grab channel unplaylisted videos", True)] - __description = """Youtube.com channel & playlist decrypter plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Youtube.com channel & playlist decrypter plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] API_KEY = "AIzaSyCKnWLNlkX-L4oD1aEzqqhRw1zczeD6_k0" @@ -95,7 +95,7 @@ class YoutubeBatch(Crypter): def decrypt(self, pyfile): - m = re.match(self.__pattern, pyfile.url) + m = re.match(self.__pattern__, pyfile.url) m_id = m.group("ID") m_type = m.group("TYPE") diff --git a/pyload/plugin/hook/AlldebridCom.py b/pyload/plugin/hook/AlldebridCom.py index 3297c12e3..5d4a2f4f4 100644 --- a/pyload/plugin/hook/AlldebridCom.py +++ b/pyload/plugin/hook/AlldebridCom.py @@ -5,19 +5,19 @@ from pyload.plugin.internal.MultiHoster import MultiHoster class AlldebridCom(MultiHoster): - __name = "AlldebridCom" - __type = "hook" - __version = "0.13" + __name__ = "AlldebridCom" + __type__ = "hook" + __version__ = "0.13" - __config = [("https", "bool", "Enable HTTPS", False), + __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")] + __description__ = """Alldebrid.com hook plugin""" + __license__ = "GPLv3" + __authors__ = [("Andy Voigt", "spamsales@online.de")] def getHoster(self): diff --git a/pyload/plugin/hook/BypassCaptcha.py b/pyload/plugin/hook/BypassCaptcha.py index 20a1582cc..038d7db79 100644 --- a/pyload/plugin/hook/BypassCaptcha.py +++ b/pyload/plugin/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), + __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/plugin/hook/Captcha9kw.py b/pyload/plugin/hook/Captcha9kw.py index dafbf72b3..a74983d9b 100644 --- a/pyload/plugin/hook/Captcha9kw.py +++ b/pyload/plugin/hook/Captcha9kw.py @@ -14,11 +14,11 @@ from pyload.plugin.Addon import Addon class Captcha9kw(Addon): - __name = "Captcha9kw" - __type = "hook" - __version = "0.26" + __name__ = "Captcha9kw" + __type__ = "hook" + __version__ = "0.26" - __config = [("ssl" , "bool" , "Use HTTPS" , True ), + __config__ = [("ssl" , "bool" , "Use HTTPS" , True ), ("force" , "bool" , "Force captcha resolving even if client is connected" , True ), ("confirm" , "bool" , "Confirm Captcha (cost +6 credits)" , False ), ("captchaperhour", "int" , "Captcha per hour" , "9999" ), @@ -30,9 +30,9 @@ class Captcha9kw(Addon): ("passkey" , "password", "API key" , "" ), ("timeout" , "int" , "Timeout in seconds (min 60, max 3999)" , "900" )] - __description = """Send captchas to 9kw.eu""" - __license = "GPLv3" - __authors = [("RaNaN", "RaNaN@pyload.org"), + __description__ = """Send captchas to 9kw.eu""" + __license__ = "GPLv3" + __authors__ = [("RaNaN", "RaNaN@pyload.org"), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hook/CaptchaBrotherhood.py b/pyload/plugin/hook/CaptchaBrotherhood.py index d01d262f2..7bbd85659 100644 --- a/pyload/plugin/hook/CaptchaBrotherhood.py +++ b/pyload/plugin/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", ""), + __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/plugin/hook/DeathByCaptcha.py b/pyload/plugin/hook/DeathByCaptcha.py index 92bfa1e70..9460a0cee 100644 --- a/pyload/plugin/hook/DeathByCaptcha.py +++ b/pyload/plugin/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", ""), + __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/plugin/hook/DebridItaliaCom.py b/pyload/plugin/hook/DebridItaliaCom.py index bce99abb2..ba3bff71e 100644 --- a/pyload/plugin/hook/DebridItaliaCom.py +++ b/pyload/plugin/hook/DebridItaliaCom.py @@ -7,18 +7,18 @@ from pyload.plugin.internal.MultiHoster import MultiHoster class DebridItaliaCom(MultiHoster): - __name = "DebridItaliaCom" - __type = "hook" - __version = "0.08" + __name__ = "DebridItaliaCom" + __type__ = "hook" + __version__ = "0.08" - __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + __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"), + __description__ = """Debriditalia.com hook plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it"), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hook/EasybytezCom.py b/pyload/plugin/hook/EasybytezCom.py index b401809fb..e5e012976 100644 --- a/pyload/plugin/hook/EasybytezCom.py +++ b/pyload/plugin/hook/EasybytezCom.py @@ -6,20 +6,20 @@ from pyload.plugin.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"), + __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/plugin/hook/ExpertDecoders.py b/pyload/plugin/hook/ExpertDecoders.py index ed8edbf69..37bb4fbbe 100644 --- a/pyload/plugin/hook/ExpertDecoders.py +++ b/pyload/plugin/hook/ExpertDecoders.py @@ -12,16 +12,16 @@ from pyload.plugin.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), + __config__ = [("force", "bool", "Force CT even if client is connected", False), ("passkey", "password", "Access key", "")] - __description = """Send captchas to expertdecoders.com""" - __license = "GPLv3" - __authors = [("RaNaN", "RaNaN@pyload.org"), + __description__ = """Send captchas to expertdecoders.com""" + __license__ = "GPLv3" + __authors__ = [("RaNaN", "RaNaN@pyload.org"), ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hook/FastixRu.py b/pyload/plugin/hook/FastixRu.py index 4bfec052e..4b840e9b4 100644 --- a/pyload/plugin/hook/FastixRu.py +++ b/pyload/plugin/hook/FastixRu.py @@ -6,17 +6,17 @@ from pyload.plugin.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"), + __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/plugin/hook/FreeWayMe.py b/pyload/plugin/hook/FreeWayMe.py index 910c9d640..f901b4ec0 100644 --- a/pyload/plugin/hook/FreeWayMe.py +++ b/pyload/plugin/hook/FreeWayMe.py @@ -5,18 +5,18 @@ from pyload.plugin.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"), + __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/plugin/hook/ImageTyperz.py b/pyload/plugin/hook/ImageTyperz.py index 4ad37eb89..6ac75b1a1 100644 --- a/pyload/plugin/hook/ImageTyperz.py +++ b/pyload/plugin/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", ""), + __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/plugin/hook/LinkdecrypterCom.py b/pyload/plugin/hook/LinkdecrypterCom.py index 6465d95e0..fff596386 100644 --- a/pyload/plugin/hook/LinkdecrypterCom.py +++ b/pyload/plugin/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 activate(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/plugin/hook/LinksnappyCom.py b/pyload/plugin/hook/LinksnappyCom.py index 487927724..f3c9ccaad 100644 --- a/pyload/plugin/hook/LinksnappyCom.py +++ b/pyload/plugin/hook/LinksnappyCom.py @@ -6,18 +6,18 @@ from pyload.plugin.internal.MultiHoster import MultiHoster class LinksnappyCom(MultiHoster): - __name = "LinksnappyCom" - __type = "hook" - __version = "0.01" + __name__ = "LinksnappyCom" + __type__ = "hook" + __version__ = "0.01" - __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + __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")] + __description__ = """Linksnappy.com hook plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it")] def getHoster(self): diff --git a/pyload/plugin/hook/MegaDebridEu.py b/pyload/plugin/hook/MegaDebridEu.py index 88a3bbe49..a125481c4 100644 --- a/pyload/plugin/hook/MegaDebridEu.py +++ b/pyload/plugin/hook/MegaDebridEu.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hook/MultishareCz.py b/pyload/plugin/hook/MultishareCz.py index 58f721df2..791f65f6d 100644 --- a/pyload/plugin/hook/MultishareCz.py +++ b/pyload/plugin/hook/MultishareCz.py @@ -7,16 +7,16 @@ from pyload.plugin.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"), + __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/plugin/hook/MyfastfileCom.py b/pyload/plugin/hook/MyfastfileCom.py index c9b3b2638..9e3709556 100644 --- a/pyload/plugin/hook/MyfastfileCom.py +++ b/pyload/plugin/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"), + __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/plugin/hook/OverLoadMe.py b/pyload/plugin/hook/OverLoadMe.py index 51d0b1dc1..93052c014 100644 --- a/pyload/plugin/hook/OverLoadMe.py +++ b/pyload/plugin/hook/OverLoadMe.py @@ -5,19 +5,19 @@ from pyload.plugin.internal.MultiHoster import MultiHoster class OverLoadMe(MultiHoster): - __name = "OverLoadMe" - __type = "hook" - __version = "0.01" + __name__ = "OverLoadMe" + __type__ = "hook" + __version__ = "0.01" - __config = [("https", "bool", "Enable HTTPS", True), + __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")] + __description__ = """Over-Load.me hook plugin""" + __license__ = "GPLv3" + __authors__ = [("marley", "marley@over-load.me")] def getHoster(self): diff --git a/pyload/plugin/hook/PremiumTo.py b/pyload/plugin/hook/PremiumTo.py index 25fb70e8d..08c3dc6bd 100644 --- a/pyload/plugin/hook/PremiumTo.py +++ b/pyload/plugin/hook/PremiumTo.py @@ -5,16 +5,16 @@ from pyload.plugin.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"), + __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/plugin/hook/PremiumizeMe.py b/pyload/plugin/hook/PremiumizeMe.py index 981c671b9..5199adc2f 100644 --- a/pyload/plugin/hook/PremiumizeMe.py +++ b/pyload/plugin/hook/PremiumizeMe.py @@ -6,18 +6,18 @@ from pyload.plugin.internal.MultiHoster import MultiHoster class PremiumizeMe(MultiHoster): - __name = "PremiumizeMe" - __type = "hook" - __version = "0.12" + __name__ = "PremiumizeMe" + __type__ = "hook" + __version__ = "0.12" - __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), + __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")] + __description__ = """Premiumize.me hook plugin""" + __license__ = "GPLv3" + __authors__ = [("Florian Franzen", "FlorianFranzen@gmail.com")] def getHoster(self): diff --git a/pyload/plugin/hook/RPNetBiz.py b/pyload/plugin/hook/RPNetBiz.py index b976aa262..f58387dda 100644 --- a/pyload/plugin/hook/RPNetBiz.py +++ b/pyload/plugin/hook/RPNetBiz.py @@ -6,18 +6,18 @@ from pyload.plugin.internal.MultiHoster import MultiHoster class RPNetBiz(MultiHoster): - __name = "RPNetBiz" - __type = "hook" - __version = "0.10" + __name__ = "RPNetBiz" + __type__ = "hook" + __version__ = "0.10" - __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported):", "all"), + __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")] + __description__ = """RPNet.biz hook plugin""" + __license__ = "GPLv3" + __authors__ = [("Dman", "dmanugm@gmail.com")] def getHoster(self): diff --git a/pyload/plugin/hook/RealdebridCom.py b/pyload/plugin/hook/RealdebridCom.py index 2584132b8..a7e3a08cd 100644 --- a/pyload/plugin/hook/RealdebridCom.py +++ b/pyload/plugin/hook/RealdebridCom.py @@ -5,19 +5,19 @@ from pyload.plugin.internal.MultiHoster import MultiHoster class RealdebridCom(MultiHoster): - __name = "RealdebridCom" - __type = "hook" - __version = "0.43" + __name__ = "RealdebridCom" + __type__ = "hook" + __version__ = "0.43" - __config = [("https", "bool", "Enable HTTPS", False), + __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")] + __description__ = """Real-Debrid.com hook plugin""" + __license__ = "GPLv3" + __authors__ = [("Devirex Hazzard", "naibaf_11@yahoo.de")] def getHoster(self): diff --git a/pyload/plugin/hook/RehostTo.py b/pyload/plugin/hook/RehostTo.py index fd51bad12..cf993a79b 100644 --- a/pyload/plugin/hook/RehostTo.py +++ b/pyload/plugin/hook/RehostTo.py @@ -5,18 +5,18 @@ from pyload.plugin.internal.MultiHoster import MultiHoster class RehostTo(MultiHoster): - __name = "RehostTo" - __type = "hook" - __version = "0.43" + __name__ = "RehostTo" + __type__ = "hook" + __version__ = "0.43" - __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + __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")] + __description__ = """Rehost.to hook plugin""" + __license__ = "GPLv3" + __authors__ = [("RaNaN", "RaNaN@pyload.org")] def getHoster(self): diff --git a/pyload/plugin/hook/SimplyPremiumCom.py b/pyload/plugin/hook/SimplyPremiumCom.py index e71a7a1c8..1e280eca2 100644 --- a/pyload/plugin/hook/SimplyPremiumCom.py +++ b/pyload/plugin/hook/SimplyPremiumCom.py @@ -6,18 +6,18 @@ from pyload.plugin.internal.MultiHoster import MultiHoster class SimplyPremiumCom(MultiHoster): - __name = "SimplyPremiumCom" - __type = "hook" - __version = "0.02" + __name__ = "SimplyPremiumCom" + __type__ = "hook" + __version__ = "0.02" - __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + __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")] + __description__ = """Simply-Premium.com hook plugin""" + __license__ = "GPLv3" + __authors__ = [("EvolutionClip", "evolutionclip@live.de")] def getHoster(self): diff --git a/pyload/plugin/hook/SimplydebridCom.py b/pyload/plugin/hook/SimplydebridCom.py index 6283032e5..650de5545 100644 --- a/pyload/plugin/hook/SimplydebridCom.py +++ b/pyload/plugin/hook/SimplydebridCom.py @@ -5,16 +5,16 @@ from pyload.plugin.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"), + __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/plugin/hook/UnrestrictLi.py b/pyload/plugin/hook/UnrestrictLi.py index a478545d6..8a3b2a040 100644 --- a/pyload/plugin/hook/UnrestrictLi.py +++ b/pyload/plugin/hook/UnrestrictLi.py @@ -6,19 +6,19 @@ from pyload.plugin.internal.MultiHoster import MultiHoster class UnrestrictLi(MultiHoster): - __name = "UnrestrictLi" - __type = "hook" - __version = "0.02" + __name__ = "UnrestrictLi" + __type__ = "hook" + __version__ = "0.02" - __config = [("hosterListMode", "all;listed;unlisted", "Use for hosters (if supported)", "all"), + __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")] + __description__ = """Unrestrict.li hook plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it")] def getHoster(self): diff --git a/pyload/plugin/hook/XFileSharingPro.py b/pyload/plugin/hook/XFileSharingPro.py index b478245dc..8fb04cf13 100644 --- a/pyload/plugin/hook/XFileSharingPro.py +++ b/pyload/plugin/hook/XFileSharingPro.py @@ -6,20 +6,20 @@ from pyload.plugin.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 ), + __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/plugin/hook/ZeveraCom.py b/pyload/plugin/hook/ZeveraCom.py index af93f1a7f..e41796a1a 100644 --- a/pyload/plugin/hook/ZeveraCom.py +++ b/pyload/plugin/hook/ZeveraCom.py @@ -5,16 +5,16 @@ from pyload.plugin.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"), + __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/plugin/hoster/AlldebridCom.py b/pyload/plugin/hoster/AlldebridCom.py index 03efde803..533f7beb6 100644 --- a/pyload/plugin/hoster/AlldebridCom.py +++ b/pyload/plugin/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/plugin/hoster/BayfilesCom.py b/pyload/plugin/hoster/BayfilesCom.py index 3a139a796..4f2469759 100644 --- a/pyload/plugin/hoster/BayfilesCom.py +++ b/pyload/plugin/hoster/BayfilesCom.py @@ -9,15 +9,15 @@ from pyload.plugin.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/plugin/hoster/BezvadataCz.py b/pyload/plugin/hoster/BezvadataCz.py index 2f28aebf5..0b65c9e8b 100644 --- a/pyload/plugin/hoster/BezvadataCz.py +++ b/pyload/plugin/hoster/BezvadataCz.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/BillionuploadsCom.py b/pyload/plugin/hoster/BillionuploadsCom.py index aa987a9bb..43fc1f4af 100644 --- a/pyload/plugin/hoster/BillionuploadsCom.py +++ b/pyload/plugin/hoster/BillionuploadsCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/BitshareCom.py b/pyload/plugin/hoster/BitshareCom.py index 3081451f7..781f31df1 100644 --- a/pyload/plugin/hoster/BitshareCom.py +++ b/pyload/plugin/hoster/BitshareCom.py @@ -9,15 +9,15 @@ from pyload.plugin.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", ""), + __description__ = """Bitshare.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("Paul King", ""), ("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/plugin/hoster/BoltsharingCom.py b/pyload/plugin/hoster/BoltsharingCom.py index a84a60aeb..93f6d619a 100644 --- a/pyload/plugin/hoster/BoltsharingCom.py +++ b/pyload/plugin/hoster/BoltsharingCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/CatShareNet.py b/pyload/plugin/hoster/CatShareNet.py index e3d12c10e..2a2fb55da 100644 --- a/pyload/plugin/hoster/CatShareNet.py +++ b/pyload/plugin/hoster/CatShareNet.py @@ -7,15 +7,15 @@ from pyload.plugin.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", ""), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/CloudzerNet.py b/pyload/plugin/hoster/CloudzerNet.py index d499b46b4..cb764e335 100644 --- a/pyload/plugin/hoster/CloudzerNet.py +++ b/pyload/plugin/hoster/CloudzerNet.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/CramitIn.py b/pyload/plugin/hoster/CramitIn.py index d4c80c0d4..f39f33a3e 100644 --- a/pyload/plugin/hoster/CramitIn.py +++ b/pyload/plugin/hoster/CramitIn.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/CrockoCom.py b/pyload/plugin/hoster/CrockoCom.py index 892f5a354..f12b2e969 100644 --- a/pyload/plugin/hoster/CrockoCom.py +++ b/pyload/plugin/hoster/CrockoCom.py @@ -7,15 +7,15 @@ from pyload.plugin.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/plugin/hoster/CyberlockerCh.py b/pyload/plugin/hoster/CyberlockerCh.py index 75262a805..1c6a04caf 100644 --- a/pyload/plugin/hoster/CyberlockerCh.py +++ b/pyload/plugin/hoster/CyberlockerCh.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/CzshareCom.py b/pyload/plugin/hoster/CzshareCom.py index 2297450e4..ad4e36ce7 100644 --- a/pyload/plugin/hoster/CzshareCom.py +++ b/pyload/plugin/hoster/CzshareCom.py @@ -10,15 +10,15 @@ from pyload.utils import parseFileSize class CzshareCom(SimpleHoster): - __name = "CzshareCom" - __type = "hoster" - __version = "0.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/plugin/hoster/DailymotionCom.py b/pyload/plugin/hoster/DailymotionCom.py index d05f2f74c..84d002e9c 100644 --- a/pyload/plugin/hoster/DailymotionCom.py +++ b/pyload/plugin/hoster/DailymotionCom.py @@ -10,7 +10,7 @@ from pyload.plugin.Hoster import Hoster def getInfo(urls): result = [] - regex = re.compile(DailymotionCom.__pattern) + regex = re.compile(DailymotionCom.__pattern__) apiurl = "https://api.dailymotion.com/video/%s" request = {"fields": "access_error,status,title"} @@ -38,16 +38,16 @@ def getInfo(urls): class DailymotionCom(Hoster): - __name = "DailymotionCom" - __type = "hoster" - __version = "0.20" + __name__ = "DailymotionCom" + __type__ = "hoster" + __version__ = "0.20" - __pattern = r'https?://(?:www\.)?dailymotion\.com/.*video/(?P<ID>[\w^_]+)' - __config = [("quality", "Lowest;LD 144p;LD 240p;SD 384p;HQ 480p;HD 720p;HD 1080p;Highest", "Quality", "Highest")] + __pattern__ = r'https?://(?:www\.)?dailymotion\.com/.*video/(?P<ID>[\w^_]+)' + __config__ = [("quality", "Lowest;LD 144p;LD 240p;SD 384p;HQ 480p;HD 720p;HD 1080p;Highest", "Quality", "Highest")] - __description = """Dailymotion.com hoster plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """Dailymotion.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] def setup(self): @@ -116,7 +116,7 @@ class DailymotionCom(Hoster): def process(self, pyfile): self.checkInfo(pyfile) - id = re.match(self.__pattern, pyfile.url).group("ID") + id = re.match(self.__pattern__, pyfile.url).group("ID") self.html = self.load("http://www.dailymotion.com/embed/video/" + id, decode=True) streams = self.getStreams() diff --git a/pyload/plugin/hoster/DataHu.py b/pyload/plugin/hoster/DataHu.py index 61456de61..49e6e1aa2 100644 --- a/pyload/plugin/hoster/DataHu.py +++ b/pyload/plugin/hoster/DataHu.py @@ -9,15 +9,15 @@ from pyload.plugin.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", ""), + __description__ = """Data.hu hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("crash", ""), ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/DataportCz.py b/pyload/plugin/hoster/DataportCz.py index a5b03afc3..d06207257 100644 --- a/pyload/plugin/hoster/DataportCz.py +++ b/pyload/plugin/hoster/DataportCz.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/DateiTo.py b/pyload/plugin/hoster/DateiTo.py index 75fca8829..1d5110784 100644 --- a/pyload/plugin/hoster/DateiTo.py +++ b/pyload/plugin/hoster/DateiTo.py @@ -7,15 +7,15 @@ from pyload.plugin.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/plugin/hoster/DdlstorageCom.py b/pyload/plugin/hoster/DdlstorageCom.py index 616a9595b..32a5a8bb7 100644 --- a/pyload/plugin/hoster/DdlstorageCom.py +++ b/pyload/plugin/hoster/DdlstorageCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/DebridItaliaCom.py b/pyload/plugin/hoster/DebridItaliaCom.py index 134309408..c28cdd89a 100644 --- a/pyload/plugin/hoster/DebridItaliaCom.py +++ b/pyload/plugin/hoster/DebridItaliaCom.py @@ -7,15 +7,15 @@ from pyload.plugin.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/plugin/hoster/DepositfilesCom.py b/pyload/plugin/hoster/DepositfilesCom.py index 8dd485e92..a401e4c90 100644 --- a/pyload/plugin/hoster/DepositfilesCom.py +++ b/pyload/plugin/hoster/DepositfilesCom.py @@ -9,15 +9,15 @@ from pyload.plugin.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/plugin/hoster/DevhostSt.py b/pyload/plugin/hoster/DevhostSt.py index 42a6e27f1..20d9930e8 100644 --- a/pyload/plugin/hoster/DevhostSt.py +++ b/pyload/plugin/hoster/DevhostSt.py @@ -9,15 +9,15 @@ from pyload.plugin.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/plugin/hoster/DlFreeFr.py b/pyload/plugin/hoster/DlFreeFr.py index 3ebaa6c22..8f55cabea 100644 --- a/pyload/plugin/hoster/DlFreeFr.py +++ b/pyload/plugin/hoster/DlFreeFr.py @@ -35,15 +35,15 @@ class CustomBrowser(Browser): class DlFreeFr(SimpleHoster): - __name = "DlFreeFr" - __type = "hoster" - __version = "0.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/plugin/hoster/DodanePl.py b/pyload/plugin/hoster/DodanePl.py index 8e543d823..2e58a9dd9 100644 --- a/pyload/plugin/hoster/DodanePl.py +++ b/pyload/plugin/hoster/DodanePl.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/DuploadOrg.py b/pyload/plugin/hoster/DuploadOrg.py index f5b68d3ef..6dd25407e 100644 --- a/pyload/plugin/hoster/DuploadOrg.py +++ b/pyload/plugin/hoster/DuploadOrg.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/EasybytezCom.py b/pyload/plugin/hoster/EasybytezCom.py index ee6c1621b..0d5905707 100644 --- a/pyload/plugin/hoster/EasybytezCom.py +++ b/pyload/plugin/hoster/EasybytezCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/EdiskCz.py b/pyload/plugin/hoster/EdiskCz.py index 9e9cafa9d..18649462a 100644 --- a/pyload/plugin/hoster/EdiskCz.py +++ b/pyload/plugin/hoster/EdiskCz.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/EgoFilesCom.py b/pyload/plugin/hoster/EgoFilesCom.py index d087f1c71..ad5ad0796 100644 --- a/pyload/plugin/hoster/EgoFilesCom.py +++ b/pyload/plugin/hoster/EgoFilesCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/EnteruploadCom.py b/pyload/plugin/hoster/EnteruploadCom.py index 992eeec25..0be9b8d76 100644 --- a/pyload/plugin/hoster/EnteruploadCom.py +++ b/pyload/plugin/hoster/EnteruploadCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/EpicShareNet.py b/pyload/plugin/hoster/EpicShareNet.py index 93620a384..061782468 100644 --- a/pyload/plugin/hoster/EpicShareNet.py +++ b/pyload/plugin/hoster/EpicShareNet.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/EuroshareEu.py b/pyload/plugin/hoster/EuroshareEu.py index 7048d3553..73b7f6fcd 100644 --- a/pyload/plugin/hoster/EuroshareEu.py +++ b/pyload/plugin/hoster/EuroshareEu.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/ExtabitCom.py b/pyload/plugin/hoster/ExtabitCom.py index fc99ddf31..a90e8ca86 100644 --- a/pyload/plugin/hoster/ExtabitCom.py +++ b/pyload/plugin/hoster/ExtabitCom.py @@ -10,15 +10,15 @@ from pyload.plugin.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/plugin/hoster/FastixRu.py b/pyload/plugin/hoster/FastixRu.py index 7e167e245..d48912a51 100644 --- a/pyload/plugin/hoster/FastixRu.py +++ b/pyload/plugin/hoster/FastixRu.py @@ -10,15 +10,15 @@ from pyload.plugin.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/plugin/hoster/FastshareCz.py b/pyload/plugin/hoster/FastshareCz.py index 4c69e0e81..7479e6414 100644 --- a/pyload/plugin/hoster/FastshareCz.py +++ b/pyload/plugin/hoster/FastshareCz.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, create_getInfo class FastshareCz(SimpleHoster): - __name = "FastshareCz" - __type = "hoster" - __version = "0.25" + __name__ = "FastshareCz" + __type__ = "hoster" + __version__ = "0.25" - __pattern = r'http://(?:www\.)?fastshare\.cz/\d+/.+' + __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+' - __description = """FastShare.cz hoster plugin""" - __license = "GPLv3" - __authors = [("Walter Purcaro", "vuolter@gmail.com")] + __description__ = """FastShare.cz hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] URL_REPLACEMENTS = [("#.*", "")] diff --git a/pyload/plugin/hoster/FileApeCom.py b/pyload/plugin/hoster/FileApeCom.py index c89272f66..212e3ba9c 100644 --- a/pyload/plugin/hoster/FileApeCom.py +++ b/pyload/plugin/hoster/FileApeCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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", "")] + __description__ = """FileApe.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("espes", "")] getInfo = create_getInfo(FileApeCom) diff --git a/pyload/plugin/hoster/FileParadoxIn.py b/pyload/plugin/hoster/FileParadoxIn.py index 51046a3c2..3020ac73d 100644 --- a/pyload/plugin/hoster/FileParadoxIn.py +++ b/pyload/plugin/hoster/FileParadoxIn.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/FileSharkPl.py b/pyload/plugin/hoster/FileSharkPl.py index 165c993bd..09a65ab2d 100644 --- a/pyload/plugin/hoster/FileSharkPl.py +++ b/pyload/plugin/hoster/FileSharkPl.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, create_getInfo class FileSharkPl(SimpleHoster): - __name = "FileSharkPl" - __type = "hoster" - __version = "0.04" + __name__ = "FileSharkPl" + __type__ = "hoster" + __version__ = "0.04" - __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", ""), + __description__ = """FileShark.pl hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("prOq", ""), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/FileStoreTo.py b/pyload/plugin/hoster/FileStoreTo.py index 6a916dab2..e69041172 100644 --- a/pyload/plugin/hoster/FileStoreTo.py +++ b/pyload/plugin/hoster/FileStoreTo.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/FilebeerInfo.py b/pyload/plugin/hoster/FilebeerInfo.py index 004613cab..92813d833 100644 --- a/pyload/plugin/hoster/FilebeerInfo.py +++ b/pyload/plugin/hoster/FilebeerInfo.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/FilecloudIo.py b/pyload/plugin/hoster/FilecloudIo.py index 792f563d6..778116ec2 100644 --- a/pyload/plugin/hoster/FilecloudIo.py +++ b/pyload/plugin/hoster/FilecloudIo.py @@ -8,15 +8,15 @@ from pyload.plugin.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/plugin/hoster/FilefactoryCom.py b/pyload/plugin/hoster/FilefactoryCom.py index c46cac679..4c7bb7978 100644 --- a/pyload/plugin/hoster/FilefactoryCom.py +++ b/pyload/plugin/hoster/FilefactoryCom.py @@ -12,22 +12,22 @@ def getInfo(urls): for url in urls: h = getURL(url, just_header=True) m = re.search(r'Location: (.+)\r\n', h) - if m and not re.match(m.group(1), FilefactoryCom.__pattern): #: It's a direct link! Skipping + if m and not re.match(m.group(1), FilefactoryCom.__pattern__): #: It's a direct link! Skipping yield (url, 0, 3, url) else: #: It's a standard html page yield parseFileInfo(FilefactoryCom, url, getURL(url)) class FilefactoryCom(SimpleHoster): - __name = "FilefactoryCom" - __type = "hoster" - __version = "0.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/plugin/hoster/FilejungleCom.py b/pyload/plugin/hoster/FilejungleCom.py index 3fa567a6b..5d493ed7c 100644 --- a/pyload/plugin/hoster/FilejungleCom.py +++ b/pyload/plugin/hoster/FilejungleCom.py @@ -5,15 +5,15 @@ from pyload.plugin.Plugin import chunks class FilejungleCom(FileserveCom): - __name = "FilejungleCom" - __type = "hoster" - __version = "0.51" + __name__ = "FilejungleCom" + __type__ = "hoster" + __version__ = "0.51" - __pattern = r'http://(?:www\.)?filejungle\.com/f/(?P<id>[^/]+).*' + __pattern__ = r'http://(?:www\.)?filejungle\.com/f/(?P<id>[^/]+).*' - __description = """Filejungle.com hoster plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Filejungle.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] URLS = ["http://www.filejungle.com/f/", "http://www.filejungle.com/check_links.php", diff --git a/pyload/plugin/hoster/FileomCom.py b/pyload/plugin/hoster/FileomCom.py index 06b5921fe..9c379546d 100644 --- a/pyload/plugin/hoster/FileomCom.py +++ b/pyload/plugin/hoster/FileomCom.py @@ -7,15 +7,15 @@ from pyload.plugin.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/plugin/hoster/FilepostCom.py b/pyload/plugin/hoster/FilepostCom.py index f7ed38a5c..950474c06 100644 --- a/pyload/plugin/hoster/FilepostCom.py +++ b/pyload/plugin/hoster/FilepostCom.py @@ -10,15 +10,15 @@ from pyload.plugin.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/plugin/hoster/FilepupNet.py b/pyload/plugin/hoster/FilepupNet.py index 71ad44ecd..65ac7a8f9 100644 --- a/pyload/plugin/hoster/FilepupNet.py +++ b/pyload/plugin/hoster/FilepupNet.py @@ -10,15 +10,15 @@ from pyload.plugin.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/plugin/hoster/FilerNet.py b/pyload/plugin/hoster/FilerNet.py index 4b355f91e..9a1008759 100644 --- a/pyload/plugin/hoster/FilerNet.py +++ b/pyload/plugin/hoster/FilerNet.py @@ -13,15 +13,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, create_getInfo class FilerNet(SimpleHoster): - __name = "FilerNet" - __type = "hoster" - __version = "0.10" + __name__ = "FilerNet" + __type__ = "hoster" + __version__ = "0.10" - __pattern = r'https?://(?:www\.)?filer\.net/get/\w+' + __pattern__ = r'https?://(?:www\.)?filer\.net/get/\w+' - __description = """Filer.net hoster plugin""" - __license = "GPLv3" - __authors = [("stickell", "l.stickell@yahoo.it") + __description__ = """Filer.net hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it") ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/FilerioCom.py b/pyload/plugin/hoster/FilerioCom.py index 19be7ef3a..b43247c9d 100644 --- a/pyload/plugin/hoster/FilerioCom.py +++ b/pyload/plugin/hoster/FilerioCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/FilesMailRu.py b/pyload/plugin/hoster/FilesMailRu.py index 47d1aa8e0..d93a2eada 100644 --- a/pyload/plugin/hoster/FilesMailRu.py +++ b/pyload/plugin/hoster/FilesMailRu.py @@ -30,15 +30,15 @@ def getInfo(urls): class FilesMailRu(Hoster): - __name = "FilesMailRu" - __type = "hoster" - __version = "0.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/plugin/hoster/FileserveCom.py b/pyload/plugin/hoster/FileserveCom.py index 27f1a95f8..782f09188 100644 --- a/pyload/plugin/hoster/FileserveCom.py +++ b/pyload/plugin/hoster/FileserveCom.py @@ -31,15 +31,15 @@ def checkFile(plugin, urls): class FileserveCom(Hoster): - __name = "FileserveCom" - __type = "hoster" - __version = "0.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", ""), ("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/plugin/hoster/FileshareInUa.py b/pyload/plugin/hoster/FileshareInUa.py index 94897d804..5f5089e54 100644 --- a/pyload/plugin/hoster/FileshareInUa.py +++ b/pyload/plugin/hoster/FileshareInUa.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/FilesonicCom.py b/pyload/plugin/hoster/FilesonicCom.py index cfb0e563b..c2b87d4d7 100644 --- a/pyload/plugin/hoster/FilesonicCom.py +++ b/pyload/plugin/hoster/FilesonicCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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", "")] diff --git a/pyload/plugin/hoster/FilezyNet.py b/pyload/plugin/hoster/FilezyNet.py index f80d3a59d..1fcc9363d 100644 --- a/pyload/plugin/hoster/FilezyNet.py +++ b/pyload/plugin/hoster/FilezyNet.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/FiredriveCom.py b/pyload/plugin/hoster/FiredriveCom.py index a889035f0..3395fc261 100644 --- a/pyload/plugin/hoster/FiredriveCom.py +++ b/pyload/plugin/hoster/FiredriveCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/FlyFilesNet.py b/pyload/plugin/hoster/FlyFilesNet.py index a76ce846d..2330ba786 100644 --- a/pyload/plugin/hoster/FlyFilesNet.py +++ b/pyload/plugin/hoster/FlyFilesNet.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster class FlyFilesNet(SimpleHoster): - __name = "FlyFilesNet" - __type = "hoster" - __version = "0.10" + __name__ = "FlyFilesNet" + __type__ = "hoster" + __version__ = "0.10" - __pattern = r'http://(?:www\.)?flyfiles\.net/.*' + __pattern__ = r'http://(?:www\.)?flyfiles\.net/.*' - __description = """FlyFiles.net hoster plugin""" - __license = "GPLv3" - __authors = [] + __description__ = """FlyFiles.net hoster plugin""" + __license__ = "GPLv3" + __authors__ = [] SESSION_PATTERN = r'flyfiles\.net/(.*)/.*' NAME_PATTERN = r'flyfiles\.net/.*/(.*)' diff --git a/pyload/plugin/hoster/FourSharedCom.py b/pyload/plugin/hoster/FourSharedCom.py index e7097271d..002173b89 100644 --- a/pyload/plugin/hoster/FourSharedCom.py +++ b/pyload/plugin/hoster/FourSharedCom.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/FreakshareCom.py b/pyload/plugin/hoster/FreakshareCom.py index 498a77a22..f11607591 100644 --- a/pyload/plugin/hoster/FreakshareCom.py +++ b/pyload/plugin/hoster/FreakshareCom.py @@ -8,15 +8,15 @@ from pyload.plugin.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/plugin/hoster/FreeWayMe.py b/pyload/plugin/hoster/FreeWayMe.py index 0d180e0fe..f65793dab 100644 --- a/pyload/plugin/hoster/FreeWayMe.py +++ b/pyload/plugin/hoster/FreeWayMe.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/FreevideoCz.py b/pyload/plugin/hoster/FreevideoCz.py index 5994cfca9..86c30e64c 100644 --- a/pyload/plugin/hoster/FreevideoCz.py +++ b/pyload/plugin/hoster/FreevideoCz.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/FshareVn.py b/pyload/plugin/hoster/FshareVn.py index 88d8ebb6e..6647a58b7 100644 --- a/pyload/plugin/hoster/FshareVn.py +++ b/pyload/plugin/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/plugin/hoster/Ftp.py b/pyload/plugin/hoster/Ftp.py index e11418a1b..4183f9b3c 100644 --- a/pyload/plugin/hoster/Ftp.py +++ b/pyload/plugin/hoster/Ftp.py @@ -10,15 +10,15 @@ from pyload.plugin.Hoster import Hoster class Ftp(Hoster): - __name = "Ftp" - __type = "hoster" - __version = "0.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/plugin/hoster/GamefrontCom.py b/pyload/plugin/hoster/GamefrontCom.py index 81568e376..89e188010 100644 --- a/pyload/plugin/hoster/GamefrontCom.py +++ b/pyload/plugin/hoster/GamefrontCom.py @@ -8,15 +8,15 @@ from pyload.utils import parseFileSize class GamefrontCom(Hoster): - __name = "GamefrontCom" - __type = "hoster" - __version = "0.04" + __name__ = "GamefrontCom" + __type__ = "hoster" + __version__ = "0.04" - __pattern = r'http://(?:www\.)?gamefront\.com/files/\w+' + __pattern__ = r'http://(?:www\.)?gamefront\.com/files/\w+' - __description = """Gamefront.com hoster plugin""" - __license = "GPLv3" - __authors = [("fwannmacher", "felipe@warhammerproject.com")] + __description__ = """Gamefront.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("fwannmacher", "felipe@warhammerproject.com")] PATTERN_FILENAME = r'<title>(.*?) | Game Front' diff --git a/pyload/plugin/hoster/GigapetaCom.py b/pyload/plugin/hoster/GigapetaCom.py index ded18c235..405fe1937 100644 --- a/pyload/plugin/hoster/GigapetaCom.py +++ b/pyload/plugin/hoster/GigapetaCom.py @@ -8,15 +8,15 @@ from pyload.plugin.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/plugin/hoster/GooIm.py b/pyload/plugin/hoster/GooIm.py index af7143b7c..bd21178d2 100644 --- a/pyload/plugin/hoster/GooIm.py +++ b/pyload/plugin/hoster/GooIm.py @@ -9,15 +9,15 @@ from pyload.plugin.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/plugin/hoster/HellshareCz.py b/pyload/plugin/hoster/HellshareCz.py index 9c3459a44..b4f4f1f1c 100644 --- a/pyload/plugin/hoster/HellshareCz.py +++ b/pyload/plugin/hoster/HellshareCz.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/HellspyCz.py b/pyload/plugin/hoster/HellspyCz.py index 2e0c63d1a..984af3c4e 100644 --- a/pyload/plugin/hoster/HellspyCz.py +++ b/pyload/plugin/hoster/HellspyCz.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/HotfileCom.py b/pyload/plugin/hoster/HotfileCom.py index 92b42bab6..b64bb5fd7 100644 --- a/pyload/plugin/hoster/HotfileCom.py +++ b/pyload/plugin/hoster/HotfileCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/HugefilesNet.py b/pyload/plugin/hoster/HugefilesNet.py index c32f2e190..7b27f4ab6 100644 --- a/pyload/plugin/hoster/HugefilesNet.py +++ b/pyload/plugin/hoster/HugefilesNet.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/HundredEightyUploadCom.py b/pyload/plugin/hoster/HundredEightyUploadCom.py index b5e8c2d4c..4614dc54f 100644 --- a/pyload/plugin/hoster/HundredEightyUploadCom.py +++ b/pyload/plugin/hoster/HundredEightyUploadCom.py @@ -7,15 +7,15 @@ from pyload.plugin.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/plugin/hoster/IFileWs.py b/pyload/plugin/hoster/IFileWs.py index 31a5f6d62..59d9c7f40 100644 --- a/pyload/plugin/hoster/IFileWs.py +++ b/pyload/plugin/hoster/IFileWs.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/IcyFilesCom.py b/pyload/plugin/hoster/IcyFilesCom.py index da45be10f..17aa1352c 100644 --- a/pyload/plugin/hoster/IcyFilesCom.py +++ b/pyload/plugin/hoster/IcyFilesCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/IfileIt.py b/pyload/plugin/hoster/IfileIt.py index 1995b210f..8ccb35308 100644 --- a/pyload/plugin/hoster/IfileIt.py +++ b/pyload/plugin/hoster/IfileIt.py @@ -8,15 +8,15 @@ from pyload.plugin.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/plugin/hoster/IfolderRu.py b/pyload/plugin/hoster/IfolderRu.py index 984d2f3ad..f31096a1c 100644 --- a/pyload/plugin/hoster/IfolderRu.py +++ b/pyload/plugin/hoster/IfolderRu.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/JumbofilesCom.py b/pyload/plugin/hoster/JumbofilesCom.py index b7c82082a..cae54ba97 100644 --- a/pyload/plugin/hoster/JumbofilesCom.py +++ b/pyload/plugin/hoster/JumbofilesCom.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/JunocloudMe.py b/pyload/plugin/hoster/JunocloudMe.py index b455c8049..80c1568ce 100644 --- a/pyload/plugin/hoster/JunocloudMe.py +++ b/pyload/plugin/hoster/JunocloudMe.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/Keep2shareCc.py b/pyload/plugin/hoster/Keep2shareCc.py index a57965ca2..8f8e8cb67 100644 --- a/pyload/plugin/hoster/Keep2shareCc.py +++ b/pyload/plugin/hoster/Keep2shareCc.py @@ -9,19 +9,19 @@ from pyload.plugin.internal.SimpleHoster import _isDirectLink, SimpleHoster, cre class Keep2shareCc(SimpleHoster): - __name = "Keep2shareCc" - __type = "hoster" - __version = "0.17" + __name__ = "Keep2shareCc" + __type__ = "hoster" + __version__ = "0.17" - __pattern = r'https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)' + __pattern__ = r'https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)' - __description = """Keep2share.cc hoster plugin""" - __license = "GPLv3" - __authors = [("stickell", "l.stickell@yahoo.it"), + __description__ = """Keep2share.cc hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("stickell", "l.stickell@yahoo.it"), ("Walter Purcaro", "vuolter@gmail.com")] - URL_REPLACEMENTS = [(__pattern + ".*", "http://k2s.cc/file/\g<ID>")] + URL_REPLACEMENTS = [(__pattern__ + ".*", "http://k2s.cc/file/\g<ID>")] NAME_PATTERN = r'File: <span>(?P<N>.+)</span>' SIZE_PATTERN = r'Size: (?P<S>[^<]+)</div>' diff --git a/pyload/plugin/hoster/KickloadCom.py b/pyload/plugin/hoster/KickloadCom.py index 781abf654..1f0c41f3d 100644 --- a/pyload/plugin/hoster/KickloadCom.py +++ b/pyload/plugin/hoster/KickloadCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/KingfilesNet.py b/pyload/plugin/hoster/KingfilesNet.py index d863dbbf0..050ee283f 100644 --- a/pyload/plugin/hoster/KingfilesNet.py +++ b/pyload/plugin/hoster/KingfilesNet.py @@ -7,15 +7,15 @@ from pyload.plugin.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/plugin/hoster/LemUploadsCom.py b/pyload/plugin/hoster/LemUploadsCom.py index 8663504dc..822670348 100644 --- a/pyload/plugin/hoster/LemUploadsCom.py +++ b/pyload/plugin/hoster/LemUploadsCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/LetitbitNet.py b/pyload/plugin/hoster/LetitbitNet.py index 164e61c01..f6ec6fb34 100644 --- a/pyload/plugin/hoster/LetitbitNet.py +++ b/pyload/plugin/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/plugin/hoster/LinksnappyCom.py b/pyload/plugin/hoster/LinksnappyCom.py index b94b8c965..57acac758 100644 --- a/pyload/plugin/hoster/LinksnappyCom.py +++ b/pyload/plugin/hoster/LinksnappyCom.py @@ -9,15 +9,15 @@ from pyload.plugin.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/plugin/hoster/LoadTo.py b/pyload/plugin/hoster/LoadTo.py index 14341ac6a..052d79214 100644 --- a/pyload/plugin/hoster/LoadTo.py +++ b/pyload/plugin/hoster/LoadTo.py @@ -11,15 +11,15 @@ from pyload.plugin.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/plugin/hoster/LomafileCom.py b/pyload/plugin/hoster/LomafileCom.py index 3c0f5ea5b..18f9a7ad8 100644 --- a/pyload/plugin/hoster/LomafileCom.py +++ b/pyload/plugin/hoster/LomafileCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/LuckyShareNet.py b/pyload/plugin/hoster/LuckyShareNet.py index 8f0843529..5025bd7d4 100644 --- a/pyload/plugin/hoster/LuckyShareNet.py +++ b/pyload/plugin/hoster/LuckyShareNet.py @@ -9,15 +9,15 @@ from pyload.plugin.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/plugin/hoster/MediafireCom.py b/pyload/plugin/hoster/MediafireCom.py index 009a42c62..e14b16d8e 100644 --- a/pyload/plugin/hoster/MediafireCom.py +++ b/pyload/plugin/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/plugin/hoster/MegaCoNz.py b/pyload/plugin/hoster/MegaCoNz.py index b8f02278b..5fe1315be 100644 --- a/pyload/plugin/hoster/MegaCoNz.py +++ b/pyload/plugin/hoster/MegaCoNz.py @@ -44,15 +44,15 @@ from pyload.plugin.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/plugin/hoster/MegaDebridEu.py b/pyload/plugin/hoster/MegaDebridEu.py index d17a8eeeb..d473cbbf1 100644 --- a/pyload/plugin/hoster/MegaDebridEu.py +++ b/pyload/plugin/hoster/MegaDebridEu.py @@ -9,15 +9,15 @@ from pyload.plugin.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/plugin/hoster/MegaFilesSe.py b/pyload/plugin/hoster/MegaFilesSe.py index 6b6e5c0b1..4120e17d6 100644 --- a/pyload/plugin/hoster/MegaFilesSe.py +++ b/pyload/plugin/hoster/MegaFilesSe.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/MegaRapidCz.py b/pyload/plugin/hoster/MegaRapidCz.py index 380032724..93a70a54e 100644 --- a/pyload/plugin/hoster/MegaRapidCz.py +++ b/pyload/plugin/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/plugin/hoster/MegacrypterCom.py b/pyload/plugin/hoster/MegacrypterCom.py index 5bf0d0864..ea1aafd70 100644 --- a/pyload/plugin/hoster/MegacrypterCom.py +++ b/pyload/plugin/hoster/MegacrypterCom.py @@ -8,15 +8,15 @@ from pyload.plugin.hoster.MegaCoNz import MegaCoNz class MegacrypterCom(MegaCoNz): - __name = "MegacrypterCom" - __type = "hoster" - __version = "0.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/plugin/hoster/MegareleaseOrg.py b/pyload/plugin/hoster/MegareleaseOrg.py index de388ef9d..6eacbd6e0 100644 --- a/pyload/plugin/hoster/MegareleaseOrg.py +++ b/pyload/plugin/hoster/MegareleaseOrg.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/MegasharesCom.py b/pyload/plugin/hoster/MegasharesCom.py index 235a2e4d4..ffcab9415 100644 --- a/pyload/plugin/hoster/MegasharesCom.py +++ b/pyload/plugin/hoster/MegasharesCom.py @@ -8,15 +8,15 @@ from pyload.plugin.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/plugin/hoster/MegauploadCom.py b/pyload/plugin/hoster/MegauploadCom.py index 468a7389d..7896dabfb 100644 --- a/pyload/plugin/hoster/MegauploadCom.py +++ b/pyload/plugin/hoster/MegauploadCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/MegavideoCom.py b/pyload/plugin/hoster/MegavideoCom.py index 2d1a17daf..02054fecb 100644 --- a/pyload/plugin/hoster/MegavideoCom.py +++ b/pyload/plugin/hoster/MegavideoCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/MovReelCom.py b/pyload/plugin/hoster/MovReelCom.py index 90c3da2c8..c55269a89 100644 --- a/pyload/plugin/hoster/MovReelCom.py +++ b/pyload/plugin/hoster/MovReelCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/MultishareCz.py b/pyload/plugin/hoster/MultishareCz.py index a66043fc0..817f457bf 100644 --- a/pyload/plugin/hoster/MultishareCz.py +++ b/pyload/plugin/hoster/MultishareCz.py @@ -8,15 +8,15 @@ from pyload.plugin.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/plugin/hoster/MyfastfileCom.py b/pyload/plugin/hoster/MyfastfileCom.py index 528a4c2c8..b67b221d2 100644 --- a/pyload/plugin/hoster/MyfastfileCom.py +++ b/pyload/plugin/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/plugin/hoster/MyvideoDe.py b/pyload/plugin/hoster/MyvideoDe.py index 08652cdc9..4b5fa99ca 100644 --- a/pyload/plugin/hoster/MyvideoDe.py +++ b/pyload/plugin/hoster/MyvideoDe.py @@ -7,15 +7,15 @@ from pyload.utils import html_unescape class MyvideoDe(Hoster): - __name = "MyvideoDe" - __type = "hoster" - __version = "0.90" + __name__ = "MyvideoDe" + __type__ = "hoster" + __version__ = "0.90" - __pattern = r'http://(?:www\.)?myvideo\.de/watch/' + __pattern__ = r'http://(?:www\.)?myvideo\.de/watch/' - __description = """Myvideo.de hoster plugin""" - __license = "GPLv3" - __authors = [("spoob", "spoob@pyload.org")] + __description__ = """Myvideo.de hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("spoob", "spoob@pyload.org")] def process(self, pyfile): diff --git a/pyload/plugin/hoster/NahrajCz.py b/pyload/plugin/hoster/NahrajCz.py index 6e187e268..5c5c71ae6 100644 --- a/pyload/plugin/hoster/NahrajCz.py +++ b/pyload/plugin/hoster/NahrajCz.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/NarodRu.py b/pyload/plugin/hoster/NarodRu.py index 9d5b1f4e6..5dfb4e245 100644 --- a/pyload/plugin/hoster/NarodRu.py +++ b/pyload/plugin/hoster/NarodRu.py @@ -8,15 +8,15 @@ from pyload.plugin.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/plugin/hoster/NetloadIn.py b/pyload/plugin/hoster/NetloadIn.py index 77ea27bcc..4ecd8d67b 100644 --- a/pyload/plugin/hoster/NetloadIn.py +++ b/pyload/plugin/hoster/NetloadIn.py @@ -15,7 +15,7 @@ def getInfo(urls): ## returns list of tupels (name, size (in bytes), status (see database.File), url) apiurl = "http://api.netload.in/info.php" - id_regex = re.compile(NetloadIn.__pattern) + id_regex = re.compile(NetloadIn.__pattern__) urls_per_query = 80 for chunk in chunks(urls, urls_per_query): @@ -60,15 +60,15 @@ def getInfo(urls): class NetloadIn(Hoster): - __name = "NetloadIn" - __type = "hoster" - __version = "0.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/plugin/hoster/NosuploadCom.py b/pyload/plugin/hoster/NosuploadCom.py index 02ceb65f2..56f70208d 100644 --- a/pyload/plugin/hoster/NosuploadCom.py +++ b/pyload/plugin/hoster/NosuploadCom.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/NovafileCom.py b/pyload/plugin/hoster/NovafileCom.py index ed39fa87e..7c709a777 100644 --- a/pyload/plugin/hoster/NovafileCom.py +++ b/pyload/plugin/hoster/NovafileCom.py @@ -8,15 +8,15 @@ from pyload.plugin.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/plugin/hoster/NowDownloadSx.py b/pyload/plugin/hoster/NowDownloadSx.py index f9ba7e681..0a66319ab 100644 --- a/pyload/plugin/hoster/NowDownloadSx.py +++ b/pyload/plugin/hoster/NowDownloadSx.py @@ -7,15 +7,15 @@ from pyload.utils import fixup class NowDownloadSx(SimpleHoster): - __name = "NowDownloadSx" - __type = "hoster" - __version = "0.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/plugin/hoster/NowVideoSx.py b/pyload/plugin/hoster/NowVideoSx.py index 5f3d1954c..e672aeff5 100644 --- a/pyload/plugin/hoster/NowVideoSx.py +++ b/pyload/plugin/hoster/NowVideoSx.py @@ -6,18 +6,18 @@ from pyload.plugin.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/plugin/hoster/OboomCom.py b/pyload/plugin/hoster/OboomCom.py index 7467dcaf5..70e117cf7 100644 --- a/pyload/plugin/hoster/OboomCom.py +++ b/pyload/plugin/hoster/OboomCom.py @@ -11,15 +11,15 @@ from pyload.plugin.internal.captcha import ReCaptcha class OboomCom(Hoster): - __name = "OboomCom" - __type = "hoster" - __version = "0.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/plugin/hoster/OneFichierCom.py b/pyload/plugin/hoster/OneFichierCom.py index eb48d7311..91cc7f001 100644 --- a/pyload/plugin/hoster/OneFichierCom.py +++ b/pyload/plugin/hoster/OneFichierCom.py @@ -6,15 +6,15 @@ from pyload.plugin.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", ""), diff --git a/pyload/plugin/hoster/OronCom.py b/pyload/plugin/hoster/OronCom.py index f2efafc83..cbbaedae0 100644 --- a/pyload/plugin/hoster/OronCom.py +++ b/pyload/plugin/hoster/OronCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/OverLoadMe.py b/pyload/plugin/hoster/OverLoadMe.py index e06aadfbe..c78d96a09 100644 --- a/pyload/plugin/hoster/OverLoadMe.py +++ b/pyload/plugin/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/plugin/hoster/PandaplaNet.py b/pyload/plugin/hoster/PandaplaNet.py index 5c4a649b9..a078ca3c9 100644 --- a/pyload/plugin/hoster/PandaplaNet.py +++ b/pyload/plugin/hoster/PandaplaNet.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/PornhostCom.py b/pyload/plugin/hoster/PornhostCom.py index 653faf81f..aab337b2d 100644 --- a/pyload/plugin/hoster/PornhostCom.py +++ b/pyload/plugin/hoster/PornhostCom.py @@ -6,15 +6,15 @@ from pyload.plugin.Hoster import Hoster class PornhostCom(Hoster): - __name = "PornhostCom" - __type = "hoster" - __version = "0.20" + __name__ = "PornhostCom" + __type__ = "hoster" + __version__ = "0.20" - __pattern = r'http://(?:www\.)?pornhost\.com/(\d+/\d+\.html|\d+)' + __pattern__ = r'http://(?:www\.)?pornhost\.com/(\d+/\d+\.html|\d+)' - __description = """Pornhost.com hoster plugin""" - __license = "GPLv3" - __authors = [("jeix", "jeix@hasnomail.de")] + __description__ = """Pornhost.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("jeix", "jeix@hasnomail.de")] def process(self, pyfile): diff --git a/pyload/plugin/hoster/PornhubCom.py b/pyload/plugin/hoster/PornhubCom.py index 48fd82871..9f8a5eec2 100644 --- a/pyload/plugin/hoster/PornhubCom.py +++ b/pyload/plugin/hoster/PornhubCom.py @@ -6,15 +6,15 @@ from pyload.plugin.Hoster import Hoster class PornhubCom(Hoster): - __name = "PornhubCom" - __type = "hoster" - __version = "0.50" + __name__ = "PornhubCom" + __type__ = "hoster" + __version__ = "0.50" - __pattern = r'http://(?:www\.)?pornhub\.com/view_video\.php\?viewkey=\w+' + __pattern__ = r'http://(?:www\.)?pornhub\.com/view_video\.php\?viewkey=\w+' - __description = """Pornhub.com hoster plugin""" - __license = "GPLv3" - __authors = [("jeix", "jeix@hasnomail.de")] + __description__ = """Pornhub.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("jeix", "jeix@hasnomail.de")] def process(self, pyfile): diff --git a/pyload/plugin/hoster/PotloadCom.py b/pyload/plugin/hoster/PotloadCom.py index 08d5a7901..bcbcb57d0 100644 --- a/pyload/plugin/hoster/PotloadCom.py +++ b/pyload/plugin/hoster/PotloadCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/PremiumTo.py b/pyload/plugin/hoster/PremiumTo.py index 4591ec7bc..2dd72f75e 100644 --- a/pyload/plugin/hoster/PremiumTo.py +++ b/pyload/plugin/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/plugin/hoster/PremiumizeMe.py b/pyload/plugin/hoster/PremiumizeMe.py index e56ccdbb0..5f0685483 100644 --- a/pyload/plugin/hoster/PremiumizeMe.py +++ b/pyload/plugin/hoster/PremiumizeMe.py @@ -5,15 +5,15 @@ from pyload.plugin.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.activate + __pattern__ = r'^unmatchable$' #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate - __description = """Premiumize.me 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/plugin/hoster/PromptfileCom.py b/pyload/plugin/hoster/PromptfileCom.py index 315714025..f0752692e 100644 --- a/pyload/plugin/hoster/PromptfileCom.py +++ b/pyload/plugin/hoster/PromptfileCom.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/PrzeklejPl.py b/pyload/plugin/hoster/PrzeklejPl.py index faaa25e0f..ff19c770e 100644 --- a/pyload/plugin/hoster/PrzeklejPl.py +++ b/pyload/plugin/hoster/PrzeklejPl.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/QuickshareCz.py b/pyload/plugin/hoster/QuickshareCz.py index ca250b47b..4c4b5df9d 100644 --- a/pyload/plugin/hoster/QuickshareCz.py +++ b/pyload/plugin/hoster/QuickshareCz.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/RPNetBiz.py b/pyload/plugin/hoster/RPNetBiz.py index aea39f76d..c6dfae9a6 100644 --- a/pyload/plugin/hoster/RPNetBiz.py +++ b/pyload/plugin/hoster/RPNetBiz.py @@ -7,15 +7,15 @@ from pyload.utils import json_loads class RPNetBiz(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/plugin/hoster/RapidfileshareNet.py b/pyload/plugin/hoster/RapidfileshareNet.py index f2d3d7c63..e5c75a7bd 100644 --- a/pyload/plugin/hoster/RapidfileshareNet.py +++ b/pyload/plugin/hoster/RapidfileshareNet.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/RapidgatorNet.py b/pyload/plugin/hoster/RapidgatorNet.py index 91c9c4eec..153b0314e 100644 --- a/pyload/plugin/hoster/RapidgatorNet.py +++ b/pyload/plugin/hoster/RapidgatorNet.py @@ -12,15 +12,15 @@ from pyload.plugin.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", ""), ("stickell", "l.stickell@yahoo.it"), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/RapiduNet.py b/pyload/plugin/hoster/RapiduNet.py index 5e5971bf5..4b6ef55bb 100644 --- a/pyload/plugin/hoster/RapiduNet.py +++ b/pyload/plugin/hoster/RapiduNet.py @@ -11,15 +11,15 @@ from pyload.plugin.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", "")] + __description__ = """Rapidu.net hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("prOq", "")] COOKIES = [("rapidu.net", "rapidu_lang", "en")] diff --git a/pyload/plugin/hoster/RarefileNet.py b/pyload/plugin/hoster/RarefileNet.py index c14bb9008..6ea06720d 100644 --- a/pyload/plugin/hoster/RarefileNet.py +++ b/pyload/plugin/hoster/RarefileNet.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/RealdebridCom.py b/pyload/plugin/hoster/RealdebridCom.py index 16744bc3d..c78fc8b55 100644 --- a/pyload/plugin/hoster/RealdebridCom.py +++ b/pyload/plugin/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/plugin/hoster/RedtubeCom.py b/pyload/plugin/hoster/RedtubeCom.py index 4ab976fdd..1f18d09c7 100644 --- a/pyload/plugin/hoster/RedtubeCom.py +++ b/pyload/plugin/hoster/RedtubeCom.py @@ -7,15 +7,15 @@ from pyload.utils import html_unescape class RedtubeCom(Hoster): - __name = "RedtubeCom" - __type = "hoster" - __version = "0.20" + __name__ = "RedtubeCom" + __type__ = "hoster" + __version__ = "0.20" - __pattern = r'http://(?:www\.)?redtube\.com/\d+' + __pattern__ = r'http://(?:www\.)?redtube\.com/\d+' - __description = """Redtube.com hoster plugin""" - __license = "GPLv3" - __authors = [("jeix", "jeix@hasnomail.de")] + __description__ = """Redtube.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("jeix", "jeix@hasnomail.de")] def process(self, pyfile): diff --git a/pyload/plugin/hoster/RehostTo.py b/pyload/plugin/hoster/RehostTo.py index 75fae2449..7aa220187 100644 --- a/pyload/plugin/hoster/RehostTo.py +++ b/pyload/plugin/hoster/RehostTo.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/RemixshareCom.py b/pyload/plugin/hoster/RemixshareCom.py index 2cf2dd2ff..96467c1e7 100644 --- a/pyload/plugin/hoster/RemixshareCom.py +++ b/pyload/plugin/hoster/RemixshareCom.py @@ -14,15 +14,15 @@ from pyload.plugin.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/plugin/hoster/RgHostNet.py b/pyload/plugin/hoster/RgHostNet.py index 82dcf42df..7a16598b2 100644 --- a/pyload/plugin/hoster/RgHostNet.py +++ b/pyload/plugin/hoster/RgHostNet.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/RyushareCom.py b/pyload/plugin/hoster/RyushareCom.py index 233ba57a4..e5b00db7f 100644 --- a/pyload/plugin/hoster/RyushareCom.py +++ b/pyload/plugin/hoster/RyushareCom.py @@ -10,15 +10,15 @@ from pyload.plugin.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/plugin/hoster/SafesharingEu.py b/pyload/plugin/hoster/SafesharingEu.py index 40824d01f..3d7140c6e 100644 --- a/pyload/plugin/hoster/SafesharingEu.py +++ b/pyload/plugin/hoster/SafesharingEu.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/SecureUploadEu.py b/pyload/plugin/hoster/SecureUploadEu.py index c332b890f..ec8bbfc57 100644 --- a/pyload/plugin/hoster/SecureUploadEu.py +++ b/pyload/plugin/hoster/SecureUploadEu.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/SendmywayCom.py b/pyload/plugin/hoster/SendmywayCom.py index 2912600fa..86c505d2d 100644 --- a/pyload/plugin/hoster/SendmywayCom.py +++ b/pyload/plugin/hoster/SendmywayCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/SendspaceCom.py b/pyload/plugin/hoster/SendspaceCom.py index bd92fb058..abdf52fa6 100644 --- a/pyload/plugin/hoster/SendspaceCom.py +++ b/pyload/plugin/hoster/SendspaceCom.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/Share4webCom.py b/pyload/plugin/hoster/Share4webCom.py index 479f42e90..4748c6e2a 100644 --- a/pyload/plugin/hoster/Share4webCom.py +++ b/pyload/plugin/hoster/Share4webCom.py @@ -5,15 +5,15 @@ from pyload.plugin.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/plugin/hoster/Share76Com.py b/pyload/plugin/hoster/Share76Com.py index 43f74ec23..7f2cea757 100644 --- a/pyload/plugin/hoster/Share76Com.py +++ b/pyload/plugin/hoster/Share76Com.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/ShareFilesCo.py b/pyload/plugin/hoster/ShareFilesCo.py index cbb5d3895..dd5c9b85d 100644 --- a/pyload/plugin/hoster/ShareFilesCo.py +++ b/pyload/plugin/hoster/ShareFilesCo.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/SharebeesCom.py b/pyload/plugin/hoster/SharebeesCom.py index f46e85a5f..3843a352b 100644 --- a/pyload/plugin/hoster/SharebeesCom.py +++ b/pyload/plugin/hoster/SharebeesCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/ShareonlineBiz.py b/pyload/plugin/hoster/ShareonlineBiz.py index a1c5da2e6..55efe0019 100644 --- a/pyload/plugin/hoster/ShareonlineBiz.py +++ b/pyload/plugin/hoster/ShareonlineBiz.py @@ -12,21 +12,21 @@ from pyload.plugin.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/plugin/hoster/ShareplaceCom.py b/pyload/plugin/hoster/ShareplaceCom.py index 173e7f41c..139426421 100644 --- a/pyload/plugin/hoster/ShareplaceCom.py +++ b/pyload/plugin/hoster/ShareplaceCom.py @@ -8,15 +8,15 @@ from pyload.plugin.Hoster import Hoster class ShareplaceCom(Hoster): - __name = "ShareplaceCom" - __type = "hoster" - __version = "0.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", "")] + __description__ = """Shareplace.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("ACCakut", "")] def process(self, pyfile): diff --git a/pyload/plugin/hoster/SharingmatrixCom.py b/pyload/plugin/hoster/SharingmatrixCom.py index 8146d67b2..a20a36543 100644 --- a/pyload/plugin/hoster/SharingmatrixCom.py +++ b/pyload/plugin/hoster/SharingmatrixCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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", "")] diff --git a/pyload/plugin/hoster/ShragleCom.py b/pyload/plugin/hoster/ShragleCom.py index 139283cd1..f606726fe 100644 --- a/pyload/plugin/hoster/ShragleCom.py +++ b/pyload/plugin/hoster/ShragleCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/SimplyPremiumCom.py b/pyload/plugin/hoster/SimplyPremiumCom.py index 364c0bd0e..f2e00cbf1 100644 --- a/pyload/plugin/hoster/SimplyPremiumCom.py +++ b/pyload/plugin/hoster/SimplyPremiumCom.py @@ -9,15 +9,15 @@ from pyload.plugin.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/plugin/hoster/SimplydebridCom.py b/pyload/plugin/hoster/SimplydebridCom.py index a0ef4a596..f93e2bc12 100644 --- a/pyload/plugin/hoster/SimplydebridCom.py +++ b/pyload/plugin/hoster/SimplydebridCom.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/SockshareCom.py b/pyload/plugin/hoster/SockshareCom.py index 4ce005135..e85a74e49 100644 --- a/pyload/plugin/hoster/SockshareCom.py +++ b/pyload/plugin/hoster/SockshareCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/SoundcloudCom.py b/pyload/plugin/hoster/SoundcloudCom.py index 48a5b465c..cfb07b35d 100644 --- a/pyload/plugin/hoster/SoundcloudCom.py +++ b/pyload/plugin/hoster/SoundcloudCom.py @@ -7,15 +7,15 @@ from pyload.plugin.Hoster import Hoster class SoundcloudCom(Hoster): - __name = "SoundcloudCom" - __type = "hoster" - __version = "0.10" + __name__ = "SoundcloudCom" + __type__ = "hoster" + __version__ = "0.10" - __pattern = r'https?://(?:www\.)?soundcloud\.com/(?P<UID>.*?)/(?P<SID>.*)' + __pattern__ = r'https?://(?:www\.)?soundcloud\.com/(?P<UID>.*?)/(?P<SID>.*)' - __description = """SoundCloud.com hoster plugin""" - __license = "GPLv3" - __authors = [("Peekayy", "peekayy.dev@gmail.com")] + __description__ = """SoundCloud.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("Peekayy", "peekayy.dev@gmail.com")] def process(self, pyfile): @@ -41,7 +41,7 @@ class SoundcloudCom(Hoster): if m: pyfile.name = m.group("TITLE") + ".mp3" else: - pyfile.name = re.match(self.__pattern, pyfile.url).group("SID") + ".mp3" + pyfile.name = re.match(self.__pattern__, pyfile.url).group("SID") + ".mp3" # url to retrieve the actual song url page = self.load("https://api.sndcdn.com/i1/tracks/%s/streams" % songId, get={"client_id": clientId}) diff --git a/pyload/plugin/hoster/SpeedLoadOrg.py b/pyload/plugin/hoster/SpeedLoadOrg.py index 39e27ef4c..588eb26a3 100644 --- a/pyload/plugin/hoster/SpeedLoadOrg.py +++ b/pyload/plugin/hoster/SpeedLoadOrg.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/SpeedfileCz.py b/pyload/plugin/hoster/SpeedfileCz.py index 29af9db4f..f17aa6a59 100644 --- a/pyload/plugin/hoster/SpeedfileCz.py +++ b/pyload/plugin/hoster/SpeedfileCz.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/SpeedyshareCom.py b/pyload/plugin/hoster/SpeedyshareCom.py index 959af8025..41c23f438 100644 --- a/pyload/plugin/hoster/SpeedyshareCom.py +++ b/pyload/plugin/hoster/SpeedyshareCom.py @@ -11,15 +11,15 @@ from pyload.plugin.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/plugin/hoster/StorageTo.py b/pyload/plugin/hoster/StorageTo.py index 978a7f75d..4b18c69da 100644 --- a/pyload/plugin/hoster/StorageTo.py +++ b/pyload/plugin/hoster/StorageTo.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/StreamCz.py b/pyload/plugin/hoster/StreamCz.py index 831072d77..e5e389e20 100644 --- a/pyload/plugin/hoster/StreamCz.py +++ b/pyload/plugin/hoster/StreamCz.py @@ -21,15 +21,15 @@ def getInfo(urls): class StreamCz(Hoster): - __name = "StreamCz" - __type = "hoster" - __version = "0.20" + __name__ = "StreamCz" + __type__ = "hoster" + __version__ = "0.20" - __pattern = r'https?://(?:www\.)?stream\.cz/[^/]+/\d+.*' + __pattern__ = r'https?://(?:www\.)?stream\.cz/[^/]+/\d+.*' - __description = """Stream.cz hoster plugin""" - __license = "GPLv3" - __authors = [("zoidberg", "zoidberg@mujmail.cz")] + __description__ = """Stream.cz hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] NAME_PATTERN = r'<link rel="video_src" href="http://www\.stream\.cz/\w+/(\d+)-([^"]+)" />' diff --git a/pyload/plugin/hoster/StreamcloudEu.py b/pyload/plugin/hoster/StreamcloudEu.py index 63bd24cbf..62e2504c4 100644 --- a/pyload/plugin/hoster/StreamcloudEu.py +++ b/pyload/plugin/hoster/StreamcloudEu.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/TurbobitNet.py b/pyload/plugin/hoster/TurbobitNet.py index 2b0fb9ef5..1aaa555a9 100644 --- a/pyload/plugin/hoster/TurbobitNet.py +++ b/pyload/plugin/hoster/TurbobitNet.py @@ -15,19 +15,19 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, create_getInfo, ti 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", "")] - 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/plugin/hoster/TurbouploadCom.py b/pyload/plugin/hoster/TurbouploadCom.py index 01b5d306f..6be6280fb 100644 --- a/pyload/plugin/hoster/TurbouploadCom.py +++ b/pyload/plugin/hoster/TurbouploadCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/TusfilesNet.py b/pyload/plugin/hoster/TusfilesNet.py index ff1540d9f..303d001df 100644 --- a/pyload/plugin/hoster/TusfilesNet.py +++ b/pyload/plugin/hoster/TusfilesNet.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/TwoSharedCom.py b/pyload/plugin/hoster/TwoSharedCom.py index 6d16ae1a6..637f9058c 100644 --- a/pyload/plugin/hoster/TwoSharedCom.py +++ b/pyload/plugin/hoster/TwoSharedCom.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/UlozTo.py b/pyload/plugin/hoster/UlozTo.py index 1e5317950..d988b2ba5 100644 --- a/pyload/plugin/hoster/UlozTo.py +++ b/pyload/plugin/hoster/UlozTo.py @@ -13,15 +13,15 @@ def convertDecimalPrefix(m): class UlozTo(SimpleHoster): - __name = "UlozTo" - __type = "hoster" - __version = "1.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/plugin/hoster/UloziskoSk.py b/pyload/plugin/hoster/UloziskoSk.py index ab16c1da7..41bafdac6 100644 --- a/pyload/plugin/hoster/UloziskoSk.py +++ b/pyload/plugin/hoster/UloziskoSk.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/UnibytesCom.py b/pyload/plugin/hoster/UnibytesCom.py index 8d1ca0344..1ce1f5c47 100644 --- a/pyload/plugin/hoster/UnibytesCom.py +++ b/pyload/plugin/hoster/UnibytesCom.py @@ -8,15 +8,15 @@ from pyload.plugin.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/plugin/hoster/UnrestrictLi.py b/pyload/plugin/hoster/UnrestrictLi.py index a1d3f1d75..116d98e47 100644 --- a/pyload/plugin/hoster/UnrestrictLi.py +++ b/pyload/plugin/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/plugin/hoster/UpleaCom.py b/pyload/plugin/hoster/UpleaCom.py index d4931224a..3fed6c8cf 100644 --- a/pyload/plugin/hoster/UpleaCom.py +++ b/pyload/plugin/hoster/UpleaCom.py @@ -8,15 +8,15 @@ from pyload.plugin.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", "")] + __description__ = """Uplea.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("Redleon", "")] HOSTER_DOMAIN = "uplea.com" diff --git a/pyload/plugin/hoster/UploadStationCom.py b/pyload/plugin/hoster/UploadStationCom.py index 7d3d806e2..9ece25cdb 100644 --- a/pyload/plugin/hoster/UploadStationCom.py +++ b/pyload/plugin/hoster/UploadStationCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/UploadableCh.py b/pyload/plugin/hoster/UploadableCh.py index 5cb443d99..07ab51601 100644 --- a/pyload/plugin/hoster/UploadableCh.py +++ b/pyload/plugin/hoster/UploadableCh.py @@ -9,15 +9,15 @@ from pyload.plugin.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/plugin/hoster/UploadboxCom.py b/pyload/plugin/hoster/UploadboxCom.py index dcb966e8b..6285b56c5 100644 --- a/pyload/plugin/hoster/UploadboxCom.py +++ b/pyload/plugin/hoster/UploadboxCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/UploadedTo.py b/pyload/plugin/hoster/UploadedTo.py index 16420d361..eb52f9721 100644 --- a/pyload/plugin/hoster/UploadedTo.py +++ b/pyload/plugin/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/plugin/hoster/UploadhereCom.py b/pyload/plugin/hoster/UploadhereCom.py index dd168bc3b..64b235eda 100644 --- a/pyload/plugin/hoster/UploadhereCom.py +++ b/pyload/plugin/hoster/UploadhereCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/UploadheroCom.py b/pyload/plugin/hoster/UploadheroCom.py index 36b8a8b7d..f29832af2 100644 --- a/pyload/plugin/hoster/UploadheroCom.py +++ b/pyload/plugin/hoster/UploadheroCom.py @@ -9,15 +9,15 @@ from pyload.plugin.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/plugin/hoster/UploadingCom.py b/pyload/plugin/hoster/UploadingCom.py index 3a92d5f20..6a75a4fba 100644 --- a/pyload/plugin/hoster/UploadingCom.py +++ b/pyload/plugin/hoster/UploadingCom.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, create_getInfo, ti 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/plugin/hoster/UploadkingCom.py b/pyload/plugin/hoster/UploadkingCom.py index 429245c30..a490d0d48 100644 --- a/pyload/plugin/hoster/UploadkingCom.py +++ b/pyload/plugin/hoster/UploadkingCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/UpstoreNet.py b/pyload/plugin/hoster/UpstoreNet.py index e0153c742..9ed08d226 100644 --- a/pyload/plugin/hoster/UpstoreNet.py +++ b/pyload/plugin/hoster/UpstoreNet.py @@ -7,15 +7,15 @@ from pyload.plugin.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/plugin/hoster/UptoboxCom.py b/pyload/plugin/hoster/UptoboxCom.py index 6c126d627..a7cc49f2a 100644 --- a/pyload/plugin/hoster/UptoboxCom.py +++ b/pyload/plugin/hoster/UptoboxCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/VeehdCom.py b/pyload/plugin/hoster/VeehdCom.py index 30a89f0a8..91d7cc443 100644 --- a/pyload/plugin/hoster/VeehdCom.py +++ b/pyload/plugin/hoster/VeehdCom.py @@ -6,17 +6,17 @@ from pyload.plugin.Hoster import Hoster class VeehdCom(Hoster): - __name = "VeehdCom" - __type = "hoster" - __version = "0.23" + __name__ = "VeehdCom" + __type__ = "hoster" + __version__ = "0.23" - __pattern = r'http://veehd\.com/video/\d+_\S+' - __config = [("filename_spaces", "bool", "Allow spaces in filename", False), + __pattern__ = r'http://veehd\.com/video/\d+_\S+' + __config__ = [("filename_spaces", "bool", "Allow spaces in filename", False), ("replacement_char", "str", "Filename replacement character", "_")] - __description = """Veehd.com hoster plugin""" - __license = "GPLv3" - __authors = [("cat", "cat@pyload")] + __description__ = """Veehd.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("cat", "cat@pyload")] def setup(self): diff --git a/pyload/plugin/hoster/VeohCom.py b/pyload/plugin/hoster/VeohCom.py index 744497064..0f4f055bf 100644 --- a/pyload/plugin/hoster/VeohCom.py +++ b/pyload/plugin/hoster/VeohCom.py @@ -6,22 +6,22 @@ from pyload.plugin.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/plugin/hoster/VidPlayNet.py b/pyload/plugin/hoster/VidPlayNet.py index 8849bafcf..657213c3a 100644 --- a/pyload/plugin/hoster/VidPlayNet.py +++ b/pyload/plugin/hoster/VidPlayNet.py @@ -7,15 +7,15 @@ from pyload.plugin.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/plugin/hoster/VimeoCom.py b/pyload/plugin/hoster/VimeoCom.py index 63a0ec882..07abf31e3 100644 --- a/pyload/plugin/hoster/VimeoCom.py +++ b/pyload/plugin/hoster/VimeoCom.py @@ -6,24 +6,24 @@ from pyload.plugin.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"), + __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/plugin/hoster/Vipleech4uCom.py b/pyload/plugin/hoster/Vipleech4uCom.py index 8936bee98..b56096d46 100644 --- a/pyload/plugin/hoster/Vipleech4uCom.py +++ b/pyload/plugin/hoster/Vipleech4uCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/WarserverCz.py b/pyload/plugin/hoster/WarserverCz.py index 3f935341c..1631a021d 100644 --- a/pyload/plugin/hoster/WarserverCz.py +++ b/pyload/plugin/hoster/WarserverCz.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/WebshareCz.py b/pyload/plugin/hoster/WebshareCz.py index 4f5b78d68..946200b58 100644 --- a/pyload/plugin/hoster/WebshareCz.py +++ b/pyload/plugin/hoster/WebshareCz.py @@ -8,7 +8,7 @@ from pyload.plugin.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/plugin/hoster/WrzucTo.py b/pyload/plugin/hoster/WrzucTo.py index ad0a88d02..76ed73be6 100644 --- a/pyload/plugin/hoster/WrzucTo.py +++ b/pyload/plugin/hoster/WrzucTo.py @@ -8,15 +8,15 @@ from pyload.plugin.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/plugin/hoster/WuploadCom.py b/pyload/plugin/hoster/WuploadCom.py index 6eb3594f5..8ad846ad8 100644 --- a/pyload/plugin/hoster/WuploadCom.py +++ b/pyload/plugin/hoster/WuploadCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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", "")] diff --git a/pyload/plugin/hoster/X7To.py b/pyload/plugin/hoster/X7To.py index d8a3b30d9..6ccc6d637 100644 --- a/pyload/plugin/hoster/X7To.py +++ b/pyload/plugin/hoster/X7To.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/XFileSharingPro.py b/pyload/plugin/hoster/XFileSharingPro.py index 9da17fd0d..54631baba 100644 --- a/pyload/plugin/hoster/XFileSharingPro.py +++ b/pyload/plugin/hoster/XFileSharingPro.py @@ -6,15 +6,15 @@ from pyload.plugin.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/plugin/hoster/XHamsterCom.py b/pyload/plugin/hoster/XHamsterCom.py index e1b0d8c32..92340152f 100644 --- a/pyload/plugin/hoster/XHamsterCom.py +++ b/pyload/plugin/hoster/XHamsterCom.py @@ -17,16 +17,16 @@ def clean_json(json_expr): class XHamsterCom(Hoster): - __name = "XHamsterCom" - __type = "hoster" - __version = "0.12" + __name__ = "XHamsterCom" + __type__ = "hoster" + __version__ = "0.12" - __pattern = r'http://(?:www\.)?xhamster\.com/movies/.+' - __config = [("type", ".mp4;.flv", "Preferred type", ".mp4")] + __pattern__ = r'http://(?:www\.)?xhamster\.com/movies/.+' + __config__ = [("type", ".mp4;.flv", "Preferred type", ".mp4")] - __description = """XHamster.com hoster plugin""" - __license = "GPLv3" - __authors = [] + __description__ = """XHamster.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [] def process(self, pyfile): diff --git a/pyload/plugin/hoster/XVideosCom.py b/pyload/plugin/hoster/XVideosCom.py index b54407b6f..abc5c0f13 100644 --- a/pyload/plugin/hoster/XVideosCom.py +++ b/pyload/plugin/hoster/XVideosCom.py @@ -8,21 +8,21 @@ from pyload.plugin.Hoster import Hoster class XVideosCom(Hoster): - __name = "XVideos.com" - __type = "hoster" - __version = "0.10" + __name__ = "XVideos.com" + __type__ = "hoster" + __version__ = "0.10" - __pattern = r'http://(?:www\.)?xvideos\.com/video(\d+)/.*' + __pattern__ = r'http://(?:www\.)?xvideos\.com/video(\d+)/.*' - __description = """XVideos.com hoster plugin""" - __license = "GPLv3" - __authors = [] + __description__ = """XVideos.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [] def process(self, pyfile): site = self.load(pyfile.url) pyfile.name = "%s (%s).flv" % ( re.search(r"<h2>([^<]+)<span", site).group(1), - re.match(self.__pattern, pyfile.url).group(1), + re.match(self.__pattern__, pyfile.url).group(1), ) self.download(unquote(re.search(r"flv_url=([^&]+)&", site).group(1))) diff --git a/pyload/plugin/hoster/Xdcc.py b/pyload/plugin/hoster/Xdcc.py index 1ce8ee677..91309b286 100644 --- a/pyload/plugin/hoster/Xdcc.py +++ b/pyload/plugin/hoster/Xdcc.py @@ -15,17 +15,17 @@ from pyload.utils import safe_join class Xdcc(Hoster): - __name = "Xdcc" - __type = "hoster" - __version = "0.32" + __name__ = "Xdcc" + __type__ = "hoster" + __version__ = "0.32" - __config = [("nick", "str", "Nickname", "pyload"), + __config__ = [("nick", "str", "Nickname", "pyload"), ("ident", "str", "Ident", "pyloadident"), ("realname", "str", "Realname", "pyloadreal")] - __description = """Download from IRC XDCC bot""" - __license = "GPLv3" - __authors = [("jeix", "jeix@hasnomail.com")] + __description__ = """Download from IRC XDCC bot""" + __license__ = "GPLv3" + __authors__ = [("jeix", "jeix@hasnomail.com")] def setup(self): @@ -36,7 +36,7 @@ class Xdcc(Hoster): def process(self, pyfile): # change request type - self.req = pyfile.m.core.requestFactory.getRequest(self.__name, type="XDCC") + self.req = pyfile.m.core.requestFactory.getRequest(self.__name__, type="XDCC") self.pyfile = pyfile for _i in xrange(0, 3): diff --git a/pyload/plugin/hoster/YibaishiwuCom.py b/pyload/plugin/hoster/YibaishiwuCom.py index 563047e57..f7640390f 100644 --- a/pyload/plugin/hoster/YibaishiwuCom.py +++ b/pyload/plugin/hoster/YibaishiwuCom.py @@ -7,15 +7,15 @@ from pyload.plugin.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/plugin/hoster/YoupornCom.py b/pyload/plugin/hoster/YoupornCom.py index 8f77a15dd..75606935d 100644 --- a/pyload/plugin/hoster/YoupornCom.py +++ b/pyload/plugin/hoster/YoupornCom.py @@ -6,15 +6,15 @@ from pyload.plugin.Hoster import Hoster class YoupornCom(Hoster): - __name = "YoupornCom" - __type = "hoster" - __version = "0.20" + __name__ = "YoupornCom" + __type__ = "hoster" + __version__ = "0.20" - __pattern = r'http://(?:www\.)?youporn\.com/watch/.+' + __pattern__ = r'http://(?:www\.)?youporn\.com/watch/.+' - __description = """Youporn.com hoster plugin""" - __license = "GPLv3" - __authors = [("willnix", "willnix@pyload.org")] + __description__ = """Youporn.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("willnix", "willnix@pyload.org")] def process(self, pyfile): diff --git a/pyload/plugin/hoster/YourfilesTo.py b/pyload/plugin/hoster/YourfilesTo.py index a58df5b72..5f84d6bef 100644 --- a/pyload/plugin/hoster/YourfilesTo.py +++ b/pyload/plugin/hoster/YourfilesTo.py @@ -8,15 +8,15 @@ from pyload.plugin.Hoster import Hoster class YourfilesTo(Hoster): - __name = "YourfilesTo" - __type = "hoster" - __version = "0.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/plugin/hoster/YoutubeCom.py b/pyload/plugin/hoster/YoutubeCom.py index b0e4c82f5..c7e7a6c85 100644 --- a/pyload/plugin/hoster/YoutubeCom.py +++ b/pyload/plugin/hoster/YoutubeCom.py @@ -35,12 +35,12 @@ def which(program): class YoutubeCom(Hoster): - __name = "YoutubeCom" - __type = "hoster" - __version = "0.40" + __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"), + __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), @@ -48,9 +48,9 @@ class YoutubeCom(Hoster): (".3gp", "bool", "Allow .3gp", False), ("3d", "bool", "Prefer 3D", False)] - __description = """Youtube.com hoster plugin""" - __license = "GPLv3" - __authors = [("spoob", "spoob@pyload.org"), + __description__ = """Youtube.com hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("spoob", "spoob@pyload.org"), ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/ZDF.py b/pyload/plugin/hoster/ZDF.py index c02eadc23..da6d6448e 100644 --- a/pyload/plugin/hoster/ZDF.py +++ b/pyload/plugin/hoster/ZDF.py @@ -9,15 +9,15 @@ from pyload.plugin.Hoster import Hoster # Based on zdfm by Roland Beermann (http://github.com/enkore/zdfm/) class ZDF(Hoster): - __name = "ZDF Mediathek" - __type = "hoster" - __version = "0.80" + __name__ = "ZDF Mediathek" + __type__ = "hoster" + __version__ = "0.80" - __pattern = r'http://(?:www\.)?zdf\.de/ZDFmediathek/\D*(\d+)\D*' + __pattern__ = r'http://(?:www\.)?zdf\.de/ZDFmediathek/\D*(\d+)\D*' - __description = """ZDF.de hoster plugin""" - __license = "GPLv3" - __authors = [] + __description__ = """ZDF.de hoster plugin""" + __license__ = "GPLv3" + __authors__ = [] XML_API = "http://www.zdf.de/ZDFmediathek/xmlservice/web/beitragsDetails?id=%i" diff --git a/pyload/plugin/hoster/ZShareNet.py b/pyload/plugin/hoster/ZShareNet.py index 1ab0cc996..a6a34143f 100644 --- a/pyload/plugin/hoster/ZShareNet.py +++ b/pyload/plugin/hoster/ZShareNet.py @@ -4,15 +4,15 @@ from pyload.plugin.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", ""), + __description__ = """ZShare.net hoster plugin""" + __license__ = "GPLv3" + __authors__ = [("espes", ""), ("Cptn Sandwich", "")] diff --git a/pyload/plugin/hoster/ZeveraCom.py b/pyload/plugin/hoster/ZeveraCom.py index 3eeccc52c..93959637c 100644 --- a/pyload/plugin/hoster/ZeveraCom.py +++ b/pyload/plugin/hoster/ZeveraCom.py @@ -4,15 +4,15 @@ from pyload.plugin.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/plugin/hoster/ZippyshareCom.py b/pyload/plugin/hoster/ZippyshareCom.py index 1bf9338c3..fa08cf18f 100644 --- a/pyload/plugin/hoster/ZippyshareCom.py +++ b/pyload/plugin/hoster/ZippyshareCom.py @@ -9,15 +9,15 @@ from pyload.plugin.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/plugin/internal/AbstractExtractor.py b/pyload/plugin/internal/AbstractExtractor.py index b4fd10895..5e09c6755 100644 --- a/pyload/plugin/internal/AbstractExtractor.py +++ b/pyload/plugin/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/plugin/internal/BasePlugin.py b/pyload/plugin/internal/BasePlugin.py index f4b8e8997..954fe4e22 100644 --- a/pyload/plugin/internal/BasePlugin.py +++ b/pyload/plugin/internal/BasePlugin.py @@ -11,15 +11,15 @@ from pyload.plugin.Hoster import Hoster class BasePlugin(Hoster): - __name = "BasePlugin" - __type = "hoster" - __version = "0.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/plugin/internal/DeadCrypter.py b/pyload/plugin/internal/DeadCrypter.py index fcc2e6eb2..97d99021e 100644 --- a/pyload/plugin/internal/DeadCrypter.py +++ b/pyload/plugin/internal/DeadCrypter.py @@ -8,15 +8,15 @@ from pyload.plugin.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/plugin/internal/DeadHoster.py b/pyload/plugin/internal/DeadHoster.py index d8f57801a..27036a139 100644 --- a/pyload/plugin/internal/DeadHoster.py +++ b/pyload/plugin/internal/DeadHoster.py @@ -8,15 +8,15 @@ from pyload.plugin.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/plugin/internal/MultiHoster.py b/pyload/plugin/internal/MultiHoster.py index 93fa13561..3b45801f8 100644 --- a/pyload/plugin/internal/MultiHoster.py +++ b/pyload/plugin/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/plugin/internal/SimpleCrypter.py b/pyload/plugin/internal/SimpleCrypter.py index 30b455545..5115692ad 100644 --- a/pyload/plugin/internal/SimpleCrypter.py +++ b/pyload/plugin/internal/SimpleCrypter.py @@ -10,17 +10,17 @@ from pyload.utils import fixup class SimpleCrypter(Crypter, SimpleHoster): - __name = "SimpleCrypter" - __type = "crypter" - __version = "0.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/plugin/internal/SimpleHoster.py b/pyload/plugin/internal/SimpleHoster.py index 9355cfe86..84c47f3b4 100644 --- a/pyload/plugin/internal/SimpleHoster.py +++ b/pyload/plugin/internal/SimpleHoster.py @@ -118,15 +118,15 @@ def _isDirectLink(self, url, resumable=True): class SimpleHoster(Hoster): - __name = "SimpleHoster" - __type = "hoster" - __version = "0.72" + __name__ = "SimpleHoster" + __type__ = "hoster" + __version__ = "0.72" - __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")] @@ -231,7 +231,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 @@ -287,8 +287,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/plugin/internal/UnRar.py b/pyload/plugin/internal/UnRar.py index 404ee906b..20da4177e 100644 --- a/pyload/plugin/internal/UnRar.py +++ b/pyload/plugin/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/plugin/internal/UnZip.py b/pyload/plugin/internal/UnZip.py index 8cf71f659..dded6158e 100644 --- a/pyload/plugin/internal/UnZip.py +++ b/pyload/plugin/internal/UnZip.py @@ -7,12 +7,12 @@ from pyload.plugin.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/plugin/internal/UpdateManager.py b/pyload/plugin/internal/UpdateManager.py index 0c40b4192..7bbfc0c79 100644 --- a/pyload/plugin/internal/UpdateManager.py +++ b/pyload/plugin/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 ), + __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 activate(self): - self.pluginConfigChanged(self.__name, "interval", self.getConfig("interval")) - x = lambda: self.pluginConfigChanged(self.__name, "reloadplugins", self.getConfig("reloadplugins")) + self.pluginConfigChanged(self.__name__, "interval", self.getConfig("interval")) + x = lambda: self.pluginConfigChanged(self.__name__, "reloadplugins", self.getConfig("reloadplugins")) self.core.scheduler.addJob(10, x, threaded=False) def deactivate(self): - self.pluginConfigChanged(self.__name, "reloadplugins", False) + self.pluginConfigChanged(self.__name__, "reloadplugins", False) def setup(self): @@ -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.plugin.") or - m.__name.startswith("userplugins.")) and - m.__name.count(".") >= 2, sys.modules.itervalues() + lambda m: m and (m.__name__.startswith("pyload.plugin.") or + m.__name__.startswith("userplugins.")) and + m.__name__.count(".") >= 2, sys.modules.itervalues() ) reloads = [] for m in modules: - root, type, name = m.__name.rsplit(".", 2) + root, type, name = m.__name__.rsplit(".", 2) id = (type, name) if type in self.core.pluginManager.plugins: f = m.__file__.replace(".pyc", ".py") @@ -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/plugin/internal/XFSAccount.py b/pyload/plugin/internal/XFSAccount.py index 388cda26c..7a9db0e79 100644 --- a/pyload/plugin/internal/XFSAccount.py +++ b/pyload/plugin/internal/XFSAccount.py @@ -10,13 +10,13 @@ from pyload.plugin.internal.SimpleHoster import parseHtmlForm, set_cookies class XFSAccount(Account): - __name = "XFSAccount" - __type = "account" - __version = "0.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/plugin/internal/XFSCrypter.py b/pyload/plugin/internal/XFSCrypter.py index 6440d328a..a3053b60c 100644 --- a/pyload/plugin/internal/XFSCrypter.py +++ b/pyload/plugin/internal/XFSCrypter.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter class XFSCrypter(SimpleCrypter): - __name = "XFSCrypter" - __type = "crypter" - __version = "0.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/plugin/internal/XFSHoster.py b/pyload/plugin/internal/XFSHoster.py index dfc923f69..0a7853966 100644 --- a/pyload/plugin/internal/XFSHoster.py +++ b/pyload/plugin/internal/XFSHoster.py @@ -12,15 +12,15 @@ from pyload.utils import html_unescape class XFSHoster(SimpleHoster): - __name = "XFSHoster" - __type = "hoster" - __version = "0.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/plugin/ocr/GigasizeCom.py b/pyload/plugin/ocr/GigasizeCom.py index f818cdb41..6982e6ca9 100644 --- a/pyload/plugin/ocr/GigasizeCom.py +++ b/pyload/plugin/ocr/GigasizeCom.py @@ -4,13 +4,13 @@ from pyload.plugin.OCR import OCR class GigasizeCom(OCR): - __name = "GigasizeCom" - __type = "ocr" - __version = "0.10" + __name__ = "GigasizeCom" + __type__ = "ocr" + __version__ = "0.10" - __description = """Gigasize.com ocr plugin""" - __license = "GPLv3" - __authors = [("pyLoad Team", "admin@pyload.org")] + __description__ = """Gigasize.com ocr plugin""" + __license__ = "GPLv3" + __authors__ = [("pyLoad Team", "admin@pyload.org")] def __init__(self): diff --git a/pyload/plugin/ocr/LinksaveIn.py b/pyload/plugin/ocr/LinksaveIn.py index cd0fe96f2..7ced74f4b 100644 --- a/pyload/plugin/ocr/LinksaveIn.py +++ b/pyload/plugin/ocr/LinksaveIn.py @@ -13,13 +13,13 @@ from pyload.plugin.OCR import OCR class LinksaveIn(OCR): - __name = "LinksaveIn" - __type = "ocr" - __version = "0.10" + __name__ = "LinksaveIn" + __type__ = "ocr" + __version__ = "0.10" - __description = """Linksave.in ocr plugin""" - __license = "GPLv3" - __authors = [("pyLoad Team", "admin@pyload.org")] + __description__ = """Linksave.in ocr plugin""" + __license__ = "GPLv3" + __authors__ = [("pyLoad Team", "admin@pyload.org")] def __init__(self): diff --git a/pyload/plugin/ocr/NetloadIn.py b/pyload/plugin/ocr/NetloadIn.py index f15ab4449..8939b5318 100644 --- a/pyload/plugin/ocr/NetloadIn.py +++ b/pyload/plugin/ocr/NetloadIn.py @@ -4,13 +4,13 @@ from pyload.plugin.OCR import OCR class NetloadIn(OCR): - __name = "NetloadIn" - __type = "ocr" - __version = "0.10" + __name__ = "NetloadIn" + __type__ = "ocr" + __version__ = "0.10" - __description = """Netload.in ocr plugin""" - __license = "GPLv3" - __authors = [("pyLoad Team", "admin@pyload.org")] + __description__ = """Netload.in ocr plugin""" + __license__ = "GPLv3" + __authors__ = [("pyLoad Team", "admin@pyload.org")] def __init__(self): diff --git a/pyload/plugin/ocr/ShareonlineBiz.py b/pyload/plugin/ocr/ShareonlineBiz.py index 103a9f96f..bbc3d1762 100644 --- a/pyload/plugin/ocr/ShareonlineBiz.py +++ b/pyload/plugin/ocr/ShareonlineBiz.py @@ -4,13 +4,13 @@ from pyload.plugin.OCR import OCR class ShareonlineBiz(OCR): - __name = "ShareonlineBiz" - __type = "ocr" - __version = "0.10" + __name__ = "ShareonlineBiz" + __type__ = "ocr" + __version__ = "0.10" - __description = """Shareonline.biz ocr plugin""" - __license = "GPLv3" - __authors = [("RaNaN", "RaNaN@pyload.org")] + __description__ = """Shareonline.biz ocr plugin""" + __license__ = "GPLv3" + __authors__ = [("RaNaN", "RaNaN@pyload.org")] def __init__(self): |