Spare improvements and fixes

11 files changed, 210 insertions, 205 deletions

diff --git a/module/plugins/internal/Addon.py b/module/plugins/internal/Addon.py
index 4ccaaba8b..35375046c 100644
--- a/module/plugins/internal/Addon.py
+++ b/module/plugins/internal/Addon.py
@@ -113,18 +113,15 @@ class Addon(Plugin):
         pass
 
 
-    def __repr__(self):
-        return "<Addon %s>" % self.__name__
-
-
-    def is_activated(self):
+    @property
+    def activated(self):
         """
         Checks if addon is activated
         """
         return self.get_config("activated")
 
 
-    #: Deprecated method, use `is_activated` instead (Remove in 0.4.10)
+    #: Deprecated method, use `activated` property instead (Remove in 0.4.10)
     def isActivated(self, *args, **kwargs):
         return self.is_activated(*args, **kwargs)
 
diff --git a/module/plugins/internal/Captcha.py b/module/plugins/internal/Captcha.py
index b864fd2d8..dd5493ce9 100644
--- a/module/plugins/internal/Captcha.py
+++ b/module/plugins/internal/Captcha.py
@@ -12,7 +12,7 @@ from module.plugins.internal.Plugin import Plugin
 class Captcha(Plugin):
     __name__    = "Captcha"
     __type__    = "captcha"
-    __version__ = "0.43"
+    __version__ = "0.44"
     __status__  = "testing"
 
     __description__ = """Base anti-captcha plugin"""
@@ -96,8 +96,7 @@ class Captcha(Plugin):
 
                 self.task.setWaiting(max(timeout, 50))  #@TODO: Move to `CaptchaManager` in 0.4.10
                 while self.task.isWaiting():
-                    if self.plugin.pyfile.abort:
-                        self.plugin.abort()
+                    self.plugin.check_abort()
                     time.sleep(1)
 
             finally:
@@ -108,7 +107,7 @@ class Captcha(Plugin):
 
             elif not self.task.result:
                 self.invalid()
-                self.plugin.retry(reason=_("No captcha result obtained in appropiate time"))
+                self.plugin.retry(msg=_("No captcha result obtained in appropiate time"))
 
             result = self.task.result
 
diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 7f5212090..f21fe473c 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -22,7 +22,7 @@ class PasswordError(Exception):
 class Extractor(Plugin):
     __name__    = "Extractor"
     __type__    = "extractor"
-    __version__ = "0.33"
+    __version__ = "0.34"
     __status__  = "testing"
 
     __description__ = """Base extractor plugin"""
@@ -43,15 +43,9 @@ class Extractor(Plugin):
 
 
     @classmethod
-    def is_multipart(cls, filename):
-        return False
-
-
-    @classmethod
     def find(cls):
         """
         Check if system statisfy dependencies
-        :return: boolean
         """
         pass
 
@@ -72,9 +66,15 @@ class Extractor(Plugin):
                 if pname not in processed:
                     processed.append(pname)
                     targets.append((fname, id, fout))
+
         return targets
 
 
+    @property
+    def target(self):
+        return fs_encode(self.filename)
+
+
     def __init__(self, plugin, filename, out,
                  fullpath=True,
                  overwrite=False,
@@ -119,53 +119,29 @@ class Extractor(Plugin):
                                 (self.__name__,) + messages)
 
 
-    def check(self):
+    def verify(self, password=None):
         """
-        Quick Check by listing content of archive.
-        Raises error if password is needed, integrity is questionable or else.
-
-        :raises PasswordError
-        :raises CRCError
-        :raises ArchiveError
+        Testing with Extractors built-in method
+        Raise error if password is needed, integrity is questionable or else
         """
-        raise NotImplementedError
-
-
-    def verify(self):
-        """
-        Testing with Extractors buildt-in method
-        Raises error if password is needed, integrity is questionable or else.
-
-        :raises PasswordError
-        :raises CRCError
-        :raises ArchiveError
-        """
-        raise NotImplementedError
+        pass
 
 
     def repair(self):
-        return None
+        return False
 
 
     def extract(self, password=None):
         """
-        Extract the archive. Raise specific errors in case of failure.
-
-        :param progress: Progress function, call this to update status
-        :param password password to use
-        :raises PasswordError
-        :raises CRCError
-        :raises ArchiveError
-        :return:
+        Extract the archive
+        Raise specific errors in case of failure
         """
         raise NotImplementedError
 
 
