diff options
Diffstat (limited to 'pyload/plugin/internal')
| -rw-r--r-- | pyload/plugin/internal/SimpleCrypter.py | 2 | ||||
| -rw-r--r-- | pyload/plugin/internal/SimpleDereferer.py | 5 | ||||
| -rw-r--r-- | pyload/plugin/internal/SimpleHoster.py | 10 | ||||
| -rw-r--r-- | pyload/plugin/internal/XFSHoster.py | 2 |
4 files changed, 7 insertions, 12 deletions
diff --git a/pyload/plugin/internal/SimpleCrypter.py b/pyload/plugin/internal/SimpleCrypter.py index f6c5aa5e2..c6582647f 100644 --- a/pyload/plugin/internal/SimpleCrypter.py +++ b/pyload/plugin/internal/SimpleCrypter.py @@ -15,7 +15,7 @@ class SimpleCrypter(Crypter, SimpleHoster): __version = "0.43" __pattern = r'^unmatchable$' - __config = [("use_subfolder" , "bool", "Save package to subfolder" , True), #: Overrides core.config['general']['folder_per_package'] + __config = [("use_subfolder" , "bool", "Save package to subfolder" , True), #: Overrides core.config.get("general", "folder_per_package") ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] __description = """Simple decrypter plugin""" diff --git a/pyload/plugin/internal/SimpleDereferer.py b/pyload/plugin/internal/SimpleDereferer.py index f3596b32c..c82afe0b4 100644 --- a/pyload/plugin/internal/SimpleDereferer.py +++ b/pyload/plugin/internal/SimpleDereferer.py @@ -59,10 +59,7 @@ class SimpleDereferer(Crypter): link = self.getLink() if link.strip(): - self.urls = [link.strip()] #@TODO: Remove `.strip()` in 0.4.10 - - elif not self.urls and not self.packages: #@TODO: Remove in 0.4.10 - self.fail(_("No link grabbed")) + self.urls = [link] def prepare(self): diff --git a/pyload/plugin/internal/SimpleHoster.py b/pyload/plugin/internal/SimpleHoster.py index c0cdc05a8..add54786f 100644 --- a/pyload/plugin/internal/SimpleHoster.py +++ b/pyload/plugin/internal/SimpleHoster.py @@ -244,7 +244,7 @@ def secondsToMidnight(gmt=0): class SimpleHoster(Hoster): __name = "SimpleHoster" __type = "hoster" - __version = "1.37" + __version = "1.38" __pattern = r'^unmatchable$' __config = [("use_premium", "bool", "Use premium account if available", True)] @@ -609,7 +609,7 @@ class SimpleHoster(Hoster): self.tempOffline() elif status is 8: - self.fail() + self.fail(self.info['error'] if 'error' in self.info else "Failed") finally: self.logDebug("File status: %s" % statusMap[status]) @@ -728,8 +728,8 @@ class SimpleHoster(Hoster): elif traffic == -1: return True else: - size = self.pyfile.size / 1024 - self.logInfo(_("Filesize: %i KiB, Traffic left for user %s: %i KiB") % (size, self.user, traffic)) + size = self.pyfile.size + self.logInfo(_("Filesize: %i KiB, Traffic left for user %s: %i KiB") % (size / 1024, self.user, traffic / 1024)) return size <= traffic @@ -751,8 +751,6 @@ class SimpleHoster(Hoster): self.retries = 0 raise Retry(_("Fallback to free download")) - #@TODO: Remove in 0.4.10 - def wait(self, seconds=0, reconnect=None): return _wait(self, seconds, reconnect) diff --git a/pyload/plugin/internal/XFSHoster.py b/pyload/plugin/internal/XFSHoster.py index 92ec020a6..7b8149bc3 100644 --- a/pyload/plugin/internal/XFSHoster.py +++ b/pyload/plugin/internal/XFSHoster.py @@ -113,7 +113,7 @@ class XFSHoster(SimpleHoster): self.logError(data['op'] if 'op' in data else _("UNKNOWN")) return "" - self.link = m.group(1).strip() #@TODO: Remove .strip() in 0.4.10 + self.link = m.group(1) def handlePremium(self, pyfile): |