diff options
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/hoster/AlldebridCom.py | 3 | ||||
| -rw-r--r-- | module/plugins/hoster/DebridItaliaCom.py | 5 | ||||
| -rw-r--r-- | module/plugins/hoster/EuroshareEu.py | 5 | ||||
| -rw-r--r-- | module/plugins/hoster/FastixRu.py | 3 | ||||
| -rw-r--r-- | module/plugins/hoster/FreeWayMe.py | 12 | ||||
| -rw-r--r-- | module/plugins/hoster/LinksnappyCom.py | 5 | ||||
| -rw-r--r-- | module/plugins/hoster/MyfastfileCom.py | 3 | ||||
| -rw-r--r-- | module/plugins/hoster/OverLoadMe.py | 3 | ||||
| -rw-r--r-- | module/plugins/hoster/RPNetBiz.py | 3 | ||||
| -rw-r--r-- | module/plugins/hoster/RealdebridCom.py | 3 | ||||
| -rw-r--r-- | module/plugins/hoster/SimplyPremiumCom.py | 3 | ||||
| -rw-r--r-- | module/plugins/hoster/SimplydebridCom.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/ZeveraCom.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 4 | 
14 files changed, 16 insertions, 48 deletions
| diff --git a/module/plugins/hoster/AlldebridCom.py b/module/plugins/hoster/AlldebridCom.py index d7dbe31a6..751ff415c 100644 --- a/module/plugins/hoster/AlldebridCom.py +++ b/module/plugins/hoster/AlldebridCom.py @@ -35,8 +35,7 @@ class AlldebridCom(MultiHoster):      def setup(self): -        self.chunkLimit     = 16 -        self.resumeDownload = True +        self.chunkLimit = 16      def handlePremium(self): diff --git a/module/plugins/hoster/DebridItaliaCom.py b/module/plugins/hoster/DebridItaliaCom.py index 842e3cd63..11b6da918 100644 --- a/module/plugins/hoster/DebridItaliaCom.py +++ b/module/plugins/hoster/DebridItaliaCom.py @@ -21,11 +21,6 @@ class DebridItaliaCom(MultiHoster):      URL_REPLACEMENTS = [("https://", "http://")] -    def setup(self): -        self.chunkLimit     = 1 -        self.resumeDownload = True - -      def handlePremium(self):          self.html = self.load("http://www.debriditalia.com/api.php",                                get={'generate': "on", 'link': self.pyfile.url, 'p': self.getPassword()}) diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py index cc10abb37..2ebdfb3ff 100644 --- a/module/plugins/hoster/EuroshareEu.py +++ b/module/plugins/hoster/EuroshareEu.py @@ -27,11 +27,6 @@ class EuroshareEu(SimpleHoster):      URL_REPLACEMENTS = [(r"(http://[^/]*\.)(sk|cz|hu|pl)/", r"\1eu/")] -    def setup(self): -        self.multiDL = self.resumeDownload = self.premium -        self.req.setOption("timeout", 120) - -      def handlePremium(self):          if self.ERR_NOT_LOGGED_IN_PATTERN in self.html:              self.account.relogin(self.user) diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py index 5f6fd2d4c..b68c79ebc 100644 --- a/module/plugins/hoster/FastixRu.py +++ b/module/plugins/hoster/FastixRu.py @@ -32,8 +32,7 @@ class FastixRu(MultiHoster):      def setup(self): -        self.chunkLimit     = 3 -        self.resumeDownload = True +        self.chunkLimit = 3      def handlePremium(self): diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py index 80d0b8515..50131e28e 100644 --- a/module/plugins/hoster/FreeWayMe.py +++ b/module/plugins/hoster/FreeWayMe.py @@ -24,11 +24,13 @@ class FreeWayMe(MultiHoster):      def handlePremium(self):          user, data = self.account.selectAccount() -        self.link = True -        self.download( -            "https://www.free-way.me/load.php", -            get={"multiget": 7, "url": self.pyfile.url, "user": user, "pw": self.account.getpw(user), "json": ""}, -            disposition=True) +        self.download("https://www.free-way.me/load.php", +                      get={'multiget': 7, +                           'url'     : self.pyfile.url, +                           'user'    : user, +                           'pw'      : self.account.getpw(user), +                           'json'    : ""}, +                      disposition=True)  getInfo = create_getInfo(FreeWayMe) diff --git a/module/plugins/hoster/LinksnappyCom.py b/module/plugins/hoster/LinksnappyCom.py index 90a47d1ac..b7127c066 100644 --- a/module/plugins/hoster/LinksnappyCom.py +++ b/module/plugins/hoster/LinksnappyCom.py @@ -23,11 +23,6 @@ class LinksnappyCom(MultiHoster):      SINGLE_CHUNK_HOSTERS = ('easybytez.com') -    def setup(self): -        self.chunkLimit     = -1 -        self.resumeDownload = True - -      def handlePremium(self):          host = self._get_host(self.pyfile.url)          json_params = json_dumps({'link': self.pyfile.url, diff --git a/module/plugins/hoster/MyfastfileCom.py b/module/plugins/hoster/MyfastfileCom.py index b5b9ec820..13ba2af21 100644 --- a/module/plugins/hoster/MyfastfileCom.py +++ b/module/plugins/hoster/MyfastfileCom.py @@ -19,8 +19,7 @@ class MyfastfileCom(MultiHoster):      def setup(self): -        self.chunkLimit     = -1 -        self.resumeDownload = True +        self.chunkLimit = -1      def handlePremium(self): diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py index 54f869635..f7c068b58 100644 --- a/module/plugins/hoster/OverLoadMe.py +++ b/module/plugins/hoster/OverLoadMe.py @@ -33,8 +33,7 @@ class OverLoadMe(MultiHoster):      def setup(self): -        self.chunkLimit     = 5 -        self.resumeDownload = True +        self.chunkLimit = 5      def handlePremium(self): diff --git a/module/plugins/hoster/RPNetBiz.py b/module/plugins/hoster/RPNetBiz.py index bffa5ef85..efd5d54ee 100644 --- a/module/plugins/hoster/RPNetBiz.py +++ b/module/plugins/hoster/RPNetBiz.py @@ -19,8 +19,7 @@ class RPNetBiz(MultiHoster):      def setup(self): -        self.chunkLimit     = -1 -        self.resumeDownload = True +        self.chunkLimit = -1      def handlePremium(self): diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py index 0332ae9da..49cfc01f7 100644 --- a/module/plugins/hoster/RealdebridCom.py +++ b/module/plugins/hoster/RealdebridCom.py @@ -34,8 +34,7 @@ class RealdebridCom(MultiHoster):      def setup(self): -        self.chunkLimit     = 3 -        self.resumeDownload = True +        self.chunkLimit = 3      def handlePremium(self): diff --git a/module/plugins/hoster/SimplyPremiumCom.py b/module/plugins/hoster/SimplyPremiumCom.py index bf7c43af6..fe38cff6e 100644 --- a/module/plugins/hoster/SimplyPremiumCom.py +++ b/module/plugins/hoster/SimplyPremiumCom.py @@ -21,8 +21,7 @@ class SimplyPremiumCom(MultiHoster):      def setup(self): -        self.chunkLimit     = 16 -        self.resumeDownload = False +        self.chunkLimit = 16      def handlePremium(self): diff --git a/module/plugins/hoster/SimplydebridCom.py b/module/plugins/hoster/SimplydebridCom.py index 5e6b47efc..8211d40d4 100644 --- a/module/plugins/hoster/SimplydebridCom.py +++ b/module/plugins/hoster/SimplydebridCom.py @@ -17,12 +17,6 @@ class SimplydebridCom(MultiHoster):      __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")] -    def setup(self): -        self.resumeDownload = True -        self.multiDL        = True -        self.chunkLimit     = 1 - -      def handlePremium(self):          #fix the links for simply-debrid.com!          self.link = self.pyfile.url diff --git a/module/plugins/hoster/ZeveraCom.py b/module/plugins/hoster/ZeveraCom.py index 40ef5de0f..60fc2a12b 100644 --- a/module/plugins/hoster/ZeveraCom.py +++ b/module/plugins/hoster/ZeveraCom.py @@ -15,12 +15,6 @@ class ZeveraCom(MultiHoster):      __authors__     = [("zoidberg", "zoidberg@mujmail.cz")] -    def setup(self): -        self.resumeDownload = True -        self.multiDL        = True -        self.chunkLimit     = 1 - -      def handlePremium(self):          if self.account.getAPIData(self.req, cmd="checklink", olink=self.pyfile.url) != "Alive":              self.fail(_("Offline or not downloadable")) diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 51891c3c6..7bab78ce8 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -447,13 +447,13 @@ class SimpleHoster(Hoster):          if hasattr(self, 'PREMIUM_ONLY_PATTERN') and self.premium and re.search(self.PREMIUM_ONLY_PATTERN, self.html):              self.fail(_("Link require a premium account to be handled")) -        if hasattr(self, 'ERROR_PATTERN'): +        elif hasattr(self, 'ERROR_PATTERN'):              m = re.search(self.ERROR_PATTERN, self.html)              if m:                  errmsg = self.info['error'] = m.group(1)                  self.error(errmsg) -        if hasattr(self, 'WAIT_PATTERN'): +        elif hasattr(self, 'WAIT_PATTERN'):              m = re.search(self.WAIT_PATTERN, self.html)              if m:                  wait_time = sum([int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in | 