-    def get_delete_files(self):
+    def items(self):
         """
-        Return list of files to delete, do *not* delete them here.
-
-        :return: List with paths of files to delete
+        Return list of archive parts
         """
         return [self.filename]
 
diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py
index ac42182c4..3449c8128 100644
--- a/module/plugins/internal/Hoster.py
+++ b/module/plugins/internal/Hoster.py
@@ -44,7 +44,7 @@ def create_getInfo(klass):
 class Hoster(Plugin):
     __name__    = "Hoster"
     __type__    = "hoster"
-    __version__ = "0.22"
+    __version__ = "0.23"
     __status__  = "testing"
 
     __pattern__ = r'^unmatchable$'
@@ -105,6 +105,16 @@ class Hoster(Plugin):
         self.init()
 
 
+    def _log(self, level, plugintype, pluginname, messages):
+        log = getattr(self.pyload.log, level)
+        msg = " | ".join(encode(a).strip() for a in messages if a)
+        log("%(plugintype)s %(pluginname)s[%(id)s]: %(msg)s"
+            % {'plugintype': plugintype.upper(),
+               'pluginname': pluginname,
+               'id'        : self.pyfile.id,
+               'msg'       : msg})
+
+
     @classmethod
     def get_info(cls, url="", html=""):
         url   = _fixurl(url)
@@ -132,6 +142,11 @@ class Hoster(Plugin):
 
 
     def _setup(self):
+        #@TODO: Remove in 0.4.10
+        self.html          = ""
+        self.last_download = ""
+        self.pyfile.error  = ""
+
         if self.account:
             self.req             = self.pyload.requestFactory.getRequest(self.__name__, self.user)
             self.chunk_limit     = -1  #: -1 for unlimited
@@ -143,23 +158,10 @@ class Hoster(Plugin):
             self.resume_download = False
             self.premium         = False
 
-
-    def load_account(self):
-        if self.req:
-            self.req.close()
-
-        if not self.account:
-            self.account = self.pyload.accountManager.getAccountPlugin(self.__name__)
-
-        if self.account:
-            if not self.user:
-                self.user = self.account.select()[0]
-
-            if not self.user or not self.account.is_logged(self.user, True):
-                self.account = False
+        return self.setup()
 
 
-    def preprocessing(self, thread):
+    def _process(self, thread):
         """
         Handles important things to do before starting
         """
@@ -172,19 +174,36 @@ class Hoster(Plugin):
             self.retry_free = False
 
         self._setup()
-        self.setup()
 
+        self.pyfile.setStatus("starting")
         self.pyload.hookManager.downloadPreparing(self.pyfile)  #@TODO: Recheck in 0.4.10
 
-        if self.pyfile.abort:
-            self.abort()
+        self.check_abort()
 
-        self.pyfile.setStatus("starting")
         self.log_debug("PROCESS URL " + self.pyfile.url, "PLUGIN VERSION %s" % self.__version__)
-
         return self.process(self.pyfile)
 
 
+    #: Deprecated method, use `_process` instead (Remove in 0.4.10)
+    def preprocessing(self, *args, **kwargs):
+        return self._process(*args, **kwargs)
+
+
+    def load_account(self):
+        if self.req:
+            self.req.close()
+
+        if not self.account:
+            self.account = self.pyload.accountManager.getAccountPlugin(self.__name__)
+
+        if self.account:
+            if not self.user:
+                self.user = self.account.select()[0]
+
+            if not self.user or not self.account.is_logged(self.user, True):
+                self.account = False
+
+
     def process(self, pyfile):
         """
         The 'main' method of every plugin, you **have to** overwrite it
@@ -242,15 +261,12 @@ class Hoster(Plugin):
                 self.log_warning("Ignore reconnection due logged account")
 
             while pyfile.waitUntil > time.time():
-                if pyfile.abort:
-                    self.abort()
-
+                self.check_abort()
                 time.sleep(2)
 
         else:
             while pyfile.waitUntil > time.time():
-                if pyfile.abort:
-                    self.abort()
+                self.check_abort()
 
                 if self.thread.m.reconnecting.isSet():
                     self.waiting = False
@@ -264,78 +280,94 @@ class Hoster(Plugin):
         pyfile.status = status  #@NOTE: Remove in 0.4.10
 
 
-    def skip(self, reason=""):
+    def skip(self, msg=""):
         """
