[SimpleCrypter] Extend SimpleHoster

1 files changed, 10 insertions, 37 deletions

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 75c687c16..8c7f0bef3 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -6,14 +6,14 @@ from urlparse import urlparse
 
 from module.plugins.Crypter import Crypter
 from module.plugins.Plugin import Fail
-from module.plugins.internal.SimpleHoster import _error, _wait, parseFileInfo, replace_patterns, set_cookies
-from module.utils import fixup, html_unescape
+from module.plugins.internal.SimpleHoster import SimpleHoster, _error, _wait, replace_patterns, set_cookies
+from module.utils import fixup
 
 
-class SimpleCrypter(Crypter):
+class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.30"
+    __version__ = "0.31"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
@@ -69,7 +69,7 @@ class SimpleCrypter(Crypter):
     LOGIN_PREMIUM = False
 
 
-    #@TODO: remove in 0.4.10
+    #@TODO: Remove in 0.4.10
     def init(self):
         account_name = (self.__name__ + ".py").replace("Folder.py", "").replace(".py", "")
         account = self.core.accountManager.getAccountPlugin(account_name)
@@ -100,13 +100,6 @@ class SimpleCrypter(Crypter):
         self.pyfile.url = replace_patterns(self.pyfile.url, self.URL_REPLACEMENTS)
 
 
-    def preload(self):
-        self.html = self.load(self.pyfile.url, cookies=bool(self.COOKIES), decode=not self.TEXT_ENCODING)
-
-        if isinstance(self.TEXT_ENCODING, basestring):
-            self.html = unicode(self.html, self.TEXT_ENCODING)
-
-
     def decrypt(self, pyfile):
         self.prepare()
 
@@ -138,30 +131,19 @@ class SimpleCrypter(Crypter):
             self.tempOffline()
 
 
-    def checkName(self):
+    def checkNameSize(self):
         name = self.info['name']
         url  = self.info['url']
 
         if name and name != url:
             self.pyfile.name = name
         else:
-            self.pyfile.name = self.info['name'] = urlparse(html_unescape(name)).path.split('/')[-1]
-
-        self.info['folder'] = self.pyfile.name
-
-        self.logDebug("File name: %s" % self.pyfile.name)
-
+            self.pyfile.name = self.info['name'] = urlparse(name).path.split('/')[-1]
 
-    def checkInfo(self):
-        self.logDebug(_("File info (previous): %s") % self.info)
+        folder = self.info['folder'] = self.pyfile.name
 
-        info = parseFileInfo(self.pyfile.url, self.html or "")
-        self.info.update(info)
-
-        self.logDebug(_("File info (current): %s")  % self.info)
-
-        self.checkName()
-        self.checkStatus()
+        self.logDebug("File name: %s" % self.pyfile.name,
+                      "File folder: %s" % folder)
 
 
     def getLinks(self):
@@ -182,12 +164,3 @@ class SimpleCrypter(Crypter):
         for p in xrange(2, pages + 1):
             self.html = self.loadPage(p)
             self.links += self.getLinks()
-
-
-    #@TODO: Remove in 0.4.10
-    def wait(self, seconds=0, reconnect=None):
-        return _wait(self, seconds, reconnect)
-
-
-    def error(self, reason="", type="parse"):
-        return _error(self, reason, type)