diff options
Diffstat (limited to 'pyload/plugin/hoster')
200 files changed, 1589 insertions, 1589 deletions
diff --git a/pyload/plugin/hoster/AlldebridCom.py b/pyload/plugin/hoster/AlldebridCom.py index c1b4a757f..d739600d9 100644 --- a/pyload/plugin/hoster/AlldebridCom.py +++ b/pyload/plugin/hoster/AlldebridCom.py @@ -11,16 +11,16 @@ from pyload.utils import parseFileSize  class AlldebridCom(MultiHoster): -    __name    = "AlldebridCom" -    __type    = "hoster" -    __version = "0.46" +    __name__    = "AlldebridCom" +    __type__    = "hoster" +    __version__ = "0.46" -    __pattern = r'https?://(?:www\.|s\d+\.)?alldebrid\.com/dl/[\w^_]+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.|s\d+\.)?alldebrid\.com/dl/[\w^_]+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Alldebrid.com multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Andy Voigt", "spamsales@online.de")] +    __description__ = """Alldebrid.com multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Andy Voigt", "spamsales@online.de")]      def setup(self): diff --git a/pyload/plugin/hoster/AndroidfilehostCom.py b/pyload/plugin/hoster/AndroidfilehostCom.py index 584001725..aa1387c24 100644 --- a/pyload/plugin/hoster/AndroidfilehostCom.py +++ b/pyload/plugin/hoster/AndroidfilehostCom.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class AndroidfilehostCom(SimpleHoster): -    __name    = "AndroidfilehostCom" -    __type    = "hoster" -    __version = "0.01" +    __name__    = "AndroidfilehostCom" +    __type__    = "hoster" +    __version__ = "0.01" -    __pattern = r'https?://(?:www\.)?androidfilehost\.com/\?fid=\d+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?androidfilehost\.com/\?fid=\d+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Androidfilehost.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description__ = """Androidfilehost.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]      NAME_PATTERN    = r'<br />(?P<N>.*?)</h1>' diff --git a/pyload/plugin/hoster/BasketbuildCom.py b/pyload/plugin/hoster/BasketbuildCom.py index d005eae74..ea9b9bc29 100644 --- a/pyload/plugin/hoster/BasketbuildCom.py +++ b/pyload/plugin/hoster/BasketbuildCom.py @@ -10,16 +10,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class BasketbuildCom(SimpleHoster): -    __name    = "BasketbuildCom" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "BasketbuildCom" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'https?://(?:www\.)?(?:\w\.)?basketbuild\.com/filedl/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?(?:\w\.)?basketbuild\.com/filedl/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """basketbuild.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description__ = """basketbuild.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]      NAME_PATTERN    = r'File Name:</strong> (?P<N>.+?)<br/>' diff --git a/pyload/plugin/hoster/BayfilesCom.py b/pyload/plugin/hoster/BayfilesCom.py index b14e28dcb..ab94b4015 100644 --- a/pyload/plugin/hoster/BayfilesCom.py +++ b/pyload/plugin/hoster/BayfilesCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class BayfilesCom(DeadHoster): -    __name    = "BayfilesCom" -    __type    = "hoster" -    __version = "0.09" +    __name__    = "BayfilesCom" +    __type__    = "hoster" +    __version__ = "0.09" -    __pattern = r'https?://(?:www\.)?bayfiles\.(com|net)/file/(?P<ID>\w+/\w+/[^/]+)' -    __config  = [] +    __pattern__ = r'https?://(?:www\.)?bayfiles\.(com|net)/file/(?P<ID>\w+/\w+/[^/]+)' +    __config__  = [] -    __description = """Bayfiles.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description__ = """Bayfiles.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/BezvadataCz.py b/pyload/plugin/hoster/BezvadataCz.py index 0792c851c..20da88010 100644 --- a/pyload/plugin/hoster/BezvadataCz.py +++ b/pyload/plugin/hoster/BezvadataCz.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class BezvadataCz(SimpleHoster): -    __name    = "BezvadataCz" -    __type    = "hoster" -    __version = "0.26" +    __name__    = "BezvadataCz" +    __type__    = "hoster" +    __version__ = "0.26" -    __pattern = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?bezvadata\.cz/stahnout/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 e34584868..2dec3e8b8 100644 --- a/pyload/plugin/hoster/BillionuploadsCom.py +++ b/pyload/plugin/hoster/BillionuploadsCom.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class BillionuploadsCom(XFSHoster): -    __name    = "BillionuploadsCom" -    __type    = "hoster" -    __version = "0.04" +    __name__    = "BillionuploadsCom" +    __type__    = "hoster" +    __version__ = "0.04" -    __pattern = r'http://(?:www\.)?billionuploads\.com/\w{12}' +    __pattern__ = r'http://(?:www\.)?billionuploads\.com/\w{12}' -    __description = """Billionuploads.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Billionuploads.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]      NAME_PATTERN = r'<td class="dofir" title="(?P<N>.+?)"' diff --git a/pyload/plugin/hoster/BitshareCom.py b/pyload/plugin/hoster/BitshareCom.py index 471951a9e..4210d0f73 100644 --- a/pyload/plugin/hoster/BitshareCom.py +++ b/pyload/plugin/hoster/BitshareCom.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class BitshareCom(SimpleHoster): -    __name    = "BitshareCom" -    __type    = "hoster" -    __version = "0.53" +    __name__    = "BitshareCom" +    __type__    = "hoster" +    __version__ = "0.53" -    __pattern = r'http://(?:www\.)?bitshare\.com/(files/)?(?(1)|\?f=)(?P<ID>\w+)(?(1)/(?P<NAME>.+?)\.html)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?bitshare\.com/(files/)?(?(1)|\?f=)(?P<ID>\w+)(?(1)/(?P<NAME>.+?)\.html)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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")] @@ -41,7 +41,7 @@ class BitshareCom(SimpleHoster):              self.account.relogin(self.user)          # File id -        m = re.match(self.__pattern, pyfile.url) +        m = re.match(self.__pattern__, pyfile.url)          self.file_id = max(m.group('ID1'), m.group('ID2'))          self.logDebug("File id is [%s]" % self.file_id) @@ -59,7 +59,7 @@ class BitshareCom(SimpleHoster):              self.retry()          # File name -        m     = re.match(self.__pattern, pyfile.url) +        m     = re.match(self.__pattern__, pyfile.url)          name1 = m.group('NAME') if m else None          m     = re.search(self.INFO_PATTERN, self.html) diff --git a/pyload/plugin/hoster/BoltsharingCom.py b/pyload/plugin/hoster/BoltsharingCom.py index 10716e695..58d4a23a9 100644 --- a/pyload/plugin/hoster/BoltsharingCom.py +++ b/pyload/plugin/hoster/BoltsharingCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class BoltsharingCom(DeadHoster): -    __name    = "BoltsharingCom" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "BoltsharingCom" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'http://(?:www\.)?boltsharing\.com/\w{12}' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?boltsharing\.com/\w{12}' +    __config__  = [] -    __description = """Boltsharing.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Boltsharing.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/CatShareNet.py b/pyload/plugin/hoster/CatShareNet.py index f60208cc4..6babb001c 100644 --- a/pyload/plugin/hoster/CatShareNet.py +++ b/pyload/plugin/hoster/CatShareNet.py @@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class CatShareNet(SimpleHoster): -    __name    = "CatShareNet" -    __type    = "hoster" -    __version = "0.12" +    __name__    = "CatShareNet" +    __type__    = "hoster" +    __version__ = "0.12" -    __pattern = r'http://(?:www\.)?catshare\.net/\w{16}' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?catshare\.net/\w{16}' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 c1b3beae8..775b4656a 100644 --- a/pyload/plugin/hoster/CloudzerNet.py +++ b/pyload/plugin/hoster/CloudzerNet.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class CloudzerNet(DeadHoster): -    __name    = "CloudzerNet" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "CloudzerNet" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'https?://(?:www\.)?(cloudzer\.net/file/|clz\.to/(file/)?)\w+' -    __config  = [] +    __pattern__ = r'https?://(?:www\.)?(cloudzer\.net/file/|clz\.to/(file/)?)\w+' +    __config__  = [] -    __description = """Cloudzer.net hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("gs", "I-_-I-_-I@web.de"), +    __description__ = """Cloudzer.net hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("gs", "I-_-I-_-I@web.de"),                         ("z00nx", "z00nx0@gmail.com"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/CloudzillaTo.py b/pyload/plugin/hoster/CloudzillaTo.py index a244b1fae..337aa9d3c 100644 --- a/pyload/plugin/hoster/CloudzillaTo.py +++ b/pyload/plugin/hoster/CloudzillaTo.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class CloudzillaTo(SimpleHoster): -    __name    = "CloudzillaTo" -    __type    = "hoster" -    __version = "0.06" +    __name__    = "CloudzillaTo" +    __type__    = "hoster" +    __version__ = "0.06" -    __pattern = r'http://(?:www\.)?cloudzilla\.to/share/file/(?P<ID>[\w^_]+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?cloudzilla\.to/share/file/(?P<ID>[\w^_]+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Cloudzilla.to hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description__ = """Cloudzilla.to hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]      INFO_PATTERN    = r'title="(?P<N>.+?)">\1</span> <span class="size">\((?P<S>[\d.]+) (?P<U>[\w^_]+)' diff --git a/pyload/plugin/hoster/CramitIn.py b/pyload/plugin/hoster/CramitIn.py index 9d8d4960d..3ccb3cfc6 100644 --- a/pyload/plugin/hoster/CramitIn.py +++ b/pyload/plugin/hoster/CramitIn.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class CramitIn(XFSHoster): -    __name    = "CramitIn" -    __type    = "hoster" -    __version = "0.07" +    __name__    = "CramitIn" +    __type__    = "hoster" +    __version__ = "0.07" -    __pattern = r'http://(?:www\.)?cramit\.in/\w{12}' +    __pattern__ = r'http://(?:www\.)?cramit\.in/\w{12}' -    __description = """Cramit.in hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Cramit.in hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]      INFO_PATTERN = r'<span class=t2>\s*(?P<N>.*?)</span>.*?<small>\s*\((?P<S>.*?)\)' diff --git a/pyload/plugin/hoster/CrockoCom.py b/pyload/plugin/hoster/CrockoCom.py index 4bf549574..38e057df6 100644 --- a/pyload/plugin/hoster/CrockoCom.py +++ b/pyload/plugin/hoster/CrockoCom.py @@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class CrockoCom(SimpleHoster): -    __name    = "CrockoCom" -    __type    = "hoster" -    __version = "0.19" +    __name__    = "CrockoCom" +    __type__    = "hoster" +    __version__ = "0.19" -    __pattern = r'http://(?:www\.)?(crocko|easy-share)\.com/\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?(crocko|easy-share)\.com/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 b56736a8e..ec06844c3 100644 --- a/pyload/plugin/hoster/CyberlockerCh.py +++ b/pyload/plugin/hoster/CyberlockerCh.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class CyberlockerCh(DeadHoster): -    __name    = "CyberlockerCh" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "CyberlockerCh" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'http://(?:www\.)?cyberlocker\.ch/\w+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?cyberlocker\.ch/\w+' +    __config__  = [] -    __description = """Cyberlocker.ch hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("stickell", "l.stickell@yahoo.it")] +    __description__ = """Cyberlocker.ch hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/CzshareCom.py b/pyload/plugin/hoster/CzshareCom.py index ee7bf5d55..70766d6fc 100644 --- a/pyload/plugin/hoster/CzshareCom.py +++ b/pyload/plugin/hoster/CzshareCom.py @@ -10,16 +10,16 @@ from pyload.utils import parseFileSize  class CzshareCom(SimpleHoster): -    __name    = "CzshareCom" -    __type    = "hoster" -    __version = "0.99" +    __name__    = "CzshareCom" +    __type__    = "hoster" +    __version__ = "0.99" -    __pattern = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 3fdac761c..f90067446 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 eb65bbda9..820736e0a 100644 --- a/pyload/plugin/hoster/DataHu.py +++ b/pyload/plugin/hoster/DataHu.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class DataHu(SimpleHoster): -    __name    = "DataHu" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "DataHu" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'http://(?:www\.)?data\.hu/get/\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?data\.hu/get/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 889d402d9..4f659b291 100644 --- a/pyload/plugin/hoster/DataportCz.py +++ b/pyload/plugin/hoster/DataportCz.py @@ -4,16 +4,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class DataportCz(SimpleHoster): -    __name    = "DataportCz" -    __type    = "hoster" -    __version = "0.41" +    __name__    = "DataportCz" +    __type__    = "hoster" +    __version__ = "0.41" -    __pattern = r'http://(?:www\.)?dataport\.cz/file/(.+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?dataport\.cz/file/(.+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 251036ad2..0669ce365 100644 --- a/pyload/plugin/hoster/DateiTo.py +++ b/pyload/plugin/hoster/DateiTo.py @@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class DateiTo(SimpleHoster): -    __name    = "DateiTo" -    __type    = "hoster" -    __version = "0.07" +    __name__    = "DateiTo" +    __type__    = "hoster" +    __version__ = "0.07" -    __pattern = r'http://(?:www\.)?datei\.to/datei/(?P<ID>\w+)\.html' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?datei\.to/datei/(?P<ID>\w+)\.html' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 53c0df7cb..c2077eb16 100644 --- a/pyload/plugin/hoster/DdlstorageCom.py +++ b/pyload/plugin/hoster/DdlstorageCom.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class DdlstorageCom(DeadHoster): -    __name    = "DdlstorageCom" -    __type    = "hoster" -    __version = "1.02" +    __name__    = "DdlstorageCom" +    __type__    = "hoster" +    __version__ = "1.02" -    __pattern = r'https?://(?:www\.)?ddlstorage\.com/\w+' -    __config  = [] +    __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/\w+' +    __config__  = [] -    __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 a0308e28e..af9500707 100644 --- a/pyload/plugin/hoster/DebridItaliaCom.py +++ b/pyload/plugin/hoster/DebridItaliaCom.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class DebridItaliaCom(MultiHoster): -    __name    = "DebridItaliaCom" -    __type    = "hoster" -    __version = "0.17" +    __name__    = "DebridItaliaCom" +    __type__    = "hoster" +    __version__ = "0.17" -    __pattern = r'https?://(?:www\.|s\d+\.)?debriditalia\.com/dl/\d+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.|s\d+\.)?debriditalia\.com/dl/\d+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Debriditalia.com multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("stickell", "l.stickell@yahoo.it"), +    __description__ = """Debriditalia.com multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("stickell", "l.stickell@yahoo.it"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/DepositfilesCom.py b/pyload/plugin/hoster/DepositfilesCom.py index 451adbdc0..0a7543dfb 100644 --- a/pyload/plugin/hoster/DepositfilesCom.py +++ b/pyload/plugin/hoster/DepositfilesCom.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class DepositfilesCom(SimpleHoster): -    __name    = "DepositfilesCom" -    __type    = "hoster" -    __version = "0.54" +    __name__    = "DepositfilesCom" +    __type__    = "hoster" +    __version__ = "0.54" -    __pattern = r'https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/(?P<ID>\w+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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")] @@ -29,7 +29,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 573b92838..5816f1ba0 100644 --- a/pyload/plugin/hoster/DevhostSt.py +++ b/pyload/plugin/hoster/DevhostSt.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class DevhostSt(SimpleHoster): -    __name    = "DevhostSt" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "DevhostSt" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'http://(?:www\.)?d-h\.st/(?!users/)\w{3}' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?d-h\.st/(?!users/)\w{3}' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """d-h.st hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description__ = """d-h.st hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]      NAME_PATTERN      = r'<span title="(?P<N>.*?)"' diff --git a/pyload/plugin/hoster/DlFreeFr.py b/pyload/plugin/hoster/DlFreeFr.py index 568b6dfce..892d72a6f 100644 --- a/pyload/plugin/hoster/DlFreeFr.py +++ b/pyload/plugin/hoster/DlFreeFr.py @@ -35,16 +35,16 @@ class CustomBrowser(Browser):  class DlFreeFr(SimpleHoster): -    __name    = "DlFreeFr" -    __type    = "hoster" -    __version = "0.28" +    __name__    = "DlFreeFr" +    __type__    = "hoster" +    __version__ = "0.28" -    __pattern = r'http://(?:www\.)?dl\.free\.fr/(\w+|getfile\.pl\?file=/\w+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?dl\.free\.fr/(\w+|getfile\.pl\?file=/\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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")] @@ -103,7 +103,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 8edbb64c0..9bd5e45a9 100644 --- a/pyload/plugin/hoster/DodanePl.py +++ b/pyload/plugin/hoster/DodanePl.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class DodanePl(DeadHoster): -    __name    = "DodanePl" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "DodanePl" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'http://(?:www\.)?dodane\.pl/file/\d+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?dodane\.pl/file/\d+' +    __config__  = [] -    __description = """Dodane.pl hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("z00nx", "z00nx0@gmail.com")] +    __description__ = """Dodane.pl hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("z00nx", "z00nx0@gmail.com")] diff --git a/pyload/plugin/hoster/DuploadOrg.py b/pyload/plugin/hoster/DuploadOrg.py index decd1a7ff..6b7574eee 100644 --- a/pyload/plugin/hoster/DuploadOrg.py +++ b/pyload/plugin/hoster/DuploadOrg.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class DuploadOrg(DeadHoster): -    __name    = "DuploadOrg" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "DuploadOrg" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'http://(?:www\.)?dupload\.org/\w{12}' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?dupload\.org/\w{12}' +    __config__  = [] -    __description = """Dupload.grg hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("stickell", "l.stickell@yahoo.it")] +    __description__ = """Dupload.grg hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/EasybytezCom.py b/pyload/plugin/hoster/EasybytezCom.py index 8dcb04b98..07e75714d 100644 --- a/pyload/plugin/hoster/EasybytezCom.py +++ b/pyload/plugin/hoster/EasybytezCom.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class EasybytezCom(XFSHoster): -    __name    = "EasybytezCom" -    __type    = "hoster" -    __version = "0.23" +    __name__    = "EasybytezCom" +    __type__    = "hoster" +    __version__ = "0.23" -    __pattern = r'http://(?:www\.)?easybytez\.com/\w{12}' +    __pattern__ = r'http://(?:www\.)?easybytez\.com/\w{12}' -    __description = """Easybytez.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description__ = """Easybytez.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/EdiskCz.py b/pyload/plugin/hoster/EdiskCz.py index 1c5a25433..2fd56eb82 100644 --- a/pyload/plugin/hoster/EdiskCz.py +++ b/pyload/plugin/hoster/EdiskCz.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class EdiskCz(SimpleHoster): -    __name    = "EdiskCz" -    __type    = "hoster" -    __version = "0.23" +    __name__    = "EdiskCz" +    __type__    = "hoster" +    __version__ = "0.23" -    __pattern = r'http://(?:www\.)?edisk\.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?edisk\.(cz|sk|eu)/(stahni|sk/stahni|en/download)/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 f87c96dd1..150b8bc0c 100644 --- a/pyload/plugin/hoster/EgoFilesCom.py +++ b/pyload/plugin/hoster/EgoFilesCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class EgoFilesCom(DeadHoster): -    __name    = "EgoFilesCom" -    __type    = "hoster" -    __version = "0.16" +    __name__    = "EgoFilesCom" +    __type__    = "hoster" +    __version__ = "0.16" -    __pattern = r'https?://(?:www\.)?egofiles\.com/\w+' -    __config  = [] +    __pattern__ = r'https?://(?:www\.)?egofiles\.com/\w+' +    __config__  = [] -    __description = """Egofiles.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("stickell", "l.stickell@yahoo.it")] +    __description__ = """Egofiles.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/EnteruploadCom.py b/pyload/plugin/hoster/EnteruploadCom.py index e64c284f6..b3a736697 100644 --- a/pyload/plugin/hoster/EnteruploadCom.py +++ b/pyload/plugin/hoster/EnteruploadCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class EnteruploadCom(DeadHoster): -    __name    = "EnteruploadCom" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "EnteruploadCom" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'http://(?:www\.)?enterupload\.com/\w+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?enterupload\.com/\w+' +    __config__  = [] -    __description = """EnterUpload.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """EnterUpload.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/EpicShareNet.py b/pyload/plugin/hoster/EpicShareNet.py index 05a1aca40..0bab20afa 100644 --- a/pyload/plugin/hoster/EpicShareNet.py +++ b/pyload/plugin/hoster/EpicShareNet.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class EpicShareNet(DeadHoster): -    __name    = "EpicShareNet" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "EpicShareNet" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'https?://(?:www\.)?epicshare\.net/\w{12}' -    __config  = [] +    __pattern__ = r'https?://(?:www\.)?epicshare\.net/\w{12}' +    __config__  = [] -    __description = """EpicShare.net hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] +    __description__ = """EpicShare.net hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] diff --git a/pyload/plugin/hoster/EuroshareEu.py b/pyload/plugin/hoster/EuroshareEu.py index ff7ca6661..fa0f69d8f 100644 --- a/pyload/plugin/hoster/EuroshareEu.py +++ b/pyload/plugin/hoster/EuroshareEu.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class EuroshareEu(SimpleHoster): -    __name    = "EuroshareEu" -    __type    = "hoster" -    __version = "0.28" +    __name__    = "EuroshareEu" +    __type__    = "hoster" +    __version__ = "0.28" -    __pattern = r'http://(?:www\.)?euroshare\.(eu|sk|cz|hu|pl)/file/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?euroshare\.(eu|sk|cz|hu|pl)/file/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Euroshare.eu hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Euroshare.eu hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]      INFO_PATTERN    = r'<span style="float: left;"><strong>(?P<N>.+?)</strong> \((?P<S>.+?)\)</span>' diff --git a/pyload/plugin/hoster/ExashareCom.py b/pyload/plugin/hoster/ExashareCom.py index c7b876076..504eef334 100644 --- a/pyload/plugin/hoster/ExashareCom.py +++ b/pyload/plugin/hoster/ExashareCom.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class ExashareCom(XFSHoster): -    __name    = "ExashareCom" -    __type    = "hoster" -    __version = "0.01" +    __name__    = "ExashareCom" +    __type__    = "hoster" +    __version__ = "0.01" -    __pattern = r'http://(?:www\.)?exashare\.com/\w{12}' +    __pattern__ = r'http://(?:www\.)?exashare\.com/\w{12}' -    __description = """Exashare.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description__ = """Exashare.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]      INFO_PATTERN      = r'>(?P<NAME>.+?)<small>\( (?P<S>[\d.,]+) (?P<U>[\w^_]+)' diff --git a/pyload/plugin/hoster/ExtabitCom.py b/pyload/plugin/hoster/ExtabitCom.py index 16f74c072..c0fa782fa 100644 --- a/pyload/plugin/hoster/ExtabitCom.py +++ b/pyload/plugin/hoster/ExtabitCom.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, secondsToMidnight  class ExtabitCom(SimpleHoster): -    __name    = "ExtabitCom" -    __type    = "hoster" -    __version = "0.65" +    __name__    = "ExtabitCom" +    __type__    = "hoster" +    __version__ = "0.65" -    __pattern = r'http://(?:www\.)?extabit\.com/(file|go|fid)/(?P<ID>\w+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?extabit\.com/(file|go|fid)/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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['pattern']['ID']          m = re.search(r'recaptcha/api/challenge\?k=(\w+)', self.html) diff --git a/pyload/plugin/hoster/FastixRu.py b/pyload/plugin/hoster/FastixRu.py index 8fa6bb386..679194969 100644 --- a/pyload/plugin/hoster/FastixRu.py +++ b/pyload/plugin/hoster/FastixRu.py @@ -10,16 +10,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class FastixRu(MultiHoster): -    __name    = "FastixRu" -    __type    = "hoster" -    __version = "0.11" +    __name__    = "FastixRu" +    __type__    = "hoster" +    __version__ = "0.11" -    __pattern = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Fastix multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Massimo Rosamilia", "max@spiritix.eu")] +    __description__ = """Fastix multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")]      def setup(self): diff --git a/pyload/plugin/hoster/FastshareCz.py b/pyload/plugin/hoster/FastshareCz.py index a98a7de31..fba0e0479 100644 --- a/pyload/plugin/hoster/FastshareCz.py +++ b/pyload/plugin/hoster/FastshareCz.py @@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FastshareCz(SimpleHoster): -    __name    = "FastshareCz" -    __type    = "hoster" -    __version = "0.29" +    __name__    = "FastshareCz" +    __type__    = "hoster" +    __version__ = "0.29" -    __pattern = r'http://(?:www\.)?fastshare\.cz/\d+/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?fastshare\.cz/\d+/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 87d995817..4dc1442c5 100644 --- a/pyload/plugin/hoster/FileApeCom.py +++ b/pyload/plugin/hoster/FileApeCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FileApeCom(DeadHoster): -    __name    = "FileApeCom" -    __type    = "hoster" -    __version = "0.12" +    __name__    = "FileApeCom" +    __type__    = "hoster" +    __version__ = "0.12" -    __pattern = r'http://(?:www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+' +    __config__  = [] -    __description = """FileApe.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("espes", "")] +    __description__ = """FileApe.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("espes", "")] diff --git a/pyload/plugin/hoster/FileSharkPl.py b/pyload/plugin/hoster/FileSharkPl.py index d3e3675ab..ab28ac144 100644 --- a/pyload/plugin/hoster/FileSharkPl.py +++ b/pyload/plugin/hoster/FileSharkPl.py @@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FileSharkPl(SimpleHoster): -    __name    = "FileSharkPl" -    __type    = "hoster" -    __version = "0.09" +    __name__    = "FileSharkPl" +    __type__    = "hoster" +    __version__ = "0.09" -    __pattern = r'http://(?:www\.)?fileshark\.pl/pobierz/\d+/\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?fileshark\.pl/pobierz/\d+/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 6315f208d..10d24c1b0 100644 --- a/pyload/plugin/hoster/FileStoreTo.py +++ b/pyload/plugin/hoster/FileStoreTo.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FileStoreTo(SimpleHoster): -    __name    = "FileStoreTo" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "FileStoreTo" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'http://(?:www\.)?filestore\.to/\?d=(?P<ID>\w+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?filestore\.to/\?d=(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 a929a0787..34f3969c2 100644 --- a/pyload/plugin/hoster/FilebeerInfo.py +++ b/pyload/plugin/hoster/FilebeerInfo.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FilebeerInfo(DeadHoster): -    __name    = "FilebeerInfo" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "FilebeerInfo" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'http://(?:www\.)?filebeer\.info/(?!\d*~f)(?P<ID>\w+)' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?filebeer\.info/(?!\d*~f)(?P<ID>\w+)' +    __config__  = [] -    __description = """Filebeer.info plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Filebeer.info plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/FilecloudIo.py b/pyload/plugin/hoster/FilecloudIo.py index 2cbc472de..aa3321016 100644 --- a/pyload/plugin/hoster/FilecloudIo.py +++ b/pyload/plugin/hoster/FilecloudIo.py @@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FilecloudIo(SimpleHoster): -    __name    = "FilecloudIo" -    __type    = "hoster" -    __version = "0.08" +    __name__    = "FilecloudIo" +    __type__    = "hoster" +    __version__ = "0.08" -    __pattern = r'http://(?:www\.)?(?:filecloud\.io|ifile\.it|mihd\.net)/(?P<ID>\w+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?(?:filecloud\.io|ifile\.it|mihd\.net)/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 85d014e1e..c6b857307 100644 --- a/pyload/plugin/hoster/FilefactoryCom.py +++ b/pyload/plugin/hoster/FilefactoryCom.py @@ -12,23 +12,23 @@ 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.54" +    __name__    = "FilefactoryCom" +    __type__    = "hoster" +    __version__ = "0.54" -    __pattern = r'https?://(?:www\.)?filefactory\.com/(file|trafficshare/\w+)/\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?filefactory\.com/(file|trafficshare/\w+)/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 c8ccbbb25..cd890778b 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 bac912c56..cdfc15dd9 100644 --- a/pyload/plugin/hoster/FileomCom.py +++ b/pyload/plugin/hoster/FileomCom.py @@ -7,15 +7,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class FileomCom(XFSHoster): -    __name    = "FileomCom" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "FileomCom" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'https?://(?:www\.)?fileom\.com/\w{12}' +    __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}' -    __description = """Fileom.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description__ = """Fileom.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]      NAME_PATTERN = r'Filename: <span>(?P<N>.+?)<' diff --git a/pyload/plugin/hoster/FilepostCom.py b/pyload/plugin/hoster/FilepostCom.py index c5cfa1521..4e611fc8e 100644 --- a/pyload/plugin/hoster/FilepostCom.py +++ b/pyload/plugin/hoster/FilepostCom.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FilepostCom(SimpleHoster): -    __name    = "FilepostCom" -    __type    = "hoster" -    __version = "0.33" +    __name__    = "FilepostCom" +    __type__    = "hoster" +    __version__ = "0.33" -    __pattern = r'https?://(?:www\.)?(?:filepost\.com/files|fp\.io)/(?P<ID>[^/]+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?(?:filepost\.com/files|fp\.io)/(?P<ID>[^/]+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 72237285c..80f4fc1c8 100644 --- a/pyload/plugin/hoster/FilepupNet.py +++ b/pyload/plugin/hoster/FilepupNet.py @@ -10,16 +10,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FilepupNet(SimpleHoster): -    __name    = "FilepupNet" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "FilepupNet" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'http://(?:www\.)?filepup\.net/files/\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?filepup\.net/files/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 7cefa6d9f..ab9d71e3f 100644 --- a/pyload/plugin/hoster/FilerNet.py +++ b/pyload/plugin/hoster/FilerNet.py @@ -14,16 +14,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FilerNet(SimpleHoster): -    __name    = "FilerNet" -    __type    = "hoster" -    __version = "0.19" +    __name__    = "FilerNet" +    __type__    = "hoster" +    __version__ = "0.19" -    __pattern = r'https?://(?:www\.)?filer\.net/get/\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?filer\.net/get/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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")]      INFO_PATTERN    = r'<h1 class="page-header">Free Download (?P<N>\S+) <small>(?P<S>[\w.]+) (?P<U>[\w^_]+)</small></h1>' diff --git a/pyload/plugin/hoster/FilerioCom.py b/pyload/plugin/hoster/FilerioCom.py index c55fd2c0b..9290bee84 100644 --- a/pyload/plugin/hoster/FilerioCom.py +++ b/pyload/plugin/hoster/FilerioCom.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class FilerioCom(XFSHoster): -    __name    = "FilerioCom" -    __type    = "hoster" -    __version = "0.07" +    __name__    = "FilerioCom" +    __type__    = "hoster" +    __version__ = "0.07" -    __pattern = r'http://(?:www\.)?(filerio\.(in|com)|filekeen\.com)/\w{12}' +    __pattern__ = r'http://(?:www\.)?(filerio\.(in|com)|filekeen\.com)/\w{12}' -    __description = """FileRio.in hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """FileRio.in hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]      URL_REPLACEMENTS = [(r'filekeen\.com', "filerio.in")] diff --git a/pyload/plugin/hoster/FilesMailRu.py b/pyload/plugin/hoster/FilesMailRu.py index 024da64cd..09da46b01 100644 --- a/pyload/plugin/hoster/FilesMailRu.py +++ b/pyload/plugin/hoster/FilesMailRu.py @@ -30,15 +30,15 @@ def getInfo(urls):  class FilesMailRu(Hoster): -    __name    = "FilesMailRu" -    __type    = "hoster" -    __version = "0.32" +    __name__    = "FilesMailRu" +    __type__    = "hoster" +    __version__ = "0.32" -    __pattern = r'http://(?:www\.)?files\.mail\.ru/.+' +    __pattern__ = r'http://(?:www\.)?files\.mail\.ru/.+' -    __description = """Files.mail.ru hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("oZiRiz", "ich@oziriz.de")] +    __description__ = """Files.mail.ru hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("oZiRiz", "ich@oziriz.de")]      def setup(self): diff --git a/pyload/plugin/hoster/FileserveCom.py b/pyload/plugin/hoster/FileserveCom.py index 2742d33ee..eb80889b1 100644 --- a/pyload/plugin/hoster/FileserveCom.py +++ b/pyload/plugin/hoster/FileserveCom.py @@ -31,15 +31,15 @@ def checkFile(plugin, urls):  class FileserveCom(Hoster): -    __name    = "FileserveCom" -    __type    = "hoster" -    __version = "0.54" +    __name__    = "FileserveCom" +    __type__    = "hoster" +    __version__ = "0.54" -    __pattern = r'http://(?:www\.)?fileserve\.com/file/(?P<ID>[^/]+)' +    __pattern__ = r'http://(?:www\.)?fileserve\.com/file/(?P<ID>[^/]+)' -    __description = """Fileserve.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("jeix", "jeix@hasnomail.de"), +    __description__ = """Fileserve.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("jeix", "jeix@hasnomail.de"),                         ("mkaay", "mkaay@mkaay.de"),                         ("Paul King", ""),                         ("zoidberg", "zoidberg@mujmail.cz")] @@ -59,7 +59,7 @@ class FileserveCom(Hoster):      def setup(self):          self.resumeDownload = self.multiDL = self.premium -        self.file_id = re.match(self.__pattern, self.pyfile.url).group('ID') +        self.file_id = re.match(self.__pattern__, self.pyfile.url).group('ID')          self.url     = "%s%s" % (self.URLS[0], self.file_id)          self.logDebug("File ID: %s URL: %s" % (self.file_id, self.url)) @@ -144,7 +144,7 @@ class FileserveCom(Hoster):          if "fail" in res:              self.fail(_("Failed getting wait time")) -        if self.__name == "FilejungleCom": +        if self.__name__ == "FilejungleCom":              m = re.search(r'"waitTime":(\d+)', res)              if m is None:                  self.fail(_("Cannot get wait time")) @@ -184,7 +184,7 @@ class FileserveCom(Hoster):      def handlePremium(self, pyfile):          premium_url = None -        if self.__name == "FileserveCom": +        if self.__name__ == "FileserveCom":              #try api download              res = self.load("http://app.fileserve.com/api/download/premium/",                              post={"username": self.user, diff --git a/pyload/plugin/hoster/FileshareInUa.py b/pyload/plugin/hoster/FileshareInUa.py index 8b09a086a..afda590c0 100644 --- a/pyload/plugin/hoster/FileshareInUa.py +++ b/pyload/plugin/hoster/FileshareInUa.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FileshareInUa(DeadHoster): -    __name    = "FileshareInUa" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "FileshareInUa" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'https?://(?:www\.)?fileshare\.in\.ua/\w{7}' -    __config  = [] +    __pattern__ = r'https?://(?:www\.)?fileshare\.in\.ua/\w{7}' +    __config__  = [] -    __description = """Fileshare.in.ua hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("fwannmacher", "felipe@warhammerproject.com")] +    __description__ = """Fileshare.in.ua hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("fwannmacher", "felipe@warhammerproject.com")] diff --git a/pyload/plugin/hoster/FilesonicCom.py b/pyload/plugin/hoster/FilesonicCom.py index f02f7bff6..4ba0f3e50 100644 --- a/pyload/plugin/hoster/FilesonicCom.py +++ b/pyload/plugin/hoster/FilesonicCom.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FilesonicCom(DeadHoster): -    __name    = "FilesonicCom" -    __type    = "hoster" -    __version = "0.35" +    __name__    = "FilesonicCom" +    __type__    = "hoster" +    __version__ = "0.35" -    __pattern = r'http://(?:www\.)?filesonic\.com/file/\w+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?filesonic\.com/file/\w+' +    __config__  = [] -    __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 bd6ac5984..0ed326a22 100644 --- a/pyload/plugin/hoster/FilezyNet.py +++ b/pyload/plugin/hoster/FilezyNet.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FilezyNet(DeadHoster): -    __name    = "FilezyNet" -    __type    = "hoster" -    __version = "0.20" +    __name__    = "FilezyNet" +    __type__    = "hoster" +    __version__ = "0.20" -    __pattern = r'http://(?:www\.)?filezy\.net/\w{12}' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?filezy\.net/\w{12}' +    __config__  = [] -    __description = """Filezy.net hoster plugin""" -    __license     = "GPLv3" -    __authors     = [] +    __description__ = """Filezy.net hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [] diff --git a/pyload/plugin/hoster/FiredriveCom.py b/pyload/plugin/hoster/FiredriveCom.py index a5e56191f..5879c4848 100644 --- a/pyload/plugin/hoster/FiredriveCom.py +++ b/pyload/plugin/hoster/FiredriveCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FiredriveCom(DeadHoster): -    __name    = "FiredriveCom" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "FiredriveCom" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'https?://(?:www\.)?(firedrive|putlocker)\.com/(mobile/)?(file|embed)/(?P<ID>\w+)' -    __config  = [] +    __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/(mobile/)?(file|embed)/(?P<ID>\w+)' +    __config__  = [] -    __description = """Firedrive.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description__ = """Firedrive.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/FlyFilesNet.py b/pyload/plugin/hoster/FlyFilesNet.py index 5ecfb5604..612de14bd 100644 --- a/pyload/plugin/hoster/FlyFilesNet.py +++ b/pyload/plugin/hoster/FlyFilesNet.py @@ -9,16 +9,16 @@ 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/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?flyfiles\.net/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 7ea5e55b8..8c15c5954 100644 --- a/pyload/plugin/hoster/FourSharedCom.py +++ b/pyload/plugin/hoster/FourSharedCom.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class FourSharedCom(SimpleHoster): -    __name    = "FourSharedCom" -    __type    = "hoster" -    __version = "0.31" +    __name__    = "FourSharedCom" +    __type__    = "hoster" +    __version__ = "0.31" -    __pattern = r'https?://(?:www\.)?4shared(\-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?4shared(\-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 06f524cb9..53eb10e55 100644 --- a/pyload/plugin/hoster/FreakshareCom.py +++ b/pyload/plugin/hoster/FreakshareCom.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleHoster import secondsToMidnight  class FreakshareCom(Hoster): -    __name    = "FreakshareCom" -    __type    = "hoster" -    __version = "0.40" +    __name__    = "FreakshareCom" +    __type__    = "hoster" +    __version__ = "0.40" -    __pattern = r'http://(?:www\.)?freakshare\.(net|com)/files/\S*?/' +    __pattern__ = r'http://(?:www\.)?freakshare\.(net|com)/files/\S*?/' -    __description = """Freakshare.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("sitacuisses", "sitacuisses@yahoo.de"), +    __description__ = """Freakshare.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("sitacuisses", "sitacuisses@yahoo.de"),                         ("spoob", "spoob@pyload.org"),                         ("mkaay", "mkaay@mkaay.de"),                         ("Toilal", "toilal.dev@gmail.com")] diff --git a/pyload/plugin/hoster/FreeWayMe.py b/pyload/plugin/hoster/FreeWayMe.py index 2406ed031..560275eba 100644 --- a/pyload/plugin/hoster/FreeWayMe.py +++ b/pyload/plugin/hoster/FreeWayMe.py @@ -4,16 +4,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class FreeWayMe(MultiHoster): -    __name    = "FreeWayMe" -    __type    = "hoster" -    __version = "0.16" +    __name__    = "FreeWayMe" +    __type__    = "hoster" +    __version__ = "0.16" -    __pattern = r'https://(?:www\.)?free-way\.me/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https://(?:www\.)?free-way\.me/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """FreeWayMe multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Nicolas Giese", "james@free-way.me")] +    __description__ = """FreeWayMe multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Nicolas Giese", "james@free-way.me")]      def setup(self): diff --git a/pyload/plugin/hoster/FreevideoCz.py b/pyload/plugin/hoster/FreevideoCz.py index f616097f2..af238c564 100644 --- a/pyload/plugin/hoster/FreevideoCz.py +++ b/pyload/plugin/hoster/FreevideoCz.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class FreevideoCz(DeadHoster): -    __name    = "FreevideoCz" -    __type    = "hoster" -    __version = "0.30" +    __name__    = "FreevideoCz" +    __type__    = "hoster" +    __version__ = "0.30" -    __pattern = r'http://(?:www\.)?freevideo\.cz/vase-videa/.+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?freevideo\.cz/vase-videa/.+' +    __config__  = [] -    __description = """Freevideo.cz hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Freevideo.cz hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/FshareVn.py b/pyload/plugin/hoster/FshareVn.py index 47348f753..73ce4e254 100644 --- a/pyload/plugin/hoster/FshareVn.py +++ b/pyload/plugin/hoster/FshareVn.py @@ -23,16 +23,16 @@ def doubleDecode(m):  class FshareVn(SimpleHoster): -    __name    = "FshareVn" -    __type    = "hoster" -    __version = "0.20" +    __name__    = "FshareVn" +    __type__    = "hoster" +    __version__ = "0.20" -    __pattern = r'http://(?:www\.)?fshare\.vn/file/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?fshare\.vn/file/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 b6808811c..6924c5910 100644 --- a/pyload/plugin/hoster/Ftp.py +++ b/pyload/plugin/hoster/Ftp.py @@ -10,15 +10,15 @@ from pyload.plugin.Hoster import Hoster  class Ftp(Hoster): -    __name    = "Ftp" -    __type    = "hoster" -    __version = "0.46" +    __name__    = "Ftp" +    __type__    = "hoster" +    __version__ = "0.46" -    __pattern = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+' +    __pattern__ = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+' -    __description = """Download from ftp directory""" -    __license     = "GPLv3" -    __authors     = [("jeix", "jeix@hasnomail.com"), +    __description__ = """Download from ftp directory""" +    __license__     = "GPLv3" +    __authors__     = [("jeix", "jeix@hasnomail.com"),                         ("mkaay", "mkaay@mkaay.de"),                         ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/GamefrontCom.py b/pyload/plugin/hoster/GamefrontCom.py index 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 003a846b5..6397882f8 100644 --- a/pyload/plugin/hoster/GigapetaCom.py +++ b/pyload/plugin/hoster/GigapetaCom.py @@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class GigapetaCom(SimpleHoster): -    __name    = "GigapetaCom" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "GigapetaCom" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'http://(?:www\.)?gigapeta\.com/dl/\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?gigapeta\.com/dl/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 60acc958a..0556e9804 100644 --- a/pyload/plugin/hoster/GooIm.py +++ b/pyload/plugin/hoster/GooIm.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class GooIm(SimpleHoster): -    __name    = "GooIm" -    __type    = "hoster" -    __version = "0.04" +    __name__    = "GooIm" +    __type__    = "hoster" +    __version__ = "0.04" -    __pattern = r'https?://(?:www\.)?goo\.im/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?goo\.im/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Goo.im hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description__ = """Goo.im hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]      NAME_PATTERN = r'You will be redirected to .*(?P<N>[^/ ]+)  in' diff --git a/pyload/plugin/hoster/GoogledriveCom.py b/pyload/plugin/hoster/GoogledriveCom.py index 609d7aa02..8ae3664a3 100644 --- a/pyload/plugin/hoster/GoogledriveCom.py +++ b/pyload/plugin/hoster/GoogledriveCom.py @@ -10,16 +10,16 @@ from pyload.utils import html_unescape  class GoogledriveCom(SimpleHoster): -    __name    = "GoogledriveCom" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "GoogledriveCom" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'https?://(?:www\.)?drive\.google\.com/file/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?drive\.google\.com/file/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Drive.google.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description__ = """Drive.google.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]      DISPOSITION = False diff --git a/pyload/plugin/hoster/HellshareCz.py b/pyload/plugin/hoster/HellshareCz.py index f7e95d273..06dbe2178 100644 --- a/pyload/plugin/hoster/HellshareCz.py +++ b/pyload/plugin/hoster/HellshareCz.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class HellshareCz(SimpleHoster): -    __name    = "HellshareCz" -    __type    = "hoster" -    __version = "0.85" +    __name__    = "HellshareCz" +    __type__    = "hoster" +    __version__ = "0.85" -    __pattern = r'http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Hellshare.cz hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Hellshare.cz hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]      CHECK_TRAFFIC = True diff --git a/pyload/plugin/hoster/HellspyCz.py b/pyload/plugin/hoster/HellspyCz.py index b64becf9c..f8d05cfe8 100644 --- a/pyload/plugin/hoster/HellspyCz.py +++ b/pyload/plugin/hoster/HellspyCz.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class HellspyCz(DeadHoster): -    __name    = "HellspyCz" -    __type    = "hoster" -    __version = "0.28" +    __name__    = "HellspyCz" +    __type__    = "hoster" +    __version__ = "0.28" -    __pattern = r'http://(?:www\.)?(?:hellspy\.(?:cz|com|sk|hu|pl)|sciagaj\.pl)(/\S+/\d+)' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?(?:hellspy\.(?:cz|com|sk|hu|pl)|sciagaj\.pl)(/\S+/\d+)' +    __config__  = [] -    __description = """HellSpy.cz hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """HellSpy.cz hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/HotfileCom.py b/pyload/plugin/hoster/HotfileCom.py index 743c24e23..9491669b0 100644 --- a/pyload/plugin/hoster/HotfileCom.py +++ b/pyload/plugin/hoster/HotfileCom.py @@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class HotfileCom(DeadHoster): -    __name    = "HotfileCom" -    __type    = "hoster" -    __version = "0.37" +    __name__    = "HotfileCom" +    __type__    = "hoster" +    __version__ = "0.37" -    __pattern = r'https?://(?:www\.)?hotfile\.com/dl/\d+/\w+' -    __config  = [] +    __pattern__ = r'https?://(?:www\.)?hotfile\.com/dl/\d+/\w+' +    __config__  = [] -    __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 2a591c7fd..413191c52 100644 --- a/pyload/plugin/hoster/HugefilesNet.py +++ b/pyload/plugin/hoster/HugefilesNet.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class HugefilesNet(XFSHoster): -    __name    = "HugefilesNet" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "HugefilesNet" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'http://(?:www\.)?hugefiles\.net/\w{12}' +    __pattern__ = r'http://(?:www\.)?hugefiles\.net/\w{12}' -    __description = """Hugefiles.net hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("stickell", "l.stickell@yahoo.it")] +    __description__ = """Hugefiles.net hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("stickell", "l.stickell@yahoo.it")]      SIZE_PATTERN = r'File Size:</span>\s*<span[^>]*>(?P<S>[^<]+)</span></div>' diff --git a/pyload/plugin/hoster/HundredEightyUploadCom.py b/pyload/plugin/hoster/HundredEightyUploadCom.py index de312245e..1abdf7212 100644 --- a/pyload/plugin/hoster/HundredEightyUploadCom.py +++ b/pyload/plugin/hoster/HundredEightyUploadCom.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class HundredEightyUploadCom(XFSHoster): -    __name    = "HundredEightyUploadCom" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "HundredEightyUploadCom" +    __type__    = "hoster" +    __version__ = "0.05" -    __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")]      OFFLINE_PATTERN = r'>File Not Found' diff --git a/pyload/plugin/hoster/IFileWs.py b/pyload/plugin/hoster/IFileWs.py index 57c86d490..62b83fe25 100644 --- a/pyload/plugin/hoster/IFileWs.py +++ b/pyload/plugin/hoster/IFileWs.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class IFileWs(DeadHoster): -    __name    = "IFileWs" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "IFileWs" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'http://(?:www\.)?ifile\.ws/\w{12}' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?ifile\.ws/\w{12}' +    __config__  = [] -    __description = """Ifile.ws hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("z00nx", "z00nx0@gmail.com")] +    __description__ = """Ifile.ws hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("z00nx", "z00nx0@gmail.com")] diff --git a/pyload/plugin/hoster/IcyFilesCom.py b/pyload/plugin/hoster/IcyFilesCom.py index 88ec57a98..48ce78ff5 100644 --- a/pyload/plugin/hoster/IcyFilesCom.py +++ b/pyload/plugin/hoster/IcyFilesCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class IcyFilesCom(DeadHoster): -    __name    = "IcyFilesCom" -    __type    = "hoster" -    __version = "0.06" +    __name__    = "IcyFilesCom" +    __type__    = "hoster" +    __version__ = "0.06" -    __pattern = r'http://(?:www\.)?icyfiles\.com/(.+)' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?icyfiles\.com/(.+)' +    __config__  = [] -    __description = """IcyFiles.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("godofdream", "soilfiction@gmail.com")] +    __description__ = """IcyFiles.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("godofdream", "soilfiction@gmail.com")] diff --git a/pyload/plugin/hoster/IfileIt.py b/pyload/plugin/hoster/IfileIt.py index 647e06c01..1b851477a 100644 --- a/pyload/plugin/hoster/IfileIt.py +++ b/pyload/plugin/hoster/IfileIt.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class IfileIt(DeadHoster): -    __name    = "IfileIt" -    __type    = "hoster" -    __version = "0.29" +    __name__    = "IfileIt" +    __type__    = "hoster" +    __version__ = "0.29" -    __pattern = r'^unmatchable$' -    __config  = [] +    __pattern__ = r'^unmatchable$' +    __config__  = [] -    __description = """Ifile.it""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Ifile.it""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/IfolderRu.py b/pyload/plugin/hoster/IfolderRu.py index 0b54dbfae..04c19ace5 100644 --- a/pyload/plugin/hoster/IfolderRu.py +++ b/pyload/plugin/hoster/IfolderRu.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class IfolderRu(SimpleHoster): -    __name    = "IfolderRu" -    __type    = "hoster" -    __version = "0.39" +    __name__    = "IfolderRu" +    __type__    = "hoster" +    __version__ = "0.39" -    __pattern = r'http://(?:www\.)?(?:ifolder\.ru|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?(?:ifolder\.ru|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Ifolder.ru hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Ifolder.ru hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]      SIZE_REPLACEMENTS = [(u'Ðб', 'KB'), (u'Ðб', 'MB'), (u'Ðб', 'GB')] diff --git a/pyload/plugin/hoster/JumbofilesCom.py b/pyload/plugin/hoster/JumbofilesCom.py index 69e2c645a..380e94a4b 100644 --- a/pyload/plugin/hoster/JumbofilesCom.py +++ b/pyload/plugin/hoster/JumbofilesCom.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class JumbofilesCom(SimpleHoster): -    __name    = "JumbofilesCom" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "JumbofilesCom" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'http://(?:www\.)?jumbofiles\.com/(?P<ID>\w{12})' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?jumbofiles\.com/(?P<ID>\w{12})' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """JumboFiles.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("godofdream", "soilfiction@gmail.com")] +    __description__ = """JumboFiles.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("godofdream", "soilfiction@gmail.com")]      INFO_PATTERN = r'<TR><TD>(?P<N>[^<]+?)\s*<small>\((?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)' diff --git a/pyload/plugin/hoster/JunocloudMe.py b/pyload/plugin/hoster/JunocloudMe.py index 9054734fb..4fc6457d7 100644 --- a/pyload/plugin/hoster/JunocloudMe.py +++ b/pyload/plugin/hoster/JunocloudMe.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class JunocloudMe(XFSHoster): -    __name    = "JunocloudMe" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "JunocloudMe" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'http://(?:\w+\.)?junocloud\.me/\w{12}' +    __pattern__ = r'http://(?:\w+\.)?junocloud\.me/\w{12}' -    __description = """Junocloud.me hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("guidobelix", "guidobelix@hotmail.it")] +    __description__ = """Junocloud.me hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]      URL_REPLACEMENTS = [(r'//(www\.)?junocloud', "//dl3.junocloud")] diff --git a/pyload/plugin/hoster/Keep2ShareCc.py b/pyload/plugin/hoster/Keep2ShareCc.py index c621b82fe..67af087b7 100644 --- a/pyload/plugin/hoster/Keep2ShareCc.py +++ b/pyload/plugin/hoster/Keep2ShareCc.py @@ -9,20 +9,20 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class Keep2ShareCc(SimpleHoster): -    __name    = "Keep2ShareCc" -    __type    = "hoster" -    __version = "0.21" +    __name__    = "Keep2ShareCc" +    __type__    = "hoster" +    __version__ = "0.21" -    __pattern = r'https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 11c79cef9..d0acb7636 100644 --- a/pyload/plugin/hoster/KickloadCom.py +++ b/pyload/plugin/hoster/KickloadCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class KickloadCom(DeadHoster): -    __name    = "KickloadCom" -    __type    = "hoster" -    __version = "0.21" +    __name__    = "KickloadCom" +    __type__    = "hoster" +    __version__ = "0.21" -    __pattern = r'http://(?:www\.)?kickload\.com/get/.+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?kickload\.com/get/.+' +    __config__  = [] -    __description = """Kickload.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("mkaay", "mkaay@mkaay.de")] +    __description__ = """Kickload.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("mkaay", "mkaay@mkaay.de")] diff --git a/pyload/plugin/hoster/KingfilesNet.py b/pyload/plugin/hoster/KingfilesNet.py index af1d49390..b90fba851 100644 --- a/pyload/plugin/hoster/KingfilesNet.py +++ b/pyload/plugin/hoster/KingfilesNet.py @@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class KingfilesNet(SimpleHoster): -    __name    = "KingfilesNet" -    __type    = "hoster" -    __version = "0.07" +    __name__    = "KingfilesNet" +    __type__    = "hoster" +    __version__ = "0.07" -    __pattern = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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")]      NAME_PATTERN = r'name="fname" value="(?P<N>.+?)">' diff --git a/pyload/plugin/hoster/LemUploadsCom.py b/pyload/plugin/hoster/LemUploadsCom.py index c43867a99..c7f2e8045 100644 --- a/pyload/plugin/hoster/LemUploadsCom.py +++ b/pyload/plugin/hoster/LemUploadsCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class LemUploadsCom(DeadHoster): -    __name    = "LemUploadsCom" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "LemUploadsCom" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'https?://(?:www\.)?lemuploads\.com/\w{12}' -    __config  = [] +    __pattern__ = r'https?://(?:www\.)?lemuploads\.com/\w{12}' +    __config__  = [] -    __description = """LemUploads.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] +    __description__ = """LemUploads.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] diff --git a/pyload/plugin/hoster/LetitbitNet.py b/pyload/plugin/hoster/LetitbitNet.py index fd55a9ad0..545cde27c 100644 --- a/pyload/plugin/hoster/LetitbitNet.py +++ b/pyload/plugin/hoster/LetitbitNet.py @@ -34,16 +34,16 @@ def getInfo(urls):  class LetitbitNet(SimpleHoster): -    __name    = "LetitbitNet" -    __type    = "hoster" -    __version = "0.30" +    __name__    = "LetitbitNet" +    __type__    = "hoster" +    __version__ = "0.30" -    __pattern = r'https?://(?:www\.)?(letitbit|shareflare)\.net/download/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?(letitbit|shareflare)\.net/download/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 2cb14dd51..a898b21b9 100644 --- a/pyload/plugin/hoster/LinksnappyCom.py +++ b/pyload/plugin/hoster/LinksnappyCom.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class LinksnappyCom(MultiHoster): -    __name    = "LinksnappyCom" -    __type    = "hoster" -    __version = "0.08" +    __name__    = "LinksnappyCom" +    __type__    = "hoster" +    __version__ = "0.08" -    __pattern = r'https?://(?:[^/]+\.)?linksnappy\.com' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:[^/]+\.)?linksnappy\.com' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Linksnappy.com multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("stickell", "l.stickell@yahoo.it")] +    __description__ = """Linksnappy.com multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("stickell", "l.stickell@yahoo.it")]      SINGLE_CHUNK_HOSTERS = ["easybytez.com"] diff --git a/pyload/plugin/hoster/LoadTo.py b/pyload/plugin/hoster/LoadTo.py index a0e4eb92e..157a2f942 100644 --- a/pyload/plugin/hoster/LoadTo.py +++ b/pyload/plugin/hoster/LoadTo.py @@ -11,16 +11,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class LoadTo(SimpleHoster): -    __name    = "LoadTo" -    __type    = "hoster" -    __version = "0.22" +    __name__    = "LoadTo" +    __type__    = "hoster" +    __version__ = "0.22" -    __pattern = r'http://(?:www\.)?load\.to/\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?load\.to/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 de56d2d58..678c93ea7 100644 --- a/pyload/plugin/hoster/LomafileCom.py +++ b/pyload/plugin/hoster/LomafileCom.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class LomafileCom(DeadHoster): -    __name    = "LomafileCom" -    __type    = "hoster" -    __version = "0.52" +    __name__    = "LomafileCom" +    __type__    = "hoster" +    __version__ = "0.52" -    __pattern = r'http://lomafile\.com/\w{12}' -    __config  = [] +    __pattern__ = r'http://lomafile\.com/\w{12}' +    __config__  = [] -    __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 7fbbbf1ea..80e92d869 100644 --- a/pyload/plugin/hoster/LuckyShareNet.py +++ b/pyload/plugin/hoster/LuckyShareNet.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class LuckyShareNet(SimpleHoster): -    __name    = "LuckyShareNet" -    __type    = "hoster" -    __version = "0.06" +    __name__    = "LuckyShareNet" +    __type__    = "hoster" +    __version__ = "0.06" -    __pattern = r'https?://(?:www\.)?luckyshare\.net/(?P<ID>\d{10,})' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?luckyshare\.net/(?P<ID>\d{10,})' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 0af531c76..8b05a95ec 100644 --- a/pyload/plugin/hoster/MediafireCom.py +++ b/pyload/plugin/hoster/MediafireCom.py @@ -5,16 +5,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class MediafireCom(SimpleHoster): -    __name    = "MediafireCom" -    __type    = "hoster" -    __version = "0.85" +    __name__    = "MediafireCom" +    __type__    = "hoster" +    __version__ = "0.85" -    __pattern = r'https?://(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/))\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/))\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/MegaCoNz.py b/pyload/plugin/hoster/MegaCoNz.py index 496d4503f..e2506ee3f 100644 --- a/pyload/plugin/hoster/MegaCoNz.py +++ b/pyload/plugin/hoster/MegaCoNz.py @@ -46,15 +46,15 @@ from pyload.utils import decode, fs_decode, fs_encode  class MegaCoNz(Hoster): -    __name    = "MegaCoNz" -    __type    = "hoster" -    __version = "0.26" +    __name__    = "MegaCoNz" +    __type__    = "hoster" +    __version__ = "0.26" -    __pattern = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#(?P<TYPE>N|)!(?P<ID>[\w^_]+)!(?P<KEY>[\w,-]+)' +    __pattern__ = r'(?:https?://(?:www\.)?mega\.co\.nz/|mega:|chrome:.+?)#(?P<TYPE>N|)!(?P<ID>[\w^_]+)!(?P<KEY>[\w,-]+)' -    __description = """Mega.co.nz hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("RaNaN", "ranan@pyload.org"), +    __description__ = """Mega.co.nz hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("RaNaN", "ranan@pyload.org"),                         ("Walter Purcaro", "vuolter@gmail.com")] @@ -183,7 +183,7 @@ class MegaCoNz(Hoster):      def process(self, pyfile): -        pattern = re.match(self.__pattern, pyfile.url).groupdict() +        pattern = re.match(self.__pattern__, pyfile.url).groupdict()          id      = pattern['ID']          key     = pattern['KEY']          public  = pattern['TYPE'] == '' diff --git a/pyload/plugin/hoster/MegaDebridEu.py b/pyload/plugin/hoster/MegaDebridEu.py index 57290e903..28707ce6f 100644 --- a/pyload/plugin/hoster/MegaDebridEu.py +++ b/pyload/plugin/hoster/MegaDebridEu.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class MegaDebridEu(MultiHoster): -    __name    = "MegaDebridEu" -    __type    = "hoster" -    __version = "0.47" +    __name__    = "MegaDebridEu" +    __type__    = "hoster" +    __version__ = "0.47" -    __pattern = r'http://((?:www\d+\.|s\d+\.)?mega-debrid\.eu|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/download/file/[\w^_]+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://((?:www\d+\.|s\d+\.)?mega-debrid\.eu|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/download/file/[\w^_]+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """mega-debrid.eu multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("D.Ducatel", "dducatel@je-geek.fr")] +    __description__ = """mega-debrid.eu multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("D.Ducatel", "dducatel@je-geek.fr")]      API_URL = "https://www.mega-debrid.eu/api.php" diff --git a/pyload/plugin/hoster/MegaFilesSe.py b/pyload/plugin/hoster/MegaFilesSe.py index 51667c786..6a1a24beb 100644 --- a/pyload/plugin/hoster/MegaFilesSe.py +++ b/pyload/plugin/hoster/MegaFilesSe.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class MegaFilesSe(DeadHoster): -    __name    = "MegaFilesSe" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "MegaFilesSe" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'http://(?:www\.)?megafiles\.se/\w{12}' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?megafiles\.se/\w{12}' +    __config__  = [] -    __description = """MegaFiles.se hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] +    __description__ = """MegaFiles.se hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] diff --git a/pyload/plugin/hoster/MegaRapidCz.py b/pyload/plugin/hoster/MegaRapidCz.py index 910a20300..9d639555f 100644 --- a/pyload/plugin/hoster/MegaRapidCz.py +++ b/pyload/plugin/hoster/MegaRapidCz.py @@ -21,16 +21,16 @@ def getInfo(urls):  class MegaRapidCz(SimpleHoster): -    __name    = "MegaRapidCz" -    __type    = "hoster" -    __version = "0.56" +    __name__    = "MegaRapidCz" +    __type__    = "hoster" +    __version__ = "0.56" -    __pattern = r'http://(?:www\.)?(share|mega)rapid\.cz/soubor/\d+/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/soubor/\d+/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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/MegaRapidoNet.py b/pyload/plugin/hoster/MegaRapidoNet.py index 90ae7b30f..938b201d5 100644 --- a/pyload/plugin/hoster/MegaRapidoNet.py +++ b/pyload/plugin/hoster/MegaRapidoNet.py @@ -21,16 +21,16 @@ def random_with_N_digits(n):  class MegaRapidoNet(MultiHoster): -    __name    = "MegaRapidoNet" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "MegaRapidoNet" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'http://(?:www\.)?\w+\.megarapido\.net/\?file=\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?\w+\.megarapido\.net/\?file=\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """MegaRapido.net multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")] +    __description__ = """MegaRapido.net multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]      LINK_PREMIUM_PATTERN = r'<\s*?a[^>]*?title\s*?=\s*?["\'][^"\']*?download["\'][^>]*?href=["\']([^"\']*)' diff --git a/pyload/plugin/hoster/MegacrypterCom.py b/pyload/plugin/hoster/MegacrypterCom.py index 264ad958d..f8fcb97fe 100644 --- a/pyload/plugin/hoster/MegacrypterCom.py +++ b/pyload/plugin/hoster/MegacrypterCom.py @@ -8,15 +8,15 @@ from pyload.plugin.hoster.MegaCoNz import MegaCoNz  class MegacrypterCom(MegaCoNz): -    __name    = "MegacrypterCom" -    __type    = "hoster" -    __version = "0.22" +    __name__    = "MegacrypterCom" +    __type__    = "hoster" +    __version__ = "0.22" -    __pattern = r'https?://\w{0,10}\.?megacrypter\.com/[\w!-]+' +    __pattern__ = r'https?://\w{0,10}\.?megacrypter\.com/[\w!-]+' -    __description = """Megacrypter.com decrypter plugin""" -    __license     = "GPLv3" -    __authors     = [("GonzaloSR", "gonzalo@gonzalosr.com")] +    __description__ = """Megacrypter.com decrypter plugin""" +    __license__     = "GPLv3" +    __authors__     = [("GonzaloSR", "gonzalo@gonzalosr.com")]      API_URL = "http://megacrypter.com/api" @@ -33,7 +33,7 @@ class MegacrypterCom(MegaCoNz):      def process(self, pyfile):          # match is guaranteed because plugin was chosen to handle url -        node = re.match(self.__pattern, pyfile.url).group(0) +        node = re.match(self.__pattern__, pyfile.url).group(0)          # get Mega.co.nz link info          info = self.api_response(link=node, m="info") diff --git a/pyload/plugin/hoster/MegareleaseOrg.py b/pyload/plugin/hoster/MegareleaseOrg.py index 65f1242a9..541a1823c 100644 --- a/pyload/plugin/hoster/MegareleaseOrg.py +++ b/pyload/plugin/hoster/MegareleaseOrg.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class MegareleaseOrg(DeadHoster): -    __name    = "MegareleaseOrg" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "MegareleaseOrg" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'https?://(?:www\.)?megarelease\.org/\w{12}' -    __config  = [] +    __pattern__ = r'https?://(?:www\.)?megarelease\.org/\w{12}' +    __config__  = [] -    __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 71d86d16c..ed07f373b 100644 --- a/pyload/plugin/hoster/MegasharesCom.py +++ b/pyload/plugin/hoster/MegasharesCom.py @@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class MegasharesCom(SimpleHoster): -    __name    = "MegasharesCom" -    __type    = "hoster" -    __version = "0.28" +    __name__    = "MegasharesCom" +    __type__    = "hoster" +    __version__ = "0.28" -    __pattern = r'http://(?:www\.)?(d\d{2}\.)?megashares\.com/((index\.php)?\?d\d{2}=|dl/)\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?(d\d{2}\.)?megashares\.com/((index\.php)?\?d\d{2}=|dl/)\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 20acad9a6..2e26b630d 100644 --- a/pyload/plugin/hoster/MegauploadCom.py +++ b/pyload/plugin/hoster/MegauploadCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class MegauploadCom(DeadHoster): -    __name    = "MegauploadCom" -    __type    = "hoster" -    __version = "0.31" +    __name__    = "MegauploadCom" +    __type__    = "hoster" +    __version__ = "0.31" -    __pattern = r'http://(?:www\.)?megaupload\.com/\?.*&?(d|v)=\w+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?megaupload\.com/\?.*&?(d|v)=\w+' +    __config__  = [] -    __description = """Megaupload.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("spoob", "spoob@pyload.org")] +    __description__ = """Megaupload.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("spoob", "spoob@pyload.org")] diff --git a/pyload/plugin/hoster/MegavideoCom.py b/pyload/plugin/hoster/MegavideoCom.py index f50ce4365..d87967cd9 100644 --- a/pyload/plugin/hoster/MegavideoCom.py +++ b/pyload/plugin/hoster/MegavideoCom.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class MegavideoCom(DeadHoster): -    __name    = "MegavideoCom" -    __type    = "hoster" -    __version = "0.21" +    __name__    = "MegavideoCom" +    __type__    = "hoster" +    __version__ = "0.21" -    __pattern = r'http://(?:www\.)?megavideo\.com/\?.*&?(d|v)=\w+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?megavideo\.com/\?.*&?(d|v)=\w+' +    __config__  = [] -    __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 1d9cf90bc..f273d623a 100644 --- a/pyload/plugin/hoster/MovReelCom.py +++ b/pyload/plugin/hoster/MovReelCom.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class MovReelCom(XFSHoster): -    __name    = "MovReelCom" -    __type    = "hoster" -    __version = "1.24" +    __name__    = "MovReelCom" +    __type__    = "hoster" +    __version__ = "1.24" -    __pattern = r'http://(?:www\.)?movreel\.com/\w{12}' +    __pattern__ = r'http://(?:www\.)?movreel\.com/\w{12}' -    __description = """MovReel.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("JorisV83", "jorisv83-pyload@yahoo.com")] +    __description__ = """MovReel.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("JorisV83", "jorisv83-pyload@yahoo.com")]      LINK_PATTERN = r'<a href="([^"]+)">Download Link' diff --git a/pyload/plugin/hoster/MultihostersCom.py b/pyload/plugin/hoster/MultihostersCom.py index 1bb2452bb..3c9e81242 100644 --- a/pyload/plugin/hoster/MultihostersCom.py +++ b/pyload/plugin/hoster/MultihostersCom.py @@ -4,12 +4,12 @@ from pyload.plugin.hoster.ZeveraCom import ZeveraCom  class MultihostersCom(ZeveraCom): -    __name    = "MultihostersCom" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "MultihostersCom" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'https?://(?:www\.)multihosters\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' +    __pattern__ = r'https?://(?:www\.)multihosters\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' -    __description = """Multihosters.com multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("tjeh", "tjeh@gmx.net")] +    __description__ = """Multihosters.com multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("tjeh", "tjeh@gmx.net")] diff --git a/pyload/plugin/hoster/MultishareCz.py b/pyload/plugin/hoster/MultishareCz.py index 4ee747043..2444a1675 100644 --- a/pyload/plugin/hoster/MultishareCz.py +++ b/pyload/plugin/hoster/MultishareCz.py @@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class MultishareCz(SimpleHoster): -    __name    = "MultishareCz" -    __type    = "hoster" -    __version = "0.40" +    __name__    = "MultishareCz" +    __type__    = "hoster" +    __version__ = "0.40" -    __pattern = r'http://(?:www\.)?multishare\.cz/stahnout/(?P<ID>\d+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?multishare\.cz/stahnout/(?P<ID>\d+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """MultiShare.cz hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """MultiShare.cz hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]      SIZE_REPLACEMENTS = [(' ', '')] diff --git a/pyload/plugin/hoster/MyfastfileCom.py b/pyload/plugin/hoster/MyfastfileCom.py index c6bf4c227..81f2ffa78 100644 --- a/pyload/plugin/hoster/MyfastfileCom.py +++ b/pyload/plugin/hoster/MyfastfileCom.py @@ -7,16 +7,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class MyfastfileCom(MultiHoster): -    __name    = "MyfastfileCom" -    __type    = "hoster" -    __version = "0.08" +    __name__    = "MyfastfileCom" +    __type__    = "hoster" +    __version__ = "0.08" -    __pattern = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Myfastfile.com multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("stickell", "l.stickell@yahoo.it")] +    __description__ = """Myfastfile.com multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/MystoreTo.py b/pyload/plugin/hoster/MystoreTo.py index 581dec612..4791d0096 100644 --- a/pyload/plugin/hoster/MystoreTo.py +++ b/pyload/plugin/hoster/MystoreTo.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class MystoreTo(SimpleHoster): -    __name    = "MystoreTo" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "MystoreTo" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'https?://(?:www\.)?mystore\.to/dl/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?mystore\.to/dl/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Mystore.to hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zapp-brannigan", "")] +    __description__ = """Mystore.to hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zapp-brannigan", "")]      NAME_PATTERN    = r'<h1>(?P<N>.+?)<' diff --git a/pyload/plugin/hoster/MyvideoDe.py b/pyload/plugin/hoster/MyvideoDe.py index 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 14f041e17..5e594ce64 100644 --- a/pyload/plugin/hoster/NahrajCz.py +++ b/pyload/plugin/hoster/NahrajCz.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class NahrajCz(DeadHoster): -    __name    = "NahrajCz" -    __type    = "hoster" -    __version = "0.21" +    __name__    = "NahrajCz" +    __type__    = "hoster" +    __version__ = "0.21" -    __pattern = r'http://(?:www\.)?nahraj\.cz/content/download/.+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?nahraj\.cz/content/download/.+' +    __config__  = [] -    __description = """Nahraj.cz hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Nahraj.cz hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/NarodRu.py b/pyload/plugin/hoster/NarodRu.py index b68f219e2..6cd9d57cc 100644 --- a/pyload/plugin/hoster/NarodRu.py +++ b/pyload/plugin/hoster/NarodRu.py @@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class NarodRu(SimpleHoster): -    __name    = "NarodRu" -    __type    = "hoster" -    __version = "0.12" +    __name__    = "NarodRu" +    __type__    = "hoster" +    __version__ = "0.12" -    __pattern = r'http://(?:www\.)?narod(\.yandex)?\.ru/(disk|start/\d+\.\w+-narod\.yandex\.ru)/(?P<ID>\d+)/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?narod(\.yandex)?\.ru/(disk|start/\d+\.\w+-narod\.yandex\.ru)/(?P<ID>\d+)/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 dcfb9dcb6..2055da5e4 100644 --- a/pyload/plugin/hoster/NetloadIn.py +++ b/pyload/plugin/hoster/NetloadIn.py @@ -15,7 +15,7 @@ def getInfo(urls):      ##  returns list of tupels (name, size (in bytes), status (see database.File), url)      apiurl = "http://api.netload.in/info.php" -    id_regex = re.compile(NetloadIn.__pattern) +    id_regex = re.compile(NetloadIn.__pattern__)      urls_per_query = 80      for chunk in chunks(urls, urls_per_query): @@ -60,15 +60,15 @@ def getInfo(urls):  class NetloadIn(Hoster): -    __name    = "NetloadIn" -    __type    = "hoster" -    __version = "0.49" +    __name__    = "NetloadIn" +    __type__    = "hoster" +    __version__ = "0.49" -    __pattern = r'https?://(?:www\.)?netload\.in/(?P<PATH>datei|index\.php\?id=10&file_id=)(?P<ID>\w+)' +    __pattern__ = r'https?://(?:www\.)?netload\.in/(?P<PATH>datei|index\.php\?id=10&file_id=)(?P<ID>\w+)' -    __description = """Netload.in hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("spoob", "spoob@pyload.org"), +    __description__ = """Netload.in hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("spoob", "spoob@pyload.org"),                         ("RaNaN", "ranan@pyload.org"),                         ("Gregy", "gregy@gregy.cz")] @@ -116,7 +116,7 @@ class NetloadIn(Hoster):      def api_load(self, n=0):          url      = self.url -        id_regex = re.compile(self.__pattern) +        id_regex = re.compile(self.__pattern__)          match    = id_regex.search(url)          if match: diff --git a/pyload/plugin/hoster/NitroflareCom.py b/pyload/plugin/hoster/NitroflareCom.py index a93ff67ec..d2bcd871d 100644 --- a/pyload/plugin/hoster/NitroflareCom.py +++ b/pyload/plugin/hoster/NitroflareCom.py @@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class NitroflareCom(SimpleHoster): -    __name    = "NitroflareCom" -    __type    = "hoster" -    __version = "0.09" +    __name__    = "NitroflareCom" +    __type__    = "hoster" +    __version__ = "0.09" -    __pattern = r'https?://(?:www\.)?nitroflare\.com/view/(?P<ID>[\w^_]+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?nitroflare\.com/view/(?P<ID>[\w^_]+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Nitroflare.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("sahil", "sahilshekhawat01@gmail.com"), +    __description__ = """Nitroflare.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("sahil", "sahilshekhawat01@gmail.com"),                         ("Walter Purcaro", "vuolter@gmail.com"),                         ("Stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/NoPremiumPl.py b/pyload/plugin/hoster/NoPremiumPl.py index 701ca6a6d..c80d2ef6c 100644 --- a/pyload/plugin/hoster/NoPremiumPl.py +++ b/pyload/plugin/hoster/NoPremiumPl.py @@ -5,16 +5,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class NoPremiumPl(MultiHoster): -    __name    = "NoPremiumPl" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "NoPremiumPl" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'https?://direct\.nopremium\.pl.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://direct\.nopremium\.pl.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """NoPremium.pl multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("goddie", "dev@nopremium.pl")] +    __description__ = """NoPremium.pl multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("goddie", "dev@nopremium.pl")]      API_URL = "http://crypt.nopremium.pl" @@ -79,7 +79,7 @@ class NoPremiumPl(MultiHoster):          if "errno" in parsed.keys():              if parsed["errno"] in self.ERROR_CODES:                  # error code in known -                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name) +                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name__)              else:                  # error code isn't yet added to plugin                  self.fail( diff --git a/pyload/plugin/hoster/NosuploadCom.py b/pyload/plugin/hoster/NosuploadCom.py index af79da22b..3d785dd90 100644 --- a/pyload/plugin/hoster/NosuploadCom.py +++ b/pyload/plugin/hoster/NosuploadCom.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class NosuploadCom(XFSHoster): -    __name    = "NosuploadCom" -    __type    = "hoster" -    __version = "0.31" +    __name__    = "NosuploadCom" +    __type__    = "hoster" +    __version__ = "0.31" -    __pattern = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}' +    __pattern__ = r'http://(?:www\.)?nosupload\.com/\?d=\w{12}' -    __description = """Nosupload.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("igel", "igelkun@myopera.com")] +    __description__ = """Nosupload.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("igel", "igelkun@myopera.com")]      SIZE_PATTERN = r'<p><strong>Size:</strong> (?P<S>[\d.,]+) (?P<U>[\w^_]+)</p>' diff --git a/pyload/plugin/hoster/NovafileCom.py b/pyload/plugin/hoster/NovafileCom.py index f81d21932..e79ba5980 100644 --- a/pyload/plugin/hoster/NovafileCom.py +++ b/pyload/plugin/hoster/NovafileCom.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class NovafileCom(XFSHoster): -    __name    = "NovafileCom" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "NovafileCom" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'http://(?:www\.)?novafile\.com/\w{12}' +    __pattern__ = r'http://(?:www\.)?novafile\.com/\w{12}' -    __description = """Novafile.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description__ = """Novafile.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/NowDownloadSx.py b/pyload/plugin/hoster/NowDownloadSx.py index 8355fdc44..1cc009b30 100644 --- a/pyload/plugin/hoster/NowDownloadSx.py +++ b/pyload/plugin/hoster/NowDownloadSx.py @@ -7,16 +7,16 @@ from pyload.utils import fixup  class NowDownloadSx(SimpleHoster): -    __name    = "NowDownloadSx" -    __type    = "hoster" -    __version = "0.09" +    __name__    = "NowDownloadSx" +    __type__    = "hoster" +    __version__ = "0.09" -    __pattern = r'http://(?:www\.)?(nowdownload\.[a-zA-Z]{2,}/(dl/|download\.php.+?id=|mobile/(#/files/|.+?id=))|likeupload\.org/)\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?(nowdownload\.[a-zA-Z]{2,}/(dl/|download\.php.+?id=|mobile/(#/files/|.+?id=))|likeupload\.org/)\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 9032cea87..3501c5219 100644 --- a/pyload/plugin/hoster/NowVideoSx.py +++ b/pyload/plugin/hoster/NowVideoSx.py @@ -6,19 +6,19 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class NowVideoSx(SimpleHoster): -    __name    = "NowVideoSx" -    __type    = "hoster" -    __version = "0.12" +    __name__    = "NowVideoSx" +    __type__    = "hoster" +    __version__ = "0.12" -    __pattern = r'http://(?:www\.)?nowvideo\.[a-zA-Z]{2,}/(video/|mobile/(#/videos/|.+?id=))(?P<ID>\w+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?nowvideo\.[a-zA-Z]{2,}/(video/|mobile/(#/videos/|.+?id=))(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """NowVideo.sx hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description__ = """NowVideo.sx hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] -    URL_REPLACEMENTS = [(__pattern + ".*", r'http://www.nowvideo.sx/video/\g<ID>')] +    URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://www.nowvideo.sx/video/\g<ID>')]      NAME_PATTERN = r'<h4>(?P<N>.+?)<'      OFFLINE_PATTERN = r'>This file no longer exists' diff --git a/pyload/plugin/hoster/OboomCom.py b/pyload/plugin/hoster/OboomCom.py index 07c40a397..dca6903ca 100644 --- a/pyload/plugin/hoster/OboomCom.py +++ b/pyload/plugin/hoster/OboomCom.py @@ -11,15 +11,15 @@ from pyload.plugin.captcha.ReCaptcha import ReCaptcha  class OboomCom(Hoster): -    __name    = "OboomCom" -    __type    = "hoster" -    __version = "0.31" +    __name__    = "OboomCom" +    __type__    = "hoster" +    __version__ = "0.31" -    __pattern = r'https?://(?:www\.)?oboom\.com/(#(id=|/)?)?(?P<ID>\w{8})' +    __pattern__ = r'https?://(?:www\.)?oboom\.com/(#(id=|/)?)?(?P<ID>\w{8})' -    __description = """oboom.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("stanley", "stanley.foerster@gmail.com")] +    __description__ = """oboom.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("stanley", "stanley.foerster@gmail.com")]      RECAPTCHA_KEY = "6LdqpO0SAAAAAJGHXo63HyalP7H4qlRs_vff0kJX" @@ -51,7 +51,7 @@ class OboomCom(Hoster):      def getFileId(self, url): -        self.fileId = re.match(OboomCom.__pattern, url).group('ID') +        self.fileId = re.match(OboomCom.__pattern__, url).group('ID')      def getSessionToken(self): diff --git a/pyload/plugin/hoster/OneFichierCom.py b/pyload/plugin/hoster/OneFichierCom.py index 808074510..dd8064585 100644 --- a/pyload/plugin/hoster/OneFichierCom.py +++ b/pyload/plugin/hoster/OneFichierCom.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class OneFichierCom(SimpleHoster): -    __name    = "OneFichierCom" -    __type    = "hoster" -    __version = "0.79" +    __name__    = "OneFichierCom" +    __type__    = "hoster" +    __version__ = "0.79" -    __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+))?' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __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+))?' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 29ca267a0..9a5207367 100644 --- a/pyload/plugin/hoster/OronCom.py +++ b/pyload/plugin/hoster/OronCom.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class OronCom(DeadHoster): -    __name    = "OronCom" -    __type    = "hoster" -    __version = "0.14" +    __name__    = "OronCom" +    __type__    = "hoster" +    __version__ = "0.14" -    __pattern = r'https?://(?:www\.)?oron\.com/\w{12}' -    __config  = [] +    __pattern__ = r'https?://(?:www\.)?oron\.com/\w{12}' +    __config__  = [] -    __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 ad15f60df..35360c28a 100644 --- a/pyload/plugin/hoster/OverLoadMe.py +++ b/pyload/plugin/hoster/OverLoadMe.py @@ -11,16 +11,16 @@ from pyload.utils import parseFileSize  class OverLoadMe(MultiHoster): -    __name    = "OverLoadMe" -    __type    = "hoster" -    __version = "0.11" +    __name__    = "OverLoadMe" +    __type__    = "hoster" +    __version__ = "0.11" -    __pattern = r'https?://.*overload\.me/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://.*overload\.me/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Over-Load.me multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("marley", "marley@over-load.me")] +    __description__ = """Over-Load.me multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("marley", "marley@over-load.me")]      def setup(self): diff --git a/pyload/plugin/hoster/PandaplaNet.py b/pyload/plugin/hoster/PandaplaNet.py index dc23ef6a0..2a61a69c4 100644 --- a/pyload/plugin/hoster/PandaplaNet.py +++ b/pyload/plugin/hoster/PandaplaNet.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class PandaplaNet(DeadHoster): -    __name    = "PandaplaNet" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "PandaplaNet" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'http://(?:www\.)?pandapla\.net/\w{12}' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?pandapla\.net/\w{12}' +    __config__  = [] -    __description = """Pandapla.net hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] +    __description__ = """Pandapla.net hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] diff --git a/pyload/plugin/hoster/PornhostCom.py b/pyload/plugin/hoster/PornhostCom.py index 819612fcf..70ce4f32e 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 b6b86b689..c1e96ff77 100644 --- a/pyload/plugin/hoster/PotloadCom.py +++ b/pyload/plugin/hoster/PotloadCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class PotloadCom(DeadHoster): -    __name    = "PotloadCom" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "PotloadCom" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'http://(?:www\.)?potload\.com/\w{12}' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?potload\.com/\w{12}' +    __config__  = [] -    __description = """Potload.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("stickell", "l.stickell@yahoo.it")] +    __description__ = """Potload.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/PremiumTo.py b/pyload/plugin/hoster/PremiumTo.py index c7ee09565..46ecf0b36 100644 --- a/pyload/plugin/hoster/PremiumTo.py +++ b/pyload/plugin/hoster/PremiumTo.py @@ -9,16 +9,16 @@ from pyload.utils import fs_encode  class PremiumTo(MultiHoster): -    __name    = "PremiumTo" -    __type    = "hoster" -    __version = "0.22" +    __name__    = "PremiumTo" +    __type__    = "hoster" +    __version__ = "0.22" -    __pattern = r'^unmatchable$' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'^unmatchable$' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Premium.to multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("RaNaN", "RaNaN@pyload.org"), +    __description__ = """Premium.to multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("RaNaN", "RaNaN@pyload.org"),                         ("zoidberg", "zoidberg@mujmail.cz"),                         ("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/PremiumizeMe.py b/pyload/plugin/hoster/PremiumizeMe.py index 809d27624..c6dcfa794 100644 --- a/pyload/plugin/hoster/PremiumizeMe.py +++ b/pyload/plugin/hoster/PremiumizeMe.py @@ -5,16 +5,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class PremiumizeMe(MultiHoster): -    __name    = "PremiumizeMe" -    __type    = "hoster" -    __version = "0.16" +    __name__    = "PremiumizeMe" +    __type__    = "hoster" +    __version__ = "0.16" -    __pattern = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Premiumize.me multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Florian Franzen", "FlorianFranzen@gmail.com")] +    __description__ = """Premiumize.me multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Florian Franzen", "FlorianFranzen@gmail.com")]      def handlePremium(self, pyfile): diff --git a/pyload/plugin/hoster/PromptfileCom.py b/pyload/plugin/hoster/PromptfileCom.py index e947ac602..f550fa573 100644 --- a/pyload/plugin/hoster/PromptfileCom.py +++ b/pyload/plugin/hoster/PromptfileCom.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class PromptfileCom(SimpleHoster): -    __name    = "PromptfileCom" -    __type    = "hoster" -    __version = "0.13" +    __name__    = "PromptfileCom" +    __type__    = "hoster" +    __version__ = "0.13" -    __pattern = r'https?://(?:www\.)?promptfile\.com/' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?promptfile\.com/' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 f4781abb9..d6437e82e 100644 --- a/pyload/plugin/hoster/PrzeklejPl.py +++ b/pyload/plugin/hoster/PrzeklejPl.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class PrzeklejPl(DeadHoster): -    __name    = "PrzeklejPl" -    __type    = "hoster" -    __version = "0.11" +    __name__    = "PrzeklejPl" +    __type__    = "hoster" +    __version__ = "0.11" -    __pattern = r'http://(?:www\.)?przeklej\.pl/plik/.+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?przeklej\.pl/plik/.+' +    __config__  = [] -    __description = """Przeklej.pl hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Przeklej.pl hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/PutdriveCom.py b/pyload/plugin/hoster/PutdriveCom.py index 051da9473..562951e81 100644 --- a/pyload/plugin/hoster/PutdriveCom.py +++ b/pyload/plugin/hoster/PutdriveCom.py @@ -4,12 +4,12 @@ from pyload.plugin.hoster.ZeveraCom import ZeveraCom  class PutdriveCom(ZeveraCom): -    __name    = "PutdriveCom" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "PutdriveCom" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'https?://(?:www\.)putdrive\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' +    __pattern__ = r'https?://(?:www\.)putdrive\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' -    __description = """Multihosters.com multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description__ = """Multihosters.com multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/QuickshareCz.py b/pyload/plugin/hoster/QuickshareCz.py index 3ae4f05cf..570c9f876 100644 --- a/pyload/plugin/hoster/QuickshareCz.py +++ b/pyload/plugin/hoster/QuickshareCz.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class QuickshareCz(SimpleHoster): -    __name    = "QuickshareCz" -    __type    = "hoster" -    __version = "0.56" +    __name__    = "QuickshareCz" +    __type__    = "hoster" +    __version__ = "0.56" -    __pattern = r'http://(?:[^/]*\.)?quickshare\.cz/stahnout-soubor/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:[^/]*\.)?quickshare\.cz/stahnout-soubor/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 6788eebce..5e393ecb9 100644 --- a/pyload/plugin/hoster/RPNetBiz.py +++ b/pyload/plugin/hoster/RPNetBiz.py @@ -7,16 +7,16 @@ from pyload.utils import json_loads  class RPNetBiz(MultiHoster): -    __name    = "RPNetBiz" -    __type    = "hoster" -    __version = "0.14" +    __name__    = "RPNetBiz" +    __type__    = "hoster" +    __version__ = "0.14" -    __pattern = r'https?://.+rpnet\.biz' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://.+rpnet\.biz' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """RPNet.biz multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Dman", "dmanugm@gmail.com")] +    __description__ = """RPNet.biz multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Dman", "dmanugm@gmail.com")]      def setup(self): diff --git a/pyload/plugin/hoster/RapideoPl.py b/pyload/plugin/hoster/RapideoPl.py index 88a596dc7..86dfad5f0 100644 --- a/pyload/plugin/hoster/RapideoPl.py +++ b/pyload/plugin/hoster/RapideoPl.py @@ -5,16 +5,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class RapideoPl(MultiHoster): -    __name    = "RapideoPl" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "RapideoPl" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'^unmatchable$' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'^unmatchable$' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Rapideo.pl multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("goddie", "dev@rapideo.pl")] +    __description__ = """Rapideo.pl multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("goddie", "dev@rapideo.pl")]      API_URL = "http://enc.rapideo.pl" @@ -79,7 +79,7 @@ class RapideoPl(MultiHoster):          if "errno" in parsed.keys():              if parsed["errno"] in self.ERROR_CODES:                  # error code in known -                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name) +                self.fail(self.ERROR_CODES[parsed["errno"]] % self.__name__)              else:                  # error code isn't yet added to plugin                  self.fail( diff --git a/pyload/plugin/hoster/RapidfileshareNet.py b/pyload/plugin/hoster/RapidfileshareNet.py index 8252b49e7..1b1895b39 100644 --- a/pyload/plugin/hoster/RapidfileshareNet.py +++ b/pyload/plugin/hoster/RapidfileshareNet.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class RapidfileshareNet(XFSHoster): -    __name    = "RapidfileshareNet" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "RapidfileshareNet" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'http://(?:www\.)?rapidfileshare\.net/\w{12}' +    __pattern__ = r'http://(?:www\.)?rapidfileshare\.net/\w{12}' -    __description = """Rapidfileshare.net hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("guidobelix", "guidobelix@hotmail.it")] +    __description__ = """Rapidfileshare.net hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]      NAME_PATTERN = r'<input type="hidden" name="fname" value="(?P<N>.+?)">' diff --git a/pyload/plugin/hoster/RapidgatorNet.py b/pyload/plugin/hoster/RapidgatorNet.py index 1f68e13a4..98a8b97c9 100644 --- a/pyload/plugin/hoster/RapidgatorNet.py +++ b/pyload/plugin/hoster/RapidgatorNet.py @@ -13,16 +13,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, secondsToMidnight  class RapidgatorNet(SimpleHoster): -    __name    = "RapidgatorNet" -    __type    = "hoster" -    __version = "0.33" +    __name__    = "RapidgatorNet" +    __type__    = "hoster" +    __version__ = "0.33" -    __pattern = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 4a7be110c..078365a4a 100644 --- a/pyload/plugin/hoster/RapiduNet.py +++ b/pyload/plugin/hoster/RapiduNet.py @@ -11,16 +11,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class RapiduNet(SimpleHoster): -    __name    = "RapiduNet" -    __type    = "hoster" -    __version = "0.07" +    __name__    = "RapiduNet" +    __type__    = "hoster" +    __version__ = "0.07" -    __pattern = r'https?://(?:www\.)?rapidu\.net/(?P<ID>\d{10})' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?rapidu\.net/(?P<ID>\d{10})' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 f89708282..1010c92ca 100644 --- a/pyload/plugin/hoster/RarefileNet.py +++ b/pyload/plugin/hoster/RarefileNet.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class RarefileNet(XFSHoster): -    __name    = "RarefileNet" -    __type    = "hoster" -    __version = "0.09" +    __name__    = "RarefileNet" +    __type__    = "hoster" +    __version__ = "0.09" -    __pattern = r'http://(?:www\.)?rarefile\.net/\w{12}' +    __pattern__ = r'http://(?:www\.)?rarefile\.net/\w{12}' -    __description = """Rarefile.net hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Rarefile.net hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]      LINK_PATTERN = r'<a href="(.+?)">\1</a>' diff --git a/pyload/plugin/hoster/RealdebridCom.py b/pyload/plugin/hoster/RealdebridCom.py index a2712aa35..ca303cf88 100644 --- a/pyload/plugin/hoster/RealdebridCom.py +++ b/pyload/plugin/hoster/RealdebridCom.py @@ -12,16 +12,16 @@ from pyload.utils import parseFileSize  class RealdebridCom(MultiHoster): -    __name    = "RealdebridCom" -    __type    = "hoster" -    __version = "0.67" +    __name__    = "RealdebridCom" +    __type__    = "hoster" +    __version__ = "0.67" -    __pattern = r'https?://((?:www\.|s\d+\.)?real-debrid\.com/dl/|[\w^_]\.rdb\.so/d/)[\w^_]+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://((?:www\.|s\d+\.)?real-debrid\.com/dl/|[\w^_]\.rdb\.so/d/)[\w^_]+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Real-Debrid.com multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Devirex Hazzard", "naibaf_11@yahoo.de")] +    __description__ = """Real-Debrid.com multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]      def setup(self): 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 c707a866f..36bdb54b5 100644 --- a/pyload/plugin/hoster/RehostTo.py +++ b/pyload/plugin/hoster/RehostTo.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class RehostTo(MultiHoster): -    __name    = "RehostTo" -    __type    = "hoster" -    __version = "0.21" +    __name__    = "RehostTo" +    __type__    = "hoster" +    __version__ = "0.21" -    __pattern = r'https?://.*rehost\.to\..+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://.*rehost\.to\..+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Rehost.com multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("RaNaN", "RaNaN@pyload.org")] +    __description__ = """Rehost.com multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("RaNaN", "RaNaN@pyload.org")]      def handlePremium(self, pyfile): diff --git a/pyload/plugin/hoster/RemixshareCom.py b/pyload/plugin/hoster/RemixshareCom.py index 19c1c9706..1df62bbba 100644 --- a/pyload/plugin/hoster/RemixshareCom.py +++ b/pyload/plugin/hoster/RemixshareCom.py @@ -14,16 +14,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class RemixshareCom(SimpleHoster): -    __name    = "RemixshareCom" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "RemixshareCom" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'https?://remixshare\.com/(download|dl)/\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://remixshare\.com/(download|dl)/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 abdccdf68..2552b5091 100644 --- a/pyload/plugin/hoster/RgHostNet.py +++ b/pyload/plugin/hoster/RgHostNet.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class RgHostNet(SimpleHoster): -    __name    = "RgHostNet" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "RgHostNet" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'http://(?:www\.)?rghost\.net/\d+(?:r=\d+)?' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?rghost\.net/\d+(?:r=\d+)?' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """RgHost.net hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("z00nx", "z00nx0@gmail.com")] +    __description__ = """RgHost.net hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("z00nx", "z00nx0@gmail.com")]      INFO_PATTERN    = r'<h1>\s+(<a[^>]+>)?(?P<N>[^<]+)(</a>)?\s+<small[^>]+>\s+\((?P<S>[^)]+)\)\s+</small>\s+</h1>' diff --git a/pyload/plugin/hoster/SafesharingEu.py b/pyload/plugin/hoster/SafesharingEu.py index 0676015a2..af046af62 100644 --- a/pyload/plugin/hoster/SafesharingEu.py +++ b/pyload/plugin/hoster/SafesharingEu.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class SafesharingEu(XFSHoster): -    __name    = "SafesharingEu" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "SafesharingEu" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'https?://(?:www\.)?safesharing\.eu/\w{12}' +    __pattern__ = r'https?://(?:www\.)?safesharing\.eu/\w{12}' -    __description = """Safesharing.eu hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description__ = """Safesharing.eu hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]      ERROR_PATTERN = r'(?:<div class="alert alert-danger">)(.+?)(?:</div>)' diff --git a/pyload/plugin/hoster/SecureUploadEu.py b/pyload/plugin/hoster/SecureUploadEu.py index 8cd310c2c..4db413c90 100644 --- a/pyload/plugin/hoster/SecureUploadEu.py +++ b/pyload/plugin/hoster/SecureUploadEu.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class SecureUploadEu(XFSHoster): -    __name    = "SecureUploadEu" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "SecureUploadEu" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'https?://(?:www\.)?secureupload\.eu/\w{12}' +    __pattern__ = r'https?://(?:www\.)?secureupload\.eu/\w{12}' -    __description = """SecureUpload.eu hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("z00nx", "z00nx0@gmail.com")] +    __description__ = """SecureUpload.eu hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("z00nx", "z00nx0@gmail.com")]      INFO_PATTERN = r'<h3>Downloading (?P<N>[^<]+) \((?P<S>[^<]+)\)</h3>' diff --git a/pyload/plugin/hoster/SendspaceCom.py b/pyload/plugin/hoster/SendspaceCom.py index 163ca3dff..5faf2a870 100644 --- a/pyload/plugin/hoster/SendspaceCom.py +++ b/pyload/plugin/hoster/SendspaceCom.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class SendspaceCom(SimpleHoster): -    __name    = "SendspaceCom" -    __type    = "hoster" -    __version = "0.17" +    __name__    = "SendspaceCom" +    __type__    = "hoster" +    __version__ = "0.17" -    __pattern = r'https?://(?:www\.)?sendspace\.com/file/\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?sendspace\.com/file/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 72e3e4a02..f2b4e49e9 100644 --- a/pyload/plugin/hoster/Share4WebCom.py +++ b/pyload/plugin/hoster/Share4WebCom.py @@ -4,15 +4,15 @@ from pyload.plugin.hoster.UnibytesCom import UnibytesCom  class Share4WebCom(UnibytesCom): -    __name    = "Share4WebCom" -    __type    = "hoster" -    __version = "0.11" +    __name__    = "Share4WebCom" +    __type__    = "hoster" +    __version__ = "0.11" -    __pattern = r'https?://(?:www\.)?share4web\.com/get/\w+' +    __pattern__ = r'https?://(?:www\.)?share4web\.com/get/\w+' -    __description = """Share4web.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Share4web.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]      HOSTER_DOMAIN = "share4web.com" diff --git a/pyload/plugin/hoster/Share76Com.py b/pyload/plugin/hoster/Share76Com.py index fda983401..e826b4e2d 100644 --- a/pyload/plugin/hoster/Share76Com.py +++ b/pyload/plugin/hoster/Share76Com.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class Share76Com(DeadHoster): -    __name    = "Share76Com" -    __type    = "hoster" -    __version = "0.04" +    __name__    = "Share76Com" +    __type__    = "hoster" +    __version__ = "0.04" -    __pattern = r'http://(?:www\.)?share76\.com/\w{12}' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?share76\.com/\w{12}' +    __config__  = [] -    __description = """Share76.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [] +    __description__ = """Share76.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [] diff --git a/pyload/plugin/hoster/ShareFilesCo.py b/pyload/plugin/hoster/ShareFilesCo.py index 37e386034..946b6a423 100644 --- a/pyload/plugin/hoster/ShareFilesCo.py +++ b/pyload/plugin/hoster/ShareFilesCo.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class ShareFilesCo(DeadHoster): -    __name    = "ShareFilesCo" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "ShareFilesCo" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'http://(?:www\.)?sharefiles\.co/\w{12}' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?sharefiles\.co/\w{12}' +    __config__  = [] -    __description = """Sharefiles.co hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("stickell", "l.stickell@yahoo.it")] +    __description__ = """Sharefiles.co hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/SharebeesCom.py b/pyload/plugin/hoster/SharebeesCom.py index 5b5017fc2..405fab050 100644 --- a/pyload/plugin/hoster/SharebeesCom.py +++ b/pyload/plugin/hoster/SharebeesCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class SharebeesCom(DeadHoster): -    __name    = "SharebeesCom" -    __type    = "hoster" -    __version = "0.02" +    __name__    = "SharebeesCom" +    __type__    = "hoster" +    __version__ = "0.02" -    __pattern = r'http://(?:www\.)?sharebees\.com/\w{12}' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?sharebees\.com/\w{12}' +    __config__  = [] -    __description = """ShareBees hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """ShareBees hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/ShareonlineBiz.py b/pyload/plugin/hoster/ShareonlineBiz.py index 273431f99..5f01b5111 100644 --- a/pyload/plugin/hoster/ShareonlineBiz.py +++ b/pyload/plugin/hoster/ShareonlineBiz.py @@ -12,22 +12,22 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class ShareonlineBiz(SimpleHoster): -    __name    = "ShareonlineBiz" -    __type    = "hoster" -    __version = "0.49" +    __name__    = "ShareonlineBiz" +    __type__    = "hoster" +    __version__ = "0.49" -    __pattern = r'https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download\.php\?id=|dl/)(?P<ID>\w+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?(share-online\.biz|egoshare\.com)/(download\.php\?id=|dl/)(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Shareonline.biz hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("spoob", "spoob@pyload.org"), +    __description__ = """Shareonline.biz hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("spoob", "spoob@pyload.org"),                         ("mkaay", "mkaay@mkaay.de"),                         ("zoidberg", "zoidberg@mujmail.cz"),                         ("Walter Purcaro", "vuolter@gmail.com")] -    URL_REPLACEMENTS = [(__pattern + ".*", "http://www.share-online.biz/dl/\g<ID>")] +    URL_REPLACEMENTS = [(__pattern__ + ".*", "http://www.share-online.biz/dl/\g<ID>")]      CHECK_TRAFFIC = True @@ -41,7 +41,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 5fa6ce4c1..61e0f8723 100644 --- a/pyload/plugin/hoster/ShareplaceCom.py +++ b/pyload/plugin/hoster/ShareplaceCom.py @@ -8,15 +8,15 @@ from pyload.plugin.Hoster import Hoster  class ShareplaceCom(Hoster): -    __name    = "ShareplaceCom" -    __type    = "hoster" -    __version = "0.12" +    __name__    = "ShareplaceCom" +    __type__    = "hoster" +    __version__ = "0.12" -    __pattern = r'http://(?:www\.)?shareplace\.(com|org)/\?\w+' +    __pattern__ = r'http://(?:www\.)?shareplace\.(com|org)/\?\w+' -    __description = """Shareplace.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("ACCakut", "")] +    __description__ = """Shareplace.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("ACCakut", "")]      def process(self, pyfile): diff --git a/pyload/plugin/hoster/SharingmatrixCom.py b/pyload/plugin/hoster/SharingmatrixCom.py index c4938f9bc..81c371c98 100644 --- a/pyload/plugin/hoster/SharingmatrixCom.py +++ b/pyload/plugin/hoster/SharingmatrixCom.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class SharingmatrixCom(DeadHoster): -    __name    = "SharingmatrixCom" -    __type    = "hoster" -    __version = "0.01" +    __name__    = "SharingmatrixCom" +    __type__    = "hoster" +    __version__ = "0.01" -    __pattern = r'http://(?:www\.)?sharingmatrix\.com/file/\w+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?sharingmatrix\.com/file/\w+' +    __config__  = [] -    __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 c435d01a7..7f06e2424 100644 --- a/pyload/plugin/hoster/ShragleCom.py +++ b/pyload/plugin/hoster/ShragleCom.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class ShragleCom(DeadHoster): -    __name    = "ShragleCom" -    __type    = "hoster" -    __version = "0.22" +    __name__    = "ShragleCom" +    __type__    = "hoster" +    __version__ = "0.22" -    __pattern = r'http://(?:www\.)?(cloudnator|shragle)\.com/files/(?P<ID>.+?)/' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?(cloudnator|shragle)\.com/files/(?P<ID>.+?)/' +    __config__  = [] -    __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 51b5ac577..83640bcd5 100644 --- a/pyload/plugin/hoster/SimplyPremiumCom.py +++ b/pyload/plugin/hoster/SimplyPremiumCom.py @@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import secondsToMidnight  class SimplyPremiumCom(MultiHoster): -    __name    = "SimplyPremiumCom" -    __type    = "hoster" -    __version = "0.08" +    __name__    = "SimplyPremiumCom" +    __type__    = "hoster" +    __version__ = "0.08" -    __pattern = r'https?://.+simply-premium\.com' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://.+simply-premium\.com' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Simply-Premium.com multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("EvolutionClip", "evolutionclip@live.de")] +    __description__ = """Simply-Premium.com multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("EvolutionClip", "evolutionclip@live.de")]      def setup(self): diff --git a/pyload/plugin/hoster/SimplydebridCom.py b/pyload/plugin/hoster/SimplydebridCom.py index 2fa68b508..0605bb4f3 100644 --- a/pyload/plugin/hoster/SimplydebridCom.py +++ b/pyload/plugin/hoster/SimplydebridCom.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster, replace_patterns  class SimplydebridCom(MultiHoster): -    __name    = "SimplydebridCom" -    __type    = "hoster" -    __version = "0.17" +    __name__    = "SimplydebridCom" +    __type__    = "hoster" +    __version__ = "0.17" -    __pattern = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd\.php' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/sd\.php' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Simply-debrid.com multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")] +    __description__ = """Simply-debrid.com multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]      def handlePremium(self, pyfile): diff --git a/pyload/plugin/hoster/SmoozedCom.py b/pyload/plugin/hoster/SmoozedCom.py index 6d62cef23..b321fee03 100644 --- a/pyload/plugin/hoster/SmoozedCom.py +++ b/pyload/plugin/hoster/SmoozedCom.py @@ -5,16 +5,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class SmoozedCom(MultiHoster): -    __name    = "SmoozedCom" -    __type    = "hoster" -    __version = "0.04" +    __name__    = "SmoozedCom" +    __type__    = "hoster" +    __version__ = "0.04" -    __pattern = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'^unmatchable$'  #: Since we want to allow the user to specify the list of hoster to use we let MultiHoster.activate +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Smoozed.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("", "")] +    __description__ = """Smoozed.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("", "")]      def handlePremium(self, pyfile): diff --git a/pyload/plugin/hoster/SockshareCom.py b/pyload/plugin/hoster/SockshareCom.py index f6cff5858..3881278e1 100644 --- a/pyload/plugin/hoster/SockshareCom.py +++ b/pyload/plugin/hoster/SockshareCom.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class SockshareCom(DeadHoster): -    __name    = "SockshareCom" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "SockshareCom" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'http://(?:www\.)?sockshare\.com/(mobile/)?(file|embed)/(?P<ID>\w+)' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?sockshare\.com/(mobile/)?(file|embed)/(?P<ID>\w+)' +    __config__  = [] -    __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 7ce0e3787..524fb6e13 100644 --- a/pyload/plugin/hoster/SoundcloudCom.py +++ b/pyload/plugin/hoster/SoundcloudCom.py @@ -7,17 +7,17 @@ from pyload.utils import json_loads  class SoundcloudCom(SimpleHoster): -    __name    = "SoundcloudCom" -    __type    = "hoster" -    __version = "0.11" +    __name__    = "SoundcloudCom" +    __type__    = "hoster" +    __version__ = "0.11" -    __pattern = r'https?://(?:www\.)?soundcloud\.com/[\w-]+/[\w-]+' -    __config  = [("use_premium", "bool"        , "Use premium account if available", True    ), +    __pattern__ = r'https?://(?:www\.)?soundcloud\.com/[\w-]+/[\w-]+' +    __config__  = [("use_premium", "bool"        , "Use premium account if available", True    ),                     ("quality"    , "Lower;Higher", "Quality"                         , "Higher")] -    __description = """SoundCloud.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description__ = """SoundCloud.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]      NAME_PATTERN    = r'title" content="(?P<N>.+?)"' diff --git a/pyload/plugin/hoster/SpeedLoadOrg.py b/pyload/plugin/hoster/SpeedLoadOrg.py index 383d60817..5642987d2 100644 --- a/pyload/plugin/hoster/SpeedLoadOrg.py +++ b/pyload/plugin/hoster/SpeedLoadOrg.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class SpeedLoadOrg(DeadHoster): -    __name    = "SpeedLoadOrg" -    __type    = "hoster" -    __version = "1.02" +    __name__    = "SpeedLoadOrg" +    __type__    = "hoster" +    __version__ = "1.02" -    __pattern = r'http://(?:www\.)?speedload\.org/(?P<ID>\w+)' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?speedload\.org/(?P<ID>\w+)' +    __config__  = [] -    __description = """Speedload.org hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("stickell", "l.stickell@yahoo.it")] +    __description__ = """Speedload.org hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("stickell", "l.stickell@yahoo.it")] diff --git a/pyload/plugin/hoster/SpeedfileCz.py b/pyload/plugin/hoster/SpeedfileCz.py index bb1b2c527..f9df09d08 100644 --- a/pyload/plugin/hoster/SpeedfileCz.py +++ b/pyload/plugin/hoster/SpeedfileCz.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class SpeedfileCz(DeadHoster): -    __name    = "SpeedFileCz" -    __type    = "hoster" -    __version = "0.32" +    __name__    = "SpeedFileCz" +    __type__    = "hoster" +    __version__ = "0.32" -    __pattern = r'http://(?:www\.)?speedfile\.cz/.+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?speedfile\.cz/.+' +    __config__  = [] -    __description = """Speedfile.cz hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Speedfile.cz hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/SpeedyshareCom.py b/pyload/plugin/hoster/SpeedyshareCom.py index 99626c765..541e41b96 100644 --- a/pyload/plugin/hoster/SpeedyshareCom.py +++ b/pyload/plugin/hoster/SpeedyshareCom.py @@ -11,16 +11,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class SpeedyshareCom(SimpleHoster): -    __name    = "SpeedyshareCom" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "SpeedyshareCom" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 8c0cc046e..835666b45 100644 --- a/pyload/plugin/hoster/StorageTo.py +++ b/pyload/plugin/hoster/StorageTo.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class StorageTo(DeadHoster): -    __name    = "StorageTo" -    __type    = "hoster" -    __version = "0.01" +    __name__    = "StorageTo" +    __type__    = "hoster" +    __version__ = "0.01" -    __pattern = r'http://(?:www\.)?storage\.to/get/.+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?storage\.to/get/.+' +    __config__  = [] -    __description = """Storage.to hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("mkaay", "mkaay@mkaay.de")] +    __description__ = """Storage.to hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("mkaay", "mkaay@mkaay.de")] diff --git a/pyload/plugin/hoster/StreamCz.py b/pyload/plugin/hoster/StreamCz.py index b0fb2cfe9..95e69abf4 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 cdf244539..01e334491 100644 --- a/pyload/plugin/hoster/StreamcloudEu.py +++ b/pyload/plugin/hoster/StreamcloudEu.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class StreamcloudEu(XFSHoster): -    __name    = "StreamcloudEu" -    __type    = "hoster" -    __version = "0.10" +    __name__    = "StreamcloudEu" +    __type__    = "hoster" +    __version__ = "0.10" -    __pattern = r'http://(?:www\.)?streamcloud\.eu/\w{12}' +    __pattern__ = r'http://(?:www\.)?streamcloud\.eu/\w{12}' -    __description = """Streamcloud.eu hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("seoester", "seoester@googlemail.com")] +    __description__ = """Streamcloud.eu hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("seoester", "seoester@googlemail.com")]      WAIT_PATTERN = r'var count = (\d+)' diff --git a/pyload/plugin/hoster/TurbobitNet.py b/pyload/plugin/hoster/TurbobitNet.py index 4c07cb84f..5a96d85e8 100644 --- a/pyload/plugin/hoster/TurbobitNet.py +++ b/pyload/plugin/hoster/TurbobitNet.py @@ -15,20 +15,20 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, timestamp  class TurbobitNet(SimpleHoster): -    __name    = "TurbobitNet" -    __type    = "hoster" -    __version = "0.19" +    __name__    = "TurbobitNet" +    __type__    = "hoster" +    __version__ = "0.19" -    __pattern = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?turbobit\.net/(?:download/free/)?(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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")] @@ -99,7 +99,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") @@ -111,7 +111,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 1452f05be..20ae8bb04 100644 --- a/pyload/plugin/hoster/TurbouploadCom.py +++ b/pyload/plugin/hoster/TurbouploadCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class TurbouploadCom(DeadHoster): -    __name    = "TurbouploadCom" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "TurbouploadCom" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'http://(?:www\.)?turboupload\.com/(\w+)' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?turboupload\.com/(\w+)' +    __config__  = [] -    __description = """Turboupload.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Turboupload.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/TusfilesNet.py b/pyload/plugin/hoster/TusfilesNet.py index d13938586..20a948925 100644 --- a/pyload/plugin/hoster/TusfilesNet.py +++ b/pyload/plugin/hoster/TusfilesNet.py @@ -5,15 +5,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class TusfilesNet(XFSHoster): -    __name    = "TusfilesNet" -    __type    = "hoster" -    __version = "0.09" +    __name__    = "TusfilesNet" +    __type__    = "hoster" +    __version__ = "0.09" -    __pattern = r'https?://(?:www\.)?tusfiles\.net/\w{12}' +    __pattern__ = r'https?://(?:www\.)?tusfiles\.net/\w{12}' -    __description = """Tusfiles.net hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com"), +    __description__ = """Tusfiles.net hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"),                         ("guidobelix", "guidobelix@hotmail.it")] diff --git a/pyload/plugin/hoster/TwoSharedCom.py b/pyload/plugin/hoster/TwoSharedCom.py index f116abfc1..854c46979 100644 --- a/pyload/plugin/hoster/TwoSharedCom.py +++ b/pyload/plugin/hoster/TwoSharedCom.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class TwoSharedCom(SimpleHoster): -    __name    = "TwoSharedCom" -    __type    = "hoster" -    __version = "0.13" +    __name__    = "TwoSharedCom" +    __type__    = "hoster" +    __version__ = "0.13" -    __pattern = r'http://(?:www\.)?2shared\.com/(account/)?(download|get|file|document|photo|video|audio)/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?2shared\.com/(account/)?(download|get|file|document|photo|video|audio)/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 08b6059bd..fbbe21f3e 100644 --- a/pyload/plugin/hoster/UlozTo.py +++ b/pyload/plugin/hoster/UlozTo.py @@ -13,16 +13,16 @@ def convertDecimalPrefix(m):  class UlozTo(SimpleHoster): -    __name    = "UlozTo" -    __type    = "hoster" -    __version = "1.04" +    __name__    = "UlozTo" +    __type__    = "hoster" +    __version__ = "1.04" -    __pattern = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(?:live/)?(?P<ID>\w+/[^/?]*)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(?:live/)?(?P<ID>\w+/[^/?]*)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 135d38b88..506ceecb1 100644 --- a/pyload/plugin/hoster/UloziskoSk.py +++ b/pyload/plugin/hoster/UloziskoSk.py @@ -6,16 +6,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class UloziskoSk(SimpleHoster): -    __name    = "UloziskoSk" -    __type    = "hoster" -    __version = "0.25" +    __name__    = "UloziskoSk" +    __type__    = "hoster" +    __version__ = "0.25" -    __pattern = r'http://(?:www\.)?ulozisko\.sk/.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?ulozisko\.sk/.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 9ac8b77e4..a02d5b8c7 100644 --- a/pyload/plugin/hoster/UnibytesCom.py +++ b/pyload/plugin/hoster/UnibytesCom.py @@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class UnibytesCom(SimpleHoster): -    __name    = "UnibytesCom" -    __type    = "hoster" -    __version = "0.12" +    __name__    = "UnibytesCom" +    __type__    = "hoster" +    __version__ = "0.12" -    __pattern = r'https?://(?:www\.)?unibytes\.com/[\w .-]{11}B' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?unibytes\.com/[\w .-]{11}B' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 4f719eae4..fa77d15e8 100644 --- a/pyload/plugin/hoster/UnrestrictLi.py +++ b/pyload/plugin/hoster/UnrestrictLi.py @@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import secondsToMidnight  class UnrestrictLi(MultiHoster): -    __name    = "UnrestrictLi" -    __type    = "hoster" -    __version = "0.22" +    __name__    = "UnrestrictLi" +    __type__    = "hoster" +    __version__ = "0.22" -    __pattern = r'https?://(?:www\.)?(unrestrict|unr)\.li/dl/[\w^_]+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?(unrestrict|unr)\.li/dl/[\w^_]+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Unrestrict.li multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("stickell", "l.stickell@yahoo.it")] +    __description__ = """Unrestrict.li multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("stickell", "l.stickell@yahoo.it")]      LOGIN_ACCOUNT = False diff --git a/pyload/plugin/hoster/UpleaCom.py b/pyload/plugin/hoster/UpleaCom.py index 46462e94a..855d9ed65 100644 --- a/pyload/plugin/hoster/UpleaCom.py +++ b/pyload/plugin/hoster/UpleaCom.py @@ -8,15 +8,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class UpleaCom(XFSHoster): -    __name    = "UpleaCom" -    __type    = "hoster" -    __version = "0.06" +    __name__    = "UpleaCom" +    __type__    = "hoster" +    __version__ = "0.06" -    __pattern = r'https?://(?:www\.)?uplea\.com/dl/\w{15}' +    __pattern__ = r'https?://(?:www\.)?uplea\.com/dl/\w{15}' -    __description = """Uplea.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Redleon", "")] +    __description__ = """Uplea.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Redleon", "")]      NAME_PATTERN = r'class="agmd size18">(?P<N>.+?)<' diff --git a/pyload/plugin/hoster/UploadStationCom.py b/pyload/plugin/hoster/UploadStationCom.py index ab55c71d4..decde08ab 100644 --- a/pyload/plugin/hoster/UploadStationCom.py +++ b/pyload/plugin/hoster/UploadStationCom.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class UploadStationCom(DeadHoster): -    __name    = "UploadStationCom" -    __type    = "hoster" -    __version = "0.52" +    __name__    = "UploadStationCom" +    __type__    = "hoster" +    __version__ = "0.52" -    __pattern = r'http://(?:www\.)?uploadstation\.com/file/(?P<ID>\w+)' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?uploadstation\.com/file/(?P<ID>\w+)' +    __config__  = [] -    __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 c030c4178..d1e356875 100644 --- a/pyload/plugin/hoster/UploadableCh.py +++ b/pyload/plugin/hoster/UploadableCh.py @@ -7,20 +7,20 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class UploadableCh(SimpleHoster): -    __name    = "UploadableCh" -    __type    = "hoster" -    __version = "0.09" +    __name__    = "UploadableCh" +    __type__    = "hoster" +    __version__ = "0.09" -    __pattern = r'http://(?:www\.)?uploadable\.ch/file/(?P<ID>\w+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?uploadable\.ch/file/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Uploadable.ch hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de"), +    __description__ = """Uploadable.ch hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"),                         ("Walter Purcaro", "vuolter@gmail.com")] -    URL_REPLACEMENTS = [(__pattern + ".*", r'http://www.uploadable.ch/file/\g<ID>')] +    URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://www.uploadable.ch/file/\g<ID>')]      INFO_PATTERN = r'div id=\"file_name\" title=.*>(?P<N>.+)<span class=\"filename_normal\">\((?P<S>[\d.]+) (?P<U>\w+)\)</span><' diff --git a/pyload/plugin/hoster/UploadboxCom.py b/pyload/plugin/hoster/UploadboxCom.py index eb769919e..33b81b97e 100644 --- a/pyload/plugin/hoster/UploadboxCom.py +++ b/pyload/plugin/hoster/UploadboxCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class UploadboxCom(DeadHoster): -    __name    = "Uploadbox" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "Uploadbox" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'http://(?:www\.)?uploadbox\.com/files/.+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?uploadbox\.com/files/.+' +    __config__  = [] -    __description = """UploadBox.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """UploadBox.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/UploadedTo.py b/pyload/plugin/hoster/UploadedTo.py index 2cd4d84c4..207817122 100644 --- a/pyload/plugin/hoster/UploadedTo.py +++ b/pyload/plugin/hoster/UploadedTo.py @@ -9,21 +9,21 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class UploadedTo(SimpleHoster): -    __name    = "UploadedTo" -    __type    = "hoster" -    __version = "0.85" +    __name__    = "UploadedTo" +    __type__    = "hoster" +    __version__ = "0.85" -    __pattern = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Uploaded.net hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description__ = """Uploaded.net hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]      API_KEY = "lhF2IeeprweDfu9ccWlxXVVypA5nA3EL" -    URL_REPLACEMENTS = [(__pattern + ".*", r'http://uploaded.net/file/\g<ID>')] +    URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://uploaded.net/file/\g<ID>')]      LINK_PREMIUM_PATTERN = r'<div class="tfree".*\s*<form method="post" action="(.+?)"' @@ -37,7 +37,7 @@ class UploadedTo(SimpleHoster):          for _i in xrange(5):              html = getURL("http://uploaded.net/api/filemultiple", -                          get={"apikey": cls.API_KEY, 'id_0': re.match(cls.__pattern, url).group('ID')}, +                          get={"apikey": cls.API_KEY, 'id_0': re.match(cls.__pattern__, url).group('ID')},                            decode=True)              if html != "can't find request": diff --git a/pyload/plugin/hoster/UploadhereCom.py b/pyload/plugin/hoster/UploadhereCom.py index 789f5e9f7..259b53dc1 100644 --- a/pyload/plugin/hoster/UploadhereCom.py +++ b/pyload/plugin/hoster/UploadhereCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class UploadhereCom(DeadHoster): -    __name    = "UploadhereCom" -    __type    = "hoster" -    __version = "0.12" +    __name__    = "UploadhereCom" +    __type__    = "hoster" +    __version__ = "0.12" -    __pattern = r'http://(?:www\.)?uploadhere\.com/\w{10}' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?uploadhere\.com/\w{10}' +    __config__  = [] -    __description = """Uploadhere.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """Uploadhere.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/UploadheroCom.py b/pyload/plugin/hoster/UploadheroCom.py index 912f4c505..2def499d9 100644 --- a/pyload/plugin/hoster/UploadheroCom.py +++ b/pyload/plugin/hoster/UploadheroCom.py @@ -11,16 +11,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class UploadheroCom(SimpleHoster): -    __name    = "UploadheroCom" -    __type    = "hoster" -    __version = "0.18" +    __name__    = "UploadheroCom" +    __type__    = "hoster" +    __version__ = "0.18" -    __pattern = r'http://(?:www\.)?uploadhero\.com?/dl/\w+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?uploadhero\.com?/dl/\w+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """UploadHero.co plugin""" -    __license     = "GPLv3" -    __authors     = [("mcmyst", "mcmyst@hotmail.fr"), +    __description__ = """UploadHero.co plugin""" +    __license__     = "GPLv3" +    __authors__     = [("mcmyst", "mcmyst@hotmail.fr"),                         ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/UploadingCom.py b/pyload/plugin/hoster/UploadingCom.py index db719ee4c..461b0113a 100644 --- a/pyload/plugin/hoster/UploadingCom.py +++ b/pyload/plugin/hoster/UploadingCom.py @@ -9,15 +9,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, timestamp  class UploadingCom(SimpleHoster): -    __name    = "UploadingCom" -    __type    = "hoster" -    __version = "0.40" +    __name__    = "UploadingCom" +    __type__    = "hoster" +    __version__ = "0.40" -    __pattern = r'http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>\w+)' +    __pattern__ = r'http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>\w+)' -    __description = """Uploading.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("jeix", "jeix@hasnomail.de"), +    __description__ = """Uploading.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("jeix", "jeix@hasnomail.de"),                         ("mkaay", "mkaay@mkaay.de"),                         ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/UploadkingCom.py b/pyload/plugin/hoster/UploadkingCom.py index 31d8874d8..33ecfd574 100644 --- a/pyload/plugin/hoster/UploadkingCom.py +++ b/pyload/plugin/hoster/UploadkingCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class UploadkingCom(DeadHoster): -    __name    = "UploadkingCom" -    __type    = "hoster" -    __version = "0.14" +    __name__    = "UploadkingCom" +    __type__    = "hoster" +    __version__ = "0.14" -    __pattern = r'http://(?:www\.)?uploadking\.com/\w{10}' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?uploadking\.com/\w{10}' +    __config__  = [] -    __description = """UploadKing.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz")] +    __description__ = """UploadKing.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/UpstoreNet.py b/pyload/plugin/hoster/UpstoreNet.py index 544cee633..f6e8a6a1d 100644 --- a/pyload/plugin/hoster/UpstoreNet.py +++ b/pyload/plugin/hoster/UpstoreNet.py @@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class UpstoreNet(SimpleHoster): -    __name    = "UpstoreNet" -    __type    = "hoster" -    __version = "0.05" +    __name__    = "UpstoreNet" +    __type__    = "hoster" +    __version__ = "0.05" -    __pattern = r'https?://(?:www\.)?upstore\.net/' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?upstore\.net/' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 a2d1e8fcc..de23d4ad0 100644 --- a/pyload/plugin/hoster/UptoboxCom.py +++ b/pyload/plugin/hoster/UptoboxCom.py @@ -4,15 +4,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class UptoboxCom(XFSHoster): -    __name    = "UptoboxCom" -    __type    = "hoster" -    __version = "0.18" +    __name__    = "UptoboxCom" +    __type__    = "hoster" +    __version__ = "0.18" -    __pattern = r'https?://(?:www\.)?(uptobox|uptostream)\.com/\w{12}' +    __pattern__ = r'https?://(?:www\.)?(uptobox|uptostream)\.com/\w{12}' -    __description = """Uptobox.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description__ = """Uptobox.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]      INFO_PATTERN         = r'"para_title">(?P<N>.+) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)' diff --git a/pyload/plugin/hoster/VeehdCom.py b/pyload/plugin/hoster/VeehdCom.py index 2c8a34a95..f9756662c 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 2571bf800..0fa118355 100644 --- a/pyload/plugin/hoster/VeohCom.py +++ b/pyload/plugin/hoster/VeohCom.py @@ -6,23 +6,23 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class VeohCom(SimpleHoster): -    __name    = "VeohCom" -    __type    = "hoster" -    __version = "0.22" +    __name__    = "VeohCom" +    __type__    = "hoster" +    __version__ = "0.22" -    __pattern = r'http://(?:www\.)?veoh\.com/(tv/)?(watch|videos)/(?P<ID>v\w+)' -    __config  = [("use_premium", "bool"         , "Use premium account if available", True  ), +    __pattern__ = r'http://(?:www\.)?veoh\.com/(tv/)?(watch|videos)/(?P<ID>v\w+)' +    __config__  = [("use_premium", "bool"         , "Use premium account if available", True  ),                     ("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 ab571f9ea..094da09bd 100644 --- a/pyload/plugin/hoster/VidPlayNet.py +++ b/pyload/plugin/hoster/VidPlayNet.py @@ -7,15 +7,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class VidPlayNet(XFSHoster): -    __name    = "VidPlayNet" -    __type    = "hoster" -    __version = "0.04" +    __name__    = "VidPlayNet" +    __type__    = "hoster" +    __version__ = "0.04" -    __pattern = r'https?://(?:www\.)?vidplay\.net/\w{12}' +    __pattern__ = r'https?://(?:www\.)?vidplay\.net/\w{12}' -    __description = """VidPlay.net hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")] +    __description__ = """VidPlay.net hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]      NAME_PATTERN = r'<b>Password:</b></div>\s*<h[1-6]>(?P<N>[^<]+)</h[1-6]>' diff --git a/pyload/plugin/hoster/VimeoCom.py b/pyload/plugin/hoster/VimeoCom.py index d64c5ad43..fb6ea094a 100644 --- a/pyload/plugin/hoster/VimeoCom.py +++ b/pyload/plugin/hoster/VimeoCom.py @@ -6,25 +6,25 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class VimeoCom(SimpleHoster): -    __name    = "VimeoCom" -    __type    = "hoster" -    __version = "0.04" +    __name__    = "VimeoCom" +    __type__    = "hoster" +    __version__ = "0.04" -    __pattern = r'https?://(?:www\.)?(player\.)?vimeo\.com/(video/)?(?P<ID>\d+)' -    __config  = [("use_premium", "bool"                       , "Use premium account if available" , True     ), +    __pattern__ = r'https?://(?:www\.)?(player\.)?vimeo\.com/(video/)?(?P<ID>\d+)' +    __config__  = [("use_premium", "bool"                       , "Use premium account if available" , True     ),                     ("quality"    , "Lowest;Mobile;SD;HD;Highest", "Quality"                          , "Highest"),                     ("original"   , "bool"                       , "Try to download the original file", True     )] -    __description = """Vimeo.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description__ = """Vimeo.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]      NAME_PATTERN         = r'<title>(?P<N>.+) on Vimeo<'      OFFLINE_PATTERN      = r'class="exception_header"'      TEMP_OFFLINE_PATTERN = r'Please try again in a few minutes.<' -    URL_REPLACEMENTS = [(__pattern + ".*", r'https://www.vimeo.com/\g<ID>')] +    URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.vimeo.com/\g<ID>')]      COOKIES = [("vimeo.com", "language", "en")] diff --git a/pyload/plugin/hoster/Vipleech4UCom.py b/pyload/plugin/hoster/Vipleech4UCom.py index cd68410f0..0550f5c77 100644 --- a/pyload/plugin/hoster/Vipleech4UCom.py +++ b/pyload/plugin/hoster/Vipleech4UCom.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class Vipleech4UCom(DeadHoster): -    __name    = "Vipleech4UCom" -    __type    = "hoster" -    __version = "0.20" +    __name__    = "Vipleech4UCom" +    __type__    = "hoster" +    __version__ = "0.20" -    __pattern = r'http://(?:www\.)?vipleech4u\.com/manager\.php' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?vipleech4u\.com/manager\.php' +    __config__  = [] -    __description = """Vipleech4u.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")] +    __description__ = """Vipleech4u.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")] diff --git a/pyload/plugin/hoster/WarserverCz.py b/pyload/plugin/hoster/WarserverCz.py index 2556a1393..bedda34a7 100644 --- a/pyload/plugin/hoster/WarserverCz.py +++ b/pyload/plugin/hoster/WarserverCz.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class WarserverCz(DeadHoster): -    __name    = "WarserverCz" -    __type    = "hoster" -    __version = "0.13" +    __name__    = "WarserverCz" +    __type__    = "hoster" +    __version__ = "0.13" -    __pattern = r'http://(?:www\.)?warserver\.cz/stahnout/\d+' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?warserver\.cz/stahnout/\d+' +    __config__  = [] -    __description = """Warserver.cz hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description__ = """Warserver.cz hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/WebshareCz.py b/pyload/plugin/hoster/WebshareCz.py index 11b7b37b0..baeecfc94 100644 --- a/pyload/plugin/hoster/WebshareCz.py +++ b/pyload/plugin/hoster/WebshareCz.py @@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class WebshareCz(SimpleHoster): -    __name    = "WebshareCz" -    __type    = "hoster" -    __version = "0.16" +    __name__    = "WebshareCz" +    __type__    = "hoster" +    __version__ = "0.16" -    __pattern = r'https?://(?:www\.)?webshare\.cz/(?:#/)?file/(?P<ID>\w+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?webshare\.cz/(?:#/)?file/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """WebShare.cz hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("stickell", "l.stickell@yahoo.it"), +    __description__ = """WebShare.cz hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("stickell", "l.stickell@yahoo.it"),                         ("rush", "radek.senfeld@gmail.com")] @@ -25,7 +25,7 @@ class WebshareCz(SimpleHoster):          info = super(WebshareCz, cls).getInfo(url, html)          if url: -            info['pattern'] = re.match(cls.__pattern, url).groupdict() +            info['pattern'] = re.match(cls.__pattern__, url).groupdict()              api_data = getURL("https://webshare.cz/api/file_info/",                                post={'ident': info['pattern']['ID']}, diff --git a/pyload/plugin/hoster/WrzucTo.py b/pyload/plugin/hoster/WrzucTo.py index 066af4f1b..88eb38789 100644 --- a/pyload/plugin/hoster/WrzucTo.py +++ b/pyload/plugin/hoster/WrzucTo.py @@ -8,16 +8,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class WrzucTo(SimpleHoster): -    __name    = "WrzucTo" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "WrzucTo" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'http://(?:www\.)?wrzuc\.to/(\w+(\.wt|\.html)|(\w+/?linki/\w+))' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?wrzuc\.to/(\w+(\.wt|\.html)|(\w+/?linki/\w+))' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 2af68ced7..0b4411a5b 100644 --- a/pyload/plugin/hoster/WuploadCom.py +++ b/pyload/plugin/hoster/WuploadCom.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class WuploadCom(DeadHoster): -    __name    = "WuploadCom" -    __type    = "hoster" -    __version = "0.23" +    __name__    = "WuploadCom" +    __type__    = "hoster" +    __version__ = "0.23" -    __pattern = r'http://(?:www\.)?wupload\..+?/file/((\w+/)?\d+)(/.*)?' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?wupload\..+?/file/((\w+/)?\d+)(/.*)?' +    __config__  = [] -    __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 865fc4b45..f8700ba67 100644 --- a/pyload/plugin/hoster/X7To.py +++ b/pyload/plugin/hoster/X7To.py @@ -4,13 +4,13 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class X7To(DeadHoster): -    __name    = "X7To" -    __type    = "hoster" -    __version = "0.41" +    __name__    = "X7To" +    __type__    = "hoster" +    __version__ = "0.41" -    __pattern = r'http://(?:www\.)?x7\.to/' -    __config  = [] +    __pattern__ = r'http://(?:www\.)?x7\.to/' +    __config__  = [] -    __description = """X7.to hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("ernieb", "ernieb")] +    __description__ = """X7.to hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("ernieb", "ernieb")] diff --git a/pyload/plugin/hoster/XFileSharingPro.py b/pyload/plugin/hoster/XFileSharingPro.py index 0696674df..e90826536 100644 --- a/pyload/plugin/hoster/XFileSharingPro.py +++ b/pyload/plugin/hoster/XFileSharingPro.py @@ -6,15 +6,15 @@ from pyload.plugin.internal.XFSHoster import XFSHoster  class XFileSharingPro(XFSHoster): -    __name    = "XFileSharingPro" -    __type    = "hoster" -    __version = "0.45" +    __name__    = "XFileSharingPro" +    __type__    = "hoster" +    __version__ = "0.45" -    __pattern = r'^unmatchable$' +    __pattern__ = r'^unmatchable$' -    __description = """XFileSharingPro dummy hoster plugin for hook""" -    __license     = "GPLv3" -    __authors     = [("Walter Purcaro", "vuolter@gmail.com")] +    __description__ = """XFileSharingPro dummy hoster plugin for hook""" +    __license__     = "GPLv3" +    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]      URL_REPLACEMENTS = [("/embed-", "/")] @@ -23,15 +23,15 @@ class XFileSharingPro(XFSHoster):      def _log(self, type, args):          msg = " | ".join(str(a).strip() for a in args if a)          logger = getattr(self.log, type) -        logger("%s: %s: %s" % (self.__name, self.HOSTER_NAME, msg or _("%s MARK" % type.upper()))) +        logger("%s: %s: %s" % (self.__name__, self.HOSTER_NAME, msg or _("%s MARK" % type.upper())))      def init(self):          super(XFileSharingPro, self).init() -        self.__pattern = self.core.pluginManager.hosterPlugins[self.__name]['pattern'] +        self.__pattern__ = self.core.pluginManager.hosterPlugins[self.__name__]['pattern'] -        self.HOSTER_DOMAIN = re.match(self.__pattern, self.pyfile.url).group("DOMAIN").lower() +        self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower()          self.HOSTER_NAME   = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.HOSTER_DOMAIN) if part != '.')          account = self.core.accountManager.getAccountPlugin(self.HOSTER_NAME) diff --git a/pyload/plugin/hoster/XHamsterCom.py b/pyload/plugin/hoster/XHamsterCom.py index adc16e233..73944a61b 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 ae4d0637f..c5e2921cb 100644 --- a/pyload/plugin/hoster/XVideosCom.py +++ b/pyload/plugin/hoster/XVideosCom.py @@ -8,21 +8,21 @@ from pyload.plugin.Hoster import Hoster  class XVideosCom(Hoster): -    __name    = "XVideos.com" -    __type    = "hoster" -    __version = "0.10" +    __name__    = "XVideos.com" +    __type__    = "hoster" +    __version__ = "0.10" -    __pattern = r'http://(?:www\.)?xvideos\.com/video(\d+)' +    __pattern__ = r'http://(?:www\.)?xvideos\.com/video(\d+)' -    __description = """XVideos.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [] +    __description__ = """XVideos.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = []      def process(self, pyfile):          site = self.load(pyfile.url)          pyfile.name = "%s (%s).flv" % (              re.search(r"<h2>([^<]+)<span", site).group(1), -            re.match(self.__pattern, pyfile.url).group(1), +            re.match(self.__pattern__, pyfile.url).group(1),          )          self.download(unquote(re.search(r"flv_url=([^&]+)&", site).group(1))) diff --git a/pyload/plugin/hoster/XdadevelopersCom.py b/pyload/plugin/hoster/XdadevelopersCom.py index 488d29c44..8ef79657f 100644 --- a/pyload/plugin/hoster/XdadevelopersCom.py +++ b/pyload/plugin/hoster/XdadevelopersCom.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class XdadevelopersCom(SimpleHoster): -    __name    = "XdadevelopersCom" -    __type    = "hoster" -    __version = "0.03" +    __name__    = "XdadevelopersCom" +    __type__    = "hoster" +    __version__ = "0.03" -    __pattern = r'https?://(?:www\.)?forum\.xda-developers\.com/devdb/project/dl/\?id=\d+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)?forum\.xda-developers\.com/devdb/project/dl/\?id=\d+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Xda-developers.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")] +    __description__ = """Xda-developers.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]      NAME_PATTERN    = r'<label>Filename:</label>\s*<div>\s*(?P<N>.*?)\n' diff --git a/pyload/plugin/hoster/Xdcc.py b/pyload/plugin/hoster/Xdcc.py index ff8d2c3b8..10d50369f 100644 --- a/pyload/plugin/hoster/Xdcc.py +++ b/pyload/plugin/hoster/Xdcc.py @@ -15,17 +15,17 @@ from pyload.utils import fs_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 6b6ee1fda..9f90dbe5e 100644 --- a/pyload/plugin/hoster/YibaishiwuCom.py +++ b/pyload/plugin/hoster/YibaishiwuCom.py @@ -7,16 +7,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class YibaishiwuCom(SimpleHoster): -    __name    = "YibaishiwuCom" -    __type    = "hoster" -    __version = "0.14" +    __name__    = "YibaishiwuCom" +    __type__    = "hoster" +    __version__ = "0.14" -    __pattern = r'http://(?:www\.)?(?:u\.)?115\.com/file/(?P<ID>\w+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://(?:www\.)?(?:u\.)?115\.com/file/(?P<ID>\w+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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 640d67173..a600d822f 100644 --- a/pyload/plugin/hoster/YourfilesTo.py +++ b/pyload/plugin/hoster/YourfilesTo.py @@ -8,15 +8,15 @@ from pyload.plugin.Hoster import Hoster  class YourfilesTo(Hoster): -    __name    = "YourfilesTo" -    __type    = "hoster" -    __version = "0.22" +    __name__    = "YourfilesTo" +    __type__    = "hoster" +    __version__ = "0.22" -    __pattern = r'http://(?:www\.)?yourfiles\.(to|biz)/\?d=\w+' +    __pattern__ = r'http://(?:www\.)?yourfiles\.(to|biz)/\?d=\w+' -    __description = """Youfiles.to hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("jeix", "jeix@hasnomail.de"), +    __description__ = """Youfiles.to hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("jeix", "jeix@hasnomail.de"),                         ("skydancer", "skydancer@hasnomail.de")] diff --git a/pyload/plugin/hoster/YoutubeCom.py b/pyload/plugin/hoster/YoutubeCom.py index 14503be03..260b1ba3d 100644 --- a/pyload/plugin/hoster/YoutubeCom.py +++ b/pyload/plugin/hoster/YoutubeCom.py @@ -31,12 +31,12 @@ def which(program):  class YoutubeCom(Hoster): -    __name    = "YoutubeCom" -    __type    = "hoster" -    __version = "0.41" +    __name__    = "YoutubeCom" +    __type__    = "hoster" +    __version__ = "0.41" -    __pattern = r'https?://(?:[^/]*\.)?(youtube\.com|youtu\.be)/watch\?(?:.*&)?v=.+' -    __config  = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting"             , "hd" ), +    __pattern__ = r'https?://(?:[^/]*\.)?(youtube\.com|youtu\.be)/watch\?(?:.*&)?v=.+' +    __config__  = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting"             , "hd" ),                     ("fmt"    , "int"                                         , "FMT/ITAG Number (0 for auto)", 0    ),                     (".mp4"   , "bool"                                        , "Allow .mp4"                  , True ),                     (".flv"   , "bool"                                        , "Allow .flv"                  , True ), @@ -44,9 +44,9 @@ class YoutubeCom(Hoster):                     (".3gp"   , "bool"                                        , "Allow .3gp"                  , False),                     ("3d"     , "bool"                                        , "Prefer 3D"                   , False)] -    __description = """Youtube.com hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("spoob", "spoob@pyload.org"), +    __description__ = """Youtube.com hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("spoob", "spoob@pyload.org"),                         ("zoidberg", "zoidberg@mujmail.cz")] diff --git a/pyload/plugin/hoster/ZDF.py b/pyload/plugin/hoster/ZDF.py index 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 a2461fb6a..fb02370f5 100644 --- a/pyload/plugin/hoster/ZShareNet.py +++ b/pyload/plugin/hoster/ZShareNet.py @@ -4,14 +4,14 @@ from pyload.plugin.internal.DeadHoster import DeadHoster  class ZShareNet(DeadHoster): -    __name    = "ZShareNet" -    __type    = "hoster" -    __version = "0.21" +    __name__    = "ZShareNet" +    __type__    = "hoster" +    __version__ = "0.21" -    __pattern = r'https?://(?:ww[2w]\.)?zshares?\.net/.+' -    __config  = [] +    __pattern__ = r'https?://(?:ww[2w]\.)?zshares?\.net/.+' +    __config__  = [] -    __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 c5defeff7..96bbf3455 100644 --- a/pyload/plugin/hoster/ZeveraCom.py +++ b/pyload/plugin/hoster/ZeveraCom.py @@ -8,16 +8,16 @@ from pyload.plugin.internal.MultiHoster import MultiHoster  class ZeveraCom(MultiHoster): -    __name    = "ZeveraCom" -    __type    = "hoster" -    __version = "0.29" +    __name__    = "ZeveraCom" +    __type__    = "hoster" +    __version__ = "0.29" -    __pattern = r'https?://(?:www\.)zevera\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'https?://(?:www\.)zevera\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __description = """Zevera.com multi-hoster plugin""" -    __license     = "GPLv3" -    __authors     = [("zoidberg", "zoidberg@mujmail.cz"), +    __description__ = """Zevera.com multi-hoster plugin""" +    __license__     = "GPLv3" +    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),                         ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/pyload/plugin/hoster/ZippyshareCom.py b/pyload/plugin/hoster/ZippyshareCom.py index 7aaa9ec70..9b1d432cc 100644 --- a/pyload/plugin/hoster/ZippyshareCom.py +++ b/pyload/plugin/hoster/ZippyshareCom.py @@ -9,16 +9,16 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster  class ZippyshareCom(SimpleHoster): -    __name    = "ZippyshareCom" -    __type    = "hoster" -    __version = "0.77" +    __name__    = "ZippyshareCom" +    __type__    = "hoster" +    __version__ = "0.77" -    __pattern = r'http://www\d{0,2}\.zippyshare\.com/v(/|iew\.jsp.*key=)(?P<KEY>[\w^_]+)' -    __config  = [("use_premium", "bool", "Use premium account if available", True)] +    __pattern__ = r'http://www\d{0,2}\.zippyshare\.com/v(/|iew\.jsp.*key=)(?P<KEY>[\w^_]+)' +    __config__  = [("use_premium", "bool", "Use premium account if available", True)] -    __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"),                         ("sebdelsol", "seb.morin@gmail.com")]  | 
