summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-11-14 01:53:24 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-11-14 01:56:18 +0100
commitaeaa7bb2f6964fd0eadb447a58495f541557fe84 (patch)
tree4fd6fcb4bf5b239f0a3e9933a7988470942a4783
parent[UlozTo] Fixed hoster and account (diff)
downloadpyload-aeaa7bb2f6964fd0eadb447a58495f541557fe84.tar.xz
[SimpleCrypter][SimpleHoster] Temp workaround
-rw-r--r--pyload/plugins/internal/SimpleCrypter.py5
-rw-r--r--pyload/plugins/internal/SimpleHoster.py9
2 files changed, 5 insertions, 9 deletions
diff --git a/pyload/plugins/internal/SimpleCrypter.py b/pyload/plugins/internal/SimpleCrypter.py
index 634ec5f12..5f7f89bc2 100644
--- a/pyload/plugins/internal/SimpleCrypter.py
+++ b/pyload/plugins/internal/SimpleCrypter.py
@@ -13,7 +13,7 @@ from pyload.utils import fixup, html_unescape
class SimpleCrypter(Crypter):
__name__ = "SimpleCrypter"
__type__ = "crypter"
- __version__ = "0.28"
+ __version__ = "0.29"
__pattern__ = r'^unmatchable$'
__config__ = [("use_subfolder", "bool", "Save package to subfolder", True), #: Overrides core.config['general']['folder_per_package']
@@ -96,8 +96,7 @@ class SimpleCrypter(Crypter):
self.pyfile.url = replace_patterns(self.pyfile.url, self.URL_REPLACEMENTS)
- if self.html is None:
- self.html = self.load(self.pyfile.url, decode=not self.TEXT_ENCODING, cookies=bool(self.COOKIES))
+ self.html = self.load(self.pyfile.url, decode=not self.TEXT_ENCODING, cookies=bool(self.COOKIES))
if isinstance(self.TEXT_ENCODING, basestring):
self.html = unicode(self.html, self.TEXT_ENCODING)
diff --git a/pyload/plugins/internal/SimpleHoster.py b/pyload/plugins/internal/SimpleHoster.py
index 5e34d694d..dd3afdefd 100644
--- a/pyload/plugins/internal/SimpleHoster.py
+++ b/pyload/plugins/internal/SimpleHoster.py
@@ -200,7 +200,7 @@ def timestamp():
class SimpleHoster(Hoster):
__name__ = "SimpleHoster"
__type__ = "hoster"
- __version__ = "0.53"
+ __version__ = "0.54"
__pattern__ = r'^unmatchable$'
@@ -274,11 +274,8 @@ class SimpleHoster(Hoster):
return direct_link
else:
self.logDebug(_("No direct download link found"))
- self.html = None
- self.info = {}
- if self.html is None:
- self.html = self.load(self.pyfile.url, decode=not self.TEXT_ENCODING, cookies=bool(self.COOKIES))
+ self.html = self.load(self.pyfile.url, decode=not self.TEXT_ENCODING, cookies=bool(self.COOKIES))
if isinstance(self.TEXT_ENCODING, basestring):
self.html = unicode(self.html, self.TEXT_ENCODING)
@@ -296,7 +293,7 @@ class SimpleHoster(Hoster):
else:
premium_only = hasattr(self, 'PREMIUM_ONLY_PATTERN') and re.search(self.PREMIUM_ONLY_PATTERN, self.html)
- if not premium_only and not self.info: #: Usually premium only pages doesn't show any file information
+ if not premium_only: #: Usually premium only pages doesn't show any file information
self.getFileInfo()
if self.premium and (not self.FORCE_CHECK_TRAFFIC or self.checkTrafficLeft()):