diff options
| -rw-r--r-- | module/plugins/internal/SimpleCrypter.py | 5 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 9 | 
2 files changed, 5 insertions, 9 deletions
| diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index 0e43496c4..01d1895a6 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -13,7 +13,7 @@ from module.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/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 1f7753003..2562f0af3 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/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()): | 