-        Skip and give reason
+        Skip and give msg
         """
-        raise Skip(encode(reason))  #@TODO: Remove `encode` in 0.4.10
+        raise Skip(encode(msg or self.pyfile.error))  #@TODO: Remove `encode` in 0.4.10
 
 
-    def abort(self, reason=""):
+    #@TODO: Remove in 0.4.10
+    def fail(self, msg):
         """
-        Abort and give reason
+        Fail and give msg
         """
-        #@TODO: Remove in 0.4.10
-        if reason:
-            self.pyfile.error = encode(reason)
+        msg = msg.strip()
+
+        if msg:
+            self.pyfile.error = msg
+        else:
+            msg = self.pyfile.error
+
+        raise Fail(encode(msg))  #@TODO: Remove `encode` in 0.4.10
+
+
+    def error(self, msg="", type=_("Parse")):
+        type = _("%s error") % type.strip().capitalize() if type else _("Unknown")
+        msg  = _("%(type)s: %(msg)s | Plugin may be out of date"
+                 % {'type': type, 'msg': msg or self.pyfile.error})
+
+        self.fail(msg)
+
+
+    def abort(self, msg=""):
+        """
+        Abort and give msg
+        """
+        if msg:  #@TODO: Remove in 0.4.10
+            self.pyfile.error = encode(msg)
 
         raise Abort
 
 
-    def offline(self, reason=""):
+    #@TODO: Recheck in 0.4.10
+    def offline(self, msg=""):
         """
         Fail and indicate file is offline
         """
-        #@TODO: Remove in 0.4.10
-        if reason:
-            self.pyfile.error = encode(reason)
-
-        raise Fail("offline")
+        self.fail("offline")
 
 
-    def temp_offline(self, reason=""):
+    #@TODO: Recheck in 0.4.10
+    def temp_offline(self, msg=""):
         """
         Fail and indicates file ist temporary offline, the core may take consequences
         """
-        #@TODO: Remove in 0.4.10
-        if reason:
-            self.pyfile.error = encode(reason)
-
-        raise Fail("temp. offline")
+        self.fail("temp. offline")
 
 
-    def retry(self, max_tries=5, wait_time=1, reason=""):
+    def retry(self, max_tries=5, wait_time=1, msg=""):
         """
         Retries and begin again from the beginning
 
         :param max_tries: number of maximum retries
         :param wait_time: time to wait in seconds
-        :param reason: reason for retrying, will be passed to fail if max_tries reached
+        :param msg: msg for retrying, will be passed to fail if max_tries reached
         """
         id = inspect.currentframe().f_back.f_lineno
         if id not in self.retries:
             self.retries[id] = 0
 
         if 0 < max_tries <= self.retries[id]:
-            self.fail(reason or _("Max retries reached"))
+            self.fail(msg or _("Max retries reached"))
 
         self.wait(wait_time, False)
 
         self.retries[id] += 1
-        raise Retry(encode(reason))  #@TODO: Remove `encode` in 0.4.10
+        raise Retry(encode(msg))  #@TODO: Remove `encode` in 0.4.10
 
 
-    def restart(self, reason=None, nopremium=False):
-        if not reason:
-            reason = _("Fallback to free download") if nopremium else _("Restart")
+    def restart(self, msg=None, nopremium=False):
+        if not msg:
+            msg = _("Fallback to free download") if nopremium else _("Restart")
 
         if nopremium:
             if self.premium:
                 self.retry_free = True
             else:
-                self.fail("%s | %s" % (reason, _("Download was already free")))
+                self.fail("%s | %s" % (msg, _("Download was already free")))
 
-        raise Retry(encode(reason))  #@TODO: Remove `encode` in 0.4.10
+        raise Retry(encode(msg))  #@TODO: Remove `encode` in 0.4.10
 
 
     def fixurl(self, url):
@@ -349,6 +381,11 @@ class Hoster(Plugin):
         return url
 
 
+    def load(self, *args, **kwargs):
+        self.check_abort()
+        return super(Hoster, self).load(*args, **kwargs)
+
+
     def download(self, url, get={}, post={}, ref=True, cookies=True, disposition=True):
         """
         Downloads the content at url to download folder
