Fix XFS plugins

4 files changed, 11 insertions, 15 deletions

diff --git a/module/plugins/internal/Captcha.py b/module/plugins/internal/Captcha.py
index c58231b71..333602e29 100644
--- a/module/plugins/internal/Captcha.py
+++ b/module/plugins/internal/Captcha.py
@@ -107,7 +107,7 @@ class Captcha(Plugin):
             except OSError, e:
                 self.log_warning(_("Error removing `%s`") % tmp_img.name, e)
 
-        #self.log_info(_("Captcha result: ") + result)  #@TODO: Remove from here?
+        # self.log_info(_("Captcha result: ") + result)  #@TODO: Remove from here?
 
         return result
 
diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 66052df09..02d94b9a3 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -57,7 +57,7 @@ class XFSAccount(MultiAccount):
 
     def setup(self):
         if not self.PLUGIN_DOMAIN:
-            self.fail_login(_("Missing PLUGIN_DOMAIN"))
+            self.fail_login(_("Missing PLUGIN DOMAIN"))
 
         if not self.PLUGIN_URL:
             self.PLUGIN_URL = "http://www.%s/" % self.PLUGIN_DOMAIN
@@ -109,7 +109,7 @@ class XFSAccount(MultiAccount):
                     premium    = False
                     validuntil = None  #: Registered account type (not premium)
         else:
-            self.log_debug("VALID_UNTIL_PATTERN not found")
+            self.log_debug("VALID UNTIL PATTERN not found")
 
         m = re.search(self.TRAFFIC_LEFT_PATTERN, self.html)
         if m is not None:
@@ -137,7 +137,7 @@ class XFSAccount(MultiAccount):
             except Exception, e:
                 self.log_error(e)
         else:
-            self.log_debug("TRAFFIC_LEFT_PATTERN not found")
+            self.log_debug("TRAFFIC LEFT PATTERN not found")
 
         leech = [m.groupdict() for m in re.finditer(self.LEECH_TRAFFIC_PATTERN, self.html)]
         if leech:
@@ -164,7 +164,7 @@ class XFSAccount(MultiAccount):
             except Exception, e:
                 self.log_error(e)
         else:
-            self.log_debug("LEECH_TRAFFIC_PATTERN not found")
+            self.log_debug("LEECH TRAFFIC PATTERN not found")
 
         return {'validuntil'  : validuntil,
                 'trafficleft' : trafficleft,
diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py
index 13757fa1f..09511097b 100644
--- a/module/plugins/internal/XFSCrypter.py
+++ b/module/plugins/internal/XFSCrypter.py
@@ -7,7 +7,7 @@ from module.plugins.internal.utils import set_cookie
 class XFSCrypter(SimpleCrypter):
     __name__    = "XFSCrypter"
     __type__    = "crypter"
-    __version__ = "0.21"
+    __version__ = "0.22"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
@@ -41,10 +41,8 @@ class XFSCrypter(SimpleCrypter):
 
 
     def prepare(self):
-        if not self.PLUGIN_DOMAIN and self.account and self.account.PLUGIN_DOMAIN:
-            self.PLUGIN_DOMAIN = self.account.PLUGIN_DOMAIN
-        else:
-            self.fail(_("Missing PLUGIN_DOMAIN"))
+        if not self.PLUGIN_DOMAIN:
+            self.fail(_("Missing PLUGIN DOMAIN"))
 
         if self.COOKIES:
             self._set_xfs_cookie()
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index f63ee8755..37afdbce0 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -12,7 +12,7 @@ from module.plugins.internal.utils import html_unescape, seconds_to_midnight, se
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.69"
+    __version__ = "0.70"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
@@ -70,10 +70,8 @@ class XFSHoster(SimpleHoster):
 
 
     def prepare(self):
-        if not self.PLUGIN_DOMAIN and self.account and self.account.PLUGIN_DOMAIN:
-            self.PLUGIN_DOMAIN = self.account.PLUGIN_DOMAIN
-        else:
-            self.fail(_("Missing PLUGIN_DOMAIN"))
+        if not self.PLUGIN_DOMAIN:
+            self.fail(_("Missing PLUGIN DOMAIN"))
 
         if self.COOKIES:
             self._set_xfs_cookie()