Prepare method improves setup one

3 files changed, 32 insertions, 23 deletions

diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
index 0c4a7cb97..cd53c98b0 100644
--- a/module/plugins/hoster/XFileSharingPro.py
+++ b/module/plugins/hoster/XFileSharingPro.py
@@ -21,13 +21,13 @@ class XFileSharingPro(SimpleHoster):
     """
     __name__ = "XFileSharingPro"
     __type__ = "hoster"
-    __version__ = "0.34"
+    __version__ = "0.35"
 
     __pattern__ = r'^unmatchable$'
 
     __description__ = """XFileSharingPro base hoster plugin"""
-    __author_name__ = ("zoidberg", "stickell")
-    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+    __author_name__ = ("zoidberg", "stickell", "Walter Purcaro")
+    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it", "vuolter@gmail.com")
 
 
     HOSTER_NAME = None
@@ -65,8 +65,12 @@ class XFileSharingPro(SimpleHoster):
             self.COOKIES = [(self.HOSTER_NAME, "lang", "english")]
         else:
             self.resumeDownload = self.multiDL = self.premium
-            if not self.HOSTER_NAME:
-                self.fail("Missing HOSTER_NAME")
+
+
+    def prepare(self):
+        """ Initialize important variables """
+        if not self.HOSTER_NAME:
+            self.fail("Missing HOSTER_NAME")
 
         if not LINK_PATTERN:
             pattr = r'(http://([^/]*?%s|\d+\.\d+\.\d+\.\d+)(:\d+)?(/d/|(?:/files)?/\d+/\w+/)[^"\'<]+)'
@@ -75,6 +79,10 @@ class XFileSharingPro(SimpleHoster):
         if isinstance(self.COOKIES, list):
             set_cookies(self.req.cj, self.COOKIES)
 
+        self.captcha = None
+        self.errmsg = None
+        self.passwords = self.getPassword().splitlines()
+
 
     def process(self, pyfile):
         self.prepare()
@@ -110,13 +118,6 @@ class XFileSharingPro(SimpleHoster):
                 self.handleFree()
 
 
-    def prepare(self):
-        """ Initialize important variables """
-        self.captcha = None
-        self.errmsg = None
-        self.passwords = self.getPassword().splitlines()
-
-
     def getDirectDownloadLink(self):
         """ Get download link for premium users with direct download enabled """
         self.req.http.lastURL = self.pyfile.url
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 3c783bcab..2873a7fa7 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -10,7 +10,7 @@ from module.utils import html_unescape
 class SimpleCrypter(Crypter):
     __name__ = "SimpleCrypter"
     __type__ = "crypter"
-    __version__ = "0.11"
+    __version__ = "0.12"
 
     __pattern__ = None
 
@@ -58,18 +58,20 @@ class SimpleCrypter(Crypter):
     LOGIN_PREMIUM = False
 
 
-    def setup(self):
-        if isinstance(self.COOKIES, list):
-            set_cookies(self.req.cj, self.COOKIES)
-
-
-    def decrypt(self, pyfile):
+    def prepare(self):
         if self.LOGIN_ACCOUNT and not self.account:
             self.fail('Required account not found!')
 
         if self.LOGIN_PREMIUM and not self.premium:
             self.fail('Required premium account not found!')
 
+        if isinstance(self.COOKIES, list):
+            set_cookies(self.req.cj, self.COOKIES)
+
+
+    def decrypt(self, pyfile):
+        self.prepare()
+
         pyfile.url = replace_patterns(pyfile.url, self.URL_REPLACEMENTS)
 
         self.html = self.load(pyfile.url, decode=not self.TEXT_ENCODING)
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index ecbeec979..1c0916541 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -153,13 +153,13 @@ class PluginParseError(Exception):
 class SimpleHoster(Hoster):
     __name__ = "SimpleHoster"
     __type__ = "hoster"
-    __version__ = "0.35"
+    __version__ = "0.36"
 
     __pattern__ = None
 
     __description__ = """Simple hoster plugin"""
-    __author_name__ = ("zoidberg", "stickell")
-    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+    __author_name__ = ("zoidberg", "stickell", "Walter Purcaro")
+    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it", "vuolter@gmail.com")
 
     """
     Following patterns should be defined by each hoster:
@@ -197,13 +197,19 @@ class SimpleHoster(Hoster):
 
     def setup(self):
         self.resumeDownload = self.multiDL = self.premium
+
+
+    def prepare(self):
         if isinstance(self.COOKIES, list):
             set_cookies(self.req.cj, self.COOKIES)
+        self.req.setOption("timeout", 120)
 
 
     def process(self, pyfile):
+        self.prepare()
+
         pyfile.url = replace_patterns(pyfile.url, self.FILE_URL_REPLACEMENTS)
-        self.req.setOption("timeout", 120)
+
         # Due to a 0.4.9 core bug self.load would keep previous cookies even if overridden by cookies parameter.
         # Workaround using getURL. Can be reverted in 0.4.10 as the cookies bug has been fixed.
         self.html = getURL(pyfile.url, decode=not self.TEXT_ENCODING, cookies=self.COOKIES)