summaryrefslogtreecommitdiffstats
path: root/module/plugins/internal
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2015-02-02 18:48:06 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2015-02-02 18:48:06 +0100
commit7b6a9a68dfbf67f075bfe86e67be5390da4b8c1d (patch)
treefe061fd9a88ad0e2d9cedbf6800f1a2b7b6a890f /module/plugins/internal
parent[UploadedTo] Improve apiInfo (2) (diff)
downloadpyload-7b6a9a68dfbf67f075bfe86e67be5390da4b8c1d.tar.xz
Fix https://github.com/pyload/pyload/issues/1134
Diffstat (limited to 'module/plugins/internal')
-rw-r--r--module/plugins/internal/SimpleCrypter.py6
-rw-r--r--module/plugins/internal/SimpleHoster.py18
2 files changed, 13 insertions, 11 deletions
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