@@ -362,8 +399,7 @@ class Hoster(Plugin):
         the filename will be changed if needed
         :return: The location where the file was saved
         """
-        if self.pyfile.abort:
-            self.abort()
+        self.check_abort()
 
         url = self.fixurl(url)
 
@@ -398,8 +434,7 @@ class Hoster(Plugin):
 
         self.pyload.hookManager.dispatchEvent("download_start", self.pyfile, url, filename)
 
-        if self.pyfile.abort:
-            self.abort()
+        self.check_abort()
 
         try:
             newname = self.req.httpDownload(url, filename, get=get, post=post, ref=ref, cookies=cookies,
@@ -432,6 +467,26 @@ class Hoster(Plugin):
         return self.last_download
 
 
+    def check_abort(self):
+        if not self.pyfile.abort:
+            return
+
+        if self.pyfile.hasStatus("failed"):
+            self.fail()
+
+        elif self.pyfile.hasStatus("skipped"):
+            self.skip(self.pyfile.statusname)
+
+        elif self.pyfile.hasStatus("offline"):
+            self.offline()
+
+        elif self.pyfile.hasStatus("temp. offline"):
+            self.temp_offline()
+
+        else:
+            self.abort()
+
+
     def check_filesize(self, file_size, size_tolerance=1024):
         """
         Checks the file size of the last downloaded file
@@ -473,7 +528,6 @@ class Hoster(Plugin):
         last_download = fs_encode(self.last_download)
 
         if not self.last_download or not exists(last_download):
-            self.last_download = ""  #@NOTE: Bad place...
             self.fail(self.pyfile.error or _("No file downloaded"))
 
         try:
@@ -609,8 +663,10 @@ class Hoster(Plugin):
 
         if traffic is None:
             return False
+
         elif traffic == -1:
             return True
+
         else:
             size = self.pyfile.size / 1024
             self.log_info(_("Filesize: %s KiB, Traffic left for user %s: %s KiB") % (size, self.user, traffic))
diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py
index feabe9f1d..e4c16846c 100644
--- a/module/plugins/internal/Plugin.py
+++ b/module/plugins/internal/Plugin.py
@@ -6,8 +6,9 @@ import datetime
 import inspect
 import os
 import re
-import urllib
 import sys
+import urllib
+import unicodedata
 
 if os.name != "nt":
     import grp
@@ -23,7 +24,7 @@ def decode(string, encoding='utf8'):
     if type(string) is str:
         return string.decode(encoding, "replace")
     else:
-        return string
+        return unicode(string)
 
 
 #@TODO: Move to utils in 0.4.10
@@ -32,7 +33,7 @@ def encode(string, encoding='utf8'):
     if type(string) is unicode:
         return string.encode(encoding, "replace")
     else:
-        return string
+        return str(string)
 
 
 #@TODO: Move to utils in 0.4.10
@@ -175,8 +176,8 @@ def chunks(iterable, size):
 
 class Plugin(object):
     __name__    = "Plugin"
-    __type__    = "hoster"
-    __version__ = "0.32"
+    __type__    = "plugin"
+    __version__ = "0.33"
     __status__  = "testing"
 
     __pattern__ = r'^unmatchable$'
@@ -195,6 +196,11 @@ class Plugin(object):
         self.init()
 
 
+    def __repr__(self):
+        return "<%(type)s %(name)s>" % {'type': self.__type__.capitalize()
+                                        'name': self.__name__}
+
+
     def _init(self, core):
         self.pyload = core
         self.info   = {}  #: Provide information in dict here
@@ -210,11 +216,10 @@ class Plugin(object):
 
     def _log(self, level, plugintype, pluginname, messages):
         log = getattr(self.pyload.log, level)
