[internals] Some code cosmetics

10 files changed, 26 insertions, 28 deletions

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 397f4f750..6f08d4498 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -27,7 +27,7 @@ class CaptchaService(Captcha):
 
 
     def retrieve_data(self):
-        return self.plugin.data or self.plugin.last_html or ""
+        return self.pyfile.plugin.data or self.pyfile.plugin.last_html or ""
 
 
     def detect_key(self, data=None):
diff --git a/module/plugins/internal/DeadCrypter.py b/module/plugins/internal/DeadCrypter.py
index 5618667ba..0ad81db6c 100644
--- a/module/plugins/internal/DeadCrypter.py
+++ b/module/plugins/internal/DeadCrypter.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.Crypter import Crypter, create_getInfo
+from module.plugins.internal.Crypter import Crypter
 
 
 class DeadCrypter(Crypter):
     __name__    = "DeadCrypter"
     __type__    = "crypter"
-    __version__ = "0.10"
+    __version__ = "0.11"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
@@ -26,6 +26,3 @@ class DeadCrypter(Crypter):
 
     def setup(self):
         self.offline(_("Crypter is no longer available"))
-
-
-getInfo = create_getInfo(DeadCrypter)
diff --git a/module/plugins/internal/DeadHoster.py b/module/plugins/internal/DeadHoster.py
index 329f2fdea..430c5eab0 100644
--- a/module/plugins/internal/DeadHoster.py
+++ b/module/plugins/internal/DeadHoster.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.Hoster import Hoster, create_getInfo
+from module.plugins.internal.Hoster import Hoster
 
 
 class DeadHoster(Hoster):
     __name__    = "DeadHoster"
     __type__    = "hoster"
-    __version__ = "0.20"
+    __version__ = "0.21"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
@@ -26,6 +26,3 @@ class DeadHoster(Hoster):
 
     def setup(self):
         self.offline(_("Hoster is no longer available"))
-
-
-getInfo = create_getInfo(DeadHoster)
diff --git a/module/plugins/internal/MultiCrypter.py b/module/plugins/internal/MultiCrypter.py
index 576d6d4b4..02bf24912 100644
--- a/module/plugins/internal/MultiCrypter.py
+++ b/module/plugins/internal/MultiCrypter.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class MultiCrypter(SimpleCrypter):
     __name__    = "MultiCrypter"
     __type__    = "hoster"
-    __version__ = "0.06"
+    __version__ = "0.07"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index cbbfcd6dc..5bd4527ae 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -3,14 +3,14 @@
 import re
 
 from module.plugins.internal.Plugin import Fail
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-from module.plugins.internal.utils import encode, replace_patterns, set_cookie, set_cookies
+from module.plugins.internal.SimpleHoster import SimpleHoster
+from module.plugins.internal.misc import encode, replace_patterns, set_cookie, set_cookies
 
 
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.58"
+    __version__ = "0.59"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
@@ -68,7 +68,7 @@ class MultiHoster(SimpleHoster):
             super(MultiHoster, self)._process(thread)
 
         except Fail, e:
-            if self.get_config("revertfailed", True) and \
+            if self.config.get("revertfailed", True) and \
                self.pyload.pluginManager.hosterPlugins[self.classname].get('new_module'):
                 hdict = self.pyload.pluginManager.hosterPlugins[self.classname]
 
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 87a2fa433..a8306f393 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -130,9 +130,9 @@ class SevenZip(UnRar):
 
         #@NOTE: return codes are not reliable, some kind of threading, cleanup whatever issue
         call = [self.CMD, command] + args + list(xargs)
-        self.log_debug(" ".join(call))
-        call = map(encode, call)
+        self.log_debug("EXECUTE " + " ".join(call))
 
+        call = map(encode, call)
         p = subprocess.Popen(call, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
         renice(p.pid, self.priority)
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 93fc04c32..b9c91bce8 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -222,9 +222,9 @@ class UnRar(Extractor):
 
         #@NOTE: return codes are not reliable, some kind of threading, cleanup whatever issue
         call = [self.CMD, command] + args + list(xargs)
-        self.log_debug(" ".join(call))
-        call = map(encode, call)
+        self.log_debug("EXECUTE " + " ".join(call))
 
+        call = map(encode, call)
         p = subprocess.Popen(call, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
         renice(p.pid, self.priority)
diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 5e93f3fe4..f5aa37c81 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -5,13 +5,13 @@ import time
 import urlparse
 
 from module.plugins.internal.MultiAccount import MultiAccount
-from module.plugins.internal.utils import parse_html_form, parse_time, set_cookie
+from module.plugins.internal.misc import parse_html_form, parse_time, set_cookie
 
 
 class XFSAccount(MultiAccount):
     __name__    = "XFSAccount"
     __type__    = "account"
-    __version__ = "0.56"
+    __version__ = "0.57"
     __status__  = "stable"
 
     __config__ = [("activated"     , "bool"               , "Activated"                    , True ),
@@ -197,8 +197,10 @@ class XFSAccount(MultiAccount):
 
 
     def check_errors(self):
+        self.log_info(_("Checking for link errors..."))
+
         if not self.data:
-            self.log_debug("No data to check")
+            self.log_warning(_("No data to check"))
             return
 
         m = re.search(self.LOGIN_BAN_PATTERN, self.data)
@@ -231,3 +233,5 @@ class XFSAccount(MultiAccount):
 
             self.timeout = self.LOGIN_TIMEOUT
             self.fail_login(errmsg)
+
+        self.log_info(_("No errors found"))
diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py
index 7e0c14fe1..ebd2ea71f 100644
--- a/module/plugins/internal/XFSCrypter.py
+++ b/module/plugins/internal/XFSCrypter.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
-from module.plugins.internal.utils import set_cookie
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
+from module.plugins.internal.misc import set_cookie
 
 
 class XFSCrypter(SimpleCrypter):
     __name__    = "XFSCrypter"
     __type__    = "crypter"
-    __version__ = "0.22"
+    __version__ = "0.23"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
diff --git a/module/plugins/internal/misc.py b/module/plugins/internal/misc.py
index de6b37163..864e5dd6f 100644
--- a/module/plugins/internal/misc.py
+++ b/module/plugins/internal/misc.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#@TODO: Move to utils directory 0.4.10
+#@TODO: Move to misc directory in 0.4.10
 
 from __future__ import with_statement
 
@@ -32,7 +32,7 @@ except ImportError:
 class misc(object):
     __name__    = "misc"
     __type__    = "plugin"
-    __version__ = "0.09"
+    __version__ = "0.10"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'