diff options
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/accounts/ShareonlineBiz.py | 5 | ||||
| -rw-r--r-- | module/plugins/hoster/RealdebridCom.py | 4 | ||||
| -rw-r--r-- | module/plugins/internal/MultiHoster.py | 10 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleCrypter.py | 4 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 7 |
5 files changed, 15 insertions, 15 deletions
diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 3f737896e..57fe52385 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -8,7 +8,7 @@ from module.plugins.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.28" + __version__ = "0.29" __description__ = """Share-online.biz account plugin""" __license__ = "GPLv3" @@ -45,6 +45,9 @@ class ShareonlineBiz(Account): maxtraffic = max(maxtraffic, traffic) trafficleft = maxtraffic - traffic + maxtraffic /= 1024 #@TODO: Remove `/ 1024` in 0.4.10 + trafficleft /= 1024 #@TODO: Remove `/ 1024` in 0.4.10 + return {'premium': premium, 'validuntil': validuntil, 'trafficleft': trafficleft, 'maxtraffic': maxtraffic} diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py index e8bb44ee5..5330659ae 100644 --- a/module/plugins/hoster/RealdebridCom.py +++ b/module/plugins/hoster/RealdebridCom.py @@ -14,9 +14,9 @@ from module.utils import parseFileSize class RealdebridCom(MultiHoster): __name__ = "RealdebridCom" __type__ = "hoster" - __version__ = "0.60" + __version__ = "0.61" - __pattern__ = r'https?://s\d+\.real-debrid\.com/dl/[\w^_]+' + __pattern__ = r'https?://(b\.rdb\.so/d/|s\d+\.real-debrid\.com/dl/)[\w^_]+' __description__ = """Real-Debrid.com hoster plugin""" __license__ = "GPLv3" diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index 9d218c3b2..8cdb2fbff 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r class MultiHoster(SimpleHoster): __name__ = "MultiHoster" __type__ = "hoster" - __version__ = "0.26" + __version__ = "0.27" __pattern__ = r'^unmatchable$' @@ -54,13 +54,17 @@ class MultiHoster(SimpleHoster): self.logDebug("Looking for direct download link...") self.handleDirect() - if not self.link and not self.lastDownload: + if self.link: + self.pyfile.url = self.link + self.checkNameSize() + + elif not self.lastDownload: self.preload() + self.checkInfo() if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()): self.logDebug("Handled as premium download") self.handlePremium() - else: self.logDebug("Handled as free download") self.handleFree() diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index 51ba07eb7..566252245 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -103,10 +103,6 @@ class SimpleCrypter(Crypter, SimpleHoster): self.prepare() self.preload() - - if self.html is None: - self.fail(_("No html retrieved")) - self.checkInfo() self.links = self.getLinks() diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index d9732d063..5c6f8c720 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -181,7 +181,7 @@ def secondsToMidnight(gmt=0): class SimpleHoster(Hoster): __name__ = "SimpleHoster" __type__ = "hoster" - __version__ = "0.82" + __version__ = "0.83" __pattern__ = r'^unmatchable$' @@ -388,7 +388,7 @@ class SimpleHoster(Hoster): def process(self, pyfile): self.prepare() - self.checkInfo() + self.checkNameSize() if self.directDL: self.logDebug("Looking for direct download link...") @@ -406,9 +406,6 @@ class SimpleHoster(Hoster): self.preload() self.checkInfo() - if self.html is None: - self.fail(_("No html retrieved")) - if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()): self.logDebug("Handled as premium download") self.handlePremium() |