-        msg = encode(" | ".join((a if isinstance(a, basestring) else str(a)).strip() for a in messages if a))
-        log("%(plugintype)s %(pluginname)s%(id)s: %(msg)s"
+        msg = " | ".join(encode(a).strip() for a in messages if a)
+        log("%(plugintype)s %(pluginname)s%: %(msg)s"
             % {'plugintype': plugintype.upper(),
                'pluginname': pluginname,
-               'id'        : ("[%s]" % self.pyfile.id) if hasattr(self, 'pyfile') else "",
                'msg'       : msg})
 
 
@@ -317,21 +322,10 @@ class Plugin(object):
         self.pyload.db.delStorage(self.__name__, key)
 
 
-    def fail(self, reason):
+    def fail(self, msg):
         """
-        Fail and give reason
+        Fail and give msg
         """
-        raise Fail(encode(reason))  #@TODO: Remove `encode` in 0.4.10
-
-
-    def error(self, reason="", type=_("Parse")):
-        if not reason:
-            type = _("Unknown")
-
-        msg  = _("%s error") % type.strip().capitalize() if type else _("Error")
-        msg += (": %s" % reason.strip()) if reason else ""
-        msg += _(" | Plugin may be out of date")
-
         raise Fail(encode(msg))  #@TODO: Remove `encode` in 0.4.10
 
 
@@ -348,9 +342,6 @@ class Plugin(object):
         :param decode: Wether to decode the output according to http header, should be True in most cases
         :return: Loaded content
         """
-        if hasattr(self, 'pyfile') and self.pyfile.abort:
-            self.abort()
-
         url = fixurl(url)
 
         if not url or not isinstance(url, basestring):
@@ -375,7 +366,7 @@ class Plugin(object):
 
         #@TODO: Move to network in 0.4.10
         if isinstance(decode, basestring):
-            res = sys.modules[__name__].decode(res, decode) #@TODO: See #1787, use utils.decode() in 0.4.10
+            res = sys.modules[self.__name__].decode(res, decode)  #@TODO: See #1787, use utils.decode() in 0.4.10
 
         if self.pyload.debug:
             frame = inspect.currentframe()
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 5811c28de..b79256536 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -10,7 +10,7 @@ from module.utils import fs_encode, save_join as fs_join
 
 class SevenZip(UnRar):
     __name__    = "SevenZip"
-    __version__ = "0.14"
+    __version__ = "0.15"
     __status__  = "testing"
 
     __description__ = """7-Zip extractor plugin"""
@@ -55,42 +55,28 @@ class SevenZip(UnRar):
             return True
 
 
-    def verify(self, password):
+    def verify(self, password=None):
         #: 7z can't distinguish crc and pw error in test
-        p = self.call_cmd("l", "-slt", fs_encode(self.filename))
+        p = self.call_cmd("l", "-slt", self.target)
         out, err = p.communicate()
 
         if self.re_wrongpwd.search(out):
             raise PasswordError
 
-        if self.re_wrongpwd.search(err):
+        elif self.re_wrongpwd.search(err):
             raise PasswordError
 
-        if self.re_wrongcrc.search(err):
-            raise CRCError(err)
-
-
-
-    def check(self, password):
-        p = self.call_cmd("l", "-slt", fs_encode(self.filename))
-        out, err = p.communicate()
-
-        #: Check if output or error macthes the 'wrong password'-Regexp
-        if self.re_wrongpwd.search(out):
-            raise PasswordError
-
-        if self.re_wrongcrc.search(out):
+        elif self.re_wrongcrc.search(out):
             raise CRCError(_("Header protected"))
 
-
-    def repair(self):
-        return False
+        elif self.re_wrongcrc.search(err):
+            raise CRCError(err)
 
 
     def extract(self, password=None):
         command = "x" if self.fullpath else "e"
 
-        p = self.call_cmd(command, '-o' + self.out, fs_encode(self.filename), password=password)
+        p = self.call_cmd(command, '-o' + self.out, self.target, password=password)
 
         renice(p.pid, self.renice)
 
@@ -117,7 +103,7 @@ class SevenZip(UnRar):
     def list(self, password=None):
         command = "l" if self.fullpath else "l"
 
-        p = self.call_cmd(command, fs_encode(self.filename), password=password)
+        p = self.call_cmd(command, self.target, password=password)
         out, err = p.communicate()
 
         if "Can not open" in err:
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index d348f92e2..488578bc0 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -10,7 +10,7 @@ from module.utils import fixup, html_unescape
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.61"
+    __version__ = "0.62"
     __status__  = "testing"
 
     __pattern__ = r'^unmatchable$'
@@ -90,8 +90,12 @@ class SimpleCrypter(Crypter, SimpleHoster):
             self.log_error(_("Too many redirects"))
 
 
+    def prepare(self):
+        self.links = []
+        return super(SimpleCrypter, self).prepare()
+
+
     def decrypt(self, pyfile):
-        self.links = []    #@TODO: Recheck in 0.4.10
         self.prepare()
         self.check_info()  #@TODO: Remove in 0.4.10
 
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 89af22c87..a23691220 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -22,7 +22,7 @@ statusMap = dict((v, k) for k, v in _statusMap.items())
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.82"
+    __version__ = "1.83"
     __status__  = "testing"
 
     __pattern__ = r'^unmatchable$'
@@ -203,12 +203,9 @@ class SimpleHoster(Hoster):
 
 
     def prepare(self):
-        self.pyfile.error  = ""  #@TODO: Remove in 0.4.10
-        self.html          = ""  #@TODO: Recheck in 0.4.10
-        self.link          = ""  #@TODO: Recheck in 0.4.10
-        self.last_download = ""
-        self.direct_dl     = False
-        self.leech_dl      = False
+        self.link      = ""
+        self.direct_dl = False
+        self.leech_dl  = False
 
         if not self.get_config('use_premium', True):
             self.restart(nopremium=True)
@@ -309,7 +306,7 @@ class SimpleHoster(Hoster):
 
         if self.captcha.task and not self.last_download:
             self.captcha.invalid()
-            self.retry(10, reason=_("Wrong captcha"))
+            self.retry(10, msg=_("Wrong captcha"))
 
         elif self.check_download({'Empty file': re.compile(r'\A((.|)(\2|\s)*)\Z')},
                                  delete=True):
@@ -334,7 +331,7 @@ class SimpleHoster(Hoster):
 
                     self.log_warning(_("Check result: ") + errmsg, _("Waiting 1 minute and retry"))
                     self.wantReconnect = True
-                    self.retry(wait_time=60, reason=errmsg)
+                    self.retry(wait_time=60, msg=errmsg)
             else:
                 if self.CHECK_FILE:
                     self.log_debug("Using custom check rules...")
@@ -409,7 +406,7 @@ class SimpleHoster(Hoster):
 
                 elif re.search('captcha|code', errmsg, re.I):
                     self.captcha.invalid()
-                    self.retry(10, reason=_("Wrong captcha"))
+                    self.retry(10, msg=_("Wrong captcha"))
 
                 elif re.search('countdown|expired', errmsg, re.I):
                     self.retry(10, 60, _("Link expired"))
@@ -426,14 +423,14 @@ class SimpleHoster(Hoster):
                 elif re.search('filename', errmsg, re.I):
                     url_p = urlparse.urlparse(self.pyfile.url)
                     self.pyfile.url = "%s://%s/%s" % (url_p.scheme, url_p.netloc, url_p.path.split('/')[0])
-                    self.retry(1, reason=_("Wrong url"))
+                    self.retry(1, msg=_("Wrong url"))
 
                 elif re.search('premium', errmsg, re.I):
                     self.fail(_("File can be downloaded by premium users only"))
 
                 else:
                     self.wantReconnect = True
-                    self.retry(wait_time=60, reason=errmsg)
+                    self.retry(wait_time=60, msg=errmsg)
 
         elif hasattr(self, 'WAIT_PATTERN'):
             m = re.search(self.WAIT_PATTERN, self.html)
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 0386991d9..88c490750 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -22,7 +22,7 @@ def renice(pid, value):
 
 class UnRar(Extractor):
     __name__    = "UnRar"
-    __version__ = "1.25"
+    __version__ = "1.26"
     __status__  = "testing"
 
     __description__ = """Rar extractor plugin"""
@@ -84,20 +84,8 @@ class UnRar(Extractor):
         return True if cls.re_multipart.search(filename) else False
 
 
-    def verify(self, password):
-        p = self.call_cmd("t", "-v", fs_encode(self.filename), password=password)
-        self._progress(p)
-        err = p.stderr.read().strip()
-
-        if self.re_wrongpwd.search(err):
-            raise PasswordError
-
-        if self.re_wrongcrc.search(err):
-            raise CRCError(err)
-
-
-    def check(self, password):
-        p = self.call_cmd("l", "-v", fs_encode(self.filename), password=password)
+    def verify(self, password=None):
+        p = self.call_cmd("l", "-v", self.target, password=password)
         out, err = p.communicate()
 
         if self.re_wrongpwd.search(err):
@@ -113,13 +101,28 @@ class UnRar(Extractor):
 
 
     def repair(self):
-        p = self.call_cmd("rc", fs_encode(self.filename))
+        p = self.call_cmd("rc", self.target)
 
         #: Communicate and retrieve stderr
         self._progress(p)
         err = p.stderr.read().strip()
+
         if err or p.returncode:
-            return False
+            p = self.call_cmd("r", self.target)
+
+            # communicate and retrieve stderr
+            self._progress(p)
+            err = p.stderr.read().strip()
+
+            if err or p.returncode:
+                return False
+
+            else:
+                dir  = os.path.dirname(filename)
+                name = re_filefixed.search(out).group(1)
+
+                self.filename = os.path.join(dir, name)
+
         return True
 
 
@@ -145,7 +148,7 @@ class UnRar(Extractor):
     def extract(self, password=None):
         command = "x" if self.fullpath else "e"
 
-        p = self.call_cmd(command, fs_encode(self.filename), self.out, password=password)
+        p = self.call_cmd(command, self.target, self.out, password=password)
 
         renice(p.pid, self.renice)
 
@@ -169,7 +172,7 @@ class UnRar(Extractor):
         self.files = self.list(password)
 
 
-    def get_delete_files(self):
+    def items(self):
         dir, name = os.path.split(self.filename)
 
         #: Actually extracted file
@@ -185,7 +188,7 @@ class UnRar(Extractor):
     def list(self, password=None):
         command = "vb" if self.fullpath else "lb"
 
-        p = self.call_cmd(command, "-v", fs_encode(self.filename), password=password)
+        p = self.call_cmd(command, "-v", self.target, password=password)
         out, err = p.communicate()
 
         if "Cannot open" in err:
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 9a01611bf..ac197a80d 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -12,7 +12,7 @@ from module.utils import fs_encode
 
 class UnZip(Extractor):
     __name__    = "UnZip"
-    __version__ = "1.15"
+    __version__ = "1.16"
     __status__  = "testing"
 
     __description__ = """Zip extractor plugin"""
@@ -30,17 +30,13 @@ class UnZip(Extractor):
 
 
     def list(self, password=None):
-        with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
+        with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z:
             z.setpassword(password)
             return z.namelist()
 
 
-    def check(self, password):
-        pass
-
-
-    def verify(self):
-        with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
+    def verify(self, password=None):
+        with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z:
             badfile = z.testzip()
 
             if badfile:
@@ -51,7 +47,7 @@ class UnZip(Extractor):
 
     def extract(self, password=None):
         try:
-            with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
+            with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z:
                 z.setpassword(password)
 
                 badfile = z.testzip()
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 5e0830dc6..1f0bd3a44 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -14,7 +14,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.57"
+    __version__ = "0.58"
     __status__  = "testing"
 
     __pattern__ = r'^unmatchable$'
@@ -150,7 +150,7 @@ class XFSHoster(SimpleHoster):
 
         action, inputs = self.parse_html_form('F1')
         if not inputs:
-            self.retry(reason=self.info['error'] if 'error' in self.info else _("TEXTAREA F1 not found"))
+            self.retry(msg=self.info['error'] if 'error' in self.info else _("TEXTAREA F1 not found"))
 
         self.log_debug(inputs)
 
@@ -163,7 +163,7 @@ class XFSHoster(SimpleHoster):
             self.retry(20, 3 * 60, _("Can not leech file"))
 
         elif 'today' in stmsg:
-            self.retry(wait_time=seconds_to_midnight(gmt=2), reason=_("You've used all Leech traffic today"))
+            self.retry(wait_time=seconds_to_midnight(gmt=2), msg=_("You've used all Leech traffic today"))
 
         else:
             self.fail(stmsg)
@@ -188,7 +188,7 @@ class XFSHoster(SimpleHoster):
         if not inputs:
             action, inputs = self.parse_html_form('F1')
             if not inputs:
-                self.retry(reason=self.info['error'] if 'error' in self.info else _("TEXTAREA F1 not found"))
+                self.retry(msg=self.info['error'] if 'error' in self.info else _("TEXTAREA F1 not found"))
 
         self.log_debug(inputs)