diff options
| author | 2015-02-02 18:48:06 +0100 | |
|---|---|---|
| committer | 2015-02-02 18:48:06 +0100 | |
| commit | 7b6a9a68dfbf67f075bfe86e67be5390da4b8c1d (patch) | |
| tree | fe061fd9a88ad0e2d9cedbf6800f1a2b7b6a890f /module | |
| parent | [UploadedTo] Improve apiInfo (2) (diff) | |
| download | pyload-7b6a9a68dfbf67f075bfe86e67be5390da4b8c1d.tar.xz | |
Fix https://github.com/pyload/pyload/issues/1134
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/hoster/UploadedTo.py | 2 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleCrypter.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 18 | 
3 files changed, 14 insertions, 12 deletions
| diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 42ad3e06d..c83814198 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -43,7 +43,7 @@ class UploadedTo(SimpleHoster):              if html != "can't find request":                  api = html.split(",", 4)                  if api[0] == "online": -                    info.update({'name': api[4], 'size': api[2], 'status': 2}) +                    info.update({'name': api[4].strip(), 'size': api[2], 'status': 2})                  else:                      info['status'] = 1                  break diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index b2622b5e0..856b548f0 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -12,7 +12,7 @@ from module.utils import fixup  class SimpleCrypter(Crypter, SimpleHoster):      __name__    = "SimpleCrypter"      __type__    = "crypter" -    __version__ = "0.42" +    __version__ = "0.43"      __pattern__ = r'^unmatchable$'      __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package'] @@ -129,8 +129,8 @@ class SimpleCrypter(Crypter, SimpleHoster):              self.logDebug("File info (AFTER): %s"  % self.info)          try: -            url  = self.info['url'] -            name = self.info['name'] +            url  = self.info['url'].strip() +            name = self.info['name'].strip()              if name and name != url:                  self.pyfile.name = name diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 4a1f62395..0ac49de19 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):  class SimpleHoster(Hoster):      __name__    = "SimpleHoster"      __type__    = "hoster" -    __version__ = "1.13" +    __version__ = "1.14"      __pattern__ = r'^unmatchable$' @@ -552,8 +552,10 @@ class SimpleHoster(Hoster):      def checkStatus(self, getinfo=True):          if not self.info or getinfo: -            self.logDebug("File info (BEFORE): %s" % self.info) +            self.logDebug("Update file info...") +            self.logDebug("Previous file info: %s" % self.info)              self.info.update(self.getInfo(self.pyfile.url, self.html)) +            self.logDebug("Current file info: %s"  % self.info)          try:              status = self.info['status'] @@ -568,19 +570,19 @@ class SimpleHoster(Hoster):                  self.fail()          finally: -            self.logDebug("File status: %s" % statusMap[status], -                          "File info: %s"   % self.info) +            self.logDebug("File status: %s" % statusMap[status])      def checkNameSize(self, getinfo=True):          if not self.info or getinfo: -            self.logDebug("File info (BEFORE): %s" % self.info) +            self.logDebug("Update file info...") +            self.logDebug("Previous file info: %s" % self.info)              self.info.update(self.getInfo(self.pyfile.url, self.html)) -            self.logDebug("File info (AFTER): %s"  % self.info) +            self.logDebug("Current file info: %s"  % self.info)          try: -            url  = self.info['url'] -            name = self.info['name'] +            url  = self.info['url'].strip() +            name = self.info['name'].strip()              if name and name != url:                  self.pyfile.name = name | 
