From f71c1ef70a199e42e8a519364d9924e138ffd37c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 24 Dec 2014 15:48:08 +0100
Subject: [ExtractArchive] Remove empty directory

---
 module/plugins/internal/UnRar.py | 2 +-
 module/plugins/internal/UnZip.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 5633b31f7..b70bf3257 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -8,7 +8,7 @@ from os.path import basename, dirname, join
 from string import digits
 from subprocess import Popen, PIPE
 
-from module.plugins.internal.AbstractExtractor import AbtractExtractor, PasswordError, ArchiveError, CRCError
+from module.plugins.internal.AbstractExtractor import AbtractExtractor, ArchiveError, CRCError, PasswordError
 from module.utils import save_join, decode
 
 
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index b3d54cba0..875a0ec09 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -5,7 +5,7 @@ from __future__ import with_statement
 import sys
 import zipfile
 
-from module.plugins.internal.AbstractExtractor import AbtractExtractor, PasswordError, ArchiveError, CRCError
+from module.plugins.internal.AbstractExtractor import AbtractExtractor, ArchiveError, CRCError, PasswordError
 
 
 class UnZip(AbtractExtractor):
-- 
cgit v1.2.3


From 4c63928557398891c30d3e2b7c962a07b3483315 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 26 Dec 2014 04:18:41 +0100
Subject: Rename AbstractExtractor to Extractor

---
 module/plugins/internal/AbstractExtractor.py | 141 ---------------------------
 module/plugins/internal/Extractor.py         | 140 ++++++++++++++++++++++++++
 module/plugins/internal/UnRar.py             |   6 +-
 module/plugins/internal/UnZip.py             |   6 +-
 4 files changed, 146 insertions(+), 147 deletions(-)
 delete mode 100644 module/plugins/internal/AbstractExtractor.py
 create mode 100644 module/plugins/internal/Extractor.py

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/AbstractExtractor.py b/module/plugins/internal/AbstractExtractor.py
deleted file mode 100644
index 310897d4e..000000000
--- a/module/plugins/internal/AbstractExtractor.py
+++ /dev/null
@@ -1,141 +0,0 @@
-# -*- coding: utf-8 -*-
-
-class ArchiveError(Exception):
-    pass
-
-
-class CRCError(Exception):
-    pass
-
-
-class PasswordError(Exception):
-    pass
-
-
-class AbtractExtractor:
-    __name__    = "AbtractExtractor"
-    __version__ = "0.12"
-
-    __description__ = """Abtract extractor plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "ranan@pyload.org"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    EXTENSIONS = []
-
-
-    @classmethod
-    def checkDeps(cls):
-        """ Check if system statisfy dependencies
-        :return: boolean
-        """
-        return True
-
-
-    @classmethod
-    def isArchive(cls, file):
-        raise NotImplementedError
-
-
-    @classmethod
-    def getTargets(cls, files_ids):
-        """ Filter suited targets from list of filename id tuple list
-        :param files_ids: List of filepathes
-        :return: List of targets, id tuple list
-        """
-        targets = []
-
-        for file, id in files_ids:
-            if cls.isArchive(file):
-                targets.append((file, id))
-
-        return targets
-
-
-    def __init__(self, m, file, out, password, fullpath, overwrite, excludefiles, renice, delete, keepbroken):
-        """Initialize extractor for specific file
-
-        :param m: ExtractArchive Hook plugin
-        :param file: Absolute filepath
-        :param out: Absolute path to destination directory
-        :param fullpath: extract to fullpath
-        :param overwrite: Overwrite existing archives
-        :param renice: Renice value
-        """
-        self.m            = m
-        self.file         = file
-        self.out          = out
-        self.password     = password
-        self.fullpath     = fullpath
-        self.overwrite    = overwrite
-        self.excludefiles = excludefiles
-        self.renice       = renice
-        self.delete       = delete
-        self.keepbroken   = keepbroken
-        self.files        = []  #: Store extracted files here
-
-
-    def init(self):
-        """ Initialize additional data structures """
-        pass
-
-
-    def verify(self):
-        """Check if password if needed. Raise ArchiveError if integrity is
-        questionable.
-
-        :raises ArchiveError
-        """
-        pass
-
-
-    def isPassword(self, password):
-        """ Check if the given password is/might be correct.
-        If it can not be decided at this point return true.
-
-        :param password:
-        :return: boolean
-        """
-        if isinstance(password, basestring):
-            return True
-        else:
-            return False
-
-
-    def setPassword(self, password):
-        if self.isPassword(password):
-            self.password = password
-            return True
-        else:
-            return False
-
-
-    def repair(self):
-        return False
-
-
-    def extract(self, progress=lambda x: None):
-        """Extract the archive. Raise specific errors in case of failure.
-
-        :param progress: Progress function, call this to update status
-        :raises PasswordError
-        :raises CRCError
-        :raises ArchiveError
-        :return:
-        """
-        self.setPassword(password)
-        raise NotImplementedError
-
-
-    def getDeleteFiles(self):
-        """Return list of files to delete, do *not* delete them here.
-
-        :return: List with paths of files to delete
-        """
-        raise NotImplementedError
-
-
-    def getExtractedFiles(self):
-        """Populate self.files at some point while extracting"""
-        return self.files
diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
new file mode 100644
index 000000000..0b2462dac
--- /dev/null
+++ b/module/plugins/internal/Extractor.py
@@ -0,0 +1,140 @@
+# -*- coding: utf-8 -*-
+
+class ArchiveError(Exception):
+    pass
+
+
+class CRCError(Exception):
+    pass
+
+
+class PasswordError(Exception):
+    pass
+
+
+class Extractor:
+    __name__    = "Extractor"
+    __version__ = "0.13"
+
+    __description__ = """Base extractor plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "ranan@pyload.org"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    EXTENSIONS = []
+
+
+    @classmethod
+    def checkDeps(cls):
+        """ Check if system statisfy dependencies
+        :return: boolean
+        """
+        return True
+
+
+    @classmethod
+    def isArchive(cls, file):
+        raise NotImplementedError
+
+
+    @classmethod
+    def getTargets(cls, files_ids):
+        """ Filter suited targets from list of filename id tuple list
+        :param files_ids: List of filepathes
+        :return: List of targets, id tuple list
+        """
+        targets = []
+
+        for file, id in files_ids:
+            if cls.isArchive(file):
+                targets.append((file, id))
+
+        return targets
+
+
+    def __init__(self, m, file, out, password, fullpath, overwrite, excludefiles, renice, delete, keepbroken):
+        """Initialize extractor for specific file
+
+        :param m: ExtractArchive Hook plugin
+        :param file: Absolute filepath
+        :param out: Absolute path to destination directory
+        :param fullpath: extract to fullpath
+        :param overwrite: Overwrite existing archives
+        :param renice: Renice value
+        """
+        self.m            = m
+        self.file         = file
+        self.out          = out
+        self.password     = password
+        self.fullpath     = fullpath
+        self.overwrite    = overwrite
+        self.excludefiles = excludefiles
+        self.renice       = renice
+        self.delete       = delete
+        self.keepbroken   = keepbroken
+        self.files        = []  #: Store extracted files here
+
+
+    def init(self):
+        """ Initialize additional data structures """
+        pass
+
+
+    def verify(self):
+        """Check if password if needed. Raise ArchiveError if integrity is
+        questionable.
+
+        :raises ArchiveError
+        """
+        pass
+
+
+    def isPassword(self, password):
+        """ Check if the given password is/might be correct.
+        If it can not be decided at this point return true.
+
+        :param password:
+        :return: boolean
+        """
+        if isinstance(password, basestring):
+            return True
+        else:
+            return False
+
+
+    def setPassword(self, password):
+        if self.isPassword(password):
+            self.password = password
+            return True
+        else:
+            return False
+
+
+    def repair(self):
+        return False
+
+
+    def extract(self, progress=lambda x: None):
+        """Extract the archive. Raise specific errors in case of failure.
+
+        :param progress: Progress function, call this to update status
+        :raises PasswordError
+        :raises CRCError
+        :raises ArchiveError
+        :return:
+        """
+        raise NotImplementedError
+
+
+    def getDeleteFiles(self):
+        """Return list of files to delete, do *not* delete them here.
+
+        :return: List with paths of files to delete
+        """
+        raise NotImplementedError
+
+
+    def getExtractedFiles(self):
+        """Populate self.files at some point while extracting"""
+        return self.files
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index b70bf3257..572fe95b9 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -8,7 +8,7 @@ from os.path import basename, dirname, join
 from string import digits
 from subprocess import Popen, PIPE
 
-from module.plugins.internal.AbstractExtractor import AbtractExtractor, ArchiveError, CRCError, PasswordError
+from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
 from module.utils import save_join, decode
 
 
@@ -20,9 +20,9 @@ def renice(pid, value):
             print "Renice failed"
 
 
-class UnRar(AbtractExtractor):
+class UnRar(Extractor):
     __name__    = "UnRar"
-    __version__ = "1.00"
+    __version__ = "1.01"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 875a0ec09..5ec56cbdf 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -5,12 +5,12 @@ from __future__ import with_statement
 import sys
 import zipfile
 
-from module.plugins.internal.AbstractExtractor import AbtractExtractor, ArchiveError, CRCError, PasswordError
+from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
 
 
-class UnZip(AbtractExtractor):
+class UnZip(Extractor):
     __name__    = "UnZip"
-    __version__ = "1.00"
+    __version__ = "1.01"
 
     __description__ = """Zip extractor plugin"""
     __license__     = "GPLv3"
-- 
cgit v1.2.3


From f37514e315e076379ab73539ffa36e48671976cc Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 26 Dec 2014 04:19:57 +0100
Subject: [MultiHoster] Improve

---
 module/plugins/internal/MultiHoster.py | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index e5c28d034..6bfff171b 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -2,13 +2,13 @@
 
 import re
 
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, replace_patterns, set_cookies
 
 
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.24"
+    __version__ = "0.25"
 
     __pattern__ = r'^unmatchable$'
 
@@ -17,7 +17,7 @@ class MultiHoster(SimpleHoster):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    DIRECT_LINK   = True
+    LOGIN_ACCOUNT = True
 
 
     def setup(self):
@@ -25,6 +25,28 @@ class MultiHoster(SimpleHoster):
         self.multiDL    = self.premium
 
 
+    def prepare(self):
+        self.info      = {}
+        self.link      = ""     #@TODO: Move to hoster class in 0.4.10
+        self.directDL  = False  #@TODO: Move to hoster class in 0.4.10
+
+        if self.LOGIN_ACCOUNT and not self.account:
+            self.fail(_("Required account not found"))
+
+        self.req.setOption("timeout", 120)
+
+        if isinstance(self.COOKIES, list):
+            set_cookies(self.req.cj, self.COOKIES)
+
+        if self.DIRECT_LINK is None:
+            self.directDL = self.__pattern__ != r'^unmatchable$'
+        else:
+            self.directDL = self.DIRECT_LINK
+
+        self.pyfile.url = replace_patterns(self.pyfile.url,
+                                           self.FILE_URL_REPLACEMENTS if hasattr(self, "FILE_URL_REPLACEMENTS") else self.URL_REPLACEMENTS)  #@TODO: Remove FILE_URL_REPLACEMENTS check in 0.4.10
+
+
     def process(self, pyfile):
         self.prepare()
 
@@ -35,7 +57,7 @@ class MultiHoster(SimpleHoster):
         if not self.link and not self.lastDownload:
             self.preload()
 
-            if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
+            if self.premium and not self.CHECK_TRAFFIC or self.checkTrafficLeft():
                 self.logDebug("Handled as premium download")
                 self.handlePremium()
 
@@ -55,4 +77,4 @@ class MultiHoster(SimpleHoster):
         if self.premium:
             raise NotImplementedError
         else:
-            self.logError(_("Required account not found"))
+            self.fail(_("Required premium account not found"))
-- 
cgit v1.2.3


From 6d3b96012ba64343586ba53041650d93493a335c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 26 Dec 2014 04:23:45 +0100
Subject: [MultiHook] Overwrites account if not premium

---
 module/plugins/internal/MultiHook.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index dcf1c3383..caac6c258 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -9,7 +9,7 @@ from module.utils import remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.22"
+    __version__ = "0.23"
 
     __description__ = """Hook plugin for MultiHoster"""
     __license__     = "GPLv3"
@@ -130,14 +130,14 @@ class MultiHook(Hook):
 
         old_supported = [hoster for hoster in old_supported if hoster not in self.supported]
         if old_supported:
-            self.logDebug("UNLOAD", ", ".join(old_supported))
+            self.logDebug("Unload: %s" % ", ".join(old_supported))
             for hoster in old_supported:
                 self.unloadHoster(hoster)
 
 
     def overridePlugins(self):
         pluginMap    = dict((name.lower(), name) for name in self.core.pluginManager.hosterPlugins.iterkeys())
-        accountList  = [name.lower() for name, data in self.core.accountManager.accounts.iteritems() if data]
+        accountList  = [account.type.lower() for account in self.core.api.getAccounts(False) if account.valid and account.premium]
         excludedList = []
 
         for hoster in self.getHosterCached():
@@ -159,26 +159,26 @@ class MultiHook(Hook):
         klass  = getattr(module, self.__name__)
 
         # inject plugin plugin
-        self.logDebug("Overwritten Hosters", ", ".join(sorted(self.supported)))
+        self.logDebug("Overwritten Hosters: %s" % ", ".join(sorted(self.supported)))
         for hoster in self.supported:
             hdict = self.core.pluginManager.hosterPlugins[hoster]
             hdict['new_module'] = module
             hdict['new_name']   = self.__name__
 
         if excludedList:
-            self.logInfo(_("The following hosters were not overwritten - account exists"), ", ".join(sorted(excludedList)))
+            self.logInfo(_("Hosters not overwritten: %s" % ", ".join(sorted(excludedList))))
 
         if self.new_supported:
             hosters = sorted(self.new_supported)
 
-            self.logDebug("New Hosters", ", ".join(hosters))
+            self.logDebug("New Hosters: %s" % ", ".join(hosters))
 
             # create new regexp
             regexp = r'.*(%s).*' % "|".join([x.replace(".", "\.") for x in hosters])
             if hasattr(klass, "__pattern__") and isinstance(klass.__pattern__, basestring) and '://' in klass.__pattern__:
                 regexp = r'%s|%s' % (klass.__pattern__, regexp)
 
-            self.logDebug("Regexp", regexp)
+            self.logDebug("Regexp: %s" % regexp)
 
             hdict = self.core.pluginManager.hosterPlugins[self.__name__]
             hdict['pattern'] = regexp
-- 
cgit v1.2.3


From 873f1bc17733148163829e23a456a6e724c486e3 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 26 Dec 2014 04:26:20 +0100
Subject: [SimpleHoster] Improve

---
 module/plugins/internal/SimpleHoster.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 6726726e1..56c25e0d9 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -160,7 +160,7 @@ def _isDirectLink(self, url, resumable=False):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.79"
+    __version__ = "0.80"
 
     __pattern__ = r'^unmatchable$'
 
@@ -381,7 +381,7 @@ class SimpleHoster(Hoster):
             if self.html is None:
                 self.fail(_("No html retrieved"))
 
-            if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
+            if self.premium and not self.CHECK_TRAFFIC or self.checkTrafficLeft():
                 self.logDebug("Handled as premium download")
                 self.handlePremium()
 
@@ -405,7 +405,11 @@ class SimpleHoster(Hoster):
             self.retry(10, reason=_("Wrong captcha"))
 
         elif not self.lastDownload or not exists(fs_encode(self.lastDownload)):
-            self.fail(_("No file downloaded"))
+            errmsg = _("No file downloaded")
+            if 'error' in self.info:
+                self.fail(errmsg, self.info['error'])
+            else:
+                self.fail(errmsg)
 
         else:
             rules = {'empty file': re.compile(r"^$")}
-- 
cgit v1.2.3


From 136f63dc39603814b215606f888fb2e639021277 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 26 Dec 2014 04:27:41 +0100
Subject: Spare code fixes

---
 module/plugins/internal/SimpleCrypter.py | 10 +++++-----
 module/plugins/internal/XFSHoster.py     | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index e0dd10585..6596828b3 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -12,7 +12,7 @@ from module.utils import fixup
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.33"
+    __version__ = "0.34"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
@@ -82,14 +82,14 @@ class SimpleCrypter(Crypter, SimpleHoster):
 
 
     def prepare(self):
-        if self.LOGIN_ACCOUNT and not self.account:
-            self.fail(_("Required account not found"))
+        self.info  = {}
+        self.links = []  #@TODO: Move to hoster class in 0.4.10
 
         if self.LOGIN_PREMIUM and not self.premium:
             self.fail(_("Required premium account not found"))
 
-        self.info  = {}
-        self.links = []
+        if self.LOGIN_ACCOUNT and not self.account:
+            self.fail(_("Required account not found"))
 
         self.req.setOption("timeout", 120)
 
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index dd2dd2527..7c6ae5725 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -16,7 +16,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.31"
+    __version__ = "0.32"
 
     __pattern__ = r'^unmatchable$'
 
@@ -32,7 +32,7 @@ class XFSHoster(SimpleHoster):
 
     TEXT_ENCODING     = False
     COOKIES           = [(HOSTER_DOMAIN, "lang", "english")]
-    CHECK_DIRECT_LINK = None
+    DIRECT_LINK       = None
     MULTI_HOSTER      = True  #@NOTE: Should be default to False for safe, but I'm lazy...
 
     NAME_PATTERN = r'(Filename[ ]*:[ ]*</b>(</td><td nowrap>)?|name="fname"[ ]+value="|<[\w^_]+ class="(file)?name">)\s*(?P<N>.+?)(\s*<|")'
@@ -45,7 +45,7 @@ class XFSHoster(SimpleHoster):
     PREMIUM_ONLY_PATTERN = r'>This file is available for Premium Users only'
     ERROR_PATTERN        = r'(?:class=["\']err["\'].*?>|<[Cc]enter><b>|>Error</td>|>\(ERROR:)(?:\s*<.+?>\s*)*(.+?)(?:["\']|<|\))'
 
-    LEECH_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
+    LINK_LEECH_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
     LINK_PATTERN       = None  #: final download url pattern
 
     CAPTCHA_PATTERN       = r'(https?://[^"\']+?/captchas?/[^"\']+)'
@@ -58,7 +58,7 @@ class XFSHoster(SimpleHoster):
 
 
     def setup(self):
-        self.chunkLimit = 1
+        self.chunkLimit     = 1
         self.resumeDownload = self.multiDL = self.premium
 
 
@@ -80,7 +80,7 @@ class XFSHoster(SimpleHoster):
 
         super(XFSHoster, self).prepare()
 
-        if self.CHECK_DIRECT_LINK is None:
+        if self.DIRECT_LINK is None:
             self.directDL = bool(self.premium)
 
 
@@ -189,9 +189,9 @@ class XFSHoster(SimpleHoster):
             self.fail(stmsg)
 
         #get easybytez.com link for uploaded file
-        m = re.search(self.LEECH_LINK_PATTERN, self.html)
+        m = re.search(self.LINK_LEECH_PATTERN, self.html)
         if m is None:
-            self.error(_("LEECH_LINK_PATTERN not found"))
+            self.error(_("LINK_LEECH_PATTERN not found"))
 
         header = self.load(m.group(1), just_header=True, decode=True)
 
-- 
cgit v1.2.3


From c7187f2142c6e06be961bb3be45ea3b61ce31651 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 26 Dec 2014 17:24:41 +0100
Subject: [SimpleHoster] getInfo handle direct link error

---
 module/plugins/internal/MultiHoster.py  |  4 ++--
 module/plugins/internal/SimpleHoster.py | 23 +++++++++++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 6bfff171b..9d218c3b2 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.25"
+    __version__ = "0.26"
 
     __pattern__ = r'^unmatchable$'
 
@@ -57,7 +57,7 @@ class MultiHoster(SimpleHoster):
         if not self.link and not self.lastDownload:
             self.preload()
 
-            if self.premium and not self.CHECK_TRAFFIC or self.checkTrafficLeft():
+            if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                 self.logDebug("Handled as premium download")
                 self.handlePremium()
 
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 56c25e0d9..89d2e629c 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -160,7 +160,7 @@ def _isDirectLink(self, url, resumable=False):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.80"
+    __version__ = "0.81"
 
     __pattern__ = r'^unmatchable$'
 
@@ -233,7 +233,13 @@ class SimpleHoster(Hoster):
 
     @classmethod
     def getInfo(cls, url="", html=""):
-        info = {'name': urlparse(unquote(url)).path.split('/')[-1] or _("Unknown"), 'size': 0, 'status': 3, 'url': url}
+        info   = {'name': urlparse(unquote(url)).path.split('/')[-1] or _("Unknown"), 'size': 0, 'status': 3, 'url': url}
+        online = False
+
+        try:
+            info['pattern'] = re.match(cls.__pattern__, url).groupdict()  #: pattern groups will be saved here, please save api stuff to info['api']
+        except Exception:
+            pass
 
         if not html:
             try:
@@ -242,6 +248,11 @@ class SimpleHoster(Hoster):
                     info['status'] = 1
                     raise
 
+                if _isDirectLink(url):
+                    info['error']  = "direct link"
+                    info['status'] = 2
+                    raise
+
                 try:
                     html = getURL(url, cookies=cls.COOKIES, decode=not cls.TEXT_ENCODING)
 
@@ -261,8 +272,6 @@ class SimpleHoster(Hoster):
             except:
                 return info
 
-        online = False
-
         if hasattr(cls, "OFFLINE_PATTERN") and re.search(cls.OFFLINE_PATTERN, html):
             info['status'] = 1
 
@@ -273,9 +282,7 @@ class SimpleHoster(Hoster):
             info['status'] = 6
 
         else:
-            try:
-                info['pattern'] = re.match(cls.__pattern__, url).groupdict()  #: pattern groups will be saved here, please save api stuff to info['api']
-            except:
+            if not 'pattern' in info:
                 info['pattern'] = {}
 
             for pattern in ("FILE_INFO_PATTERN", "INFO_PATTERN",
@@ -381,7 +388,7 @@ class SimpleHoster(Hoster):
             if self.html is None:
                 self.fail(_("No html retrieved"))
 
-            if self.premium and not self.CHECK_TRAFFIC or self.checkTrafficLeft():
+            if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                 self.logDebug("Handled as premium download")
                 self.handlePremium()
 
-- 
cgit v1.2.3


From ff42cec46274b0f2019272424c1a57ec4b413507 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 26 Dec 2014 17:58:54 +0100
Subject: [PremiumTo] Fixup

---
 module/plugins/internal/MultiHook.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index caac6c258..78de1ed0a 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -47,6 +47,7 @@ class MultiHook(Hook):
         """getConfig with default value - sublass may not implements all config options"""
         try:
             return self.getConf(option)
+
         except KeyError:
             return default
 
-- 
cgit v1.2.3


From 4f287a307dd61afbbf1029065dcd6d1b9c304a15 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 27 Dec 2014 13:39:25 +0100
Subject: New plugin: SimpleDereferer

---
 module/plugins/internal/SimpleDereferer.py | 96 ++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 module/plugins/internal/SimpleDereferer.py

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
new file mode 100644
index 000000000..0ad1098f4
--- /dev/null
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from urllib import unquote
+
+from module.plugins.Crypter import Crypter
+from module.plugins.internal.SimpleHoster import _isDirectLink, set_cookies
+
+
+class SimpleDereferer(Crypter):
+    __name__    = "SimpleDereferer"
+    __type__    = "crypter"
+    __version__ = "0.01"
+
+    __pattern__ = r'^unmatchable$'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
+                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
+
+    __description__ = """Simple dereferer plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    """
+    Following patterns should be defined by each crypter:
+
+      LINK_PATTERN: Regex to catch the redirect url in group(1)
+        example: LINK_PATTERN = r'<div class="link"><a href="(.+?)"'
+
+      OFFLINE_PATTERN: (optional) Checks if the page is unreachable
+        example: OFFLINE_PATTERN = r'File (deleted|not found)'
+
+      TEMP_OFFLINE_PATTERN: (optional) Checks if the page is temporarily unreachable
+        example: TEMP_OFFLINE_PATTERN = r'Server maintainance'
+
+
+    You can override the getLinks method if you need a more sophisticated way to extract the redirect url.
+    """
+
+    LINK_PATTERN = None
+
+    TEXT_ENCODING = False
+    COOKIES       = True
+
+
+    def decrypt(self, pyfile):
+        link = _isDirectLink(pyfile.url)
+
+        if not link:
+            try:
+                link = unquote(re.match(self.__pattern__, pyfile.url).group('LINK'))
+
+            except Exception:
+                self.prepare()
+                self.preload()
+
+                if self.html is None:
+                    self.fail(_("No html retrieved"))
+
+                self.checkStatus()
+
+                link = self.getLink()
+
+        if link.strip():
+            self.urls = [link.strip()]  #@TODO: Remove `.strip()` in 0.4.10
+
+
+    def prepare(self):
+        self.req.setOption("timeout", 120)
+
+        if isinstance(self.COOKIES, list):
+            set_cookies(self.req.cj, self.COOKIES)
+
+
+    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 checkStatus(self):
+        if hasattr(self, "OFFLINE_PATTERN") and re.search(self.OFFLINE_PATTERN, self.html):
+            self.offline()
+
+        elif hasattr(self, "TEMP_OFFLINE_PATTERN") and re.search(self.TEMP_OFFLINE_PATTERN, self.html):
+            self.tempOffline()
+
+
+    def getLink(self):
+        try:
+            return re.search(self.LINK_PATTERN, self.html).group(1)
+
+        except Exception:
+            pass
-- 
cgit v1.2.3


From 2260302b71a803da708f3ec6a0cc2200baae527b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 27 Dec 2014 13:44:36 +0100
Subject: [SimpleHoster] Improve _isDirectLink + move here secondsToMidnight
 routine + spare code cosmetics

---
 module/plugins/internal/SimpleHoster.py | 55 +++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 16 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 89d2e629c..d9732d063 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -131,7 +131,7 @@ def _isDirectLink(self, url, resumable=False):
     for i in xrange(5 if resumable else 1):
         header = self.load(url, ref=True, cookies=True, just_header=True, decode=True)
 
-        if 'content-disposition' in header:
+        if 'content-disposition' in header or 'content-length' in header:
             link = url
 
         elif 'location' in header and header['location']:
@@ -150,6 +150,9 @@ def _isDirectLink(self, url, resumable=False):
                 self.logDebug("Redirect #%d to: %s" % (++i, location))
                 continue
 
+        elif 'content-type' in header and header['content-type' ] and "html" not in header['content-type']:
+            link = url
+
         break
     else:
         self.logError(_("Too many redirects"))
@@ -157,10 +160,28 @@ def _isDirectLink(self, url, resumable=False):
     return link
 
 
+def secondsToMidnight(gmt=0):
+    now = datetime.utcnow() + timedelta(hours=gmt)
+
+    if now.hour is 0 and now.minute < 10:
+        midnight = now
+    else:
+        midnight = now + timedelta(days=1)
+
+    td = midnight.replace(hour=0, minute=10, second=0, microsecond=0) - now
+
+    if hasattr(td, 'total_seconds'):
+        res = td.total_seconds()
+    else:  #@NOTE: work-around for python 2.5 and 2.6 missing timedelta.total_seconds
+        res = (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
+
+    return int(res)
+
+
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.81"
+    __version__ = "0.82"
 
     __pattern__ = r'^unmatchable$'
 
@@ -185,10 +206,10 @@ class SimpleHoster(Hoster):
       HASHSUM_PATTERN: (optional) Hash code and type of the file
         example: HASHSUM_PATTERN = r'(?P<H>hash_code) (?P<T>MD5)'
 
-      OFFLINE_PATTERN: (optional) Check if the file is yet available online
+      OFFLINE_PATTERN: (optional) Check if the page is unreachable
         example: OFFLINE_PATTERN = r'File (deleted|not found)'
 
-      TEMP_OFFLINE_PATTERN: (optional) Check if the file is temporarily offline
+      TEMP_OFFLINE_PATTERN: (optional) Check if the page is temporarily unreachable
         example: TEMP_OFFLINE_PATTERN = r'Server (maintenance|maintainance)'
 
 
@@ -217,11 +238,11 @@ class SimpleHoster(Hoster):
     SIZE_REPLACEMENTS = []
     URL_REPLACEMENTS  = []
 
-    TEXT_ENCODING       = False  #: Set to True or encoding name if encoding value in http header is not correct
-    COOKIES             = True   #: or False or list of tuples [(domain, name, value)]
-    CHECK_TRAFFIC       = False  #: Set to True to force checking traffic left for premium account
-    DIRECT_LINK         = None   #: Set to True to looking for direct link (as defined in handleDirect method), set to None to do it if self.account is True else False
-    MULTI_HOSTER        = False  #: Set to True to leech other hoster link (as defined in handleMulti method)
+    TEXT_ENCODING = False  #: Set to True or encoding name if encoding value in http header is not correct
+    COOKIES       = True   #: or False or list of tuples [(domain, name, value)]
+    CHECK_TRAFFIC = False  #: Set to True to force checking traffic left for premium account
+    DIRECT_LINK   = None   #: Set to True to looking for direct link (as defined in handleDirect method), set to None to do it if self.account is True else False
+    MULTI_HOSTER  = False  #: Set to True to leech other hoster link (as defined in handleMulti method)
 
 
     @classmethod
@@ -451,7 +472,10 @@ class SimpleHoster(Hoster):
         self.info.pop('error', None)
 
 
-    def checkStatus(self):
+    def checkStatus(self, getinfo=True):
+        if getinfo:
+            self.updateInfo(self.getInfo(self.pyfile.url, self.html))
+
         status = self.info['status']
 
         if status is 1:
@@ -465,7 +489,10 @@ class SimpleHoster(Hoster):
                           "File info: %s"   % self.info)
 
 
-    def checkNameSize(self):
+    def checkNameSize(self, getinfo=True):
+        if getinfo:
+            self.updateInfo(self.getInfo(self.pyfile.url, self.html))
+
         name = self.info['name']
         size = self.info['size']
         url  = self.info['url']
@@ -485,17 +512,13 @@ class SimpleHoster(Hoster):
 
 
     def checkInfo(self):
-        self.updateInfo(self.getInfo(self.pyfile.url, self.html))
-
         self.checkNameSize()
 
         if self.html:
             self.checkErrors()
 
-        self.updateInfo(self.getInfo(self.pyfile.url, self.html))
-
         self.checkNameSize()
-        self.checkStatus()
+        self.checkStatus(getinfo=False)
 
 
     #: Deprecated
-- 
cgit v1.2.3


From b6a2bd53628bd2824bac1dafc7b4eafdf3c815dd Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 27 Dec 2014 13:48:03 +0100
Subject: Update plugins after SimpleHoster changes

---
 module/plugins/internal/SimpleCrypter.py | 15 +++++++++------
 module/plugins/internal/XFSHoster.py     | 17 ++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 6596828b3..428826456 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -12,7 +12,7 @@ from module.utils import fixup
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.34"
+    __version__ = "0.35"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
@@ -28,16 +28,16 @@ class SimpleCrypter(Crypter, SimpleHoster):
     """
     Following patterns should be defined by each crypter:
 
-      LINK_PATTERN: group(1) must be a download link or a regex to catch more links
+      LINK_PATTERN: Download link or regex to catch links in group(1)
         example: LINK_PATTERN = r'<div class="link"><a href="(.+?)"'
 
-      NAME_PATTERN: (optional) folder name or webpage title
+      NAME_PATTERN: (optional) folder name or page title
         example: NAME_PATTERN = r'<title>Files of: (?P<N>[^<]+) folder</title>'
 
-      OFFLINE_PATTERN: (optional) Checks if the file is yet available online
+      OFFLINE_PATTERN: (optional) Checks if the page is unreachable
         example: OFFLINE_PATTERN = r'File (deleted|not found)'
 
-      TEMP_OFFLINE_PATTERN: (optional) Checks if the file is temporarily offline
+      TEMP_OFFLINE_PATTERN: (optional) Checks if the page is temporarily unreachable
         example: TEMP_OFFLINE_PATTERN = r'Server maintainance'
 
 
@@ -120,7 +120,10 @@ class SimpleCrypter(Crypter, SimpleHoster):
             self.packages = [(self.info['name'], self.links, self.info['folder'])]
 
 
-    def checkNameSize(self):
+    def checkNameSize(self, getinfo=True):
+        if getinfo:
+            self.updateInfo(self.getInfo(self.pyfile.url, self.html))
+
         name = self.info['name']
         url  = self.info['url']
 
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 7c6ae5725..f2168d0c7 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -7,16 +7,15 @@ from time import sleep
 
 from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME
 
-from module.plugins.hoster.UnrestrictLi import secondsToMidnight
 from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, secondsToMidnight
 from module.utils import html_unescape
 
 
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.32"
+    __version__ = "0.33"
 
     __pattern__ = r'^unmatchable$'
 
@@ -30,10 +29,10 @@ class XFSHoster(SimpleHoster):
     HOSTER_DOMAIN = None
     HOSTER_NAME   = None
 
-    TEXT_ENCODING     = False
-    COOKIES           = [(HOSTER_DOMAIN, "lang", "english")]
-    DIRECT_LINK       = None
-    MULTI_HOSTER      = True  #@NOTE: Should be default to False for safe, but I'm lazy...
+    TEXT_ENCODING = False
+    COOKIES       = [(HOSTER_DOMAIN, "lang", "english")]
+    DIRECT_LINK   = None
+    MULTI_HOSTER  = True  #@NOTE: Should be default to False for safe, but I'm lazy...
 
     NAME_PATTERN = r'(Filename[ ]*:[ ]*</b>(</td><td nowrap>)?|name="fname"[ ]+value="|<[\w^_]+ class="(file)?name">)\s*(?P<N>.+?)(\s*<|")'
     SIZE_PATTERN = r'(Size[ ]*:[ ]*</b>(</td><td>)?|File:.*>|</font>\s*\(|<[\w^_]+ class="size">)\s*(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)'
@@ -226,10 +225,10 @@ class XFSHoster(SimpleHoster):
 
             elif 'limit' in self.errmsg:
                 if 'days' in self.errmsg:
-                    delay = secondsToMidnight(gmt=2)
+                    delay   = secondsToMidnight(gmt=2)
                     retries = 3
                 else:
-                    delay = 1 * 60 * 60
+                    delay   = 1 * 60 * 60
                     retries = 24
 
                 self.wantReconnect = True
-- 
cgit v1.2.3


From b72be64cc16660e3ba877d97dbc0e717bb030666 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 27 Dec 2014 21:14:40 +0100
Subject: [MultiHook] Crypter support

---
 module/plugins/internal/MultiHook.py | 150 +++++++++++++++++++----------------
 1 file changed, 83 insertions(+), 67 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 78de1ed0a..cf251bacf 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -9,16 +9,22 @@ from module.utils import remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.23"
+    __version__ = "0.25"
 
-    __description__ = """Hook plugin for MultiHoster"""
+    __config__ = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"),
+                  ("pluginlist"  , "str"                , "Plugin list (comma separated)"                , ""   ),
+                  ("revertfailed", "bool"               , "Revert to standard download if download fails", False),
+                  ("interval"    , "int"                , "Reload interval in hours (0 to disable)"      , 12   )]
+
+    __description__ = """Hook plugin for multi hoster/crypter"""
     __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+    __authors__     = [("pyLoad Team", "admin@pyload.org"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    interval = 12 * 60 * 60  #: reload hosters every 12h
+    MIN_INTERVAL = 12 * 60 * 60  #: reload plugins every 12h
 
-    HOSTER_REPLACEMENTS = [("1fichier.com"   , "onefichier.com"),
+    PLUGIN_REPLACEMENTS = [("1fichier.com"   , "onefichier.com"),
                            ("2shared.com"    , "twoshared.com" ),
                            ("4shared.com"    , "fourshared.com"),
                            ("cloudnator.com" , "shragle.com"   ),
@@ -34,15 +40,26 @@ class MultiHook(Hook):
                            ("sharerapid.cz"  , "multishare.cz" ),
                            ("ul.to"          , "uploaded.to"   ),
                            ("uploaded.net"   , "uploaded.to"   )]
-    HOSTER_EXCLUDED     = []
 
 
     def setup(self):
-        self.hosters       = []
+        self.type          = self.core.pluginManager.findPlugin(self.__name__)[1] or "hoster"
+        self.plugins       = []
         self.supported     = []
         self.new_supported = []
 
 
+    def getURL(self, *args, **kwargs):  #@TODO: Remove in 0.4.10
+        """ see HTTPRequest for argument list """
+        h = pyreq.getHTTPRequest(timeout=120)
+        try:
+            rep = h.load(*args, **kwargs)
+        finally:
+            h.close()
+
+        return rep
+
+
     def getConfig(self, option, default=''):
         """getConfig with default value - sublass may not implements all config options"""
         try:
@@ -52,36 +69,37 @@ class MultiHook(Hook):
             return default
 
 
-    def getHosterCached(self):
-        if not self.hosters:
+    def pluginCached(self):
+        if not self.plugins:
             try:
-                hosterSet = self.toHosterSet(self.getHoster()) - set(self.HOSTER_EXCLUDED)
+                pluginset = self.pluginSet(self.getHosters() if self.type is "hoster" else self.getCrypters())
             except Exception, e:
                 self.logError(e)
                 return []
 
             try:
-                configMode = self.getConfig('hosterListMode', 'all')
-                if configMode in ("listed", "unlisted"):
-                    configSet = self.toHosterSet(self.getConfig('hosterList', '').replace('|', ',').replace(';', ',').split(','))
+                configmode = self.getConfig("mode", 'all')
+                if configmode in ("listed", "unlisted"):
+                    list      = self.getConfig("pluginlist", '').replace('|', ',').replace(';', ',').split(',')
+                    configset = self.pluginSet(list)
 
-                    if configMode == "listed":
-                        hosterSet &= configSet
+                    if configmode == "listed":
+                        pluginset &= configset
                     else:
-                        hosterSet -= configSet
+                        pluginset -= configset
 
             except Exception, e:
                 self.logError(e)
 
-            self.hosters = list(hosterSet)
+            self.plugins = list(pluginset)
 
-        return self.hosters
+        return self.plugins
 
 
-    def toHosterSet(self, hosters):
+    def pluginSet(self, hosters):
         hosters = set((str(x).strip().lower() for x in hosters))
 
-        for rep in self.HOSTER_REPLACEMENTS:
+        for rep in self.PLUGIN_REPLACEMENTS:
             if rep[0] in hosters:
                 hosters.remove(rep[0])
                 hosters.add(rep[1])
@@ -90,7 +108,7 @@ class MultiHook(Hook):
         return hosters
 
 
-    def getHoster(self):
+    def getHosters(self):
         """Load list of supported hoster
 
         :return: List of domain names
@@ -98,96 +116,93 @@ class MultiHook(Hook):
         raise NotImplementedError
 
 
-    def coreReady(self):
-        if self.cb:
-            self.core.scheduler.removeJob(self.cb)
-
-        self.setConfig("activated", True)  #: config not in sync after plugin reload
-
-        cfg_interval = self.getConfig("interval", None)  #: reload interval in hours
-        if cfg_interval is not None:
-            self.interval = cfg_interval * 60 * 60
-
-        if self.interval:
-            self._periodical()
-        else:
-            self.periodical()
-
+    def getCrypters(self):
+        """Load list of supported crypters
 
-    def initPeriodical(self):
-        pass
+        :return: List of domain names
+        """
+        raise NotImplementedError
 
 
     def periodical(self):
-        """reload hoster list periodically"""
-        self.logInfo(_("Reloading supported hoster list"))
+        """reload plugin list periodically"""
+        self.interval = max(self.getConfig("interval", 0), self.MIN_INTERVAL)
+
+        self.logInfo(_("Reloading supported %s list") % self.type)
 
         old_supported      = self.supported
         self.supported     = []
         self.new_supported = []
-        self.hosters       = []
+        self.plugins       = []
 
         self.overridePlugins()
 
-        old_supported = [hoster for hoster in old_supported if hoster not in self.supported]
+        old_supported = [plugin for plugin in old_supported if plugin not in self.supported]
+
         if old_supported:
             self.logDebug("Unload: %s" % ", ".join(old_supported))
-            for hoster in old_supported:
-                self.unloadHoster(hoster)
+            for plugin in old_supported:
+                self.unloadPlugin(plugin)
 
 
     def overridePlugins(self):
-        pluginMap    = dict((name.lower(), name) for name in self.core.pluginManager.hosterPlugins.iterkeys())
-        accountList  = [account.type.lower() for account in self.core.api.getAccounts(False) if account.valid and account.premium]
         excludedList = []
 
-        for hoster in self.getHosterCached():
-            name = remove_chars(hoster, "-.")
+        if self.type is "hoster":
+            pluginMap    = dict((name.lower(), name) for name in self.core.pluginManager.hosterPlugins.iterkeys())
+            accountList  = [account.type.lower() for account in self.core.api.getAccounts(False) if account.valid and account.premium]
+        else:
+            pluginMap    = {}
+            accountList  = [name[::-1].replace("Folder"[::-1], "", 1).lower()[::-1] for name in self.core.pluginManager.crypterPlugins.iterkeys()]
+
+        for plugin in self.pluginCached():
+            name = remove_chars(plugin, "-.")
 
             if name in accountList:
-                excludedList.append(hoster)
+                excludedList.append(plugin)
             else:
                 if name in pluginMap:
                     self.supported.append(pluginMap[name])
                 else:
-                    self.new_supported.append(hoster)
+                    self.new_supported.append(plugin)
 
         if not self.supported and not self.new_supported:
-            self.logError(_("No Hoster loaded"))
+            self.logError(_("No %s loaded") % self.type)
             return
 
         module = self.core.pluginManager.getPlugin(self.__name__)
         klass  = getattr(module, self.__name__)
 
         # inject plugin plugin
-        self.logDebug("Overwritten Hosters: %s" % ", ".join(sorted(self.supported)))
-        for hoster in self.supported:
-            hdict = self.core.pluginManager.hosterPlugins[hoster]
+        self.logDebug("Overwritten %ss: %s" % (self.type, ", ".join(sorted(self.supported))))
+
+        for plugin in self.supported:
+            hdict = self.core.pluginManager.plugins[self.type][plugin]
             hdict['new_module'] = module
             hdict['new_name']   = self.__name__
 
         if excludedList:
-            self.logInfo(_("Hosters not overwritten: %s" % ", ".join(sorted(excludedList))))
+            self.logInfo(_("%ss not overwritten: %s") % (self.type.capitalize(), ", ".join(sorted(excludedList))))
 
         if self.new_supported:
-            hosters = sorted(self.new_supported)
+            plugins = sorted(self.new_supported)
 
-            self.logDebug("New Hosters: %s" % ", ".join(hosters))
+            self.logDebug("New %ss: %s" % (self.type, ", ".join(plugins)))
 
             # create new regexp
-            regexp = r'.*(%s).*' % "|".join([x.replace(".", "\.") for x in hosters])
+            regexp = r'.*(%s).*' % "|".join([x.replace(".", "\.") for x in plugins])
             if hasattr(klass, "__pattern__") and isinstance(klass.__pattern__, basestring) and '://' in klass.__pattern__:
                 regexp = r'%s|%s' % (klass.__pattern__, regexp)
 
             self.logDebug("Regexp: %s" % regexp)
 
-            hdict = self.core.pluginManager.hosterPlugins[self.__name__]
+            hdict = self.core.pluginManager.plugins[self.type][self.__name__]
             hdict['pattern'] = regexp
             hdict['re']      = re.compile(regexp)
 
 
-    def unloadHoster(self, hoster):
-        hdict = self.core.pluginManager.hosterPlugins[hoster]
+    def unloadPlugin(self, plugin):
+        hdict = self.core.pluginManager.plugins[self.type][plugin]
         if "module" in hdict:
             del hdict['module']
 
@@ -198,21 +213,22 @@ class MultiHook(Hook):
 
     def unload(self):
         """Remove override for all hosters. Scheduler job is removed by hookmanager"""
-        for hoster in self.supported:
-            self.unloadHoster(hoster)
+        for plugin in self.supported:
+            self.unloadPlugin(plugin)
 
         # reset pattern
         klass = getattr(self.core.pluginManager.getPlugin(self.__name__), self.__name__)
-        hdict  = self.core.pluginManager.hosterPlugins[self.__name__]
+        hdict = self.core.pluginManager.plugins[self.type][self.__name__]
+
         hdict['pattern'] = getattr(klass, "__pattern__", r'^unmatchable$')
         hdict['re']      = re.compile(hdict['pattern'])
 
 
     def downloadFailed(self, pyfile):
         """remove plugin override if download fails but not if file is offline/temp.offline"""
-        if pyfile.hasStatus("failed") and self.getConfig("unloadFailing", True):
-            hdict = self.core.pluginManager.hosterPlugins[pyfile.pluginname]
+        if self.type is "hoster" and pyfile.hasStatus("failed") and self.getConfig("revertfailed", True):
+            hdict = self.core.pluginManager.plugins[self.type][pyfile.pluginname]
             if "new_name" in hdict and hdict['new_name'] == self.__name__:
                 self.logDebug("Unload MultiHook", pyfile.pluginname, hdict)
-                self.unloadHoster(pyfile.pluginname)
+                self.unloadPlugin(pyfile.pluginname)
                 pyfile.setStatus("queued")
-- 
cgit v1.2.3


From 4882503efe1fce2f123723766f672456e5ccc221 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 27 Dec 2014 21:23:33 +0100
Subject: [SimpleCrypter][SimpleDereferer] Fail if no link grabbed

---
 module/plugins/internal/SimpleCrypter.py   | 5 ++++-
 module/plugins/internal/SimpleDereferer.py | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 428826456..51ba07eb7 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -12,7 +12,7 @@ from module.utils import fixup
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.35"
+    __version__ = "0.36"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
@@ -119,6 +119,9 @@ class SimpleCrypter(Crypter, SimpleHoster):
         if self.links:
             self.packages = [(self.info['name'], self.links, self.info['folder'])]
 
+        elif not self.urls and not self.packages:  #@TODO: Remove in 0.4.10
+            self.fail("No link grabbed")
+
 
     def checkNameSize(self, getinfo=True):
         if getinfo:
diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 0ad1098f4..04d63658e 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import _isDirectLink, set_cookies
 class SimpleDereferer(Crypter):
     __name__    = "SimpleDereferer"
     __type__    = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -65,6 +65,9 @@ class SimpleDereferer(Crypter):
         if link.strip():
             self.urls = [link.strip()]  #@TODO: Remove `.strip()` in 0.4.10
 
+        elif not self.urls and not self.packages:  #@TODO: Remove in 0.4.10
+            self.fail("No link grabbed")
+
 
     def prepare(self):
         self.req.setOption("timeout", 120)
-- 
cgit v1.2.3


From 1c443921febd75050968bb37e7fc88e361c487a9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 27 Dec 2014 21:27:00 +0100
Subject: [XFSHoster] Code cosmetics

---
 module/plugins/internal/XFSHoster.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index f2168d0c7..4555e7b0f 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -73,9 +73,8 @@ class XFSHoster(SimpleHoster):
             pattern = r'(https?://(www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<]'
             self.LINK_PATTERN = pattern % self.HOSTER_DOMAIN.replace('.', '\.')
 
-        self.captcha   = None
-        self.errmsg    = None
-        self.passwords = self.getPassword().splitlines()
+        self.captcha = None
+        self.errmsg  = None
 
         super(XFSHoster, self).prepare()
 
@@ -271,8 +270,9 @@ class XFSHoster(SimpleHoster):
 
         if 'op' in inputs:
             if "password" in inputs:
-                if self.passwords:
-                    inputs['password'] = self.passwords.pop(0)
+                password = self.getPassword()
+                if password:
+                    inputs['password'] = password
                 else:
                     self.fail(_("Missing password"))
 
-- 
cgit v1.2.3


From 388c894716e670e89b88b0b05f99d902d0bc054d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 28 Dec 2014 01:05:27 +0100
Subject: [MultiHoster] Filename recognition

---
 module/plugins/internal/MultiHoster.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 9d218c3b2..8cdb2fbff 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.26"
+    __version__ = "0.27"
 
     __pattern__ = r'^unmatchable$'
 
@@ -54,13 +54,17 @@ class MultiHoster(SimpleHoster):
             self.logDebug("Looking for direct download link...")
             self.handleDirect()
 
-        if not self.link and not self.lastDownload:
+        if self.link:
+            self.pyfile.url = self.link
+            self.checkNameSize()
+
+        elif not self.lastDownload:
             self.preload()
+            self.checkInfo()
 
             if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                 self.logDebug("Handled as premium download")
                 self.handlePremium()
-
             else:
                 self.logDebug("Handled as free download")
                 self.handleFree()
-- 
cgit v1.2.3


From 0c61cbb03493b15970a5ccb9a5e20b02b3884a4e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 28 Dec 2014 01:05:59 +0100
Subject: [SimpleHoster] Improve

---
 module/plugins/internal/SimpleCrypter.py | 4 ----
 module/plugins/internal/SimpleHoster.py  | 7 ++-----
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 51ba07eb7..566252245 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -103,10 +103,6 @@ class SimpleCrypter(Crypter, SimpleHoster):
         self.prepare()
 
         self.preload()
-
-        if self.html is None:
-            self.fail(_("No html retrieved"))
-
         self.checkInfo()
 
         self.links = self.getLinks()
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index d9732d063..5c6f8c720 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -181,7 +181,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.82"
+    __version__ = "0.83"
 
     __pattern__ = r'^unmatchable$'
 
@@ -388,7 +388,7 @@ class SimpleHoster(Hoster):
 
     def process(self, pyfile):
         self.prepare()
-        self.checkInfo()
+        self.checkNameSize()
 
         if self.directDL:
             self.logDebug("Looking for direct download link...")
@@ -406,9 +406,6 @@ class SimpleHoster(Hoster):
             self.preload()
             self.checkInfo()
 
-            if self.html is None:
-                self.fail(_("No html retrieved"))
-
             if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                 self.logDebug("Handled as premium download")
                 self.handlePremium()
-- 
cgit v1.2.3


From 98ae3d727b60d3f529b39a6c275e31732231bd91 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 28 Dec 2014 11:53:37 +0100
Subject: [SimpleHoster] Fix https://github.com/pyload/pyload/issues/983

---
 module/plugins/internal/SimpleHoster.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 5c6f8c720..6075e3f67 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -181,7 +181,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.83"
+    __version__ = "0.84"
 
     __pattern__ = r'^unmatchable$'
 
@@ -444,7 +444,9 @@ class SimpleHoster(Hoster):
 
             check = self.checkDownload(rules)
             if check:  #@TODO: Move to hoster in 0.4.10
-                errmsg = check.strip().capitalize() + (" | " + self.lastCheck.strip() if self.lastCheck else "")
+                errmsg = check.strip().capitalize()
+                if self.lastCheck:
+                    errmsg += " | " + self.lastCheck.group(0).strip()
                 self.retry(10, 60, errmsg)
 
 
-- 
cgit v1.2.3


From e4cf98e1f368eb846469d1acaf0efd015bf2a921 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 30 Dec 2014 15:43:11 +0100
Subject: [MultiHook] Fixup

---
 module/plugins/internal/MultiHook.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index cf251bacf..8164a02fc 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -9,7 +9,7 @@ from module.utils import remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.25"
+    __version__ = "0.26"
 
     __config__ = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"),
                   ("pluginlist"  , "str"                , "Plugin list (comma separated)"                , ""   ),
@@ -72,7 +72,7 @@ class MultiHook(Hook):
     def pluginCached(self):
         if not self.plugins:
             try:
-                pluginset = self.pluginSet(self.getHosters() if self.type is "hoster" else self.getCrypters())
+                pluginset = self.pluginSet(self.getHosters() if self.type == "hoster" else self.getCrypters())
             except Exception, e:
                 self.logError(e)
                 return []
@@ -80,8 +80,8 @@ class MultiHook(Hook):
             try:
                 configmode = self.getConfig("mode", 'all')
                 if configmode in ("listed", "unlisted"):
-                    list      = self.getConfig("pluginlist", '').replace('|', ',').replace(';', ',').split(',')
-                    configset = self.pluginSet(list)
+                    pluginlist = self.getConfig("pluginlist", '').replace('|', ',').replace(';', ',').split(',')
+                    configset  = self.pluginSet(pluginlist)
 
                     if configmode == "listed":
                         pluginset &= configset
@@ -96,16 +96,17 @@ class MultiHook(Hook):
         return self.plugins
 
 
-    def pluginSet(self, hosters):
-        hosters = set((str(x).strip().lower() for x in hosters))
+    def pluginSet(self, plugins):
+        plugins = set((str(x).strip().lower() for x in plugins))
 
         for rep in self.PLUGIN_REPLACEMENTS:
-            if rep[0] in hosters:
-                hosters.remove(rep[0])
-                hosters.add(rep[1])
+            if rep[0] in plugins:
+                plugins.remove(rep[0])
+                plugins.add(rep[1])
 
-        hosters.discard('')
-        return hosters
+        plugins.discard('')
+
+        return plugins
 
 
     def getHosters(self):
@@ -148,7 +149,7 @@ class MultiHook(Hook):
     def overridePlugins(self):
         excludedList = []
 
-        if self.type is "hoster":
+        if self.type == "hoster":
             pluginMap    = dict((name.lower(), name) for name in self.core.pluginManager.hosterPlugins.iterkeys())
             accountList  = [account.type.lower() for account in self.core.api.getAccounts(False) if account.valid and account.premium]
         else:
@@ -212,7 +213,7 @@ class MultiHook(Hook):
 
 
     def unload(self):
-        """Remove override for all hosters. Scheduler job is removed by hookmanager"""
+        """Remove override for all plugins. Scheduler job is removed by hookmanager"""
         for plugin in self.supported:
             self.unloadPlugin(plugin)
 
@@ -226,7 +227,7 @@ class MultiHook(Hook):
 
     def downloadFailed(self, pyfile):
         """remove plugin override if download fails but not if file is offline/temp.offline"""
-        if self.type is "hoster" and pyfile.hasStatus("failed") and self.getConfig("revertfailed", True):
+        if pyfile.hasStatus("failed") and self.getConfig("revertfailed", True):
             hdict = self.core.pluginManager.plugins[self.type][pyfile.pluginname]
             if "new_name" in hdict and hdict['new_name'] == self.__name__:
                 self.logDebug("Unload MultiHook", pyfile.pluginname, hdict)
-- 
cgit v1.2.3


From db1ea11119adb71293fe2118d6257a3921709a7b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 31 Dec 2014 00:00:49 +0100
Subject: [SimpleHoster] Clean lastDownload when download fails

---
 module/plugins/internal/SimpleHoster.py | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 6075e3f67..2792834f2 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -181,7 +181,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.84"
+    __version__ = "0.85"
 
     __pattern__ = r'^unmatchable$'
 
@@ -430,6 +430,8 @@ class SimpleHoster(Hoster):
             self.retry(10, reason=_("Wrong captcha"))
 
         elif not self.lastDownload or not exists(fs_encode(self.lastDownload)):
+            self.lastDownload = ""
+
             errmsg = _("No file downloaded")
             if 'error' in self.info:
                 self.fail(errmsg, self.info['error'])
@@ -447,6 +449,8 @@ class SimpleHoster(Hoster):
                 errmsg = check.strip().capitalize()
                 if self.lastCheck:
                     errmsg += " | " + self.lastCheck.group(0).strip()
+
+                self.lastDownload = ""
                 self.retry(10, 60, errmsg)
 
 
@@ -473,7 +477,8 @@ class SimpleHoster(Hoster):
 
     def checkStatus(self, getinfo=True):
         if getinfo:
-            self.updateInfo(self.getInfo(self.pyfile.url, self.html))
+            self.logDebug("File info (BEFORE): %s" % self.info)
+            self.info.update(self.getInfo(self.pyfile.url, self.html))
 
         status = self.info['status']
 
@@ -490,7 +495,9 @@ class SimpleHoster(Hoster):
 
     def checkNameSize(self, getinfo=True):
         if getinfo:
-            self.updateInfo(self.getInfo(self.pyfile.url, self.html))
+            self.logDebug("File info (BEFORE): %s" % self.info)
+            self.info.update(self.getInfo(self.pyfile.url, self.html))
+            self.logDebug("File info (AFTER): %s"  % self.info)
 
         name = self.info['name']
         size = self.info['size']
@@ -515,8 +522,8 @@ class SimpleHoster(Hoster):
 
         if self.html:
             self.checkErrors()
+            self.checkNameSize()
 
-        self.checkNameSize()
         self.checkStatus(getinfo=False)
 
 
@@ -527,28 +534,22 @@ class SimpleHoster(Hoster):
         return self.info
 
 
-    def updateInfo(self, info):
-        self.logDebug(_("File info (BEFORE): %s") % self.info)
-        self.info.update(info)
-        self.logDebug(_("File info (AFTER): %s")  % self.info)
-
-
-    def handleDirect(self):
-        link = _isDirectLink(self, self.pyfile.url, self.resumeDownload)
+    def handleDirect(self, pyfile=None):
+        link = _isDirectLink(self, pyfile.url, self.resumeDownload)
 
         if link:
             self.logInfo(_("Direct download link detected"))
 
             self.link = link
         else:
-            self.logDebug(_("Direct download link not found"))
+            self.logDebug("Direct download link not found")
 
 
-    def handleMulti(self):  #: Multi-hoster handler
+    def handleMulti(self, pyfile=None):  #: Multi-hoster handler
         pass
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile=None):
         if not hasattr(self, 'LINK_FREE_PATTERN'):
             self.fail(_("Free download not implemented"))
 
@@ -563,7 +564,7 @@ class SimpleHoster(Hoster):
             self.fail(e)
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile=None):
         if not hasattr(self, 'LINK_PREMIUM_PATTERN'):
             self.fail(_("Premium download not implemented"))
 
-- 
cgit v1.2.3


From be51f9235eb555be07b9d5cc0a34c73b75ac0cfe Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 31 Dec 2014 00:05:39 +0100
Subject: Handle methods get pyfile argument

---
 module/plugins/internal/MultiHoster.py   |  6 +++---
 module/plugins/internal/SimpleCrypter.py | 12 +++++++-----
 module/plugins/internal/XFSHoster.py     |  8 ++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 8cdb2fbff..810eab4ee 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -73,11 +73,11 @@ class MultiHoster(SimpleHoster):
         self.checkFile()
 
 
-    def handlePremium(self):
-        return self.handleFree()
+    def handlePremium(self, pyfile=None):
+        return self.handleFree(pyfile)
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile=None):
         if self.premium:
             raise NotImplementedError
         else:
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 566252245..c83ee8a78 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -12,7 +12,7 @@ from module.utils import fixup
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.36"
+    __version__ = "0.37"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
@@ -108,7 +108,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
         self.links = self.getLinks()
 
         if hasattr(self, 'PAGES_PATTERN') and hasattr(self, 'loadPage'):
-            self.handleMultiPages()
+            self.handlePages(pyfile)
 
         self.logDebug("Package has %d links" % len(self.links))
 
@@ -121,7 +121,9 @@ class SimpleCrypter(Crypter, SimpleHoster):
 
     def checkNameSize(self, getinfo=True):
         if getinfo:
-            self.updateInfo(self.getInfo(self.pyfile.url, self.html))
+            self.logDebug("File info (BEFORE): %s" % self.info)
+            self.info.update(self.getInfo(self.pyfile.url, self.html))
+            self.logDebug("File info (AFTER): %s"  % self.info)
 
         name = self.info['name']
         url  = self.info['url']
@@ -133,7 +135,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
 
         folder = self.info['folder'] = self.pyfile.name
 
-        self.logDebug("File name: %s" % self.pyfile.name,
+        self.logDebug("File name: %s"   % self.pyfile.name,
                       "File folder: %s" % folder)
 
 
@@ -145,7 +147,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
         return re.findall(self.LINK_PATTERN, self.html)
 
 
-    def handleMultiPages(self):
+    def handlePages(self, pyfile):
         try:
             m = re.search(self.PAGES_PATTERN, self.html)
             pages = int(m.group(1))
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 4555e7b0f..474e2ec10 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -82,7 +82,7 @@ class XFSHoster(SimpleHoster):
             self.directDL = bool(self.premium)
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile=None):
         link = self.getDownloadLink()
 
         if link:
@@ -101,8 +101,8 @@ class XFSHoster(SimpleHoster):
             self.fail(_("Download link not found"))
 
 
-    def handlePremium(self):
-        return self.handleFree()
+    def handlePremium(self, pyfile=None):
+        return self.handleFree(pyfile)
 
 
     def getDownloadLink(self):
@@ -139,7 +139,7 @@ class XFSHoster(SimpleHoster):
         return m.group(1).strip()  #@TODO: Remove .strip() in 0.4.10
 
 
-    def handleMulti(self):
+    def handleMulti(self, pyfile=None):
         if not self.account:
             self.fail(_("Only registered or premium users can use url leech feature"))
 
-- 
cgit v1.2.3


From d07caf13ccfd9b4ca6066078764f9a9267423ff1 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 31 Dec 2014 00:28:56 +0100
Subject: Handle methods get pyfile argument (2)

---
 module/plugins/internal/MultiHoster.py  |  4 ++--
 module/plugins/internal/SimpleHoster.py | 10 +++++-----
 module/plugins/internal/XFSHoster.py    |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 810eab4ee..16c32b3ef 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.27"
+    __version__ = "0.28"
 
     __pattern__ = r'^unmatchable$'
 
@@ -52,7 +52,7 @@ class MultiHoster(SimpleHoster):
 
         if self.directDL:
             self.logDebug("Looking for direct download link...")
-            self.handleDirect()
+            self.handleDirect(pyfile)
 
         if self.link:
             self.pyfile.url = self.link
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 2792834f2..7b96205c8 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -181,7 +181,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.85"
+    __version__ = "0.86"
 
     __pattern__ = r'^unmatchable$'
 
@@ -392,11 +392,11 @@ class SimpleHoster(Hoster):
 
         if self.directDL:
             self.logDebug("Looking for direct download link...")
-            self.handleDirect()
+            self.handleDirect(pyfile)
 
         if self.multihost and not self.link and not self.lastDownload:
             self.logDebug("Looking for leeched download link...")
-            self.handleMulti()
+            self.handleMulti(pyfile)
 
             if not self.link and not self.lastDownload:
                 self.MULTI_HOSTER = False
@@ -534,7 +534,7 @@ class SimpleHoster(Hoster):
         return self.info
 
 
-    def handleDirect(self, pyfile=None):
+    def handleDirect(self, pyfile):
         link = _isDirectLink(self, pyfile.url, self.resumeDownload)
 
         if link:
@@ -545,7 +545,7 @@ class SimpleHoster(Hoster):
             self.logDebug("Direct download link not found")
 
 
-    def handleMulti(self, pyfile=None):  #: Multi-hoster handler
+    def handleMulti(self, pyfile):  #: Multi-hoster handler
         pass
 
 
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 474e2ec10..e15504d16 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -15,7 +15,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.33"
+    __version__ = "0.34"
 
     __pattern__ = r'^unmatchable$'
 
@@ -139,7 +139,7 @@ class XFSHoster(SimpleHoster):
         return m.group(1).strip()  #@TODO: Remove .strip() in 0.4.10
 
 
-    def handleMulti(self, pyfile=None):
+    def handleMulti(self, pyfile):
         if not self.account:
             self.fail(_("Only registered or premium users can use url leech feature"))
 
@@ -152,7 +152,7 @@ class XFSHoster(SimpleHoster):
         action += upload_id + "&js_on=1&utype=prem&upload_type=url"
 
         inputs['tos'] = '1'
-        inputs['url_mass'] = self.pyfile.url
+        inputs['url_mass'] = pyfile.url
         inputs['up1oad_type'] = 'url'
 
         self.logDebug(action, inputs)
-- 
cgit v1.2.3


From 3cf12589b86aed7a73a1bc5affc0a8d257f6cd60 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 31 Dec 2014 17:06:09 +0100
Subject: [SimpleHoster] Fix info stuff

---
 module/plugins/internal/SimpleHoster.py | 121 +++++++++++++++++++-------------
 1 file changed, 71 insertions(+), 50 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 7b96205c8..0b2c1f7c3 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -2,6 +2,7 @@
 
 import re
 
+from inspect import isclass
 from os.path import exists
 from time import time
 from urllib import unquote
@@ -124,12 +125,40 @@ def timestamp():
     return int(time() * 1000)
 
 
-#@TODO: Move to hoster class in 0.4.10
-def _isDirectLink(self, url, resumable=False):
+#@TODO: Move to hoster class in 0.4.10 as staticmethod
+def _isDirectLink(plugin, url, resumable=False):
     link = ""
 
+    if isclass(plugin) or not hasattr(plugin, "load"):
+        load         = getURL
+        parse_header = True
+    else:
+        load         = plugin.load
+        parse_header = False
+
     for i in xrange(5 if resumable else 1):
-        header = self.load(url, ref=True, cookies=True, just_header=True, decode=True)
+        header = load(url, just_header=True, decode=True)
+
+        if parse_header:
+            h = {}
+            for line in header.splitlines():
+                line = line.strip()
+                if not line or ":" not in line:
+                    continue
+
+                key, none, value = line.partition(":")
+                key              = key.lower().strip()
+                value            = value.strip()
+
+                if key in h:
+                    if type(h[key]) == list:
+                        h[key].append(value)
+                    else:
+                        h[key] = [h[key], value]
+                else:
+                    h[key] = value
+
+            header = h
 
         if 'content-disposition' in header or 'content-length' in header:
             link = url
@@ -147,15 +176,15 @@ def _isDirectLink(self, url, resumable=False):
 
             elif resumable:
                 url = location
-                self.logDebug("Redirect #%d to: %s" % (++i, location))
+                # plugin.logDebug("Redirect #%d to: %s" % (++i, location))
                 continue
 
-        elif 'content-type' in header and header['content-type' ] and "html" not in header['content-type']:
+        elif 'content-type' in header and header['content-type'] and "html" not in header['content-type']:
             link = url
 
         break
-    else:
-        self.logError(_("Too many redirects"))
+    # else:
+        # plugin.logError(_("Too many redirects"))
 
     return link
 
@@ -181,7 +210,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.86"
+    __version__ = "0.87"
 
     __pattern__ = r'^unmatchable$'
 
@@ -263,17 +292,15 @@ class SimpleHoster(Hoster):
             pass
 
         if not html:
-            try:
-                if not url:
-                    info['error']  = "missing url"
-                    info['status'] = 1
-                    raise
+            if not url:
+                info['error']  = "missing url"
+                info['status'] = 1
 
-                if _isDirectLink(url):
-                    info['error']  = "direct link"
-                    info['status'] = 2
-                    raise
+            elif _isDirectLink(cls, url):
+                info['error']  = "direct link"
+                info['status'] = 2
 
+            else:
                 try:
                     html = getURL(url, cookies=cls.COOKIES, decode=not cls.TEXT_ENCODING)
 
@@ -285,46 +312,40 @@ class SimpleHoster(Hoster):
 
                     if e.code is 404:
                         info['status'] = 1
-                        raise
 
-                    if e.code is 503:
+                    elif e.code is 503:
                         info['status'] = 6
-                        raise
-            except:
-                return info
 
-        if hasattr(cls, "OFFLINE_PATTERN") and re.search(cls.OFFLINE_PATTERN, html):
-            info['status'] = 1
+        if html:
+            if hasattr(cls, "OFFLINE_PATTERN") and re.search(cls.OFFLINE_PATTERN, html):
+                info['status'] = 1
 
-        elif hasattr(cls, "FILE_OFFLINE_PATTERN") and re.search(cls.FILE_OFFLINE_PATTERN, html):  #@TODO: Remove in 0.4.10
-            info['status'] = 1
+            elif hasattr(cls, "FILE_OFFLINE_PATTERN") and re.search(cls.FILE_OFFLINE_PATTERN, html):  #@TODO: Remove in 0.4.10
+                info['status'] = 1
 
-        elif hasattr(cls, "TEMP_OFFLINE_PATTERN") and re.search(cls.TEMP_OFFLINE_PATTERN, html):
-            info['status'] = 6
+            elif hasattr(cls, "TEMP_OFFLINE_PATTERN") and re.search(cls.TEMP_OFFLINE_PATTERN, html):
+                info['status'] = 6
 
-        else:
-            if not 'pattern' in info:
-                info['pattern'] = {}
-
-            for pattern in ("FILE_INFO_PATTERN", "INFO_PATTERN",
-                            "FILE_NAME_PATTERN", "NAME_PATTERN",
-                            "FILE_SIZE_PATTERN", "SIZE_PATTERN",
-                            "HASHSUM_PATTERN"):  #@TODO: Remove old patterns starting with "FILE_" in 0.4.10
-                try:
-                    attr  = getattr(cls, pattern)
-                    pdict = re.search(attr, html).groupdict()
-
-                    if all(True for k in pdict if k not in info['pattern']):
-                        info['pattern'].update(pdict)
-
-                except AttributeError:
-                    continue
+            else:
+                for pattern in ("FILE_INFO_PATTERN", "INFO_PATTERN",
+                                "FILE_NAME_PATTERN", "NAME_PATTERN",
+                                "FILE_SIZE_PATTERN", "SIZE_PATTERN",
+                                "HASHSUM_PATTERN"):  #@TODO: Remove old patterns starting with "FILE_" in 0.4.10
+                    try:
+                        attr  = getattr(cls, pattern)
+                        pdict = re.search(attr, html).groupdict()
+
+                        if all(True for k in pdict if k not in info['pattern']):
+                            info['pattern'].update(pdict)
+
+                    except AttributeError:
+                        continue
 
-                else:
-                    online = True
+                    else:
+                        online = True
 
-            if not info['pattern']:
-                info.pop('pattern', None)
+        if 'pattern' in info and not info['pattern']:
+            info.pop('pattern', None)
 
         if online:
             info['status'] = 2
@@ -388,7 +409,7 @@ class SimpleHoster(Hoster):
 
     def process(self, pyfile):
         self.prepare()
-        self.checkNameSize()
+        self.checkInfo()
 
         if self.directDL:
             self.logDebug("Looking for direct download link...")
-- 
cgit v1.2.3


From 60e9c46f32d97d01d728c8515985b58ba33fdafd Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 1 Jan 2015 01:48:37 +0100
Subject: [SimpleHoster] Fix https://github.com/pyload/pyload/issues/997

---
 module/plugins/internal/SimpleHoster.py | 46 +++++----------------------------
 1 file changed, 7 insertions(+), 39 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 0b2c1f7c3..51891c3c6 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -125,40 +125,12 @@ def timestamp():
     return int(time() * 1000)
 
 
-#@TODO: Move to hoster class in 0.4.10 as staticmethod
-def _isDirectLink(plugin, url, resumable=False):
+#@TODO: Move to hoster class in 0.4.10
+def _isDirectLink(self, url, resumable=False):
     link = ""
 
-    if isclass(plugin) or not hasattr(plugin, "load"):
-        load         = getURL
-        parse_header = True
-    else:
-        load         = plugin.load
-        parse_header = False
-
     for i in xrange(5 if resumable else 1):
-        header = load(url, just_header=True, decode=True)
-
-        if parse_header:
-            h = {}
-            for line in header.splitlines():
-                line = line.strip()
-                if not line or ":" not in line:
-                    continue
-
-                key, none, value = line.partition(":")
-                key              = key.lower().strip()
-                value            = value.strip()
-
-                if key in h:
-                    if type(h[key]) == list:
-                        h[key].append(value)
-                    else:
-                        h[key] = [h[key], value]
-                else:
-                    h[key] = value
-
-            header = h
+        header = self.load(url, ref=True, cookies=True, just_header=True, decode=True)
 
         if 'content-disposition' in header or 'content-length' in header:
             link = url
@@ -176,15 +148,15 @@ def _isDirectLink(plugin, url, resumable=False):
 
             elif resumable:
                 url = location
-                # plugin.logDebug("Redirect #%d to: %s" % (++i, location))
+                self.logDebug("Redirect #%d to: %s" % (++i, location))
                 continue
 
         elif 'content-type' in header and header['content-type'] and "html" not in header['content-type']:
             link = url
 
         break
-    # else:
-        # plugin.logError(_("Too many redirects"))
+    else:
+        self.logError(_("Too many redirects"))
 
     return link
 
@@ -210,7 +182,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.87"
+    __version__ = "0.88"
 
     __pattern__ = r'^unmatchable$'
 
@@ -296,10 +268,6 @@ class SimpleHoster(Hoster):
                 info['error']  = "missing url"
                 info['status'] = 1
 
-            elif _isDirectLink(cls, url):
-                info['error']  = "direct link"
-                info['status'] = 2
-
             else:
                 try:
                     html = getURL(url, cookies=cls.COOKIES, decode=not cls.TEXT_ENCODING)
-- 
cgit v1.2.3


From bbf4c9d993d09ea09e6fae04d2fa5ebb8a237385 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 2 Jan 2015 02:45:22 +0100
Subject: [MultiHook] Store account type

---
 module/plugins/internal/MultiHook.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 8164a02fc..5cb72677f 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -9,7 +9,7 @@ from module.utils import remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.26"
+    __version__ = "0.27"
 
     __config__ = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"),
                   ("pluginlist"  , "str"                , "Plugin list (comma separated)"                , ""   ),
@@ -49,6 +49,10 @@ class MultiHook(Hook):
         self.new_supported = []
 
 
+    def coreReady(self):
+        self.account = self.core.accountManager.getAccountPlugin(self.__name__)
+
+
     def getURL(self, *args, **kwargs):  #@TODO: Remove in 0.4.10
         """ see HTTPRequest for argument list """
         h = pyreq.getHTTPRequest(timeout=120)
@@ -131,7 +135,8 @@ class MultiHook(Hook):
 
         self.logInfo(_("Reloading supported %s list") % self.type)
 
-        old_supported      = self.supported
+        old_supported = self.supported
+
         self.supported     = []
         self.new_supported = []
         self.plugins       = []
-- 
cgit v1.2.3


From ea58af3c625d90aec6becfd943289e42e4a71a9a Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 2 Jan 2015 02:49:26 +0100
Subject: Code cosmetics

---
 module/plugins/internal/SimpleHoster.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 51891c3c6..7bab78ce8 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -447,13 +447,13 @@ class SimpleHoster(Hoster):
         if hasattr(self, 'PREMIUM_ONLY_PATTERN') and self.premium and re.search(self.PREMIUM_ONLY_PATTERN, self.html):
             self.fail(_("Link require a premium account to be handled"))
 
-        if hasattr(self, 'ERROR_PATTERN'):
+        elif hasattr(self, 'ERROR_PATTERN'):
             m = re.search(self.ERROR_PATTERN, self.html)
             if m:
                 errmsg = self.info['error'] = m.group(1)
                 self.error(errmsg)
 
-        if hasattr(self, 'WAIT_PATTERN'):
+        elif hasattr(self, 'WAIT_PATTERN'):
             m = re.search(self.WAIT_PATTERN, self.html)
             if m:
                 wait_time = sum([int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
-- 
cgit v1.2.3


From f321ae380c31b345c403aa02804eabfaf586aa59 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 2 Jan 2015 15:43:35 +0100
Subject: [SimpleHoster] Fix _isDirectLink

---
 module/plugins/internal/SimpleHoster.py | 43 ++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 19 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 7bab78ce8..4e2b4803b 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -132,7 +132,7 @@ def _isDirectLink(self, url, resumable=False):
     for i in xrange(5 if resumable else 1):
         header = self.load(url, ref=True, cookies=True, just_header=True, decode=True)
 
-        if 'content-disposition' in header or 'content-length' in header:
+        if 'content-disposition' in header:
             link = url
 
         elif 'location' in header and header['location']:
@@ -143,14 +143,14 @@ def _isDirectLink(self, url, resumable=False):
                 base = "%s://%s" % (p.scheme, p.netloc)
                 location = urljoin(base, location)
 
-            if 'code' in header and header['code'] == 302:
-                link = location
-
-            elif resumable:
+            if resumable:
                 url = location
                 self.logDebug("Redirect #%d to: %s" % (++i, location))
                 continue
 
+            elif 'code' in header and header['code'] == 302:
+                link = location
+
         elif 'content-type' in header and header['content-type'] and "html" not in header['content-type']:
             link = url
 
@@ -182,7 +182,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.88"
+    __version__ = "0.89"
 
     __pattern__ = r'^unmatchable$'
 
@@ -469,6 +469,9 @@ class SimpleHoster(Hoster):
             self.logDebug("File info (BEFORE): %s" % self.info)
             self.info.update(self.getInfo(self.pyfile.url, self.html))
 
+        if 'status' not in self.info:
+            return
+
         status = self.info['status']
 
         if status is 1:
@@ -488,22 +491,24 @@ class SimpleHoster(Hoster):
             self.info.update(self.getInfo(self.pyfile.url, self.html))
             self.logDebug("File info (AFTER): %s"  % self.info)
 
-        name = self.info['name']
-        size = self.info['size']
-        url  = self.info['url']
+        try:
+            name = self.info['name']
+            size = self.info['size']
+            url  = self.info['url']
 
-        if name and name != url:
-            self.pyfile.name = name
-        else:
-            self.pyfile.name = name = self.info['name'] = urlparse(name).path.split('/')[-1]
+            if name and name != url:
+                self.pyfile.name = name
+            else:
+                self.pyfile.name = name = self.info['name'] = urlparse(name).path.split('/')[-1]
 
-        if size > 0:
-            self.pyfile.size = size
-        else:
-            size = "Unknown"
+            if size > 0:
+                self.pyfile.size = size
+
+        except Exception:
+            pass
 
-        self.logDebug("File name: %s" % name,
-                      "File size: %s" % size)
+        self.logDebug("File name: %s" % self.pyfile.name,
+                      "File size: %s" % self.pyfile.size if self.pyfile.size > 0 else "Unknown")
 
 
     def checkInfo(self):
-- 
cgit v1.2.3


From 8d1231901b3ccccdc2d3d2593c0baf4ff7be4220 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 2 Jan 2015 15:46:46 +0100
Subject: Spare code cosmetics

---
 module/plugins/internal/SimpleCrypter.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index c83ee8a78..bfc473801 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -125,13 +125,17 @@ class SimpleCrypter(Crypter, SimpleHoster):
             self.info.update(self.getInfo(self.pyfile.url, self.html))
             self.logDebug("File info (AFTER): %s"  % self.info)
 
-        name = self.info['name']
-        url  = self.info['url']
+        try:
+            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(name).path.split('/')[-1]
 
-        if name and name != url:
-            self.pyfile.name = name
-        else:
-            self.pyfile.name = self.info['name'] = urlparse(name).path.split('/')[-1]
+        except Exception:
+            pass
 
         folder = self.info['folder'] = self.pyfile.name
 
-- 
cgit v1.2.3


From cbfd244f6240a6e29420d10a2aef8fa107cf8d7c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 3 Jan 2015 02:11:08 +0100
Subject: [MultiHoster] Improve info grabbing

---
 module/plugins/internal/MultiHoster.py | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 16c32b3ef..60320399a 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.28"
+    __version__ = "0.29"
 
     __pattern__ = r'^unmatchable$'
 
@@ -50,15 +50,26 @@ class MultiHoster(SimpleHoster):
     def process(self, pyfile):
         self.prepare()
 
+        try:
+            module = self.core.pluginManager.hosterPlugins[self.__name__]['module']
+            klass  = getattr(module, self.__name__)
+
+            self.logDebug("File info (BEFORE): %s" % self.info)
+            self.info.update(klass.getInfo(self.pyfile.url, self.html))
+            self.logDebug("File info (AFTER): %s"  % self.info)
+
+        except Exception:
+            self.checkNameSize()
+
+        else:
+            self.checkNameSize(getinfo=False)
+            self.checkStatus(getinfo=False)
+
         if self.directDL:
             self.logDebug("Looking for direct download link...")
             self.handleDirect(pyfile)
 
-        if self.link:
-            self.pyfile.url = self.link
-            self.checkNameSize()
-
-        elif not self.lastDownload:
+        if not self.link and not self.lastDownload:
             self.preload()
             self.checkInfo()
 
-- 
cgit v1.2.3


From 8a79ad6e25210b2ec6ce74bc5b2d55dbe303dbaa Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 3 Jan 2015 02:13:10 +0100
Subject: [MultiHook] Unload if related multihoster account is not available

---
 module/plugins/internal/MultiHook.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 5cb72677f..b5ac132b7 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -9,7 +9,7 @@ from module.utils import remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.27"
+    __version__ = "0.28"
 
     __config__ = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"),
                   ("pluginlist"  , "str"                , "Plugin list (comma separated)"                , ""   ),
@@ -51,6 +51,8 @@ class MultiHook(Hook):
 
     def coreReady(self):
         self.account = self.core.accountManager.getAccountPlugin(self.__name__)
+        if not self.account:
+            self.setConfig('activated', False)
 
 
     def getURL(self, *args, **kwargs):  #@TODO: Remove in 0.4.10
-- 
cgit v1.2.3


From 9792c7f55449a97bbe4dcfa1579e1049fadbcf16 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 4 Jan 2015 20:22:06 +0100
Subject: [SimpleHoster] Improve checkTrafficLeft routine

---
 module/plugins/internal/SimpleHoster.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 4e2b4803b..c87a6160f 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -182,7 +182,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.89"
+    __version__ = "0.90"
 
     __pattern__ = r'^unmatchable$'
 
@@ -593,6 +593,9 @@ class SimpleHoster(Hoster):
 
 
     def checkTrafficLeft(self):
+        if not self.account:
+            return True
+
         traffic = self.account.getAccountInfo(self.user, True)['trafficleft']
 
         if traffic is None:
-- 
cgit v1.2.3


From 003c1ce55e7ac0765236d3210b8081bfc5fddb2d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 4 Jan 2015 20:23:01 +0100
Subject: [MultiHook] Better account check

---
 module/plugins/internal/MultiHook.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index b5ac132b7..ea9f32673 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -9,7 +9,7 @@ from module.utils import remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.28"
+    __version__ = "0.29"
 
     __config__ = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"),
                   ("pluginlist"  , "str"                , "Plugin list (comma separated)"                , ""   ),
@@ -43,6 +43,7 @@ class MultiHook(Hook):
 
 
     def setup(self):
+        self.account       = None
         self.type          = self.core.pluginManager.findPlugin(self.__name__)[1] or "hoster"
         self.plugins       = []
         self.supported     = []
@@ -51,7 +52,12 @@ class MultiHook(Hook):
 
     def coreReady(self):
         self.account = self.core.accountManager.getAccountPlugin(self.__name__)
+
+        if self.account and not self.account.canUse():
+            self.account = None
+
         if not self.account:
+            self.logWarning("MultiHook will be deactivated due missing account reference")
             self.setConfig('activated', False)
 
 
-- 
cgit v1.2.3


From df143e902d00903f16cf32174948f636bda56e4c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 8 Jan 2015 22:58:32 +0100
Subject: "New Year" Update: internal plugins

---
 module/plugins/internal/CaptchaService.py  |  49 ++++++---
 module/plugins/internal/MultiHook.py       | 158 ++++++++++++++++++-----------
 module/plugins/internal/MultiHoster.py     |  15 +--
 module/plugins/internal/SimpleCrypter.py   |   4 +-
 module/plugins/internal/SimpleDereferer.py |   6 +-
 module/plugins/internal/SimpleHoster.py    |  55 ++++++----
 module/plugins/internal/XFSAccount.py      |   8 +-
 module/plugins/internal/XFSCrypter.py      |   1 -
 module/plugins/internal/XFSHoster.py       |  26 ++---
 9 files changed, 197 insertions(+), 125 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 965799e8e..b429fd6e0 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -2,6 +2,7 @@
 
 import re
 
+from base64 import urlsafe_b64encode
 from random import random
 
 from module.common.json_layer import json_loads
@@ -54,14 +55,14 @@ class CaptchaService:
 
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __description__ = """ReCaptcha captcha service plugin"""
     __license__     = "GPLv3"
     __authors__     = [("pyLoad Team", "admin@pyload.org")]
 
 
-    KEY_PATTERN      = r'recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=([\w-]+)'
+    KEY_PATTERN      = r'(?:class="g-recaptcha"\s+data-sitekey="|recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=)([\w-]+)'
     KEY_AJAX_PATTERN = r'Recaptcha\.create\s*\(\s*["\']([\w-]+)'
 
 
@@ -84,7 +85,7 @@ class ReCaptcha(CaptchaService):
             return None
 
 
-    def challenge(self, key=None):
+    def challenge(self, key=None, userverify=False):
         if not key:
             if self.detect_key():
                 key = self.key
@@ -97,14 +98,30 @@ class ReCaptcha(CaptchaService):
         try:
             challenge = re.search("challenge : '(.+?)',", html).group(1)
             server    = re.search("server : '(.+?)',", html).group(1)
-        except:
+
+        except AttributeError:
             errmsg = _("ReCaptcha challenge pattern not found")
             self.plugin.fail(errmsg)
-            raise ValueError(errmsg)
+            raise AttributeError(errmsg)
 
         self.plugin.logDebug("ReCaptcha challenge: %s" % challenge)
 
-        return challenge, self.result(server, challenge)
+        response = challenge, self.result(server, challenge)
+
+        return self.userverify(*response) if userverify else response
+
+
+    def userverify(self, challenge, result):
+        response = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify",
+                                        post={'c'       : challenge,
+                                              'response': urlsafe_b64encode('{"response":"%s"}' % result)})
+        try:
+            return re.search(r'"uvresp","(.+?)"', response).group(1)
+
+        except AttributeError:
+            errmsg = _("ReCaptcha userverify response not found")
+            self.plugin.fail(errmsg)
+            raise AttributeError(errmsg)
 
 
     def result(self, server, challenge):
@@ -167,10 +184,11 @@ class AdsCaptcha(CaptchaService):
         try:
             challenge = re.search("challenge: '(.+?)',", html).group(1)
             server    = re.search("server: '(.+?)',", html).group(1)
-        except:
+
+        except AttributeError:
             errmsg = _("AdsCaptcha challenge pattern not found")
             self.plugin.fail(errmsg)
-            raise ValueError(errmsg)
+            raise AttributeError(errmsg)
 
         self.plugin.logDebug("AdsCaptcha challenge: %s" % challenge)
 
@@ -214,10 +232,11 @@ class SolveMedia(CaptchaService):
             challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="([^"]+)">',
                                   html).group(1)
             server    = "http://api.solvemedia.com/papi/media"
-        except:
+
+        except AttributeError:
             errmsg = _("SolveMedia challenge pattern not found")
             self.plugin.fail(errmsg)
-            raise ValueError(errmsg)
+            raise AttributeError(errmsg)
 
         self.plugin.logDebug("SolveMedia challenge: %s" % challenge)
 
@@ -286,10 +305,11 @@ class AdYouLike(CaptchaService):
                                          'callback': callback})
         try:
             challenge = json_loads(re.search(callback + r'\s*\((.+?)\)', html).group(1))
-        except:
+
+        except AttributeError:
             errmsg = _("AdYouLike challenge pattern not found")
             self.plugin.fail(errmsg)
-            raise ValueError(errmsg)
+            raise AttributeError(errmsg)
 
         self.plugin.logDebug("AdYouLike challenge: %s" % challenge)
 
@@ -316,10 +336,11 @@ class AdYouLike(CaptchaService):
         try:
             instructions_visual = challenge['translations'][server['all']['lang']]['instructions_visual']
             result = re.search(u'«(.+?)»', instructions_visual).group(1).strip()
-        except:
+
+        except AttributeError:
             errmsg = _("AdYouLike result not found")
             self.plugin.fail(errmsg)
-            raise ValueError(errmsg)
+            raise AttributeError(errmsg)
 
         result = {'_ayl_captcha_engine' : "adyoulike",
                   '_ayl_env'            : server['all']['env'],
diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index ea9f32673..202868175 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -9,12 +9,15 @@ from module.utils import remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.29"
+    __version__ = "0.30"
 
-    __config__ = [("mode"        , "all;listed;unlisted", "Use for plugins (if supported)"               , "all"),
-                  ("pluginlist"  , "str"                , "Plugin list (comma separated)"                , ""   ),
-                  ("revertfailed", "bool"               , "Revert to standard download if download fails", False),
-                  ("interval"    , "int"                , "Reload interval in hours (0 to disable)"      , 12   )]
+    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
+                  ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
+                  ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
+                  ("retry"         , "int"                , "Number of retries before revert"     , 10   ),
+                  ("retryinterval" , "int"                , "Retry interval in minutes"           , 1    ),
+                  ("reload"        , "bool"               , "Reload plugin list"                  , True ),
+                  ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
 
     __description__ = """Hook plugin for multi hoster/crypter"""
     __license__     = "GPLv3"
@@ -22,45 +25,68 @@ class MultiHook(Hook):
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    MIN_INTERVAL = 12 * 60 * 60  #: reload plugins every 12h
+    MIN_INTERVAL = 1 * 60 * 60
 
-    PLUGIN_REPLACEMENTS = [("1fichier.com"   , "onefichier.com"),
-                           ("2shared.com"    , "twoshared.com" ),
-                           ("4shared.com"    , "fourshared.com"),
-                           ("cloudnator.com" , "shragle.com"   ),
-                           ("easy-share.com" , "crocko.com"    ),
-                           ("fileparadox.com", "fileparadox.in"),
-                           ("freakshare.net" , "freakshare.com"),
-                           ("hellshare.com"  , "hellshare.cz"  ),
-                           ("ifile.it"       , "filecloud.io"  ),
-                           ("nowdownload.ch" , "nowdownload.sx"),
-                           ("nowvideo.co"    , "nowvideo.sx"   ),
-                           ("putlocker.com"  , "firedrive.com" ),
-                           ("share-rapid.cz" , "multishare.cz" ),
-                           ("sharerapid.cz"  , "multishare.cz" ),
-                           ("ul.to"          , "uploaded.to"   ),
-                           ("uploaded.net"   , "uploaded.to"   )]
+    DOMAIN_REPLACEMENTS = [(r'\d+.+'           , "_\0"             ),
+                           (r'bayfiles\.net'   , "bayfiles.com"    ),
+                           (r'cloudnator\.com' , "shragle.com"     ),
+                           (r'dfiles\.eu'      , "depositfiles.com"),
+                           (r'easy-share\.com' , "crocko.com"      ),
+                           (r'freakshare\.net' , "freakshare.com"  ),
+                           (r'hellshare\.com'  , "hellshare.cz"    ),
+                           (r'ifile\.it'       , "filecloud.io"    ),
+                           (r'nowdownload\.\w+', "nowdownload.sx"  ),
+                           (r'nowvideo\.\w+'   , "nowvideo.sx"     ),
+                           (r'putlocker\.com'  , "firedrive.com"   ),
+                           (r'share-?rapid\.cz', "multishare.cz"   ),
+                           (r'ul\.to'          , "uploaded.to"     ),
+                           (r'uploaded\.net'   , "uploaded.to"     ),
+                           (r'uploadhero\.co'  , "uploadhero.com"  ),
+                           (r'zshares\.net'    , "zshare.net"      )]
 
 
     def setup(self):
-        self.account       = None
-        self.type          = self.core.pluginManager.findPlugin(self.__name__)[1] or "hoster"
         self.plugins       = []
         self.supported     = []
         self.new_supported = []
 
+        self.account      = None
+        self.pluginclass  = None
+        self.pluginmodule = None
+        self.pluginname   = None
+        self.plugintype   = None
 
-    def coreReady(self):
-        self.account = self.core.accountManager.getAccountPlugin(self.__name__)
+        self._initPlugin()
+
+
+    def _initPlugin(self):
+        plugin, type = self.core.pluginManager.findPlugin(self.__name__)
+
+        if not plugin:
+            self.logWarning("Hook plugin will be deactivated due missing plugin reference")
+            self.setConfig('activated', False)
+        else:
+            self.pluginname   = self.__name__
+            self.plugintype   = type
+            self.pluginmodule = self.core.pluginManager.loadModule(type, self.__name__)
+            self.pluginclass  = getattr(self.pluginmodule, self.__name__)
+
+
+    def _loadAccount(self):
+        self.account = self.core.accountManager.getAccountPlugin(self.pluginname)
 
         if self.account and not self.account.canUse():
             self.account = None
 
-        if not self.account:
-            self.logWarning("MultiHook will be deactivated due missing account reference")
+        if not self.account and hasattr(self.pluginclass, "LOGIN_ACCOUNT") and not self.pluginclass.LOGIN_ACCOUNT:
+            self.logWarning("Hook plugin will be deactivated due missing account reference")
             self.setConfig('activated', False)
 
 
+    def coreReady(self):
+        self._loadAccount()
+
+
     def getURL(self, *args, **kwargs):  #@TODO: Remove in 0.4.10
         """ see HTTPRequest for argument list """
         h = pyreq.getHTTPRequest(timeout=120)
@@ -81,19 +107,19 @@ class MultiHook(Hook):
             return default
 
 
-    def pluginCached(self):
+    def pluginsCached(self):
         if not self.plugins:
             try:
-                pluginset = self.pluginSet(self.getHosters() if self.type == "hoster" else self.getCrypters())
+                pluginset = self._pluginSet(self.getHosters() if self.plugintype == "hoster" else self.getCrypters())
             except Exception, e:
                 self.logError(e)
                 return []
 
             try:
-                configmode = self.getConfig("mode", 'all')
+                configmode = self.getConfig("pluginmode", 'all')
                 if configmode in ("listed", "unlisted"):
                     pluginlist = self.getConfig("pluginlist", '').replace('|', ',').replace(';', ',').split(',')
-                    configset  = self.pluginSet(pluginlist)
+                    configset  = self._pluginSet(pluginlist)
 
                     if configmode == "listed":
                         pluginset &= configset
@@ -108,13 +134,14 @@ class MultiHook(Hook):
         return self.plugins
 
 
-    def pluginSet(self, plugins):
+    def _pluginSet(self, plugins):
         plugins = set((str(x).strip().lower() for x in plugins))
 
-        for rep in self.PLUGIN_REPLACEMENTS:
-            if rep[0] in plugins:
-                plugins.remove(rep[0])
-                plugins.add(rep[1])
+        for rf, rt in self.DOMAIN_REPLACEMENTS:
+            regex = re.compile(rf)
+            for p in filter(lambda x: regex.match(x), plugins):
+                plugins.remove(p)
+                plugins.add(re.sub(rf, rt, p))
 
         plugins.discard('')
 
@@ -139,9 +166,7 @@ class MultiHook(Hook):
 
     def periodical(self):
         """reload plugin list periodically"""
-        self.interval = max(self.getConfig("interval", 0), self.MIN_INTERVAL)
-
-        self.logInfo(_("Reloading supported %s list") % self.type)
+        self.logInfo(_("Reloading supported %s list") % self.plugintype)
 
         old_supported = self.supported
 
@@ -158,18 +183,24 @@ class MultiHook(Hook):
             for plugin in old_supported:
                 self.unloadPlugin(plugin)
 
+        if self.getConfig("reload", True):
+            self.interval = max(self.getConfig("reloadinterval", 12), self.MIN_INTERVAL)
+        else:
+            self.core.scheduler.removeJob(self.cb)
+            self.cb = None
+
 
     def overridePlugins(self):
         excludedList = []
 
-        if self.type == "hoster":
+        if self.plugintype == "hoster":
             pluginMap    = dict((name.lower(), name) for name in self.core.pluginManager.hosterPlugins.iterkeys())
             accountList  = [account.type.lower() for account in self.core.api.getAccounts(False) if account.valid and account.premium]
         else:
             pluginMap    = {}
             accountList  = [name[::-1].replace("Folder"[::-1], "", 1).lower()[::-1] for name in self.core.pluginManager.crypterPlugins.iterkeys()]
 
-        for plugin in self.pluginCached():
+        for plugin in self.pluginsCached():
             name = remove_chars(plugin, "-.")
 
             if name in accountList:
@@ -181,42 +212,39 @@ class MultiHook(Hook):
                     self.new_supported.append(plugin)
 
         if not self.supported and not self.new_supported:
-            self.logError(_("No %s loaded") % self.type)
+            self.logError(_("No %s loaded") % self.plugintype)
             return
 
-        module = self.core.pluginManager.getPlugin(self.__name__)
-        klass  = getattr(module, self.__name__)
-
         # inject plugin plugin
-        self.logDebug("Overwritten %ss: %s" % (self.type, ", ".join(sorted(self.supported))))
+        self.logDebug("Overwritten %ss: %s" % (self.plugintype, ", ".join(sorted(self.supported))))
 
         for plugin in self.supported:
-            hdict = self.core.pluginManager.plugins[self.type][plugin]
-            hdict['new_module'] = module
-            hdict['new_name']   = self.__name__
+            hdict = self.core.pluginManager.plugins[self.plugintype][plugin]
+            hdict['new_module'] = self.pluginmodule
+            hdict['new_name']   = self.pluginname
 
         if excludedList:
-            self.logInfo(_("%ss not overwritten: %s") % (self.type.capitalize(), ", ".join(sorted(excludedList))))
+            self.logInfo(_("%ss not overwritten: %s") % (self.plugintype.capitalize(), ", ".join(sorted(excludedList))))
 
         if self.new_supported:
             plugins = sorted(self.new_supported)
 
-            self.logDebug("New %ss: %s" % (self.type, ", ".join(plugins)))
+            self.logDebug("New %ss: %s" % (self.plugintype, ", ".join(plugins)))
 
             # create new regexp
             regexp = r'.*(%s).*' % "|".join([x.replace(".", "\.") for x in plugins])
-            if hasattr(klass, "__pattern__") and isinstance(klass.__pattern__, basestring) and '://' in klass.__pattern__:
-                regexp = r'%s|%s' % (klass.__pattern__, regexp)
+            if hasattr(self.pluginclass, "__pattern__") and isinstance(self.pluginclass.__pattern__, basestring) and '://' in self.pluginclass.__pattern__:
+                regexp = r'%s|%s' % (self.pluginclass.__pattern__, regexp)
 
             self.logDebug("Regexp: %s" % regexp)
 
-            hdict = self.core.pluginManager.plugins[self.type][self.__name__]
+            hdict = self.core.pluginManager.plugins[self.plugintype][self.pluginname]
             hdict['pattern'] = regexp
             hdict['re']      = re.compile(regexp)
 
 
     def unloadPlugin(self, plugin):
-        hdict = self.core.pluginManager.plugins[self.type][plugin]
+        hdict = self.core.pluginManager.plugins[self.plugintype][plugin]
         if "module" in hdict:
             del hdict['module']
 
@@ -231,18 +259,24 @@ class MultiHook(Hook):
             self.unloadPlugin(plugin)
 
         # reset pattern
-        klass = getattr(self.core.pluginManager.getPlugin(self.__name__), self.__name__)
-        hdict = self.core.pluginManager.plugins[self.type][self.__name__]
+        hdict = self.core.pluginManager.plugins[self.plugintype][self.pluginname]
 
-        hdict['pattern'] = getattr(klass, "__pattern__", r'^unmatchable$')
+        hdict['pattern'] = getattr(self.pluginclass, "__pattern__", r'^unmatchable$')
         hdict['re']      = re.compile(hdict['pattern'])
 
 
     def downloadFailed(self, pyfile):
         """remove plugin override if download fails but not if file is offline/temp.offline"""
-        if pyfile.hasStatus("failed") and self.getConfig("revertfailed", True):
-            hdict = self.core.pluginManager.plugins[self.type][pyfile.pluginname]
-            if "new_name" in hdict and hdict['new_name'] == self.__name__:
+        if pyfile.status != 8 or not self.getConfig("revertfailed", True):
+            return
+
+        hdict = self.core.pluginManager.plugins[self.plugintype][pyfile.pluginname]
+        if "new_name" in hdict and hdict['new_name'] == self.pluginname:
+            if pyfile.error == "MultiHook":
                 self.logDebug("Unload MultiHook", pyfile.pluginname, hdict)
                 self.unloadPlugin(pyfile.pluginname)
                 pyfile.setStatus("queued")
+            else:
+                retries   = max(self.getConfig("retry", 10), 0)
+                wait_time = max(self.getConfig("retryinterval", 1), 0)
+                pyfile.plugin.retry(retries, wait_time, "MultiHook")
diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 60320399a..ae06eaf4b 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.29"
+    __version__ = "0.30"
 
     __pattern__ = r'^unmatchable$'
 
@@ -17,12 +17,14 @@ class MultiHoster(SimpleHoster):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
+    CHECK_TRAFFIC = True
     LOGIN_ACCOUNT = True
 
 
     def setup(self):
-        self.chunkLimit = 1
-        self.multiDL    = self.premium
+        self.chunkLimit     = 1
+        self.multiDL        = bool(self.account)
+        self.resumeDownload = self.premium
 
 
     def prepare(self):
@@ -76,7 +78,8 @@ class MultiHoster(SimpleHoster):
             if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                 self.logDebug("Handled as premium download")
                 self.handlePremium()
-            else:
+
+            elif not self.LOGIN_ACCOUNT or (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                 self.logDebug("Handled as free download")
                 self.handleFree()
 
@@ -84,11 +87,11 @@ class MultiHoster(SimpleHoster):
         self.checkFile()
 
 
-    def handlePremium(self, pyfile=None):
+    def handlePremium(self, pyfile):
         return self.handleFree(pyfile)
 
 
-    def handleFree(self, pyfile=None):
+    def handleFree(self, pyfile):
         if self.premium:
             raise NotImplementedError
         else:
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index bfc473801..e16e45405 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -12,7 +12,7 @@ from module.utils import fixup
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.37"
+    __version__ = "0.38"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
@@ -82,6 +82,8 @@ class SimpleCrypter(Crypter, SimpleHoster):
 
 
     def prepare(self):
+        self.pyfile.error = ""  #@TODO: Remove in 0.4.10
+
         self.info  = {}
         self.links = []  #@TODO: Move to hoster class in 0.4.10
 
diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 04d63658e..53b80f827 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -5,13 +5,13 @@ import re
 from urllib import unquote
 
 from module.plugins.Crypter import Crypter
-from module.plugins.internal.SimpleHoster import _isDirectLink, set_cookies
+from module.plugins.internal.SimpleHoster import directLink, set_cookies
 
 
 class SimpleDereferer(Crypter):
     __name__    = "SimpleDereferer"
     __type__    = "crypter"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -45,7 +45,7 @@ class SimpleDereferer(Crypter):
 
 
     def decrypt(self, pyfile):
-        link = _isDirectLink(pyfile.url)
+        link = directLink(self, pyfile.url)
 
         if not link:
             try:
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index c87a6160f..991dc6240 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -10,6 +10,7 @@ from urlparse import urljoin, urlparse
 
 from module.PyFile import statusMap as _statusMap
 from module.network.CookieJar import CookieJar
+from module.network.HTTPRequest import BadHeader
 from module.network.RequestFactory import getURL
 from module.plugins.Hoster import Hoster
 from module.plugins.Plugin import Fail
@@ -126,7 +127,7 @@ def timestamp():
 
 
 #@TODO: Move to hoster class in 0.4.10
-def _isDirectLink(self, url, resumable=False):
+def directLink(self, url, resumable=False):
     link = ""
 
     for i in xrange(5 if resumable else 1):
@@ -182,7 +183,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.90"
+    __version__ = "0.91"
 
     __pattern__ = r'^unmatchable$'
 
@@ -244,18 +245,32 @@ class SimpleHoster(Hoster):
     CHECK_TRAFFIC = False  #: Set to True to force checking traffic left for premium account
     DIRECT_LINK   = None   #: Set to True to looking for direct link (as defined in handleDirect method), set to None to do it if self.account is True else False
     MULTI_HOSTER  = False  #: Set to True to leech other hoster link (as defined in handleMulti method)
+    LOGIN_ACCOUNT = False  #: Set to True to require account login
+
+    directLink = directLink  #@TODO: Remove in 0.4.10
 
 
     @classmethod
-    def parseInfos(cls, urls):
+    def parseInfos(cls, urls):  #@TODO: Built-in in 0.4.10 core, then remove from plugins
         for url in urls:
             url = replace_patterns(url, cls.FILE_URL_REPLACEMENTS if hasattr(cls, "FILE_URL_REPLACEMENTS") else cls.URL_REPLACEMENTS)  #@TODO: Remove FILE_URL_REPLACEMENTS check in 0.4.10
             yield cls.getInfo(url)
 
 
+    @classmethod
+    def apiInfo(cls, url="", get={}, post={}):
+        url = unquote(url)
+        return {'name'  : (urlparse(url).path.split('/')[-1]
+                           or urlparse(url).query.split('&', 1)[0].split('=', 1)[1]
+                           or _("Unknown")),
+                'size'  : 0,
+                'status': 3,
+                'url'   : url}
+
+
     @classmethod
     def getInfo(cls, url="", html=""):
-        info   = {'name': urlparse(unquote(url)).path.split('/')[-1] or _("Unknown"), 'size': 0, 'status': 3, 'url': url}
+        info   = cls.apiInfo(url)
         online = False
 
         try:
@@ -268,7 +283,7 @@ class SimpleHoster(Hoster):
                 info['error']  = "missing url"
                 info['status'] = 1
 
-            else:
+            elif info['status'] is 3:
                 try:
                     html = getURL(url, cookies=cls.COOKIES, decode=not cls.TEXT_ENCODING)
 
@@ -343,11 +358,16 @@ class SimpleHoster(Hoster):
 
 
     def prepare(self):
+        self.pyfile.error = ""  #@TODO: Remove in 0.4.10
+
         self.info      = {}
         self.link      = ""     #@TODO: Move to hoster class in 0.4.10
         self.directDL  = False  #@TODO: Move to hoster class in 0.4.10
         self.multihost = False  #@TODO: Move to hoster class in 0.4.10
 
+        if self.LOGIN_ACCOUNT and not self.account:
+            self.fail(_("Required account not found"))
+
         self.req.setOption("timeout", 120)
 
         if isinstance(self.COOKIES, list):
@@ -399,7 +419,7 @@ class SimpleHoster(Hoster):
                 self.logDebug("Handled as premium download")
                 self.handlePremium()
 
-            else:
+            elif not self.LOGIN_ACCOUNT or (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                 self.logDebug("Handled as free download")
                 self.handleFree()
 
@@ -420,15 +440,12 @@ class SimpleHoster(Hoster):
 
         elif not self.lastDownload or not exists(fs_encode(self.lastDownload)):
             self.lastDownload = ""
-
-            errmsg = _("No file downloaded")
-            if 'error' in self.info:
-                self.fail(errmsg, self.info['error'])
-            else:
-                self.fail(errmsg)
+            self.fail(errmsg, self.pyfile.error or _("No file downloaded"))
 
         else:
-            rules = {'empty file': re.compile(r"^$")}
+            rules = {'empty file': re.compile(r'\A\Z'),
+                     'html file' : re.compile(r'\A\s*<!DOCTYPE html'),
+                     'html error': re.compile(r'\A\s*(<.+>)?\d{3}[^\d]*')}
 
             if hasattr(self, 'ERROR_PATTERN'):
                 rules['error'] = re.compile(self.ERROR_PATTERN)
@@ -529,7 +546,7 @@ class SimpleHoster(Hoster):
 
 
     def handleDirect(self, pyfile):
-        link = _isDirectLink(self, pyfile.url, self.resumeDownload)
+        link = self.directLink(pyfile.url, self.resumeDownload)
 
         if link:
             self.logInfo(_("Direct download link detected"))
@@ -543,9 +560,9 @@ class SimpleHoster(Hoster):
         pass
 
 
-    def handleFree(self, pyfile=None):
+    def handleFree(self, pyfile):
         if not hasattr(self, 'LINK_FREE_PATTERN'):
-            self.fail(_("Free download not implemented"))
+            self.logError(_("Free download not implemented"))
 
         try:
             m = re.search(self.LINK_FREE_PATTERN, self.html)
@@ -558,9 +575,11 @@ class SimpleHoster(Hoster):
             self.fail(e)
 
 
-    def handlePremium(self, pyfile=None):
+    def handlePremium(self, pyfile):
         if not hasattr(self, 'LINK_PREMIUM_PATTERN'):
-            self.fail(_("Premium download not implemented"))
+            self.logError(_("Premium download not implemented"))
+            self.logDebug("Handled as free download")
+            self.handleFree()
 
         try:
             m = re.search(self.LINK_PREMIUM_PATTERN, self.html)
diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 2784ecd0b..263d78ff8 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies
 class XFSAccount(Account):
     __name__    = "XFSAccount"
     __type__    = "account"
-    __version__ = "0.33"
+    __version__ = "0.34"
 
     __description__ = """XFileSharing account plugin"""
     __license__     = "GPLv3"
@@ -35,7 +35,7 @@ class XFSAccount(Account):
     LEECH_TRAFFIC_PATTERN = r'Leech Traffic left:<b>.*?(?P<S>[\d.,]+|[Uu]nlimited)\s*(?:(?P<U>[\w^_]+)\s*)?</b>'
     LEECH_TRAFFIC_UNIT    = "MB"  #: used only if no group <U> was found
 
-    LOGIN_FAIL_PATTERN = r'>\s*(Incorrect Login or Password|Error<)'
+    LOGIN_FAIL_PATTERN = r'Incorrect Login or Password|account was banned|Error<'
 
 
     def __init__(self, manager, accounts):  #@TODO: remove in 0.4.10
@@ -76,10 +76,10 @@ class XFSAccount(Account):
                 self.logDebug("Valid until: %s" % validuntil)
 
                 if validuntil > mktime(gmtime()):
-                    premium = True
+                    premium     = True
                     trafficleft = -1
                 else:
-                    premium = False
+                    premium    = False
                     validuntil = None  #: registered account type (not premium)
         else:
             self.logDebug("VALID_UNTIL_PATTERN not found")
diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py
index 4b57dab90..3cb837aac 100644
--- a/module/plugins/internal/XFSCrypter.py
+++ b/module/plugins/internal/XFSCrypter.py
@@ -16,7 +16,6 @@ class XFSCrypter(SimpleCrypter):
 
 
     HOSTER_DOMAIN = None
-    HOSTER_NAME = None
 
     URL_REPLACEMENTS = [(r'&?per_page=\d+', ""), (r'[?/&]+$', ""), (r'(.+/[^?]+)$', r'\1?'), (r'$', r'&per_page=10000')]
 
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index e15504d16..873df8989 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -15,7 +15,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.34"
+    __version__ = "0.35"
 
     __pattern__ = r'^unmatchable$'
 
@@ -27,7 +27,6 @@ class XFSHoster(SimpleHoster):
 
 
     HOSTER_DOMAIN = None
-    HOSTER_NAME   = None
 
     TEXT_ENCODING = False
     COOKIES       = [(HOSTER_DOMAIN, "lang", "english")]
@@ -66,9 +65,6 @@ class XFSHoster(SimpleHoster):
         if not self.HOSTER_DOMAIN:
             self.fail(_("Missing HOSTER_DOMAIN"))
 
-        if not self.HOSTER_NAME:
-            self.HOSTER_NAME = "".join([str.capitalize() for str in self.HOSTER_DOMAIN.split('.')])
-
         if not self.LINK_PATTERN:
             pattern = r'(https?://(www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<]'
             self.LINK_PATTERN = pattern % self.HOSTER_DOMAIN.replace('.', '\.')
@@ -82,10 +78,8 @@ class XFSHoster(SimpleHoster):
             self.directDL = bool(self.premium)
 
 
-    def handleFree(self, pyfile=None):
-        link = self.getDownloadLink()
-
-        if link:
+    def downloadLink(self, link):
+        if link and isinstance(link, basestring):
             if self.captcha:
                 self.correctCaptcha()
 
@@ -101,11 +95,7 @@ class XFSHoster(SimpleHoster):
             self.fail(_("Download link not found"))
 
 
-    def handlePremium(self, pyfile=None):
-        return self.handleFree(pyfile)
-
-
-    def getDownloadLink(self):
+    def handleFree(self, pyfile):
         for i in xrange(1, 6):
             self.logDebug("Getting download link: #%d" % i)
 
@@ -119,7 +109,7 @@ class XFSHoster(SimpleHoster):
 
             self.req.http.c.setopt(FOLLOWLOCATION, 0)
 
-            self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True)
+            self.html = self.load(pyfile.url, post=data, ref=True, decode=True)
 
             self.req.http.c.setopt(FOLLOWLOCATION, 1)
 
@@ -136,7 +126,11 @@ class XFSHoster(SimpleHoster):
 
         self.errmsg = None
 
-        return m.group(1).strip()  #@TODO: Remove .strip() in 0.4.10
+        self.link = m.group(1).strip()  #@TODO: Remove .strip() in 0.4.10
+
+
+    def handlePremium(self, pyfile):
+        return self.handleFree(pyfile)
 
 
     def handleMulti(self, pyfile):
-- 
cgit v1.2.3


From e7d5b4df7c5b0bc859175d4d1902207f91964f89 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 9 Jan 2015 00:36:54 +0100
Subject: [SimpleHoster] Better checkDownload rules

---
 module/plugins/internal/SimpleHoster.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 991dc6240..5450f2bc9 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -445,7 +445,7 @@ class SimpleHoster(Hoster):
         else:
             rules = {'empty file': re.compile(r'\A\Z'),
                      'html file' : re.compile(r'\A\s*<!DOCTYPE html'),
-                     'html error': re.compile(r'\A\s*(<.+>)?\d{3}[^\d]*')}
+                     'html error': re.compile(r'\A\s*(<.+>)?\d{3}(\Z|\s+)')}
 
             if hasattr(self, 'ERROR_PATTERN'):
                 rules['error'] = re.compile(self.ERROR_PATTERN)
-- 
cgit v1.2.3


From ea2d07843d369d8b8fd2aa02930bf549ce94a661 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 9 Jan 2015 03:25:42 +0100
Subject: Spare fixes

---
 module/plugins/internal/MultiHook.py    | 36 ++++++++++++++++++---------------
 module/plugins/internal/MultiHoster.py  |  4 ++--
 module/plugins/internal/SimpleHoster.py | 10 ++++-----
 module/plugins/internal/XFSHoster.py    |  2 +-
 4 files changed, 28 insertions(+), 24 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 202868175..82a0a68ea 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -27,22 +27,26 @@ class MultiHook(Hook):
 
     MIN_INTERVAL = 1 * 60 * 60
 
-    DOMAIN_REPLACEMENTS = [(r'\d+.+'           , "_\0"             ),
-                           (r'bayfiles\.net'   , "bayfiles.com"    ),
-                           (r'cloudnator\.com' , "shragle.com"     ),
-                           (r'dfiles\.eu'      , "depositfiles.com"),
-                           (r'easy-share\.com' , "crocko.com"      ),
-                           (r'freakshare\.net' , "freakshare.com"  ),
-                           (r'hellshare\.com'  , "hellshare.cz"    ),
-                           (r'ifile\.it'       , "filecloud.io"    ),
-                           (r'nowdownload\.\w+', "nowdownload.sx"  ),
-                           (r'nowvideo\.\w+'   , "nowvideo.sx"     ),
-                           (r'putlocker\.com'  , "firedrive.com"   ),
-                           (r'share-?rapid\.cz', "multishare.cz"   ),
-                           (r'ul\.to'          , "uploaded.to"     ),
-                           (r'uploaded\.net'   , "uploaded.to"     ),
-                           (r'uploadhero\.co'  , "uploadhero.com"  ),
-                           (r'zshares\.net'    , "zshare.net"      )]
+    DOMAIN_REPLACEMENTS = [(r'180upload.com'   , "hundredeightyupload.com"),
+                           (r'1fichier.com'    , "onefichier.com"         ),
+                           (r'2shared.com'     , "twoshared.com"          ),
+                           (r'4shared.com'     , "fourshared.com"         ),
+                           (r'bayfiles\.net'   , "bayfiles.com"           ),
+                           (r'cloudnator\.com' , "shragle.com"            ),
+                           (r'dfiles\.eu'      , "depositfiles.com"       ),
+                           (r'easy-share\.com' , "crocko.com"             ),
+                           (r'freakshare\.net' , "freakshare.com"         ),
+                           (r'hellshare\.com'  , "hellshare.cz"           ),
+                           (r'ifile\.it'       , "filecloud.io"           ),
+                           (r'nowdownload\.\w+', "nowdownload.sx"         ),
+                           (r'nowvideo\.\w+'   , "nowvideo.sx"            ),
+                           (r'putlocker\.com'  , "firedrive.com"          ),
+                           (r'share-?rapid\.cz', "multishare.cz"          ),
+                           (r'ul\.to'          , "uploaded.to"            ),
+                           (r'uploaded\.net'   , "uploaded.to"            ),
+                           (r'uploadhero\.co'  , "uploadhero.com"         ),
+                           (r'zshares\.net'    , "zshare.net"             ),
+                           (r'\d+.+'           , "X\0"                    )]
 
 
     def setup(self):
diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index ae06eaf4b..b6eaf34aa 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -77,11 +77,11 @@ class MultiHoster(SimpleHoster):
 
             if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                 self.logDebug("Handled as premium download")
-                self.handlePremium()
+                self.handlePremium(pyfile)
 
             elif not self.LOGIN_ACCOUNT or (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                 self.logDebug("Handled as free download")
-                self.handleFree()
+                self.handleFree(pyfile)
 
         self.downloadLink(self.link)
         self.checkFile()
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 5450f2bc9..2a6624e10 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -261,7 +261,7 @@ class SimpleHoster(Hoster):
     def apiInfo(cls, url="", get={}, post={}):
         url = unquote(url)
         return {'name'  : (urlparse(url).path.split('/')[-1]
-                           or urlparse(url).query.split('&', 1)[0].split('=', 1)[1]
+                           or urlparse(url).query.split('=', 1)[::-1][0].split('&', 1)[0]
                            or _("Unknown")),
                 'size'  : 0,
                 'status': 3,
@@ -417,11 +417,11 @@ class SimpleHoster(Hoster):
 
             if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                 self.logDebug("Handled as premium download")
-                self.handlePremium()
+                self.handlePremium(pyfile)
 
             elif not self.LOGIN_ACCOUNT or (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                 self.logDebug("Handled as free download")
-                self.handleFree()
+                self.handleFree(pyfile)
 
         self.downloadLink(self.link)
         self.checkFile()
@@ -430,7 +430,7 @@ class SimpleHoster(Hoster):
     def downloadLink(self, link):
         if link and isinstance(link, basestring):
             self.correctCaptcha()
-            self.download(link, disposition=True)
+            self.download(link, disposition=False)  #@TODO: Set `disposition=True` in 0.4.10
 
 
     def checkFile(self):
@@ -579,7 +579,7 @@ class SimpleHoster(Hoster):
         if not hasattr(self, 'LINK_PREMIUM_PATTERN'):
             self.logError(_("Premium download not implemented"))
             self.logDebug("Handled as free download")
-            self.handleFree()
+            self.handleFree(pyfile)
 
         try:
             m = re.search(self.LINK_PREMIUM_PATTERN, self.html)
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 873df8989..b32f5978f 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -83,7 +83,7 @@ class XFSHoster(SimpleHoster):
             if self.captcha:
                 self.correctCaptcha()
 
-            self.download(link, ref=True, cookies=True, disposition=True)
+            self.download(link, ref=True, cookies=True, disposition=False)  #@TODO: Set `disposition=True` in 0.4.10
 
         elif self.errmsg:
             if 'captcha' in self.errmsg:
-- 
cgit v1.2.3


From 7950463dbd5cc062f89a1b69bbc1464a8e0ad1b7 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 9 Jan 2015 17:31:46 +0100
Subject: [MultiHook] Fix auto-deactivation

---
 module/plugins/internal/MultiHook.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 82a0a68ea..9acf3744f 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -9,7 +9,7 @@ from module.utils import remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.30"
+    __version__ = "0.31"
 
     __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
@@ -82,7 +82,7 @@ class MultiHook(Hook):
         if self.account and not self.account.canUse():
             self.account = None
 
-        if not self.account and hasattr(self.pluginclass, "LOGIN_ACCOUNT") and not self.pluginclass.LOGIN_ACCOUNT:
+        if not self.account and hasattr(self.pluginclass, "LOGIN_ACCOUNT") and self.pluginclass.LOGIN_ACCOUNT:
             self.logWarning("Hook plugin will be deactivated due missing account reference")
             self.setConfig('activated', False)
 
-- 
cgit v1.2.3


From 8f46ca7012fd9f17a99ae9baa3394be747f26a7e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 9 Jan 2015 21:07:41 +0100
Subject: [MultiHook] Fix encoding in _pluginSet

---
 module/plugins/internal/MultiHook.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 9acf3744f..bb132252f 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -3,13 +3,13 @@
 import re
 
 from module.plugins.Hook import Hook
-from module.utils import remove_chars
+from module.utils import decode, remove_chars
 
 
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.31"
+    __version__ = "0.32"
 
     __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
@@ -95,6 +95,8 @@ class MultiHook(Hook):
         """ see HTTPRequest for argument list """
         h = pyreq.getHTTPRequest(timeout=120)
         try:
+            if not 'decode' in kwargs:
+                kwargs['decode'] = True
             rep = h.load(*args, **kwargs)
         finally:
             h.close()
@@ -139,7 +141,7 @@ class MultiHook(Hook):
 
 
     def _pluginSet(self, plugins):
-        plugins = set((str(x).strip().lower() for x in plugins))
+        plugins = set((decode(x).strip().lower() for x in plugins))
 
         for rf, rt in self.DOMAIN_REPLACEMENTS:
             regex = re.compile(rf)
-- 
cgit v1.2.3


From 7124a00dccf36816aff73b3834131e7e392a0c3c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 9 Jan 2015 21:22:04 +0100
Subject: [SimpleHoster] Fix https://github.com/pyload/pyload/issues/1022

---
 module/plugins/internal/SimpleHoster.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 2a6624e10..1a2961167 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -183,7 +183,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.91"
+    __version__ = "0.92"
 
     __pattern__ = r'^unmatchable$'
 
@@ -274,9 +274,10 @@ class SimpleHoster(Hoster):
         online = False
 
         try:
-            info['pattern'] = re.match(cls.__pattern__, url).groupdict()  #: pattern groups will be saved here, please save api stuff to info['api']
+            info['pattern'] = re.match(cls.__pattern__, url).groupdict()  #: pattern groups will be saved here
+
         except Exception:
-            pass
+            info['pattern'] = {}
 
         if not html:
             if not url:
@@ -327,7 +328,7 @@ class SimpleHoster(Hoster):
                     else:
                         online = True
 
-        if 'pattern' in info and not info['pattern']:
+        if not info['pattern']:
             info.pop('pattern', None)
 
         if online:
-- 
cgit v1.2.3


From 4c43c2948fe0092ca6dfa8f5fa3e52325e01df5e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 10 Jan 2015 02:16:58 +0100
Subject: [FilefactoryComFolder] Fix
 https://github.com/pyload/pyload/issues/961

---
 module/plugins/internal/SimpleCrypter.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index e16e45405..c1571c679 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -155,8 +155,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
 
     def handlePages(self, pyfile):
         try:
-            m = re.search(self.PAGES_PATTERN, self.html)
-            pages = int(m.group(1))
+            pages = int(re.search(self.PAGES_PATTERN, self.html).group(1))
         except:
             pages = 1
 
-- 
cgit v1.2.3


From 9414b30e931b5659786035972690d14788b49826 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 10 Jan 2015 15:56:14 +0100
Subject: [MultiHoster] Fix filename recognition

---
 module/plugins/internal/MultiHoster.py | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index b6eaf34aa..5011b88a3 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.30"
+    __version__ = "0.31"
 
     __pattern__ = r'^unmatchable$'
 
@@ -52,28 +52,23 @@ class MultiHoster(SimpleHoster):
     def process(self, pyfile):
         self.prepare()
 
-        try:
-            module = self.core.pluginManager.hosterPlugins[self.__name__]['module']
-            klass  = getattr(module, self.__name__)
+        self.wait(5)
 
-            self.logDebug("File info (BEFORE): %s" % self.info)
-            self.info.update(klass.getInfo(self.pyfile.url, self.html))
-            self.logDebug("File info (AFTER): %s"  % self.info)
+        if self.__pattern__ != r'^unmatchable$' and re.match(self.__pattern__, pyfile.url):
+            self.checkInfo()
 
-        except Exception:
+        elif not pyfile.name or pyfile.name == pyfile.url:
             self.checkNameSize()
 
-        else:
-            self.checkNameSize(getinfo=False)
-            self.checkStatus(getinfo=False)
-
         if self.directDL:
             self.logDebug("Looking for direct download link...")
             self.handleDirect(pyfile)
 
         if not self.link and not self.lastDownload:
             self.preload()
-            self.checkInfo()
+
+            self.checkErrors()
+            self.checkStatus(getinfo=False)
 
             if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
                 self.logDebug("Handled as premium download")
-- 
cgit v1.2.3


From 502c1437e838282aa56a286bb3751382c3aaf65e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 10 Jan 2015 16:01:38 +0100
Subject: Improve getInfo

---
 module/plugins/internal/DeadCrypter.py   |  6 +++--
 module/plugins/internal/DeadHoster.py    |  6 +++--
 module/plugins/internal/MultiHook.py     | 10 ++++----
 module/plugins/internal/SimpleCrypter.py | 15 ++++++------
 module/plugins/internal/SimpleHoster.py  | 40 ++++++++++++++++++--------------
 module/plugins/internal/XFSAccount.py    |  2 +-
 6 files changed, 45 insertions(+), 34 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/DeadCrypter.py b/module/plugins/internal/DeadCrypter.py
index 07c5c3881..0fa23eef3 100644
--- a/module/plugins/internal/DeadCrypter.py
+++ b/module/plugins/internal/DeadCrypter.py
@@ -20,8 +20,10 @@ class DeadCrypter(_Crypter):
 
 
     @classmethod
-    def getInfo(cls, url="", html=""):
-        return {'name': urlparse(unquote(url)).path.split('/')[-1] or _("Unknown"), 'size': 0, 'status': 1, 'url': url}
+    def apiInfo(cls, url="", get={}, post={}):
+        api = super(DeadCrypter, self).apiInfo(url, get, post)
+        api['status'] = 1
+        return api
 
 
     def setup(self):
diff --git a/module/plugins/internal/DeadHoster.py b/module/plugins/internal/DeadHoster.py
index 6f3252f70..cc7adf4df 100644
--- a/module/plugins/internal/DeadHoster.py
+++ b/module/plugins/internal/DeadHoster.py
@@ -20,8 +20,10 @@ class DeadHoster(_Hoster):
 
 
     @classmethod
-    def getInfo(cls, url="", html=""):
-        return {'name': urlparse(unquote(url)).path.split('/')[-1] or _("Unknown"), 'size': 0, 'status': 1, 'url': url}
+    def apiInfo(cls, url="", get={}, post={}):
+        api = super(DeadHoster, self).apiInfo(url, get, post)
+        api['status'] = 1
+        return api
 
 
     def setup(self):
diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index bb132252f..4408ebf0e 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -9,7 +9,7 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.32"
+    __version__ = "0.33"
 
     __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
@@ -27,10 +27,10 @@ class MultiHook(Hook):
 
     MIN_INTERVAL = 1 * 60 * 60
 
-    DOMAIN_REPLACEMENTS = [(r'180upload.com'   , "hundredeightyupload.com"),
-                           (r'1fichier.com'    , "onefichier.com"         ),
-                           (r'2shared.com'     , "twoshared.com"          ),
-                           (r'4shared.com'     , "fourshared.com"         ),
+    DOMAIN_REPLACEMENTS = [(r'180upload\.com'  , "hundredeightyupload.com"),
+                           (r'1fichier\.com'   , "onefichier.com"         ),
+                           (r'2shared\.com'    , "twoshared.com"          ),
+                           (r'4shared\.com'    , "fourshared.com"         ),
                            (r'bayfiles\.net'   , "bayfiles.com"           ),
                            (r'cloudnator\.com' , "shragle.com"            ),
                            (r'dfiles\.eu'      , "depositfiles.com"       ),
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index c1571c679..43b1347fd 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -122,27 +122,28 @@ class SimpleCrypter(Crypter, SimpleHoster):
 
 
     def checkNameSize(self, getinfo=True):
-        if getinfo:
+        if not self.info or getinfo:
             self.logDebug("File info (BEFORE): %s" % self.info)
             self.info.update(self.getInfo(self.pyfile.url, self.html))
             self.logDebug("File info (AFTER): %s"  % self.info)
 
         try:
-            name = self.info['name']
             url  = self.info['url']
-
+            name = self.info['name']
             if name and name != url:
                 self.pyfile.name = name
-            else:
-                self.pyfile.name = self.info['name'] = urlparse(name).path.split('/')[-1]
 
         except Exception:
             pass
 
-        folder = self.info['folder'] = self.pyfile.name
+        try:
+            folder = self.info['folder'] = self.pyfile.name
+
+        except Exception:
+            pass
 
         self.logDebug("File name: %s"   % self.pyfile.name,
-                      "File folder: %s" % folder)
+                      "File folder: %s" % self.pyfile.name)
 
 
     def getLinks(self):
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 1a2961167..fb19b8725 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -183,7 +183,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.92"
+    __version__ = "0.93"
 
     __pattern__ = r'^unmatchable$'
 
@@ -264,7 +264,7 @@ class SimpleHoster(Hoster):
                            or urlparse(url).query.split('=', 1)[::-1][0].split('&', 1)[0]
                            or _("Unknown")),
                 'size'  : 0,
-                'status': 3,
+                'status': 3 if url else 8,
                 'url'   : url}
 
 
@@ -462,6 +462,10 @@ class SimpleHoster(Hoster):
 
 
     def checkErrors(self):
+        if not self.html:
+            self.logWarning(_("No html code to check"))
+            return
+
         if hasattr(self, 'PREMIUM_ONLY_PATTERN') and self.premium and re.search(self.PREMIUM_ONLY_PATTERN, self.html):
             self.fail(_("Link require a premium account to be handled"))
 
@@ -483,42 +487,44 @@ class SimpleHoster(Hoster):
 
 
     def checkStatus(self, getinfo=True):
-        if getinfo:
+        if not self.info or getinfo:
             self.logDebug("File info (BEFORE): %s" % self.info)
             self.info.update(self.getInfo(self.pyfile.url, self.html))
 
-        if 'status' not in self.info:
-            return
+        try:
+            status = self.info['status']
 
-        status = self.info['status']
+            if status is 1:
+                self.offline()
 
-        if status is 1:
-            self.offline()
+            elif status is 6:
+                self.tempOffline()
 
-        elif status is 6:
-            self.tempOffline()
+            elif status is 8:
+                self.fail()
 
-        elif status is not 2:
+        finally:
             self.logDebug("File status: %s" % statusMap[status],
                           "File info: %s"   % self.info)
 
 
     def checkNameSize(self, getinfo=True):
-        if getinfo:
+        if not self.info or getinfo:
             self.logDebug("File info (BEFORE): %s" % self.info)
             self.info.update(self.getInfo(self.pyfile.url, self.html))
             self.logDebug("File info (AFTER): %s"  % self.info)
 
         try:
-            name = self.info['name']
-            size = self.info['size']
             url  = self.info['url']
-
+            name = self.info['name']
             if name and name != url:
                 self.pyfile.name = name
-            else:
-                self.pyfile.name = name = self.info['name'] = urlparse(name).path.split('/')[-1]
 
+        except Exception:
+            pass
+
+        try:
+            size = self.info['size']
             if size > 0:
                 self.pyfile.size = size
 
diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 263d78ff8..a767a878f 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -143,7 +143,7 @@ class XFSAccount(Account):
         if isinstance(self.COOKIES, list):
             set_cookies(req.cj, self.COOKIES)
 
-        url = urljoin(self.HOSTER_URL, "login.html")
+        url  = urljoin(self.HOSTER_URL, "login.html")
         html = req.load(url, decode=True)
 
         action, inputs = parseHtmlForm('name="FL"', html)
-- 
cgit v1.2.3


From 398a0dd02df28b6bbdb8c7f950db3131e77d8183 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 10 Jan 2015 19:50:54 +0100
Subject: [MultiHook] Fix downloadFailed routine

---
 module/plugins/internal/MultiHook.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 4408ebf0e..ac53c0c9c 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -9,7 +9,7 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.33"
+    __version__ = "0.34"
 
     __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
@@ -285,4 +285,9 @@ class MultiHook(Hook):
             else:
                 retries   = max(self.getConfig("retry", 10), 0)
                 wait_time = max(self.getConfig("retryinterval", 1), 0)
-                pyfile.plugin.retry(retries, wait_time, "MultiHook")
+                
+                if 0 < retries > pyfile.plugin.retries:
+                    pyfile.plugin.retries += 1
+                    pyfile.plugin.setCustomStatus("MultiHook", "queued")
+                    pyfile.plugin.setWait(wait_time)
+                    pyfile.plugin.wait()
-- 
cgit v1.2.3


From 4b04c8d5761e77fc77207dcac7dc9a34b325877d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 10 Jan 2015 19:51:36 +0100
Subject: [MultiHoster] Use content-disposition

---
 module/plugins/internal/MultiHoster.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 5011b88a3..eca7e9ecd 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.31"
+    __version__ = "0.32"
 
     __pattern__ = r'^unmatchable$'
 
@@ -52,14 +52,9 @@ class MultiHoster(SimpleHoster):
     def process(self, pyfile):
         self.prepare()
 
-        self.wait(5)
-
         if self.__pattern__ != r'^unmatchable$' and re.match(self.__pattern__, pyfile.url):
             self.checkInfo()
 
-        elif not pyfile.name or pyfile.name == pyfile.url:
-            self.checkNameSize()
-
         if self.directDL:
             self.logDebug("Looking for direct download link...")
             self.handleDirect(pyfile)
@@ -81,6 +76,13 @@ class MultiHoster(SimpleHoster):
         self.downloadLink(self.link)
         self.checkFile()
 
+    
+    #@TODO: Remove in 0.4.10
+    def downloadLink(self, link):
+        if link and isinstance(link, basestring):
+            self.correctCaptcha()
+            self.download(link, disposition=True)
+            
 
     def handlePremium(self, pyfile):
         return self.handleFree(pyfile)
-- 
cgit v1.2.3


From aac6063859b9036612e86fb4029dc010d5c5d1e0 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 10 Jan 2015 19:53:09 +0100
Subject: Code cosmetics

---
 module/plugins/internal/MultiHook.py   | 2 +-
 module/plugins/internal/MultiHoster.py | 4 ++--
 module/plugins/internal/XFSAccount.py  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index ac53c0c9c..8bf72f21b 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -285,7 +285,7 @@ class MultiHook(Hook):
             else:
                 retries   = max(self.getConfig("retry", 10), 0)
                 wait_time = max(self.getConfig("retryinterval", 1), 0)
-                
+
                 if 0 < retries > pyfile.plugin.retries:
                     pyfile.plugin.retries += 1
                     pyfile.plugin.setCustomStatus("MultiHook", "queued")
diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index eca7e9ecd..8ca4d427f 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -76,13 +76,13 @@ class MultiHoster(SimpleHoster):
         self.downloadLink(self.link)
         self.checkFile()
 
-    
+
     #@TODO: Remove in 0.4.10
     def downloadLink(self, link):
         if link and isinstance(link, basestring):
             self.correctCaptcha()
             self.download(link, disposition=True)
-            
+
 
     def handlePremium(self, pyfile):
         return self.handleFree(pyfile)
diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index a767a878f..c350729ac 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies
 class XFSAccount(Account):
     __name__    = "XFSAccount"
     __type__    = "account"
-    __version__ = "0.34"
+    __version__ = "0.35"
 
     __description__ = """XFileSharing account plugin"""
     __license__     = "GPLv3"
@@ -48,7 +48,7 @@ class XFSAccount(Account):
             self.logError(_("Missing HOSTER_DOMAIN"))
 
         if not self.HOSTER_URL:
-            self.HOSTER_URL = "http://www.%s/" % self.HOSTER_DOMAIN or ""
+            self.HOSTER_URL = "http://www.%s/" % (self.HOSTER_DOMAIN or "")
 
 
     def loadAccountInfo(self, user, req):
-- 
cgit v1.2.3


From 4747e1d7958c9fb1180da6f3a21f3093220a6655 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 10 Jan 2015 21:17:27 +0100
Subject: Code improvements

---
 module/plugins/internal/MultiHook.py    | 49 ++++++++++++++++++++-------------
 module/plugins/internal/SimpleHoster.py |  4 +--
 2 files changed, 32 insertions(+), 21 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 8bf72f21b..a3b266679 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -2,6 +2,8 @@
 
 import re
 
+from time import sleep
+
 from module.plugins.Hook import Hook
 from module.utils import decode, remove_chars
 
@@ -9,7 +11,7 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.34"
+    __version__ = "0.35"
 
     __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
@@ -114,34 +116,43 @@ class MultiHook(Hook):
 
 
     def pluginsCached(self):
-        if not self.plugins:
+        if self.plugins:
+            return self.plugins
+            
+        for _i in xrange(3):
             try:
                 pluginset = self._pluginSet(self.getHosters() if self.plugintype == "hoster" else self.getCrypters())
+            
             except Exception, e:
-                self.logError(e)
-                return []
+                self.logError(e, "Waiting 1 minute and retry")
+                sleep(60)
+            
+            else:
+                break
+        else:
+            return list()
 
-            try:
-                configmode = self.getConfig("pluginmode", 'all')
-                if configmode in ("listed", "unlisted"):
-                    pluginlist = self.getConfig("pluginlist", '').replace('|', ',').replace(';', ',').split(',')
-                    configset  = self._pluginSet(pluginlist)
+        try:
+            configmode = self.getConfig("pluginmode", 'all')
+            if configmode in ("listed", "unlisted"):
+                pluginlist = self.getConfig("pluginlist", '').replace('|', ',').replace(';', ',').split(',')
+                configset  = self._pluginSet(pluginlist)
 
-                    if configmode == "listed":
-                        pluginset &= configset
-                    else:
-                        pluginset -= configset
+                if configmode == "listed":
+                    pluginset &= configset
+                else:
+                    pluginset -= configset
 
-            except Exception, e:
-                self.logError(e)
+        except Exception, e:
+            self.logError(e)
 
-            self.plugins = list(pluginset)
+        self.plugins = list(pluginset)
 
         return self.plugins
 
 
     def _pluginSet(self, plugins):
-        plugins = set((decode(x).strip().lower() for x in plugins))
+        plugins = set((decode(x).strip().lower() for x in plugins if '.' in x))
 
         for rf, rt in self.DOMAIN_REPLACEMENTS:
             regex = re.compile(rf)
@@ -238,7 +249,7 @@ class MultiHook(Hook):
             self.logDebug("New %ss: %s" % (self.plugintype, ", ".join(plugins)))
 
             # create new regexp
-            regexp = r'.*(%s).*' % "|".join([x.replace(".", "\.") for x in plugins])
+            regexp = r'.*(?P<DOMAIN>%s).*' % "|".join([x.replace(".", "\.") for x in plugins])
             if hasattr(self.pluginclass, "__pattern__") and isinstance(self.pluginclass.__pattern__, basestring) and '://' in self.pluginclass.__pattern__:
                 regexp = r'%s|%s' % (self.pluginclass.__pattern__, regexp)
 
@@ -287,7 +298,7 @@ class MultiHook(Hook):
                 wait_time = max(self.getConfig("retryinterval", 1), 0)
 
                 if 0 < retries > pyfile.plugin.retries:
+                    pyfile.setCustomStatus("MultiHook", "queued")
                     pyfile.plugin.retries += 1
-                    pyfile.plugin.setCustomStatus("MultiHook", "queued")
                     pyfile.plugin.setWait(wait_time)
                     pyfile.plugin.wait()
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index fb19b8725..5a32ac943 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -183,7 +183,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.93"
+    __version__ = "0.94"
 
     __pattern__ = r'^unmatchable$'
 
@@ -441,7 +441,7 @@ class SimpleHoster(Hoster):
 
         elif not self.lastDownload or not exists(fs_encode(self.lastDownload)):
             self.lastDownload = ""
-            self.fail(errmsg, self.pyfile.error or _("No file downloaded"))
+            self.fail(self.pyfile.error or _("No file downloaded"))
 
         else:
             rules = {'empty file': re.compile(r'\A\Z'),
-- 
cgit v1.2.3


From e3bdcffc6020322d9f8985c6f6be9476e8c779c9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 11 Jan 2015 23:20:32 +0100
Subject: [SkipRev] Fix https://github.com/pyload/pyload/issues/1036

---
 module/plugins/internal/SimpleHoster.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 5a32ac943..3bdaa5aef 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -115,9 +115,9 @@ def parseFileInfo(plugin, url="", html=""):
 #@NOTE: Every plugin must have own parseInfos classmethod to work with 0.4.10
 def create_getInfo(plugin):
     if hasattr(plugin, "parseInfos"):
-        fn = lambda urls: [(info['name'], info['size'], info['status'], info['url']) for info in plugin.parseInfos(urls)]
+        fn = lambda urls: map(yield, (info['name'], info['size'], info['status'], info['url']) for info in plugin.parseInfos(urls))
     else:
-        fn = lambda urls: [parseFileInfo(url) for url in urls]
+        fn = lambda urls: map(yield, parseFileInfo(url) for url in urls)
 
     return fn
 
@@ -183,7 +183,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.94"
+    __version__ = "0.95"
 
     __pattern__ = r'^unmatchable$'
 
-- 
cgit v1.2.3


From db34c2493babf7a0313fb72ac2349c324d12d0ae Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 11 Jan 2015 23:34:58 +0100
Subject: [SimpleHoster] Fix previous commit

---
 module/plugins/internal/SimpleHoster.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 3bdaa5aef..fa1ea45f2 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -114,10 +114,15 @@ def parseFileInfo(plugin, url="", html=""):
 #@TODO: Remove in 0.4.10
 #@NOTE: Every plugin must have own parseInfos classmethod to work with 0.4.10
 def create_getInfo(plugin):
+
+    def generator(list):
+        for x in list:
+            yield x
+
     if hasattr(plugin, "parseInfos"):
-        fn = lambda urls: map(yield, (info['name'], info['size'], info['status'], info['url']) for info in plugin.parseInfos(urls))
+        fn = lambda urls: generator((info['name'], info['size'], info['status'], info['url']) for info in plugin.parseInfos(urls))
     else:
-        fn = lambda urls: map(yield, parseFileInfo(url) for url in urls)
+        fn = lambda urls: generator(parseFileInfo(url) for url in urls)
 
     return fn
 
@@ -183,7 +188,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.95"
+    __version__ = "0.96"
 
     __pattern__ = r'^unmatchable$'
 
-- 
cgit v1.2.3


From 6343210720782fa99f679f87447c1418ee5875cb Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 13 Jan 2015 01:43:29 +0100
Subject: [SimpleCrypter] getLinks auto-complete links

---
 module/plugins/internal/SimpleCrypter.py | 10 +++++++---
 module/plugins/internal/SimpleHoster.py  |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 43b1347fd..d33ad77e9 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -2,7 +2,7 @@
 
 import re
 
-from urlparse import urlparse
+from urlparse import urljoin, urlparse
 
 from module.plugins.Crypter import Crypter
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, replace_patterns, set_cookies
@@ -12,7 +12,7 @@ from module.utils import fixup
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.38"
+    __version__ = "0.39"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
@@ -151,7 +151,11 @@ class SimpleCrypter(Crypter, SimpleHoster):
         Returns the links extracted from self.html
         You should override this only if it's impossible to extract links using only the LINK_PATTERN.
         """
-        return re.findall(self.LINK_PATTERN, self.html)
+        parsed = urlparse(self.pyfile.url)
+        base   = "%s://%s" % (parsed.scheme, parsed.netloc)
+
+        return [urljoin(base, link) if not urlparse(link).scheme else link \
+                for link in re.finditer(self.LINK_PATTERN, self.html)]
 
 
     def handlePages(self, pyfile):
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index fa1ea45f2..4c3d376ca 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -145,8 +145,8 @@ def directLink(self, url, resumable=False):
             location = header['location']
 
             if not urlparse(location).scheme:
-                p = urlparse(url)
-                base = "%s://%s" % (p.scheme, p.netloc)
+                parsed   = urlparse(url)
+                base     = "%s://%s" % (parsed.scheme, parsed.netloc)
                 location = urljoin(base, location)
 
             if resumable:
-- 
cgit v1.2.3


From a6754015159f1b447d870711c901cb3fc4e1515d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 13 Jan 2015 01:46:32 +0100
Subject: [MultiHook] Fix DOMAIN_REPLACEMENTS + retry feature

---
 module/plugins/internal/MultiHook.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index a3b266679..795565d73 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -11,7 +11,7 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.35"
+    __version__ = "0.36"
 
     __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
@@ -48,7 +48,7 @@ class MultiHook(Hook):
                            (r'uploaded\.net'   , "uploaded.to"            ),
                            (r'uploadhero\.co'  , "uploadhero.com"         ),
                            (r'zshares\.net'    , "zshare.net"             ),
-                           (r'\d+.+'           , "X\0"                    )]
+                           (r'(\d+.+)'         , "X\1"                    )]
 
 
     def setup(self):
@@ -118,15 +118,15 @@ class MultiHook(Hook):
     def pluginsCached(self):
         if self.plugins:
             return self.plugins
-            
+
         for _i in xrange(3):
             try:
                 pluginset = self._pluginSet(self.getHosters() if self.plugintype == "hoster" else self.getCrypters())
-            
+
             except Exception, e:
                 self.logError(e, "Waiting 1 minute and retry")
                 sleep(60)
-            
+
             else:
                 break
         else:
@@ -293,12 +293,16 @@ class MultiHook(Hook):
                 self.logDebug("Unload MultiHook", pyfile.pluginname, hdict)
                 self.unloadPlugin(pyfile.pluginname)
                 pyfile.setStatus("queued")
+                pyfile.sync()
             else:
                 retries   = max(self.getConfig("retry", 10), 0)
                 wait_time = max(self.getConfig("retryinterval", 1), 0)
 
                 if 0 < retries > pyfile.plugin.retries:
+                    self.logInfo(_("Retrying: %s") % pyfile.name)
                     pyfile.setCustomStatus("MultiHook", "queued")
+                    pyfile.sync()
+
                     pyfile.plugin.retries += 1
                     pyfile.plugin.setWait(wait_time)
                     pyfile.plugin.wait()
-- 
cgit v1.2.3


From 94429800fff775d6fde3c840318c5f26d767051c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 13 Jan 2015 01:47:45 +0100
Subject: [MultiHoster] Revert CHECK_TRAFFIC to False

---
 module/plugins/internal/MultiHoster.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 8ca4d427f..ba613c997 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.32"
+    __version__ = "0.33"
 
     __pattern__ = r'^unmatchable$'
 
@@ -17,7 +17,6 @@ class MultiHoster(SimpleHoster):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    CHECK_TRAFFIC = True
     LOGIN_ACCOUNT = True
 
 
-- 
cgit v1.2.3


From 99f3e73c86c84a39d3f83611d53c8fccc1b7305f Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 13 Jan 2015 14:53:58 +0100
Subject: [SimpleHoster] Fix https://github.com/pyload/pyload/issues/1039

---
 module/plugins/internal/SimpleHoster.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 4c3d376ca..0c8d7c5ae 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -2,6 +2,7 @@
 
 import re
 
+from datetime import datetime, timedelta
 from inspect import isclass
 from os.path import exists
 from time import time
@@ -188,7 +189,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.96"
+    __version__ = "0.97"
 
     __pattern__ = r'^unmatchable$'
 
@@ -446,7 +447,7 @@ class SimpleHoster(Hoster):
 
         elif not self.lastDownload or not exists(fs_encode(self.lastDownload)):
             self.lastDownload = ""
-            self.fail(self.pyfile.error or _("No file downloaded"))
+            self.error(self.pyfile.error or _("No file downloaded"))
 
         else:
             rules = {'empty file': re.compile(r'\A\Z'),
-- 
cgit v1.2.3


From 114542939a9ccc0d93e120d590f81a4a0f2ab809 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 13 Jan 2015 22:09:47 +0100
Subject: [SimpleHoster] Fix https://github.com/pyload/pyload/issues/1038

---
 module/plugins/internal/SimpleHoster.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 0c8d7c5ae..3f14ca711 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -189,7 +189,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.97"
+    __version__ = "0.98"
 
     __pattern__ = r'^unmatchable$'
 
@@ -334,9 +334,6 @@ class SimpleHoster(Hoster):
                     else:
                         online = True
 
-        if not info['pattern']:
-            info.pop('pattern', None)
-
         if online:
             info['status'] = 2
 
@@ -357,6 +354,9 @@ class SimpleHoster(Hoster):
                 hashtype = info['pattern']['T'] if 'T' in info['pattern'] else "hash"
                 info[hashtype] = info['pattern']['H']
 
+        if not info['pattern']:
+            info.pop('pattern', None)
+
         return info
 
 
-- 
cgit v1.2.3


From ee8c3a7f95e7ea85a74e34c434d9973fd041180f Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 13 Jan 2015 23:11:10 +0100
Subject: [XFSHoster] Auto-resolve HOSTER_DOMAIN

---
 module/plugins/internal/XFSHoster.py | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index b32f5978f..bae75c092 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -15,7 +15,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.35"
+    __version__ = "0.36"
 
     __pattern__ = r'^unmatchable$'
 
@@ -63,10 +63,28 @@ class XFSHoster(SimpleHoster):
     def prepare(self):
         """ Initialize important variables """
         if not self.HOSTER_DOMAIN:
-            self.fail(_("Missing HOSTER_DOMAIN"))
+            if self.account:
+                account = self.account
+            else:
+                account = self.pyfile.m.core.accountManager.getAccountPlugin(self.__name__)
+
+            if account and hasattr(account, "HOSTER_DOMAIN") and account.HOSTER_DOMAIN:
+                self.HOSTER_DOMAIN = account.HOSTER_DOMAIN
+            else:
+                self.fail(_("Missing HOSTER_DOMAIN"))
+
+            try:
+                self.COOKIES.index((None, "lang", "english"))
+
+            except ValueError:
+                pass
+
+            else:
+                self.COOKIES.remove((None, "lang", "english"))
+                self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english"))
 
         if not self.LINK_PATTERN:
-            pattern = r'(https?://(www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<]'
+            pattern = r'(https?://(?:www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<]'
             self.LINK_PATTERN = pattern % self.HOSTER_DOMAIN.replace('.', '\.')
 
         self.captcha = None
@@ -75,7 +93,7 @@ class XFSHoster(SimpleHoster):
         super(XFSHoster, self).prepare()
 
         if self.DIRECT_LINK is None:
-            self.directDL = bool(self.premium)
+            self.directDL = self.premium
 
 
     def downloadLink(self, link):
@@ -311,7 +329,7 @@ class XFSHoster(SimpleHoster):
         recaptcha = ReCaptcha(self)
         try:
             captcha_key = re.search(self.RECAPTCHA_PATTERN, self.html).group(1)
-        except:
+        except Exception:
             captcha_key = recaptcha.detect_key()
         else:
             self.logDebug("ReCaptcha key: %s" % captcha_key)
@@ -323,7 +341,7 @@ class XFSHoster(SimpleHoster):
         solvemedia = SolveMedia(self)
         try:
             captcha_key = re.search(self.SOLVEMEDIA_PATTERN, self.html).group(1)
-        except:
+        except Exception:
             captcha_key = solvemedia.detect_key()
         else:
             self.logDebug("SolveMedia key: %s" % captcha_key)
-- 
cgit v1.2.3


From 569c5afa7667110d138968e1c8b50f02649136ca Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 13 Jan 2015 23:13:00 +0100
Subject: [SimpleCrypter] Better account retrieving

---
 module/plugins/internal/SimpleCrypter.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index d33ad77e9..9f8eb2f7e 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -12,7 +12,7 @@ from module.utils import fixup
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.39"
+    __version__ = "0.40"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
@@ -71,12 +71,12 @@ class SimpleCrypter(Crypter, SimpleHoster):
     #@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)
+        account      = self.pyfile.m.core.accountManager.getAccountPlugin(account_name)
 
         if account and account.canUse():
             self.user, data = account.selectAccount()
-            self.req = account.getAccountRequest(self.user)
-            self.premium = account.isPremium(self.user)
+            self.req        = account.getAccountRequest(self.user)
+            self.premium    = account.isPremium(self.user)
 
             self.account = account
 
@@ -161,7 +161,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
     def handlePages(self, pyfile):
         try:
             pages = int(re.search(self.PAGES_PATTERN, self.html).group(1))
-        except:
+        except Exception:
             pages = 1
 
         for p in xrange(2, pages + 1):
-- 
cgit v1.2.3


From e1baccf1ec914563d3b2b845906cce024e7cd3b1 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 13 Jan 2015 23:14:50 +0100
Subject: Replace 'except' with 'except Exception'

---
 module/plugins/internal/UnRar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 572fe95b9..296405101 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -16,7 +16,7 @@ def renice(pid, value):
     if os.name != "nt" and value:
         try:
             Popen(["renice", str(value), str(pid)], stdout=PIPE, stderr=PIPE, bufsize=-1)
-        except:
+        except Exception:
             print "Renice failed"
 
 
-- 
cgit v1.2.3


From f2ac339fa159cd2bcea912d6fc2e40129b2dfc15 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 13 Jan 2015 23:27:54 +0100
Subject: [SimpleHoster] Improve error handling

---
 module/plugins/internal/SimpleHoster.py | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 3f14ca711..2b87c5996 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -189,7 +189,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.98"
+    __version__ = "0.99"
 
     __pattern__ = r'^unmatchable$'
 
@@ -577,16 +577,12 @@ class SimpleHoster(Hoster):
         if not hasattr(self, 'LINK_FREE_PATTERN'):
             self.logError(_("Free download not implemented"))
 
-        try:
-            m = re.search(self.LINK_FREE_PATTERN, self.html)
-            if m is None:
-                self.error(_("Free download link not found"))
-
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
+        if m is None:
+            self.error(_("Free download link not found"))
+        else:
             self.link = m.group(1)
 
-        except Exception, e:
-            self.fail(e)
-
 
     def handlePremium(self, pyfile):
         if not hasattr(self, 'LINK_PREMIUM_PATTERN'):
@@ -594,16 +590,12 @@ class SimpleHoster(Hoster):
             self.logDebug("Handled as free download")
             self.handleFree(pyfile)
 
-        try:
-            m = re.search(self.LINK_PREMIUM_PATTERN, self.html)
-            if m is None:
-                self.error(_("Premium download link not found"))
-
+        m = re.search(self.LINK_PREMIUM_PATTERN, self.html)
+        if m is None:
+            self.error(_("Premium download link not found"))
+        else:
             self.link = m.group(1)
 
-        except Exception, e:
-            self.fail(e)
-
 
     def longWait(self, wait_time=None, max_tries=3):
         if wait_time and isinstance(wait_time, (int, long, float)):
-- 
cgit v1.2.3


From e0338975e9404ba66a86d6a004db595d087b1039 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 13 Jan 2015 23:38:04 +0100
Subject: [SimpleCrypter] Fix new getLinks routine

---
 module/plugins/internal/SimpleCrypter.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 9f8eb2f7e..2e2f2ca0d 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -12,7 +12,7 @@ from module.utils import fixup
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.40"
+    __version__ = "0.41"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
@@ -155,7 +155,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
         base   = "%s://%s" % (parsed.scheme, parsed.netloc)
 
         return [urljoin(base, link) if not urlparse(link).scheme else link \
-                for link in re.finditer(self.LINK_PATTERN, self.html)]
+                for link in re.findall(self.LINK_PATTERN, self.html)]
 
 
     def handlePages(self, pyfile):
-- 
cgit v1.2.3


From 14bfb249da1a6dcda6e13f91f8b2687eb0cfb756 Mon Sep 17 00:00:00 2001
From: zapp-brannigan <zapp-brannigan@users.noreply.github.com>
Date: Wed, 14 Jan 2015 12:40:21 +0100
Subject: [CaptchaService.py] Added support for ReCaptchaV2

---
 module/plugins/internal/CaptchaService.py | 172 +++++++++++++++++++++++-------
 1 file changed, 135 insertions(+), 37 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index b429fd6e0..be6a056fc 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
 
 import re
+import time
+import base64
 
-from base64 import urlsafe_b64encode
-from random import random
+from random import random,randint
 
 from module.common.json_layer import json_loads
 
 
 class CaptchaService:
     __name__    = "CaptchaService"
-    __version__ = "0.16"
+    __version__ = "0.17"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
@@ -55,14 +56,14 @@ class CaptchaService:
 
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
-    __version__ = "0.09"
+    __version__ = "0.08"
 
     __description__ = """ReCaptcha captcha service plugin"""
     __license__     = "GPLv3"
     __authors__     = [("pyLoad Team", "admin@pyload.org")]
 
 
-    KEY_PATTERN      = r'(?:class="g-recaptcha"\s+data-sitekey="|recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=)([\w-]+)'
+    KEY_PATTERN      = r'recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=([\w-]+)'
     KEY_AJAX_PATTERN = r'Recaptcha\.create\s*\(\s*["\']([\w-]+)'
 
 
@@ -85,7 +86,7 @@ class ReCaptcha(CaptchaService):
             return None
 
 
-    def challenge(self, key=None, userverify=False):
+    def challenge(self, key=None):
         if not key:
             if self.detect_key():
                 key = self.key
@@ -98,30 +99,14 @@ class ReCaptcha(CaptchaService):
         try:
             challenge = re.search("challenge : '(.+?)',", html).group(1)
             server    = re.search("server : '(.+?)',", html).group(1)
-
-        except AttributeError:
+        except:
             errmsg = _("ReCaptcha challenge pattern not found")
             self.plugin.fail(errmsg)
-            raise AttributeError(errmsg)
+            raise ValueError(errmsg)
 
         self.plugin.logDebug("ReCaptcha challenge: %s" % challenge)
 
-        response = challenge, self.result(server, challenge)
-
-        return self.userverify(*response) if userverify else response
-
-
-    def userverify(self, challenge, result):
-        response = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify",
-                                        post={'c'       : challenge,
-                                              'response': urlsafe_b64encode('{"response":"%s"}' % result)})
-        try:
-            return re.search(r'"uvresp","(.+?)"', response).group(1)
-
-        except AttributeError:
-            errmsg = _("ReCaptcha userverify response not found")
-            self.plugin.fail(errmsg)
-            raise AttributeError(errmsg)
+        return challenge, self.result(server, challenge)
 
 
     def result(self, server, challenge):
@@ -136,6 +121,123 @@ class ReCaptcha(CaptchaService):
         return result
 
 
+class ReCaptchaV2(CaptchaService):
+    __name__    = "ReCaptchaV2"
+    __version__ = "0.01"
+
+    __description__ = """ReCaptchaV2 captcha service plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+
+
+    KEY_PATTERN     = r'data-sitekey="(.*?)">'
+
+
+    def detect_key(self, html=None):
+        if not html:
+            if hasattr(self.plugin, "html") and self.plugin.html:
+                html = self.plugin.html
+            else:
+                errmsg = _("ReCaptcha html not found")
+                self.plugin.fail(errmsg)
+                raise TypeError(errmsg)
+
+        m = re.search(self.KEY_PATTERN, html)
+        if m:
+            self.key = m.group(1).strip()
+            self.plugin.logDebug("ReCaptcha key: %s" % self.key)
+            return self.key
+        else:
+            self.plugin.logDebug("ReCaptcha key not found")
+            return None
+
+
+    def collectApiInfo(self):
+        html = self.plugin.req.load("http://www.google.com/recaptcha/api.js",cookies=True)
+        a = re.search("po.src = '(.*?)';",html).group(1)
+        vers = a.split("/")[5]
+        self.plugin.logDebug("API version: %s" %vers)
+        language = a.split("__")[1].split(".")[0]
+        self.plugin.logDebug("API language: %s" %language)
+              
+        html = self.plugin.req.load("https://apis.google.com/js/api.js",cookies=True)
+        b = re.search('"h":"(.*?)","',html).group(1)
+        jsh = b.decode('unicode-escape')
+        self.plugin.logDebug("API jsh-string: %s" %jsh)
+        
+        return vers,language,jsh
+        
+    def prepareTimeAndRpc(self):
+        html = self.plugin.req.load("http://www.google.com/recaptcha/api2/demo",cookies=True)
+        
+        millis = int(round(time.time() * 1000))
+        self.plugin.logDebug("Systemtime in milliseconds: %s" %str(millis))
+        
+        rand = randint(1,99999999)
+        a = "0.%s"%str(rand*2147483647)
+        rpc = int(100000000*float(a))
+        self.plugin.logDebug("Self-generated rpc-token: %s" %str(rpc))
+        
+        return millis,rpc
+        
+    def doTheCaptcha(self, host):
+        self.plugin.logDebug("Parent host: %s" %host)
+        botguardstring  = "!A"
+        sitekey = self.detect_key()
+        vers,language,jsh = self.collectApiInfo()
+        millis,rpc = self.prepareTimeAndRpc()
+
+        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/anchor",
+                  get={"k":sitekey, 
+                       "hl":language, 
+                       "v":vers, 
+                       "usegapi":"1", 
+                       "jsh":jsh+"#id=IO_"+str(millis), 
+                       "parent":"http://"+host, 
+                       "pfname":"",
+                       "rpctoken":rpc},
+                  cookies=True)
+        recaptchatoken = re.search('id="recaptcha-token" value="(.*?)">',html)
+        self.plugin.logDebug("Captchatoken #1: %s" %recaptchatoken.group(1))
+            
+        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/frame", get={"c":recaptchatoken.group(1),
+                                                                                        "hl":language,
+                                                                                        "v":vers, 
+                                                                                        "bg":botguardstring,
+                                                                                        "usegapi":"1", 
+                                                                                        "jsh":jsh},
+                                                                                   cookies=True)    
+        html = html.decode('unicode-escape')
+        recaptchatoken2 = re.search('"finput","(.*?)",',html)
+        self.plugin.logDebug("Captchatoken #2: %s" %recaptchatoken2.group(1))
+        recaptchatoken3 = re.search('."asconf".\s.\s,"(.*?)".',html)
+        self.plugin.logDebug("Captchatoken #3: %s" %recaptchatoken3.group(1))
+        
+        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/reload", post={"c":recaptchatoken2.group(1), 
+                                                                                          "reason":"fi", 
+                                                                                          "fbg":recaptchatoken3.group(1)},
+                                                                                    cookies=True)
+        recaptchatoken4 = re.search('"rresp","(.*?)",',html)
+        self.plugin.logDebug("Captchatoken #4: %s" %recaptchatoken4.group(1))
+            
+        millis_captcha_loading = int(round(time.time() * 1000))
+        captcha_response = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload", get={"c":recaptchatoken4.group(1)},forceUser=True)
+        respone_encoded = base64.b64encode('{"response":"%s"}' %captcha_response)
+        self.plugin.logDebug("Encoded result: %s" %respone_encoded)
+          
+        timeToSolve = int(round(time.time() * 1000)) - millis_captcha_loading
+        timeToSolveMore = timeToSolve + int(float("0."+str(randint(1,99999999))) * 500)
+        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify", cookies=True, post={"c":recaptchatoken4.group(1), 
+                                                                                                            "response":respone_encoded, 
+                                                                                                            "t":timeToSolve,
+                                                                                                            "ct":timeToSolveMore,
+                                                                                                            "bg":botguardstring})
+        recaptchatoken5 = re.search('"uvresp","(.*?)",',html)
+        self.plugin.logDebug("Captchatoken #5: %s" %recaptchatoken5.group(1))
+        
+        return recaptchatoken5.group(1)
+
+
 class AdsCaptcha(CaptchaService):
     __name__    = "AdsCaptcha"
     __version__ = "0.06"
@@ -184,11 +286,10 @@ class AdsCaptcha(CaptchaService):
         try:
             challenge = re.search("challenge: '(.+?)',", html).group(1)
             server    = re.search("server: '(.+?)',", html).group(1)
-
-        except AttributeError:
+        except:
             errmsg = _("AdsCaptcha challenge pattern not found")
             self.plugin.fail(errmsg)
-            raise AttributeError(errmsg)
+            raise ValueError(errmsg)
 
         self.plugin.logDebug("AdsCaptcha challenge: %s" % challenge)
 
@@ -232,11 +333,10 @@ class SolveMedia(CaptchaService):
             challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="([^"]+)">',
                                   html).group(1)
             server    = "http://api.solvemedia.com/papi/media"
-
-        except AttributeError:
+        except:
             errmsg = _("SolveMedia challenge pattern not found")
             self.plugin.fail(errmsg)
-            raise AttributeError(errmsg)
+            raise ValueError(errmsg)
 
         self.plugin.logDebug("SolveMedia challenge: %s" % challenge)
 
@@ -305,11 +405,10 @@ class AdYouLike(CaptchaService):
                                          'callback': callback})
         try:
             challenge = json_loads(re.search(callback + r'\s*\((.+?)\)', html).group(1))
-
-        except AttributeError:
+        except:
             errmsg = _("AdYouLike challenge pattern not found")
             self.plugin.fail(errmsg)
-            raise AttributeError(errmsg)
+            raise ValueError(errmsg)
 
         self.plugin.logDebug("AdYouLike challenge: %s" % challenge)
 
@@ -336,11 +435,10 @@ class AdYouLike(CaptchaService):
         try:
             instructions_visual = challenge['translations'][server['all']['lang']]['instructions_visual']
             result = re.search(u'«(.+?)»', instructions_visual).group(1).strip()
-
-        except AttributeError:
+        except:
             errmsg = _("AdYouLike result not found")
             self.plugin.fail(errmsg)
-            raise AttributeError(errmsg)
+            raise ValueError(errmsg)
 
         result = {'_ayl_captcha_engine' : "adyoulike",
                   '_ayl_env'            : server['all']['env'],
-- 
cgit v1.2.3


From 9f1519a690a8c0e9650ee9ec5b8ad5d7db12a2c8 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 16 Jan 2015 16:15:00 +0100
Subject: [SimpleHoster] Fix https://github.com/pyload/pyload/issues/1045

---
 module/plugins/internal/SimpleHoster.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 2b87c5996..4d7329541 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -137,6 +137,8 @@ def directLink(self, url, resumable=False):
     link = ""
 
     for i in xrange(5 if resumable else 1):
+        self.logDebug("Redirect #%d to: %s" % (i, url))
+
         header = self.load(url, ref=True, cookies=True, just_header=True, decode=True)
 
         if 'content-disposition' in header:
@@ -150,18 +152,21 @@ def directLink(self, url, resumable=False):
                 base     = "%s://%s" % (parsed.scheme, parsed.netloc)
                 location = urljoin(base, location)
 
-            if resumable:
-                url = location
-                self.logDebug("Redirect #%d to: %s" % (++i, location))
-                continue
-
-            elif 'code' in header and header['code'] == 302:
+            if 'code' in header and header['code'] == 302:
                 link = location
 
-        elif 'content-type' in header and header['content-type'] and "html" not in header['content-type']:
-            link = url
+            url = location
+            continue
+
+        elif 'content-type' in header:
+            if "html" not in header['content-type']:
+                link = url
+
+            elif link:
+                link = ""
 
         break
+
     else:
         self.logError(_("Too many redirects"))
 
@@ -189,7 +194,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.99"
+    __version__ = "1.00"
 
     __pattern__ = r'^unmatchable$'
 
-- 
cgit v1.2.3


From 1721b2e2f55e97b381da3b6a2dde034534208bc8 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 18 Jan 2015 12:15:17 +0100
Subject: [SimpleHoster] Fix and improve directLink routine (now fileUrl)

---
 module/plugins/internal/SimpleHoster.py | 63 +++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 19 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 4d7329541..c1982ee67 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 
+import mimetypes
+import os
 import re
 
 from datetime import datetime, timedelta
 from inspect import isclass
-from os.path import exists
 from time import time
 from urllib import unquote
 from urlparse import urljoin, urlparse
@@ -107,7 +108,13 @@ def parseFileInfo(plugin, url="", html=""):
         info = plugin.getInfo(url, html)
         res  = info['name'], info['size'], info['status'], info['url']
     else:
-        res  = urlparse(unquote(url)).path.split('/')[-1] or _("Unknown"), 0, 3, url
+        url  = unquote(url)
+        res  = ((urlparse(url).path.split('/')[-1]
+                 or urlparse(url).query.split('=', 1)[::-1][0].split('&', 1)[0]
+                 or _("Unknown")),
+                0,
+                3 if url else 8,
+                url)
 
     return res
 
@@ -133,10 +140,17 @@ def timestamp():
 
 
 #@TODO: Move to hoster class in 0.4.10
-def directLink(self, url, resumable=False):
-    link = ""
+def fileUrl(self, url, follow_location=False):
+    link     = ""
+    redirect = 1
 
-    for i in xrange(5 if resumable else 1):
+    if isinstance(follow_location, int):
+        redirect = max(follow_location, 1)
+
+    elif follow_location:
+        redirect = 5
+
+    for i in xrange(redirect):
         self.logDebug("Redirect #%d to: %s" % (i, url))
 
         header = self.load(url, ref=True, cookies=True, just_header=True, decode=True)
@@ -144,25 +158,36 @@ def directLink(self, url, resumable=False):
         if 'content-disposition' in header:
             link = url
 
-        elif 'location' in header and header['location']:
+        elif 'location' in header and header['location'].strip():
             location = header['location']
 
             if not urlparse(location).scheme:
-                parsed   = urlparse(url)
-                base     = "%s://%s" % (parsed.scheme, parsed.netloc)
-                location = urljoin(base, location)
+                url_p    = urlparse(url)
+                baseurl  = "%s://%s" % (url_p.scheme, url_p.netloc)
+                location = urljoin(baseurl, location)
 
             if 'code' in header and header['code'] == 302:
                 link = location
 
-            url = location
-            continue
+            if follow_location:
+                url = location
+                continue
 
-        elif 'content-type' in header:
-            if "html" not in header['content-type']:
-                link = url
+        else:
+            extension = os.path.splitext(urlparse(url).path.split('/')[-1])[-1]
+
+            if 'content-type' in header and header['content-type'].strip():
+                mimetype = header['content-type'].split(';')[0].strip()
 
-            elif link:
+            elif extension:
+                mimetype = mimetypes.guess_extension(extension, False)[0] or "application/octet-stream"
+
+            else:
+                mimetype = ""
+
+            if mimetype and (link or 'html' not in mimetype):
+                link = url
+            else:
                 link = ""
 
         break
@@ -194,7 +219,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.00"
+    __version__ = "1.01"
 
     __pattern__ = r'^unmatchable$'
 
@@ -258,7 +283,7 @@ class SimpleHoster(Hoster):
     MULTI_HOSTER  = False  #: Set to True to leech other hoster link (as defined in handleMulti method)
     LOGIN_ACCOUNT = False  #: Set to True to require account login
 
-    directLink = directLink  #@TODO: Remove in 0.4.10
+    directLink = fileUrl  #@TODO: Remove in 0.4.10
 
 
     @classmethod
@@ -450,7 +475,7 @@ class SimpleHoster(Hoster):
             self.invalidCaptcha()
             self.retry(10, reason=_("Wrong captcha"))
 
-        elif not self.lastDownload or not exists(fs_encode(self.lastDownload)):
+        elif not self.lastDownload or not os.path.exists(fs_encode(self.lastDownload)):
             self.lastDownload = ""
             self.error(self.pyfile.error or _("No file downloaded"))
 
@@ -564,7 +589,7 @@ class SimpleHoster(Hoster):
 
 
     def handleDirect(self, pyfile):
-        link = self.directLink(pyfile.url, self.resumeDownload)
+        link = self.fileUrl(pyfile.url, self.resumeDownload)
 
         if link:
             self.logInfo(_("Direct download link detected"))
-- 
cgit v1.2.3


From b08ac6609f87140d52a00a0ae6c5ce0fbee8f0a1 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 18 Jan 2015 12:16:49 +0100
Subject: [BasePlugin][SimpleDereferer] Use SimpleHoster fileUrl

---
 module/plugins/internal/SimpleDereferer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 53b80f827..deef42620 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -5,13 +5,13 @@ import re
 from urllib import unquote
 
 from module.plugins.Crypter import Crypter
-from module.plugins.internal.SimpleHoster import directLink, set_cookies
+from module.plugins.internal.SimpleHoster import fileUrl, set_cookies
 
 
 class SimpleDereferer(Crypter):
     __name__    = "SimpleDereferer"
     __type__    = "crypter"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -45,7 +45,7 @@ class SimpleDereferer(Crypter):
 
 
     def decrypt(self, pyfile):
-        link = directLink(self, pyfile.url)
+        link = fileUrl(self, pyfile.url)
 
         if not link:
             try:
-- 
cgit v1.2.3


From 46f690782d55d54153fdba2f6b352c9be653eae5 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 18 Jan 2015 13:29:04 +0100
Subject: [SimpleHoster] Fix typo

---
 module/plugins/internal/SimpleHoster.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index c1982ee67..afbfea1c8 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -219,7 +219,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.01"
+    __version__ = "1.02"
 
     __pattern__ = r'^unmatchable$'
 
@@ -589,7 +589,7 @@ class SimpleHoster(Hoster):
 
 
     def handleDirect(self, pyfile):
-        link = self.fileUrl(pyfile.url, self.resumeDownload)
+        link = self.directLink(pyfile.url, self.resumeDownload)
 
         if link:
             self.logInfo(_("Direct download link detected"))
-- 
cgit v1.2.3


From f015b68c186c5d73a24ba2b99804757d7ca8b09e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 18 Jan 2015 13:34:51 +0100
Subject: [MultiHook] Fix reloadinterval

---
 module/plugins/internal/MultiHook.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 795565d73..652443098 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -11,7 +11,7 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.36"
+    __version__ = "0.37"
 
     __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
@@ -201,7 +201,7 @@ class MultiHook(Hook):
                 self.unloadPlugin(plugin)
 
         if self.getConfig("reload", True):
-            self.interval = max(self.getConfig("reloadinterval", 12), self.MIN_INTERVAL)
+            self.interval = max(self.getConfig("reloadinterval", 12) * 60 * 60, self.MIN_INTERVAL)
         else:
             self.core.scheduler.removeJob(self.cb)
             self.cb = None
-- 
cgit v1.2.3


From df84a349ce9008ce927461a53d9ead1fdf71a73e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 18 Jan 2015 18:28:07 +0100
Subject: [SimpleHoster] Fix PREMIUM_ONLY_PATTERN handling

---
 module/plugins/internal/SimpleHoster.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index afbfea1c8..e499f4e47 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -219,7 +219,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.02"
+    __version__ = "1.03"
 
     __pattern__ = r'^unmatchable$'
 
@@ -502,7 +502,7 @@ class SimpleHoster(Hoster):
             self.logWarning(_("No html code to check"))
             return
 
-        if hasattr(self, 'PREMIUM_ONLY_PATTERN') and self.premium and re.search(self.PREMIUM_ONLY_PATTERN, self.html):
+        if hasattr(self, 'PREMIUM_ONLY_PATTERN') and not self.premium and re.search(self.PREMIUM_ONLY_PATTERN, self.html):
             self.fail(_("Link require a premium account to be handled"))
 
         elif hasattr(self, 'ERROR_PATTERN'):
-- 
cgit v1.2.3


From 04c47a8052c4180cb0c7222b9f0cd5929c825b07 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 18 Jan 2015 19:16:28 +0100
Subject: [SimpleHoster] Fix fileUrl follow_location

---
 module/plugins/internal/SimpleHoster.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index e499f4e47..d55ed6f99 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -144,12 +144,12 @@ def fileUrl(self, url, follow_location=False):
     link     = ""
     redirect = 1
 
-    if isinstance(follow_location, int):
-        redirect = max(follow_location, 1)
-
-    elif follow_location:
+    if isinstance(follow_location, bool):
         redirect = 5
 
+    elif isinstance(follow_location, int):
+        redirect = max(follow_location, 1)
+
     for i in xrange(redirect):
         self.logDebug("Redirect #%d to: %s" % (i, url))
 
@@ -219,7 +219,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.03"
+    __version__ = "1.04"
 
     __pattern__ = r'^unmatchable$'
 
-- 
cgit v1.2.3


From 5fef6d42b6df3758be8ceb6320582f96e0d63fe7 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 18 Jan 2015 19:38:02 +0100
Subject: [MultiHoster] Code cosmetics

---
 module/plugins/internal/MultiHoster.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index ba613c997..24dcf64c7 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.33"
+    __version__ = "0.34"
 
     __pattern__ = r'^unmatchable$'
 
@@ -40,7 +40,7 @@ class MultiHoster(SimpleHoster):
             set_cookies(self.req.cj, self.COOKIES)
 
         if self.DIRECT_LINK is None:
-            self.directDL = self.__pattern__ != r'^unmatchable$'
+            self.directDL = self.__pattern__ != r'^unmatchable$' and re.match(self.__pattern__, self.pyfile.url)
         else:
             self.directDL = self.DIRECT_LINK
 
@@ -51,10 +51,8 @@ class MultiHoster(SimpleHoster):
     def process(self, pyfile):
         self.prepare()
 
-        if self.__pattern__ != r'^unmatchable$' and re.match(self.__pattern__, pyfile.url):
-            self.checkInfo()
-
         if self.directDL:
+            self.checkInfo()
             self.logDebug("Looking for direct download link...")
             self.handleDirect(pyfile)
 
-- 
cgit v1.2.3


From 830e36874a123d8513211c82ad7e03c30235ca44 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 19 Jan 2015 01:17:59 +0100
Subject: Fix COOKIES in XFS internal plugins

---
 module/plugins/internal/XFSAccount.py | 31 +++++++++++++++++++++++--------
 module/plugins/internal/XFSCrypter.py | 23 ++++++++++++++++++++---
 module/plugins/internal/XFSHoster.py  | 14 +++-----------
 3 files changed, 46 insertions(+), 22 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index c350729ac..c3bd91e52 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -23,7 +23,7 @@ class XFSAccount(Account):
     HOSTER_DOMAIN = None
     HOSTER_URL    = None
 
-    COOKIES = [(HOSTER_DOMAIN, "lang", "english")]
+    COOKIES = True
 
     PREMIUM_PATTERN = r'\(Premium only\)'
 
@@ -46,9 +46,15 @@ class XFSAccount(Account):
     def init(self):
         if not self.HOSTER_DOMAIN:
             self.logError(_("Missing HOSTER_DOMAIN"))
+            self.COOKIES = False
 
-        if not self.HOSTER_URL:
-            self.HOSTER_URL = "http://www.%s/" % (self.HOSTER_DOMAIN or "")
+        else:
+            if not self.HOSTER_URL:
+                self.HOSTER_URL = "http://www.%s/" % self.HOSTER_DOMAIN
+
+            if isinstance(self.COOKIES, list):
+                self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english"))
+                set_cookies(req.cj, self.COOKIES)
 
 
     def loadAccountInfo(self, user, req):
@@ -57,6 +63,12 @@ class XFSAccount(Account):
         leechtraffic = None
         premium      = None
 
+        if not self.HOSTER_URL:  #@TODO: Remove in 0.4.10
+            return {'validuntil'  : validuntil,
+                    'trafficleft' : trafficleft,
+                    'leechtraffic': leechtraffic,
+                    'premium'     : premium}
+
         html = req.load(self.HOSTER_URL, get={'op': "my_account"}, decode=True)
 
         premium = True if re.search(self.PREMIUM_PATTERN, html) else False
@@ -136,22 +148,25 @@ class XFSAccount(Account):
         else:
             self.logDebug("LEECH_TRAFFIC_PATTERN not found")
 
-        return {'validuntil': validuntil, 'trafficleft': trafficleft, 'leechtraffic': leechtraffic, 'premium': premium}
+        return {'validuntil'  : validuntil,
+                'trafficleft' : trafficleft,
+                'leechtraffic': leechtraffic,
+                'premium'     : premium}
 
 
     def login(self, user, data, req):
-        if isinstance(self.COOKIES, list):
-            set_cookies(req.cj, self.COOKIES)
+        if not self.HOSTER_URL:  #@TODO: Remove in 0.4.10
+            raise Exception(_("Missing HOSTER_DOMAIN"))
 
         url  = urljoin(self.HOSTER_URL, "login.html")
         html = req.load(url, decode=True)
 
         action, inputs = parseHtmlForm('name="FL"', html)
         if not inputs:
-            inputs = {'op': "login",
+            inputs = {'op'      : "login",
                       'redirect': self.HOSTER_URL}
 
-        inputs.update({'login': user,
+        inputs.update({'login'   : user,
                        'password': data['password']})
 
         html = req.load(self.HOSTER_URL, post=inputs, decode=True)
diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py
index 3cb837aac..665e13b18 100644
--- a/module/plugins/internal/XFSCrypter.py
+++ b/module/plugins/internal/XFSCrypter.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 class XFSCrypter(SimpleCrypter):
     __name__    = "XFSCrypter"
     __type__    = "crypter"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __pattern__ = r'^unmatchable$'
 
@@ -19,10 +19,27 @@ class XFSCrypter(SimpleCrypter):
 
     URL_REPLACEMENTS = [(r'&?per_page=\d+', ""), (r'[?/&]+$', ""), (r'(.+/[^?]+)$', r'\1?'), (r'$', r'&per_page=10000')]
 
-    COOKIES = [(HOSTER_DOMAIN, "lang", "english")]
-
     LINK_PATTERN = r'<(?:td|TD).*?>\s*<a href="(.+?)".*?>.+?(?:</a>)?\s*</(?:td|TD)>'
     NAME_PATTERN = r'<[tT]itle>.*?\: (?P<N>.+) folder</[tT]itle>'
 
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
+
+
+    def prepare(self):
+        if not self.HOSTER_DOMAIN:
+            if self.account:
+                account      = self.account
+            else:
+                account_name = (self.__name__ + ".py").replace("Folder.py", "").replace(".py", "")
+                account      = self.pyfile.m.core.accountManager.getAccountPlugin(account_name)
+
+            if account and hasattr(account, "HOSTER_DOMAIN") and account.HOSTER_DOMAIN:
+                self.HOSTER_DOMAIN = account.HOSTER_DOMAIN
+            else:
+                self.fail(_("Missing HOSTER_DOMAIN"))
+
+        if isinstance(self.COOKIES, list):
+            self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english"))
+
+        return super(XFSCrypter, self).prepare()
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index bae75c092..75d4df275 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -15,7 +15,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.36"
+    __version__ = "0.37"
 
     __pattern__ = r'^unmatchable$'
 
@@ -29,7 +29,6 @@ class XFSHoster(SimpleHoster):
     HOSTER_DOMAIN = None
 
     TEXT_ENCODING = False
-    COOKIES       = [(HOSTER_DOMAIN, "lang", "english")]
     DIRECT_LINK   = None
     MULTI_HOSTER  = True  #@NOTE: Should be default to False for safe, but I'm lazy...
 
@@ -73,15 +72,8 @@ class XFSHoster(SimpleHoster):
             else:
                 self.fail(_("Missing HOSTER_DOMAIN"))
 
-            try:
-                self.COOKIES.index((None, "lang", "english"))
-
-            except ValueError:
-                pass
-
-            else:
-                self.COOKIES.remove((None, "lang", "english"))
-                self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english"))
+        if isinstance(self.COOKIES, list):
+            self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english"))
 
         if not self.LINK_PATTERN:
             pattern = r'(https?://(?:www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<]'
-- 
cgit v1.2.3


From ac2714af28d4719dff415f364469dc847ac53721 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 19 Jan 2015 01:18:51 +0100
Subject: [CaptchaService] Whitespaces cleanup

---
 module/plugins/internal/CaptchaService.py | 50 +++++++++++++++----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index be6a056fc..1cd261698 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -159,27 +159,27 @@ class ReCaptchaV2(CaptchaService):
         self.plugin.logDebug("API version: %s" %vers)
         language = a.split("__")[1].split(".")[0]
         self.plugin.logDebug("API language: %s" %language)
-              
+
         html = self.plugin.req.load("https://apis.google.com/js/api.js",cookies=True)
         b = re.search('"h":"(.*?)","',html).group(1)
         jsh = b.decode('unicode-escape')
         self.plugin.logDebug("API jsh-string: %s" %jsh)
-        
+
         return vers,language,jsh
-        
+
     def prepareTimeAndRpc(self):
         html = self.plugin.req.load("http://www.google.com/recaptcha/api2/demo",cookies=True)
-        
+
         millis = int(round(time.time() * 1000))
         self.plugin.logDebug("Systemtime in milliseconds: %s" %str(millis))
-        
+
         rand = randint(1,99999999)
         a = "0.%s"%str(rand*2147483647)
         rpc = int(100000000*float(a))
         self.plugin.logDebug("Self-generated rpc-token: %s" %str(rpc))
-        
+
         return millis,rpc
-        
+
     def doTheCaptcha(self, host):
         self.plugin.logDebug("Parent host: %s" %host)
         botguardstring  = "!A"
@@ -188,53 +188,53 @@ class ReCaptchaV2(CaptchaService):
         millis,rpc = self.prepareTimeAndRpc()
 
         html = self.plugin.req.load("https://www.google.com/recaptcha/api2/anchor",
-                  get={"k":sitekey, 
-                       "hl":language, 
-                       "v":vers, 
-                       "usegapi":"1", 
-                       "jsh":jsh+"#id=IO_"+str(millis), 
-                       "parent":"http://"+host, 
+                  get={"k":sitekey,
+                       "hl":language,
+                       "v":vers,
+                       "usegapi":"1",
+                       "jsh":jsh+"#id=IO_"+str(millis),
+                       "parent":"http://"+host,
                        "pfname":"",
                        "rpctoken":rpc},
                   cookies=True)
         recaptchatoken = re.search('id="recaptcha-token" value="(.*?)">',html)
         self.plugin.logDebug("Captchatoken #1: %s" %recaptchatoken.group(1))
-            
+
         html = self.plugin.req.load("https://www.google.com/recaptcha/api2/frame", get={"c":recaptchatoken.group(1),
                                                                                         "hl":language,
-                                                                                        "v":vers, 
+                                                                                        "v":vers,
                                                                                         "bg":botguardstring,
-                                                                                        "usegapi":"1", 
+                                                                                        "usegapi":"1",
                                                                                         "jsh":jsh},
-                                                                                   cookies=True)    
+                                                                                   cookies=True)
         html = html.decode('unicode-escape')
         recaptchatoken2 = re.search('"finput","(.*?)",',html)
         self.plugin.logDebug("Captchatoken #2: %s" %recaptchatoken2.group(1))
         recaptchatoken3 = re.search('."asconf".\s.\s,"(.*?)".',html)
         self.plugin.logDebug("Captchatoken #3: %s" %recaptchatoken3.group(1))
-        
-        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/reload", post={"c":recaptchatoken2.group(1), 
-                                                                                          "reason":"fi", 
+
+        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/reload", post={"c":recaptchatoken2.group(1),
+                                                                                          "reason":"fi",
                                                                                           "fbg":recaptchatoken3.group(1)},
                                                                                     cookies=True)
         recaptchatoken4 = re.search('"rresp","(.*?)",',html)
         self.plugin.logDebug("Captchatoken #4: %s" %recaptchatoken4.group(1))
-            
+
         millis_captcha_loading = int(round(time.time() * 1000))
         captcha_response = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload", get={"c":recaptchatoken4.group(1)},forceUser=True)
         respone_encoded = base64.b64encode('{"response":"%s"}' %captcha_response)
         self.plugin.logDebug("Encoded result: %s" %respone_encoded)
-          
+
         timeToSolve = int(round(time.time() * 1000)) - millis_captcha_loading
         timeToSolveMore = timeToSolve + int(float("0."+str(randint(1,99999999))) * 500)
-        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify", cookies=True, post={"c":recaptchatoken4.group(1), 
-                                                                                                            "response":respone_encoded, 
+        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify", cookies=True, post={"c":recaptchatoken4.group(1),
+                                                                                                            "response":respone_encoded,
                                                                                                             "t":timeToSolve,
                                                                                                             "ct":timeToSolveMore,
                                                                                                             "bg":botguardstring})
         recaptchatoken5 = re.search('"uvresp","(.*?)",',html)
         self.plugin.logDebug("Captchatoken #5: %s" %recaptchatoken5.group(1))
-        
+
         return recaptchatoken5.group(1)
 
 
-- 
cgit v1.2.3


From 8f45ccee3c26f991738288805963a5961cd68267 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 20 Jan 2015 01:23:33 +0100
Subject: [SimpleHoster] Improve downloadLink routine

---
 module/plugins/internal/DeadCrypter.py   | 3 ---
 module/plugins/internal/DeadHoster.py    | 3 ---
 module/plugins/internal/SimpleCrypter.py | 6 +++---
 module/plugins/internal/SimpleHoster.py  | 8 +++++++-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/DeadCrypter.py b/module/plugins/internal/DeadCrypter.py
index 0fa23eef3..866d177cf 100644
--- a/module/plugins/internal/DeadCrypter.py
+++ b/module/plugins/internal/DeadCrypter.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from urllib import unquote
-from urlparse import urlparse
-
 from module.plugins.internal.SimpleCrypter import create_getInfo
 from module.plugins.Crypter import Crypter as _Crypter
 
diff --git a/module/plugins/internal/DeadHoster.py b/module/plugins/internal/DeadHoster.py
index cc7adf4df..a6ad92607 100644
--- a/module/plugins/internal/DeadHoster.py
+++ b/module/plugins/internal/DeadHoster.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from urllib import unquote
-from urlparse import urlparse
-
 from module.plugins.internal.SimpleHoster import create_getInfo
 from module.plugins.Hoster import Hoster as _Hoster
 
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 2e2f2ca0d..80504bf67 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -151,10 +151,10 @@ class SimpleCrypter(Crypter, SimpleHoster):
         Returns the links extracted from self.html
         You should override this only if it's impossible to extract links using only the LINK_PATTERN.
         """
-        parsed = urlparse(self.pyfile.url)
-        base   = "%s://%s" % (parsed.scheme, parsed.netloc)
+        url_p   = urlparse(self.pyfile.url)
+        baseurl = "%s://%s" % (url_p.scheme, url_p.netloc)
 
-        return [urljoin(base, link) if not urlparse(link).scheme else link \
+        return [urljoin(baseurl, link) if not urlparse(link).scheme else link \
                 for link in re.findall(self.LINK_PATTERN, self.html)]
 
 
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index d55ed6f99..78f5e531d 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -219,7 +219,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.04"
+    __version__ = "1.05"
 
     __pattern__ = r'^unmatchable$'
 
@@ -467,6 +467,12 @@ class SimpleHoster(Hoster):
     def downloadLink(self, link):
         if link and isinstance(link, basestring):
             self.correctCaptcha()
+
+            if not urlparse(link).scheme:
+                url_p   = urlparse(self.pyfile.url)
+                baseurl = "%s://%s" % (url_p.scheme, url_p.netloc)
+                link    = urljoin(baseurl, link)
+
             self.download(link, disposition=False)  #@TODO: Set `disposition=True` in 0.4.10
 
 
-- 
cgit v1.2.3


From 96ee02d0120690291962269d23f1a324ff674e99 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 20 Jan 2015 02:46:39 +0100
Subject: [SimpleHoster] Improve getInfo

---
 module/plugins/internal/MultiHoster.py  | 11 ++-------
 module/plugins/internal/SimpleHoster.py | 41 +++++++++++++++++++++++++++------
 2 files changed, 36 insertions(+), 16 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 24dcf64c7..eee634d46 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.34"
+    __version__ = "0.35"
 
     __pattern__ = r'^unmatchable$'
 
@@ -70,17 +70,10 @@ class MultiHoster(SimpleHoster):
                 self.logDebug("Handled as free download")
                 self.handleFree(pyfile)
 
-        self.downloadLink(self.link)
+        self.downloadLink(self.link, True)
         self.checkFile()
 
 
-    #@TODO: Remove in 0.4.10
-    def downloadLink(self, link):
-        if link and isinstance(link, basestring):
-            self.correctCaptcha()
-            self.download(link, disposition=True)
-
-
     def handlePremium(self, pyfile):
         return self.handleFree(pyfile)
 
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 78f5e531d..819572a7e 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -151,9 +151,33 @@ def fileUrl(self, url, follow_location=False):
         redirect = max(follow_location, 1)
 
     for i in xrange(redirect):
-        self.logDebug("Redirect #%d to: %s" % (i, url))
+        try:
+            self.logDebug("Redirect #%d to: %s" % (i, url))
+            header = self.load(url, ref=True, cookies=True, just_header=True, decode=True)
+
+        except Exception:  #: Bad bad bad...
+            req = pyreq.getHTTPRequest()
+            res = req.load(url, cookies=True, just_header=True, decode=True)
+
+            req.close()
+
+            header = {"code": req.code}
+            for line in res.splitlines():
+                line = line.strip()
+                if not line or ":" not in line:
+                    continue
+
+                key, none, value = line.partition(":")
+                key              = key.lower().strip()
+                value            = value.strip()
 
-        header = self.load(url, ref=True, cookies=True, just_header=True, decode=True)
+                if key in header:
+                    if type(header[key]) == list:
+                        header[key].append(value)
+                    else:
+                        header[key] = [header[key], value]
+                else:
+                    header[key] = value
 
         if 'content-disposition' in header:
             link = url
@@ -193,7 +217,10 @@ def fileUrl(self, url, follow_location=False):
         break
 
     else:
-        self.logError(_("Too many redirects"))
+        try:
+            self.logError(_("Too many redirects"))
+        except Exception:
+            pass
 
     return link
 
@@ -219,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.05"
+    __version__ = "1.06"
 
     __pattern__ = r'^unmatchable$'
 
@@ -320,7 +347,7 @@ class SimpleHoster(Hoster):
                 info['error']  = "missing url"
                 info['status'] = 1
 
-            elif info['status'] is 3:
+            elif info['status'] is 3 and not fileUrl(None, url):
                 try:
                     html = getURL(url, cookies=cls.COOKIES, decode=not cls.TEXT_ENCODING)
 
@@ -464,7 +491,7 @@ class SimpleHoster(Hoster):
         self.checkFile()
 
 
-    def downloadLink(self, link):
+    def downloadLink(self, link, disposition=False):
         if link and isinstance(link, basestring):
             self.correctCaptcha()
 
@@ -473,7 +500,7 @@ class SimpleHoster(Hoster):
                 baseurl = "%s://%s" % (url_p.scheme, url_p.netloc)
                 link    = urljoin(baseurl, link)
 
-            self.download(link, disposition=False)  #@TODO: Set `disposition=True` in 0.4.10
+            self.download(link, disposition=disposition)  #@TODO: Set `disposition=True` in 0.4.10
 
 
     def checkFile(self):
-- 
cgit v1.2.3


From 4d6880849502f8f848e3ab5bc49fc61faec8fddb Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 22 Jan 2015 21:28:03 +0100
Subject: [CaptchaService] Merge together ReCaptcha versions

---
 module/plugins/internal/CaptchaService.py | 267 ++++++++++++++++--------------
 1 file changed, 142 insertions(+), 125 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 1cd261698..db31bd1bd 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -2,16 +2,17 @@
 
 import re
 import time
-import base64
 
-from random import random,randint
+from base64 import b64encode
+from random import random, randint
+from urlparse import urljoin, urlparse
 
 from module.common.json_layer import json_loads
 
 
 class CaptchaService:
     __name__    = "CaptchaService"
-    __version__ = "0.17"
+    __version__ = "0.18"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
@@ -46,7 +47,7 @@ class CaptchaService:
             return None
 
 
-    def challenge(self, key=None):
+    def challenge(self, key=None, html=None):
         raise NotImplementedError
 
 
@@ -56,14 +57,15 @@ class CaptchaService:
 
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __description__ = """ReCaptcha captcha service plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+    __authors__     = [("pyLoad Team", "admin@pyload.org"),
+                       ("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
-    KEY_PATTERN      = r'recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=([\w-]+)'
+    KEY_PATTERN      = r'(?:data-sitekey=["\']|["\']sitekey["\']:\s*["\']|recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=)([\w-]+)'
     KEY_AJAX_PATTERN = r'Recaptcha\.create\s*\(\s*["\']([\w-]+)'
 
 
@@ -86,9 +88,23 @@ class ReCaptcha(CaptchaService):
             return None
 
 
-    def challenge(self, key=None):
+    def challenge(self, key=None, html=None):
+        if not html:
+            if hasattr(self.plugin, "html") and self.plugin.html:
+                html = self.plugin.html
+            else:
+                errmsg = _("ReCaptcha html not found")
+                self.plugin.fail(errmsg)
+                raise TypeError(errmsg)
+
+        challenge = "challenge_%s" % 'new' if re.search(r'sitekey', html) else 'old'
+
+        return getattr(self, challenge)(key, html)
+
+
+    def challenge_old(self, key=None, html=None):
         if not key:
-            if self.detect_key():
+            if self.detect_key(html):
                 key = self.key
             else:
                 errmsg = _("ReCaptcha key not found")
@@ -99,14 +115,15 @@ class ReCaptcha(CaptchaService):
         try:
             challenge = re.search("challenge : '(.+?)',", html).group(1)
             server    = re.search("server : '(.+?)',", html).group(1)
-        except:
+
+        except AttributeError:
             errmsg = _("ReCaptcha challenge pattern not found")
             self.plugin.fail(errmsg)
-            raise ValueError(errmsg)
+            raise AttributeError(errmsg)
 
         self.plugin.logDebug("ReCaptcha challenge: %s" % challenge)
 
-        return challenge, self.result(server, challenge)
+        return self.result(server, challenge), challenge
 
 
     def result(self, server, challenge):
@@ -121,126 +138,122 @@ class ReCaptcha(CaptchaService):
         return result
 
 
-class ReCaptchaV2(CaptchaService):
-    __name__    = "ReCaptchaV2"
-    __version__ = "0.01"
+    def _collectApiInfo(self):
+        html = self.plugin.req.load("http://www.google.com/recaptcha/api.js")
+        a    = re.search(r'po.src = \'(.*?)\';', html).group(1)
+        vers = a.split("/")[5]
 
-    __description__ = """ReCaptchaV2 captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+        self.plugin.logDebug("ReCaptcha API version: %s" %vers)
 
+        language = a.split("__")[1].split(".")[0]
 
-    KEY_PATTERN     = r'data-sitekey="(.*?)">'
+        self.plugin.logDebug("ReCaptcha API language: %s" % language)
 
+        html = self.plugin.req.load("https://apis.google.com/js/api.js")
+        b    = re.search(r'"h":"(.*?)","', html).group(1)
+        jsh  = b.decode('unicode-escape')
 
-    def detect_key(self, html=None):
-        if not html:
-            if hasattr(self.plugin, "html") and self.plugin.html:
-                html = self.plugin.html
-            else:
-                errmsg = _("ReCaptcha html not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
+        self.plugin.logDebug("ReCaptcha API jsh-string: %s" % jsh)
 
-        m = re.search(self.KEY_PATTERN, html)
-        if m:
-            self.key = m.group(1).strip()
-            self.plugin.logDebug("ReCaptcha key: %s" % self.key)
-            return self.key
-        else:
-            self.plugin.logDebug("ReCaptcha key not found")
-            return None
+        return vers, language, jsh
 
 
-    def collectApiInfo(self):
-        html = self.plugin.req.load("http://www.google.com/recaptcha/api.js",cookies=True)
-        a = re.search("po.src = '(.*?)';",html).group(1)
-        vers = a.split("/")[5]
-        self.plugin.logDebug("API version: %s" %vers)
-        language = a.split("__")[1].split(".")[0]
-        self.plugin.logDebug("API language: %s" %language)
+    def _prepareTimeAndRpc(self):
+        self.plugin.req.load("http://www.google.com/recaptcha/api2/demo")
 
-        html = self.plugin.req.load("https://apis.google.com/js/api.js",cookies=True)
-        b = re.search('"h":"(.*?)","',html).group(1)
-        jsh = b.decode('unicode-escape')
-        self.plugin.logDebug("API jsh-string: %s" %jsh)
+        millis = int(round(time.time() * 1000))
 
-        return vers,language,jsh
+        self.plugin.logDebug("ReCaptcha time: %s" % millis)
 
-    def prepareTimeAndRpc(self):
-        html = self.plugin.req.load("http://www.google.com/recaptcha/api2/demo",cookies=True)
+        rand = randint(1, 99999999)
+        a    = "0.%s" % str(rand * 2147483647)
+        rpc  = int(100000000 * float(a))
 
-        millis = int(round(time.time() * 1000))
-        self.plugin.logDebug("Systemtime in milliseconds: %s" %str(millis))
+        self.plugin.logDebug("ReCaptcha rpc-token: %s" % rpc)
 
-        rand = randint(1,99999999)
-        a = "0.%s"%str(rand*2147483647)
-        rpc = int(100000000*float(a))
-        self.plugin.logDebug("Self-generated rpc-token: %s" %str(rpc))
+        return millis, rpc
 
-        return millis,rpc
 
-    def doTheCaptcha(self, host):
-        self.plugin.logDebug("Parent host: %s" %host)
-        botguardstring  = "!A"
-        sitekey = self.detect_key()
-        vers,language,jsh = self.collectApiInfo()
-        millis,rpc = self.prepareTimeAndRpc()
+    def challenge_new(self, key=None, html=None):
+        if not key:
+            if self.detect_key(html):
+                key = self.key
+            else:
+                errmsg = _("ReCaptcha key not found")
+                self.plugin.fail(errmsg)
+                raise TypeError(errmsg)
+
+        try:
+            parent = urljoin("http://", urlparse(self.plugin.pyfile.url).netloc)
+
+        except Exception:
+            parent = ""
+
+        botguardstring      = "!A"
+        vers, language, jsh = self._collectApiInfo()
+        millis, rpc         = self._prepareTimeAndRpc()
 
         html = self.plugin.req.load("https://www.google.com/recaptcha/api2/anchor",
-                  get={"k":sitekey,
-                       "hl":language,
-                       "v":vers,
-                       "usegapi":"1",
-                       "jsh":jsh+"#id=IO_"+str(millis),
-                       "parent":"http://"+host,
-                       "pfname":"",
-                       "rpctoken":rpc},
-                  cookies=True)
-        recaptchatoken = re.search('id="recaptcha-token" value="(.*?)">',html)
-        self.plugin.logDebug("Captchatoken #1: %s" %recaptchatoken.group(1))
-
-        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/frame", get={"c":recaptchatoken.group(1),
-                                                                                        "hl":language,
-                                                                                        "v":vers,
-                                                                                        "bg":botguardstring,
-                                                                                        "usegapi":"1",
-                                                                                        "jsh":jsh},
-                                                                                   cookies=True)
-        html = html.decode('unicode-escape')
-        recaptchatoken2 = re.search('"finput","(.*?)",',html)
-        self.plugin.logDebug("Captchatoken #2: %s" %recaptchatoken2.group(1))
-        recaptchatoken3 = re.search('."asconf".\s.\s,"(.*?)".',html)
-        self.plugin.logDebug("Captchatoken #3: %s" %recaptchatoken3.group(1))
-
-        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/reload", post={"c":recaptchatoken2.group(1),
-                                                                                          "reason":"fi",
-                                                                                          "fbg":recaptchatoken3.group(1)},
-                                                                                    cookies=True)
-        recaptchatoken4 = re.search('"rresp","(.*?)",',html)
-        self.plugin.logDebug("Captchatoken #4: %s" %recaptchatoken4.group(1))
+                                    get={'k'       : key,
+                                         'hl'      : language,
+                                         'v'       : vers,
+                                         'usegapi' : "1",
+                                         'jsh'     : "%s#id=IO_%s" % (jsh, millis),
+                                         'parent'  : parent,
+                                         'pfname'  : "",
+                                         'rpctoken': rpc})
+
+        token1 = re.search(r'id="recaptcha-token" value="(.*?)">', html)
+        self.plugin.logDebug("ReCaptcha token #1: %s" % token1.group(1))
+
+        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/frame",
+                                    get={'c'      : token1.group(1),
+                                         'hl'     : language,
+                                         'v'      : vers,
+                                         'bg'     : botguardstring,
+                                         'usegapi': "1",
+                                         'jsh'    : jsh}).decode('unicode-escape')
+
+        token2 = re.search(r'"finput","(.*?)",', html)
+        self.plugin.logDebug("ReCaptcha token #2: %s" % token2.group(1))
+
+        token3 = re.search(r'."asconf".\s.\s,"(.*?)".', html)
+        self.plugin.logDebug("ReCaptcha token #3: %s" % token3.group(1))
+
+        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/reload",
+                                    post={'c'     : token2.group(1),
+                                          'reason': "fi",
+                                          'fbg'   : token3.group(1)})
+
+        token4 = re.search(r'"rresp","(.*?)",', html)
+        self.plugin.logDebug("ReCaptcha token #4: %s" % token4.group(1))
 
         millis_captcha_loading = int(round(time.time() * 1000))
-        captcha_response = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload", get={"c":recaptchatoken4.group(1)},forceUser=True)
-        respone_encoded = base64.b64encode('{"response":"%s"}' %captcha_response)
-        self.plugin.logDebug("Encoded result: %s" %respone_encoded)
+        captcha_response       = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload",
+                                                            get={'c':token4.group(1)}, forceUser=True)
+        response               = b64encode('{"response":"%s"}' % captcha_response)
+
+        self.plugin.logDebug("ReCaptcha result: %s" % response)
 
-        timeToSolve = int(round(time.time() * 1000)) - millis_captcha_loading
-        timeToSolveMore = timeToSolve + int(float("0."+str(randint(1,99999999))) * 500)
-        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify", cookies=True, post={"c":recaptchatoken4.group(1),
-                                                                                                            "response":respone_encoded,
-                                                                                                            "t":timeToSolve,
-                                                                                                            "ct":timeToSolveMore,
-                                                                                                            "bg":botguardstring})
-        recaptchatoken5 = re.search('"uvresp","(.*?)",',html)
-        self.plugin.logDebug("Captchatoken #5: %s" %recaptchatoken5.group(1))
+        timeToSolve     = int(round(time.time() * 1000)) - millis_captcha_loading
+        timeToSolveMore = timeToSolve + int(float("0." + str(randint(1, 99999999))) * 500)
 
-        return recaptchatoken5.group(1)
+        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify",
+                                    post={'c'       : token4.group(1),
+                                          'response': response,
+                                          't'       : timeToSolve,
+                                          'ct'      : timeToSolveMore,
+                                          'bg'      : botguardstring})
+
+        token5 = re.search(r'"uvresp","(.*?)",', html)
+        self.plugin.logDebug("ReCaptcha token #5: %s" % token5.group(1))
+
+        return token5.group(1), None
 
 
 class AdsCaptcha(CaptchaService):
     __name__    = "AdsCaptcha"
-    __version__ = "0.06"
+    __version__ = "0.07"
 
     __description__ = """AdsCaptcha captcha service plugin"""
     __license__     = "GPLv3"
@@ -271,9 +284,9 @@ class AdsCaptcha(CaptchaService):
             return None
 
 
-    def challenge(self, key=None):
+    def challenge(self, key=None, html=None):
         if not key:
-            if self.detect_key():
+            if self.detect_key(html):
                 key = self.key
             else:
                 errmsg = _("AdsCaptcha key not found")
@@ -286,14 +299,15 @@ class AdsCaptcha(CaptchaService):
         try:
             challenge = re.search("challenge: '(.+?)',", html).group(1)
             server    = re.search("server: '(.+?)',", html).group(1)
-        except:
+
+        except AttributeError:
             errmsg = _("AdsCaptcha challenge pattern not found")
             self.plugin.fail(errmsg)
-            raise ValueError(errmsg)
+            raise AttributeError(errmsg)
 
         self.plugin.logDebug("AdsCaptcha challenge: %s" % challenge)
 
-        return challenge, self.result(server, challenge)
+        return self.result(server, challenge), challenge
 
 
     def result(self, server, challenge):
@@ -309,7 +323,7 @@ class AdsCaptcha(CaptchaService):
 
 class SolveMedia(CaptchaService):
     __name__    = "SolveMedia"
-    __version__ = "0.06"
+    __version__ = "0.07"
 
     __description__ = """SolveMedia captcha service plugin"""
     __license__     = "GPLv3"
@@ -319,9 +333,9 @@ class SolveMedia(CaptchaService):
     KEY_PATTERN = r'api\.solvemedia\.com/papi/challenge\.(?:no)?script\?k=(.+?)["\']'
 
 
-    def challenge(self, key=None):
+    def challenge(self, key=None, html=None):
         if not key:
-            if self.detect_key():
+            if self.detect_key(html):
                 key = self.key
             else:
                 errmsg = _("SolveMedia key not found")
@@ -333,14 +347,15 @@ class SolveMedia(CaptchaService):
             challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="([^"]+)">',
                                   html).group(1)
             server    = "http://api.solvemedia.com/papi/media"
-        except:
+
+        except AttributeError:
             errmsg = _("SolveMedia challenge pattern not found")
             self.plugin.fail(errmsg)
-            raise ValueError(errmsg)
+            raise AttributeError(errmsg)
 
         self.plugin.logDebug("SolveMedia challenge: %s" % challenge)
 
-        return challenge, self.result(server, challenge)
+        return self.result(server, challenge), challenge
 
 
     def result(self, server, challenge):
@@ -353,7 +368,7 @@ class SolveMedia(CaptchaService):
 
 class AdYouLike(CaptchaService):
     __name__    = "AdYouLike"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __description__ = """AdYouLike captcha service plugin"""
     __license__     = "GPLv3"
@@ -384,9 +399,9 @@ class AdYouLike(CaptchaService):
             return None
 
 
-    def challenge(self, key=None):
+    def challenge(self, key=None, html=None):
         if not key:
-            if self.detect_key():
+            if self.detect_key(html):
                 key = self.key
             else:
                 errmsg = _("AdYouLike key not found")
@@ -405,10 +420,11 @@ class AdYouLike(CaptchaService):
                                          'callback': callback})
         try:
             challenge = json_loads(re.search(callback + r'\s*\((.+?)\)', html).group(1))
-        except:
+
+        except AttributeError:
             errmsg = _("AdYouLike challenge pattern not found")
             self.plugin.fail(errmsg)
-            raise ValueError(errmsg)
+            raise AttributeError(errmsg)
 
         self.plugin.logDebug("AdYouLike challenge: %s" % challenge)
 
@@ -435,10 +451,11 @@ class AdYouLike(CaptchaService):
         try:
             instructions_visual = challenge['translations'][server['all']['lang']]['instructions_visual']
             result = re.search(u'«(.+?)»', instructions_visual).group(1).strip()
-        except:
+
+        except AttributeError:
             errmsg = _("AdYouLike result not found")
             self.plugin.fail(errmsg)
-            raise ValueError(errmsg)
+            raise AttributeError(errmsg)
 
         result = {'_ayl_captcha_engine' : "adyoulike",
                   '_ayl_env'            : server['all']['env'],
-- 
cgit v1.2.3


From cf4ded052964047de88d676045329b8fa4fca2dc Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 22 Jan 2015 21:31:19 +0100
Subject: Update plugins after CaptchaService changes

---
 module/plugins/internal/SimpleCrypter.py   | 2 +-
 module/plugins/internal/SimpleDereferer.py | 2 +-
 module/plugins/internal/XFSHoster.py       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 80504bf67..9df262deb 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -118,7 +118,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
             self.packages = [(self.info['name'], self.links, self.info['folder'])]
 
         elif not self.urls and not self.packages:  #@TODO: Remove in 0.4.10
-            self.fail("No link grabbed")
+            self.fail(_("No link grabbed"))
 
 
     def checkNameSize(self, getinfo=True):
diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index deef42620..35ac09b70 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -66,7 +66,7 @@ class SimpleDereferer(Crypter):
             self.urls = [link.strip()]  #@TODO: Remove `.strip()` in 0.4.10
 
         elif not self.urls and not self.packages:  #@TODO: Remove in 0.4.10
-            self.fail("No link grabbed")
+            self.fail(_("No link grabbed"))
 
 
     def prepare(self):
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 75d4df275..1dd3075d8 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -15,7 +15,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.37"
+    __version__ = "0.38"
 
     __pattern__ = r'^unmatchable$'
 
@@ -327,7 +327,7 @@ class XFSHoster(SimpleHoster):
             self.logDebug("ReCaptcha key: %s" % captcha_key)
 
         if captcha_key:
-            inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge(captcha_key)
+            inputs['recaptcha_response_field'], inputs['recaptcha_challenge_field'] = recaptcha.challenge(captcha_key)
             return 3
 
         solvemedia = SolveMedia(self)
@@ -339,7 +339,7 @@ class XFSHoster(SimpleHoster):
             self.logDebug("SolveMedia key: %s" % captcha_key)
 
         if captcha_key:
-            inputs['adcopy_challenge'], inputs['adcopy_response'] = solvemedia.challenge(captcha_key)
+            inputs['adcopy_response'], inputs['adcopy_challenge'] = solvemedia.challenge(captcha_key)
             return 4
 
         return 0
-- 
cgit v1.2.3


From f531393337b58e570c2b23f63275b883506cb92c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 22 Jan 2015 22:14:47 +0100
Subject: [SimpleDereferer][SimpleHoster] Fix
 https://github.com/pyload/pyload/issues/1065

---
 module/plugins/internal/SimpleDereferer.py | 3 ++-
 module/plugins/internal/SimpleHoster.py    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 35ac09b70..72d61d4a0 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import fileUrl, set_cookies
 class SimpleDereferer(Crypter):
     __name__    = "SimpleDereferer"
     __type__    = "crypter"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -77,6 +77,7 @@ class SimpleDereferer(Crypter):
 
 
     def preload(self):
+        self.req.renewHTTPRequest()  #@NOTE: Remove in 0.4.10
         self.html = self.load(self.pyfile.url, cookies=bool(self.COOKIES), decode=not self.TEXT_ENCODING)
 
         if isinstance(self.TEXT_ENCODING, basestring):
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 819572a7e..13a26c732 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.06"
+    __version__ = "1.07"
 
     __pattern__ = r'^unmatchable$'
 
@@ -453,6 +453,7 @@ class SimpleHoster(Hoster):
 
 
     def preload(self):
+        self.req.renewHTTPRequest()  #@NOTE: Remove in 0.4.10
         self.html = self.load(self.pyfile.url, cookies=bool(self.COOKIES), decode=not self.TEXT_ENCODING)
 
         if isinstance(self.TEXT_ENCODING, basestring):
-- 
cgit v1.2.3


From 7b870794d5e76e2eb0fc035d74521969a676edb9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 24 Jan 2015 01:47:37 +0100
Subject: [CaptchaService] Fix https://github.com/pyload/pyload/issues/1069

---
 module/plugins/internal/CaptchaService.py | 64 ++++++++++++++++---------------
 1 file changed, 34 insertions(+), 30 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index db31bd1bd..0223f9a5a 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -12,15 +12,13 @@ from module.common.json_layer import json_loads
 
 class CaptchaService:
     __name__    = "CaptchaService"
-    __version__ = "0.18"
+    __version__ = "0.19"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
     __authors__     = [("pyLoad Team", "admin@pyload.org")]
 
 
-    KEY_PATTERN = None
-
     key = None  #: last key detected
 
 
@@ -29,22 +27,7 @@ class CaptchaService:
 
 
     def detect_key(self, html=None):
-        if not html:
-            if hasattr(self.plugin, "html") and self.plugin.html:
-                html = self.plugin.html
-            else:
-                errmsg = _("%s html not found") % self.__name__
-                self.plugin.fail(errmsg)  #@TODO: replace all plugin.fail(errmsg) with plugin.error(errmsg) in 0.4.10
-                raise TypeError(errmsg)
-
-        m = re.search(self.KEY_PATTERN, html)
-        if m:
-            self.key = m.group(1).strip()
-            self.plugin.logDebug("%s key: %s" % (self.__name__, self.key))
-            return self.key
-        else:
-            self.plugin.logDebug("%s key not found" % self.__name__)
-            return None
+        raise NotImplementedError
 
 
     def challenge(self, key=None, html=None):
@@ -57,16 +40,17 @@ class CaptchaService:
 
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
-    __version__ = "0.09"
+    __version__ = "0.10"
 
     __description__ = """ReCaptcha captcha service plugin"""
     __license__     = "GPLv3"
     __authors__     = [("pyLoad Team", "admin@pyload.org"),
+                       ("Walter Purcaro", "vuolter@gmail.com"),
                        ("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
-    KEY_PATTERN      = r'(?:data-sitekey=["\']|["\']sitekey["\']:\s*["\']|recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=)([\w-]+)'
-    KEY_AJAX_PATTERN = r'Recaptcha\.create\s*\(\s*["\']([\w-]+)'
+    KEY_V2_PATTERN = r'(?:data-sitekey=["\']|["\']sitekey["\']:\s*["\'])([\w-]+)'
+    KEY_V1_PATTERN = r'(?:recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=|Recaptcha\.create\s*\(\s*["\'])([\w-]+)'
 
 
     def detect_key(self, html=None):
@@ -78,7 +62,7 @@ class ReCaptcha(CaptchaService):
                 self.plugin.fail(errmsg)
                 raise TypeError(errmsg)
 
-        m = re.search(self.KEY_PATTERN, html) or re.search(self.KEY_AJAX_PATTERN, html)
+        m = re.search(self.KEY_V2_PATTERN, html) or re.search(self.KEY_V1_PATTERN, html)
         if m:
             self.key = m.group(1).strip()
             self.plugin.logDebug("ReCaptcha key: %s" % self.key)
@@ -88,7 +72,7 @@ class ReCaptcha(CaptchaService):
             return None
 
 
-    def challenge(self, key=None, html=None):
+    def challenge(self, key=None, html=None, version=None):
         if not html:
             if hasattr(self.plugin, "html") and self.plugin.html:
                 html = self.plugin.html
@@ -97,12 +81,13 @@ class ReCaptcha(CaptchaService):
                 self.plugin.fail(errmsg)
                 raise TypeError(errmsg)
 
-        challenge = "challenge_%s" % 'new' if re.search(r'sitekey', html) else 'old'
+        challenge = "challenge_v%s" % ((version if version in (1, 2) else
+                                       (2 if re.search(self.KEY_V2_PATTERN, html) else 1))
 
         return getattr(self, challenge)(key, html)
 
 
-    def challenge_old(self, key=None, html=None):
+    def challenge_v1(self, key=None, html=None):
         if not key:
             if self.detect_key(html):
                 key = self.key
@@ -174,7 +159,7 @@ class ReCaptcha(CaptchaService):
         return millis, rpc
 
 
-    def challenge_new(self, key=None, html=None):
+    def challenge_v2(self, key=None, html=None):
         if not key:
             if self.detect_key(html):
                 key = self.key
@@ -323,7 +308,7 @@ class AdsCaptcha(CaptchaService):
 
 class SolveMedia(CaptchaService):
     __name__    = "SolveMedia"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __description__ = """SolveMedia captcha service plugin"""
     __license__     = "GPLv3"
@@ -333,6 +318,25 @@ class SolveMedia(CaptchaService):
     KEY_PATTERN = r'api\.solvemedia\.com/papi/challenge\.(?:no)?script\?k=(.+?)["\']'
 
 
+    def detect_key(self, html=None):
+        if not html:
+            if hasattr(self.plugin, "html") and self.plugin.html:
+                html = self.plugin.html
+            else:
+                errmsg = _("SolveMedia html not found")
+                self.plugin.fail(errmsg)
+                raise TypeError(errmsg)
+
+        m = re.search(self.KEY_PATTERN, html)
+        if m:
+            self.key = m.group(1).strip()
+            self.plugin.logDebug("SolveMedia key: %s" % self.key)
+            return self.key
+        else:
+            self.plugin.logDebug("SolveMedia key not found")
+            return None
+
+
     def challenge(self, key=None, html=None):
         if not key:
             if self.detect_key(html):
@@ -368,7 +372,7 @@ class SolveMedia(CaptchaService):
 
 class AdYouLike(CaptchaService):
     __name__    = "AdYouLike"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __description__ = """AdYouLike captcha service plugin"""
     __license__     = "GPLv3"
@@ -428,7 +432,7 @@ class AdYouLike(CaptchaService):
 
         self.plugin.logDebug("AdYouLike challenge: %s" % challenge)
 
-        return self.result(ayl, challenge)
+        return self.result(ayl, challenge), challenge
 
 
     def result(self, server, challenge):
-- 
cgit v1.2.3


From 312bbd1e82404a8e73bb14fae2acb81f7ea62193 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 24 Jan 2015 02:15:18 +0100
Subject: [SimpleHoster] Fix https://github.com/pyload/pyload/issues/1070

---
 module/plugins/internal/SimpleHoster.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 13a26c732..3770d0575 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -140,15 +140,14 @@ def timestamp():
 
 
 #@TODO: Move to hoster class in 0.4.10
-def fileUrl(self, url, follow_location=False):
+def fileUrl(self, url, follow_location=None):
     link     = ""
     redirect = 1
 
-    if isinstance(follow_location, bool):
-        redirect = 5
-
-    elif isinstance(follow_location, int):
+    if type(follow_location) is int:
         redirect = max(follow_location, 1)
+    else:
+        redirect = 5
 
     for i in xrange(redirect):
         try:
@@ -204,7 +203,7 @@ def fileUrl(self, url, follow_location=False):
                 mimetype = header['content-type'].split(';')[0].strip()
 
             elif extension:
-                mimetype = mimetypes.guess_extension(extension, False)[0] or "application/octet-stream"
+                mimetype = mimetypes.guess_type(extension, False)[0] or "application/octet-stream"
 
             else:
                 mimetype = ""
@@ -246,7 +245,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.07"
+    __version__ = "1.08"
 
     __pattern__ = r'^unmatchable$'
 
-- 
cgit v1.2.3


From 85945226e59dfe75b4005ad3f7db5af41b81172b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 24 Jan 2015 02:54:04 +0100
Subject: [CaptchaService] Fix typo

---
 module/plugins/internal/CaptchaService.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 0223f9a5a..c6e83fe7d 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -12,7 +12,7 @@ from module.common.json_layer import json_loads
 
 class CaptchaService:
     __name__    = "CaptchaService"
-    __version__ = "0.19"
+    __version__ = "0.20"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
@@ -40,7 +40,7 @@ class CaptchaService:
 
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
-    __version__ = "0.10"
+    __version__ = "0.11"
 
     __description__ = """ReCaptcha captcha service plugin"""
     __license__     = "GPLv3"
@@ -81,8 +81,8 @@ class ReCaptcha(CaptchaService):
                 self.plugin.fail(errmsg)
                 raise TypeError(errmsg)
 
-        challenge = "challenge_v%s" % ((version if version in (1, 2) else
-                                       (2 if re.search(self.KEY_V2_PATTERN, html) else 1))
+        challenge = "challenge_v%s" % (version if version in (1, 2) else
+                                       2 if re.search(self.KEY_V2_PATTERN, html) else 1)
 
         return getattr(self, challenge)(key, html)
 
-- 
cgit v1.2.3


From 031d86706aa13270793e31c21ad3f386ca62752b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 24 Jan 2015 03:50:33 +0100
Subject: Spare code improvements

---
 module/plugins/internal/MultiHoster.py     | 9 +++++----
 module/plugins/internal/SimpleCrypter.py   | 3 ++-
 module/plugins/internal/SimpleDereferer.py | 9 ++++-----
 module/plugins/internal/SimpleHoster.py    | 3 ++-
 4 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index eee634d46..ad5b6283e 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.35"
+    __version__ = "0.36"
 
     __pattern__ = r'^unmatchable$'
 
@@ -27,9 +27,10 @@ class MultiHoster(SimpleHoster):
 
 
     def prepare(self):
-        self.info      = {}
-        self.link      = ""     #@TODO: Move to hoster class in 0.4.10
-        self.directDL  = False  #@TODO: Move to hoster class in 0.4.10
+        self.info     = {}
+        self.html     = ""
+        self.link     = ""     #@TODO: Move to hoster class in 0.4.10
+        self.directDL = False  #@TODO: Move to hoster class in 0.4.10
 
         if self.LOGIN_ACCOUNT and not self.account:
             self.fail(_("Required account not found"))
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 9df262deb..b2622b5e0 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -12,7 +12,7 @@ from module.utils import fixup
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.41"
+    __version__ = "0.42"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
@@ -85,6 +85,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
         self.pyfile.error = ""  #@TODO: Remove in 0.4.10
 
         self.info  = {}
+        self.html  = ""
         self.links = []  #@TODO: Move to hoster class in 0.4.10
 
         if self.LOGIN_PREMIUM and not self.premium:
diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 72d61d4a0..4c5e67a4c 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import fileUrl, set_cookies
 class SimpleDereferer(Crypter):
     __name__    = "SimpleDereferer"
     __type__    = "crypter"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -54,10 +54,6 @@ class SimpleDereferer(Crypter):
             except Exception:
                 self.prepare()
                 self.preload()
-
-                if self.html is None:
-                    self.fail(_("No html retrieved"))
-
                 self.checkStatus()
 
                 link = self.getLink()
@@ -70,6 +66,9 @@ class SimpleDereferer(Crypter):
 
 
     def prepare(self):
+        self.info = {}
+        self.html = ""
+
         self.req.setOption("timeout", 120)
 
         if isinstance(self.COOKIES, list):
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 3770d0575..506974259 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -245,7 +245,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.08"
+    __version__ = "1.09"
 
     __pattern__ = r'^unmatchable$'
 
@@ -424,6 +424,7 @@ class SimpleHoster(Hoster):
         self.pyfile.error = ""  #@TODO: Remove in 0.4.10
 
         self.info      = {}
+        self.html      = ""
         self.link      = ""     #@TODO: Move to hoster class in 0.4.10
         self.directDL  = False  #@TODO: Move to hoster class in 0.4.10
         self.multihost = False  #@TODO: Move to hoster class in 0.4.10
-- 
cgit v1.2.3


From 4657db852d55b9c37dc2461baae47385bd68946b Mon Sep 17 00:00:00 2001
From: stickell <l.stickell@yahoo.it>
Date: Sat, 24 Jan 2015 20:12:03 +0100
Subject: Free XFS Premium chunked downloads. Let's make them fly!

---
 module/plugins/internal/XFSHoster.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 1dd3075d8..c6ec5faff 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -15,7 +15,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.38"
+    __version__ = "0.39"
 
     __pattern__ = r'^unmatchable$'
 
@@ -55,7 +55,7 @@ class XFSHoster(SimpleHoster):
 
 
     def setup(self):
-        self.chunkLimit     = 1
+        self.chunkLimit     = -1 if self.premium else 1
         self.resumeDownload = self.multiDL = self.premium
 
 
-- 
cgit v1.2.3


From be322927f8bedbe86e801326651bd548eeda1dd3 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 25 Jan 2015 00:27:21 +0100
Subject: [BasePlugin] Fix https://github.com/pyload/pyload/issues/1073

---
 module/plugins/internal/SimpleHoster.py |  6 +++---
 module/plugins/internal/XFSHoster.py    | 14 +++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 506974259..5c9d993e7 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -245,7 +245,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.09"
+    __version__ = "1.10"
 
     __pattern__ = r'^unmatchable$'
 
@@ -492,7 +492,7 @@ class SimpleHoster(Hoster):
         self.checkFile()
 
 
-    def downloadLink(self, link, disposition=False):
+    def downloadLink(self, link, disposition=False):  #@TODO: Set `disposition=True` in 0.4.10
         if link and isinstance(link, basestring):
             self.correctCaptcha()
 
@@ -501,7 +501,7 @@ class SimpleHoster(Hoster):
                 baseurl = "%s://%s" % (url_p.scheme, url_p.netloc)
                 link    = urljoin(baseurl, link)
 
-            self.download(link, disposition=disposition)  #@TODO: Set `disposition=True` in 0.4.10
+            self.download(link, ref=False, disposition=disposition)
 
 
     def checkFile(self):
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index c6ec5faff..fbbb37b37 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -15,7 +15,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.39"
+    __version__ = "0.40"
 
     __pattern__ = r'^unmatchable$'
 
@@ -88,12 +88,16 @@ class XFSHoster(SimpleHoster):
             self.directDL = self.premium
 
 
-    def downloadLink(self, link):
+    def downloadLink(self, link, disposition=False):  #@TODO: Set `disposition=True` in 0.4.10
         if link and isinstance(link, basestring):
-            if self.captcha:
-                self.correctCaptcha()
+            self.correctCaptcha()
 
-            self.download(link, ref=True, cookies=True, disposition=False)  #@TODO: Set `disposition=True` in 0.4.10
+            if not urlparse(link).scheme:
+                url_p   = urlparse(self.pyfile.url)
+                baseurl = "%s://%s" % (url_p.scheme, url_p.netloc)
+                link    = urljoin(baseurl, link)
+
+            self.download(link, ref=False, disposition=disposition)
 
         elif self.errmsg:
             if 'captcha' in self.errmsg:
-- 
cgit v1.2.3


From 7fc3362307737cd7c565b710ec83c5bdc4d3e8a9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 25 Jan 2015 03:05:00 +0100
Subject: Revert Extractor to the old one (temp)

---
 module/plugins/internal/Extractor.py |  79 ++++---------
 module/plugins/internal/UnRar.py     | 216 +++++++++++++++--------------------
 module/plugins/internal/UnZip.py     |  69 +++--------
 3 files changed, 133 insertions(+), 231 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 0b2462dac..55d9b2e83 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -8,52 +8,37 @@ class CRCError(Exception):
     pass
 
 
-class PasswordError(Exception):
+class WrongPassword(Exception):
     pass
 
 
 class Extractor:
     __name__    = "Extractor"
-    __version__ = "0.13"
+    __version__ = "0.14"
 
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "ranan@pyload.org"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
+    __authors__     = [("pyLoad Team", "admin@pyload.org")]
 
 
-    EXTENSIONS = []
-
-
-    @classmethod
-    def checkDeps(cls):
+    @staticmethod
+    def checkDeps():
         """ Check if system statisfy dependencies
         :return: boolean
         """
         return True
 
 
-    @classmethod
-    def isArchive(cls, file):
-        raise NotImplementedError
-
-
-    @classmethod
-    def getTargets(cls, files_ids):
+    @staticmethod
+    def getTargets(files_ids):
         """ Filter suited targets from list of filename id tuple list
         :param files_ids: List of filepathes
         :return: List of targets, id tuple list
         """
-        targets = []
-
-        for file, id in files_ids:
-            if cls.isArchive(file):
-                targets.append((file, id))
-
-        return targets
+        raise NotImplementedError
 
 
-    def __init__(self, m, file, out, password, fullpath, overwrite, excludefiles, renice, delete, keepbroken):
+    def __init__(self, m, file, out, fullpath, overwrite, excludefiles, renice):
         """Initialize extractor for specific file
 
         :param m: ExtractArchive Hook plugin
@@ -63,17 +48,14 @@ class Extractor:
         :param overwrite: Overwrite existing archives
         :param renice: Renice value
         """
-        self.m            = m
-        self.file         = file
-        self.out          = out
-        self.password     = password
-        self.fullpath     = fullpath
-        self.overwrite    = overwrite
+        self.m = m
+        self.file = file
+        self.out = out
+        self.fullpath = fullpath
+        self.overwrite = overwrite
         self.excludefiles = excludefiles
-        self.renice       = renice
-        self.delete       = delete
-        self.keepbroken   = keepbroken
-        self.files        = []  #: Store extracted files here
+        self.renice = renice
+        self.files = []  #: Store extracted files here
 
 
     def init(self):
@@ -81,45 +63,32 @@ class Extractor:
         pass
 
 
-    def verify(self):
+    def checkArchive(self):
         """Check if password if needed. Raise ArchiveError if integrity is
         questionable.
 
+        :return: boolean
         :raises ArchiveError
         """
-        pass
+        return False
 
 
-    def isPassword(self, password):
+    def checkPassword(self, password):
         """ Check if the given password is/might be correct.
         If it can not be decided at this point return true.
 
         :param password:
         :return: boolean
         """
-        if isinstance(password, basestring):
-            return True
-        else:
-            return False
-
-
-    def setPassword(self, password):
-        if self.isPassword(password):
-            self.password = password
-            return True
-        else:
-            return False
-
-
-    def repair(self):
-        return False
+        return True
 
 
-    def extract(self, progress=lambda x: None):
+    def extract(self, progress, password=None):
         """Extract the archive. Raise specific errors in case of failure.
 
         :param progress: Progress function, call this to update status
-        :raises PasswordError
+        :param password password to use
+        :raises WrongPassword
         :raises CRCError
         :raises ArchiveError
         :return:
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 296405101..a1b438e47 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -4,11 +4,11 @@ import os
 import re
 
 from glob import glob
-from os.path import basename, dirname, join
+from os.path import basename, join
 from string import digits
 from subprocess import Popen, PIPE
 
-from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
+from module.plugins.internal.Extractor import Extractor, WrongPassword, ArchiveError, CRCError
 from module.utils import save_join, decode
 
 
@@ -22,142 +22,115 @@ def renice(pid, value):
 
 class UnRar(Extractor):
     __name__    = "UnRar"
-    __version__ = "1.01"
+    __version__ = "1.02"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     CMD = "unrar"
 
-    EXTENSIONS = ["rar", "zip", "cab", "arj", "lzh", "tar", "gz", "bz2", "ace", "uue", "jar", "iso", "7z", "xz", "z"]
+    # there are some more uncovered rar formats
+    re_version = re.compile(r"(UNRAR 5[\d.]+(.*?)freeware)")
+    re_splitfile = re.compile(r"(.*)\.part(\d+)\.rar$", re.I)
+    re_partfiles = re.compile(r".*\.(rar|r\d+)", re.I)
+    re_filelist = re.compile(r"(.+)\s+(\d+)\s+(\d+)\s+")
+    re_filelist5 = re.compile(r"(.+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)")
+    re_wrongpwd = re.compile("(Corrupt file or wrong password|password incorrect)", re.I)
 
 
-    #@NOTE: there are some more uncovered rar formats
-    re_rarpart = re.compile(r'(.*)\.part(\d+)\.rar$', re.I)
-    re_rarfile = re.compile(r'.*\.(rar|r\d+)$', re.I)
-
-    re_filelist  = re.compile(r'(.+)\s+(\d+)\s+(\d+)\s+|(.+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)')
-    re_wrongpwd  = re.compile(r'password', re.I)
-    re_wrongcrc  = re.compile(r'encrypted|damaged|CRC failed|checksum error', re.I)
-
-
-    @classmethod
-    def checkDeps(cls):
+    @staticmethod
+    def checkDeps():
         if os.name == "nt":
-            cls.CMD = join(pypath, "UnRAR.exe")
-            p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
+            UnRar.CMD = join(pypath, "UnRAR.exe")
+            p = Popen([UnRar.CMD], stdout=PIPE, stderr=PIPE)
             p.communicate()
         else:
             try:
-                p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
+                p = Popen([UnRar.CMD], stdout=PIPE, stderr=PIPE)
                 p.communicate()
-
             except OSError:
+
                 # fallback to rar
-                cls.CMD = "rar"
-                p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
+                UnRar.CMD = "rar"
+                p = Popen([UnRar.CMD], stdout=PIPE, stderr=PIPE)
                 p.communicate()
 
         return True
 
 
-    @classmethod
-    def isArchive(cls, file):
-        f = basename(file).lower()
-        return any(f.endswith('.%s' % ext) for ext in cls.EXTENSIONS)
-
-
-    @classmethod
-    def getTargets(cls, files_ids):
-        targets = []
+    @staticmethod
+    def getTargets(files_ids):
+        result = []
 
         for file, id in files_ids:
-            if not cls.isArchive(file):
+            if not file.endswith(".rar"):
                 continue
 
-            m = cls.re_rarpart.findall(file)
-            if m:
+            match = UnRar.re_splitfile.findall(file)
+            if match:
                 # only add first parts
-                if int(m[0][1]) == 1:
-                    targets.append((file, id))
+                if int(match[0][1]) == 1:
+                    result.append((file, id))
             else:
-                targets.append((file, id))
-
-        return targets
+                result.append((file, id))
 
+        return result
 
-    def check(self, out="", err=""):
-        if not out or not err:
-            return
 
-        if err.strip():
-            if self.re_wrongpwd.search(err):
-                raise PasswordError
+    def init(self):
+        self.passwordProtected = False
+        self.headerProtected = False  #: list files will not work without password
+        self.smallestFile = None  #: small file to test passwords
+        self.password = ""  #: save the correct password
 
-            elif self.re_wrongcrc.search(err):
-                raise CRCError
 
-            else:  #: raise error if anything is on stderr
-                raise ArchiveError(err.strip())
+    def checkArchive(self):
+        p = self.call_unrar("l", "-v", self.file)
+        out, err = p.communicate()
+        if self.re_wrongpwd.search(err):
+            self.passwordProtected = True
+            self.headerProtected = True
+            return True
 
         # output only used to check if passworded files are present
-        for attr in self.re_filelist.findall(out):
-            if attr[0].startswith("*"):
-                raise PasswordError
-
-
-    def verify(self):
-        p = self.call_cmd("l", "-v", self.file, password=self.password)
-
-        self.check(*p.communicate())
-
-        if p and p.returncode:
-            raise ArchiveError("Process terminated")
-
-        if not self.list():
-            raise ArchiveError("Empty archive")
-
-
-    def isPassword(self, password):
-        if isinstance(password, basestring):
-            p = self.call_cmd("l", "-v", self.file, password=password)
-            out, err = p.communicate()
+        if self.re_version.search(out):
+            for attr, size, name in self.re_filelist5.findall(out):
+                if attr.startswith("*"):
+                    self.passwordProtected = True
+                    return True
+        else:
+            for name, size, packed in self.re_filelist.findall(out):
+                if name.startswith("*"):
+                    self.passwordProtected = True
+                    return True
 
-            if not self.re_wrongpwd.search(err):
-                return True
+        self.listContent()
+        if not self.files:
+            raise ArchiveError("Empty Archive")
 
         return False
 
 
-    def repair(self):
-        p = self.call_cmd("rc", self.file)
-        out, err = p.communicate()
-
-        if p.returncode or err.strip():
-            p = self.call_cmd("r", self.file)
+    def checkPassword(self, password):
+        # at this point we can only verify header protected files
+        if self.headerProtected:
+            p = self.call_unrar("l", "-v", self.file, password=password)
             out, err = p.communicate()
-
-            if p.returncode or err.strip():
+            if self.re_wrongpwd.search(err):
                 return False
-            else:
-                self.file = join(dirname(self.file), re.search(r'(fixed|rebuild)\.%s' % basename(self.file), out).group(0))
 
         return True
 
 
-    def extract(self, progress=lambda x: None):
-        self.verify()
-
-        progress(0)
-
+    def extract(self, progress, password=None):
         command = "x" if self.fullpath else "e"
 
-        p = self.call_cmd(command, self.file, self.out, password=self.password)
-
+        p = self.call_unrar(command, self.file, self.out, password=password)
         renice(p.pid, self.renice)
 
+        progress(0)
         progressstring = ""
         while True:
             c = p.stdout.read(1)
@@ -165,7 +138,7 @@ class UnRar(Extractor):
             if not c:
                 break
             # reading a percentage sign -> set progress and restart
-            if c is '%':
+            if c == '%':
                 progress(int(progressstring))
                 progressstring = ""
             # not reading a digit -> therefore restart
@@ -173,43 +146,44 @@ class UnRar(Extractor):
                 progressstring = ""
             # add digit to progressstring
             else:
-                progressstring += c
-
+                progressstring = progressstring + c
         progress(100)
 
-        self.files = self.list()
-
         # retrieve stderr
-        self.check(err=p.stderr.read())
-
+        err = p.stderr.read()
+
+        if "CRC failed" in err and not password and not self.passwordProtected:
+            raise CRCError
+        elif "CRC failed" in err:
+            raise WrongPassword
+        if err.strip():  #: raise error if anything is on stderr
+            raise ArchiveError(err.strip())
         if p.returncode:
             raise ArchiveError("Process terminated")
 
+        if not self.files:
+            self.password = password
+            self.listContent()
+
 
     def getDeleteFiles(self):
         if ".part" in basename(self.file):
             return glob(re.sub("(?<=\.part)([01]+)", "*", self.file, re.I))
-
         # get files which matches .r* and filter unsuited files out
         parts = glob(re.sub(r"(?<=\.r)ar$", "*", self.file, re.I))
+        return filter(lambda x: self.re_partfiles.match(x), parts)
 
-        return filter(lambda x: self.re_rarfile.match(x), parts)
 
-
-    def list(self):
+    def listContent(self):
         command = "vb" if self.fullpath else "lb"
-
-        p = self.call_cmd(command, "-v", self.file, password=self.password)
+        p = self.call_unrar(command, "-v", self.file, password=self.password)
         out, err = p.communicate()
 
-        if err.strip():
-            self.m.logError(err)
-            if "Cannot open" in err:
-                return list()
+        if "Cannot open" in err:
+            raise ArchiveError("Cannot open file")
 
-        if p.returncode:
-            self.m.logError("Process terminated")
-            return list()
+        if err.strip():  #: only log error at this point
+            self.m.logError(err.strip())
 
         result = set()
 
@@ -217,22 +191,17 @@ class UnRar(Extractor):
             f = f.strip()
             result.add(save_join(self.out, f))
 
-        return list(result)
+        self.files = result
 
 
-    def call_cmd(self, command, *xargs, **kwargs):
+    def call_unrar(self, command, *xargs, **kwargs):
         args = []
-
         # overwrite flag
-        if self.overwrite:
-            args.append("-o+")
-        else:
-            args.append("-o-")
-            if self.delete:
-                args.append("-or")
+        args.append("-o+") if self.overwrite else args.append("-o-")
 
-        for word in self.excludefiles:
-            args.append("-x%s" % word.strip())
+        if self.excludefiles:
+            for word in self.excludefiles.split(';'):
+                args.append("-x%s" % word)
 
         # assume yes on all queries
         args.append("-y")
@@ -243,11 +212,10 @@ class UnRar(Extractor):
         else:
             args.append("-p-")
 
-        if self.keepbroken:
-            args.append("-kb")
-
         # NOTE: return codes are not reliable, some kind of threading, cleanup whatever issue
         call = [self.CMD, command] + args + list(xargs)
         self.m.logDebug(" ".join(call))
 
-        return Popen(call, stdout=PIPE, stderr=PIPE)
+        p = Popen(call, stdout=PIPE, stderr=PIPE)
+
+        return p
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 5ec56cbdf..888ae7ebe 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -1,86 +1,51 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import with_statement
-
 import sys
 import zipfile
 
-from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
+from module.plugins.internal.Extractor import Extractor, WrongPassword, ArchiveError
 
 
 class UnZip(Extractor):
     __name__    = "UnZip"
-    __version__ = "1.01"
+    __version__ = "1.02"
 
     __description__ = """Zip extractor plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    EXTENSIONS = ["zip", "zip64"]
+    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
 
 
-    @classmethod
-    def checkDeps(cls):
+    @staticmethod
+    def checkDeps():
         return sys.version_info[:2] >= (2, 6)
 
 
-    @classmethod
-    def isArchive(cls, file):
-        return zipfile.is_zipfile(file)
+    @staticmethod
+    def getTargets(files_ids):
+        result = []
 
+        for file, id in files_ids:
+            if file.endswith(".zip"):
+                result.append((file, id))
 
-    def verify(self):
-        try:
-            with zipfile.ZipFile(self.file, 'r', allowZip64=True) as z:
-                z.setpassword(self.password)
-                badcrc = z.testzip()
+        return result
 
-        except (BadZipfile, LargeZipFile), e:
-            raise ArchiveError(e)
 
-        except RuntimeError, e:
-            if 'encrypted' in e:
-                raise PasswordError
-            else:
-                raise ArchiveError(e)
-
-        else:
-            if badcrc:
-                raise CRCError
-
-        if not self.list():
-            raise ArchiveError("Empty archive")
-
-
-    def list(self):
+    def extract(self, progress, password=None):
         try:
-            with zipfile.ZipFile(self.file, 'r', allowZip64=True) as z:
-                z.setpassword(self.password)
-                return z.namelist()
-        except Exception:
-            return list()
-
-
-    def extract(self, progress=lambda x: None):
-        try:
-            with zipfile.ZipFile(self.file, 'r', allowZip64=True) as z:
-                progress(0)
-                z.extractall(self.out, pwd=self.password)
-                progress(100)
+            z = zipfile.ZipFile(self.file)
+            self.files = z.namelist()
+            z.extractall(self.out, pwd=password)
 
         except (BadZipfile, LargeZipFile), e:
             raise ArchiveError(e)
 
         except RuntimeError, e:
             if e is "Bad password for file":
-                raise PasswordError
+                raise WrongPassword
             else:
                 raise ArchiveError(e)
 
-        finally:
-            self.files = self.list()
-
 
     def getDeleteFiles(self):
         return [self.file]
-- 
cgit v1.2.3


From 65d720a6e4be3f90024bc032209fd26012081ed1 Mon Sep 17 00:00:00 2001
From: stickell <l.stickell@yahoo.it>
Date: Sun, 25 Jan 2015 16:17:14 +0100
Subject: [XFSHoster] Fixed #1078

---
 module/plugins/internal/XFSHoster.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index fbbb37b37..2054b1824 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -4,6 +4,7 @@ import re
 
 from random import random
 from time import sleep
+from urlparse import urljoin, urlparse
 
 from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME
 
@@ -15,7 +16,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.40"
+    __version__ = "0.41"
 
     __pattern__ = r'^unmatchable$'
 
-- 
cgit v1.2.3


From 99ed44b0d919a33e3a559472893163b347cd1c37 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 25 Jan 2015 19:09:21 +0100
Subject: Fix reverted Extractor

---
 module/plugins/internal/UnRar.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index a1b438e47..43592c3de 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.02"
+    __version__ = "1.03"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -32,12 +32,13 @@ class UnRar(Extractor):
     CMD = "unrar"
 
     # there are some more uncovered rar formats
-    re_version = re.compile(r"(UNRAR 5[\d.]+(.*?)freeware)")
-    re_splitfile = re.compile(r"(.*)\.part(\d+)\.rar$", re.I)
-    re_partfiles = re.compile(r".*\.(rar|r\d+)", re.I)
-    re_filelist = re.compile(r"(.+)\s+(\d+)\s+(\d+)\s+")
-    re_filelist5 = re.compile(r"(.+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)")
-    re_wrongpwd = re.compile("(Corrupt file or wrong password|password incorrect)", re.I)
+    re_version   = re.compile(r'UNRAR 5[\d.]+')
+    re_splitfile = re.compile(r'(.*)\.part(\d+)\.rar$', re.I)
+    re_partfiles = re.compile(r'.*\.(rar|r\d+)$', re.I)
+    re_filelist  = re.compile(r'(.+)\s+(\d+)\s+(\d+)\s+')
+    re_filelist5 = re.compile(r'(.+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)')
+    re_wrongpwd  = re.compile(r'Corrupt file or wrong password|password incorrect', re.I)
+    re_wrongcrc  = re.compile(r'encrypted|damaged|CRC failed|checksum error', re.I)
 
 
     @staticmethod
@@ -81,9 +82,9 @@ class UnRar(Extractor):
 
     def init(self):
         self.passwordProtected = False
-        self.headerProtected = False  #: list files will not work without password
-        self.smallestFile = None  #: small file to test passwords
-        self.password = ""  #: save the correct password
+        self.headerProtected   = False  #: list files will not work without password
+        self.smallestFile      = None  #: small file to test passwords
+        self.password          = ""  #: save the correct password
 
 
     def checkArchive(self):
@@ -152,12 +153,15 @@ class UnRar(Extractor):
         # retrieve stderr
         err = p.stderr.read()
 
-        if "CRC failed" in err and not password and not self.passwordProtected:
-            raise CRCError
-        elif "CRC failed" in err:
+        if self.re_wrongpwd.search(err):
             raise WrongPassword
-        if err.strip():  #: raise error if anything is on stderr
+
+        elif self.re_wrongcrc.search(err):
+            raise CRCError
+
+        elif err.strip():  #: raise error if anything is on stderr
             raise ArchiveError(err.strip())
+
         if p.returncode:
             raise ArchiveError("Process terminated")
 
-- 
cgit v1.2.3


From 8848a359a43316fb346b728d1d79d7b72d27e5a0 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 27 Jan 2015 17:48:25 +0100
Subject: Update Extractor (again)

---
 module/plugins/internal/Extractor.py |  76 +++++++++------
 module/plugins/internal/SevenZip.py  | 163 ++++++++++++++++++++++++++++++++
 module/plugins/internal/UnRar.py     | 175 +++++++++++++++++------------------
 module/plugins/internal/UnZip.py     |  47 +++++-----
 4 files changed, 320 insertions(+), 141 deletions(-)
 create mode 100644 module/plugins/internal/SevenZip.py

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 55d9b2e83..ddf0f8a85 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -1,5 +1,11 @@
 # -*- coding: utf-8 -*-
 
+import os
+
+from module.PyFile import PyFile
+from module.utils import fs_encode
+
+
 class ArchiveError(Exception):
     pass
 
@@ -8,29 +14,39 @@ class CRCError(Exception):
     pass
 
 
-class WrongPassword(Exception):
+class PasswordError(Exception):
     pass
 
 
 class Extractor:
     __name__    = "Extractor"
-    __version__ = "0.14"
+    __version__ = "0.15"
 
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+    __authors__     = [("RaNaN", "ranan@pyload.org"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    EXTENSIONS = []
 
 
-    @staticmethod
-    def checkDeps():
+    @classmethod
+    def isArchive(cls, filename):
+        name = os.path.basename(filename).lower()
+        return any(name.endswith(ext) for ext in cls.EXTENSIONS)
+
+
+    @classmethod
+    def checkDeps(cls):
         """ Check if system statisfy dependencies
         :return: boolean
         """
         return True
 
 
-    @staticmethod
-    def getTargets(files_ids):
+    @classmethod
+    def getTargets(cls, files_ids):
         """ Filter suited targets from list of filename id tuple list
         :param files_ids: List of filepathes
         :return: List of targets, id tuple list
@@ -38,24 +54,28 @@ class Extractor:
         raise NotImplementedError
 
 
-    def __init__(self, m, file, out, fullpath, overwrite, excludefiles, renice):
-        """Initialize extractor for specific file
-
-        :param m: ExtractArchive Hook plugin
-        :param file: Absolute filepath
-        :param out: Absolute path to destination directory
-        :param fullpath: extract to fullpath
-        :param overwrite: Overwrite existing archives
-        :param renice: Renice value
-        """
-        self.m = m
-        self.file = file
-        self.out = out
-        self.fullpath = fullpath
-        self.overwrite = overwrite
-        self.excludefiles = excludefiles
-        self.renice = renice
-        self.files = []  #: Store extracted files here
+    def __init__(self, manager, filename, out,
+                 fullpath=True,
+                 overwrite=False,
+                 excludefiles=[],
+                 renice=0,
+                 delete=False,
+                 keepbroken=False,
+                 fid=None):
+        """ Initialize extractor for specific file """
+        self.manager        = manager
+        self.target         = fs_encode(filename)
+        self.out            = out
+        self.fullpath       = fullpath
+        self.overwrite      = overwrite
+        self.excludefiles   = excludefiles
+        self.renice         = renice
+        self.delete         = delete
+        self.keepbroken     = keepbroken
+        self.files          = []  #: Store extracted files here
+
+        pyfile = self.manager.core.files.getFile(fid) if fid else None
+        self.notifyProgress = lambda x: pyfile.setProgress(x) if pyfile else lambda x: None
 
 
     def init(self):
@@ -83,12 +103,12 @@ class Extractor:
         return True
 
 
-    def extract(self, progress, password=None):
+    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 WrongPassword
+        :raises PasswordError
         :raises CRCError
         :raises ArchiveError
         :return:
@@ -101,7 +121,7 @@ class Extractor:
 
         :return: List with paths of files to delete
         """
-        raise NotImplementedError
+        return [self.target]
 
 
     def getExtractedFiles(self):
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
new file mode 100644
index 000000000..508cf9c8d
--- /dev/null
+++ b/module/plugins/internal/SevenZip.py
@@ -0,0 +1,163 @@
+# -*- coding: utf-8 -*-
+
+import os
+import re
+
+from subprocess import Popen, PIPE
+
+from module.plugins.internal.UnRar import UnRar, renice
+from module.utils import save_join
+
+
+class SevenZip(UnRar):
+    __name__    = "SevenZip"
+    __version__ = "0.02"
+
+    __description__ = """7-Zip extractor plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Michael Nowak", ""),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    CMD = "7z"
+
+    EXTENSIONS = [".7z", ".xz", ".zip", ".gz", ".gzip", ".tgz", ".bz2", ".bzip2",
+                  ".tbz2", ".tbz", ".tar", ".wim", ".swm", ".lzma", ".rar", ".cab",
+                  ".arj", ".z", ".taz", ".cpio", ".rpm", ".deb", ".lzh", ".lha",
+                  ".chm", ".chw", ".hxs", ".iso", ".msi", ".doc", ".xls", ".ppt",
+                  ".dmg", ".xar", ".hfs", ".exe", ".ntfs", ".fat", ".vhd", ".mbr",
+                  ".squashfs", ".cramfs", ".scap"]
+
+
+    #@NOTE: there are some more uncovered 7z formats
+    re_filelist = re.compile(r'([\d\:]+)\s+([\d\:]+)\s+([\w\.]+)\s+(\d+)\s+(\d+)\s+(.+)')
+    re_wrongpwd = re.compile(r'(Can not open encrypted archive|Wrong password)', re.I)
+    re_wrongcrc = re.compile(r'Encrypted\s+\=\s+\+', re.I)
+
+
+    @classmethod
+    def checkDeps(cls):
+        if os.name == "nt":
+            cls.CMD = os.path.join(pypath, "7z.exe")
+            p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
+            p.communicate()
+        else:
+            p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
+            p.communicate()
+
+        return True
+
+
+    def checkArchive(self):
+        p = self.call_cmd("l", "-slt", self.target)
+        out, err = p.communicate()
+
+        if p.returncode > 1:
+            raise ArchiveError("Process terminated")
+
+        # check if output or error macthes the 'wrong password'-Regexp
+        if self.re_wrongpwd.search(out):
+            return True
+
+        # check if output matches 'Encrypted = +'
+        if self.re_wrongcrc.search(out):
+            return True
+
+        # check if archive is empty
+        self.files = self.list()
+        if not self.files:
+            raise ArchiveError("Empty Archive")
+
+        return False
+
+
+    def checkPassword(self, password):
+        p = self.call_cmd("l", self.target, password=password)
+        p.communicate()
+        return p.returncode == 0
+
+
+    def extract(self, password=None):
+        command = "x" if self.fullpath else "e"
+
+        p = self.call_cmd(command, '-o' + self.out, self.target, password=password)
+
+        renice(p.pid, self.renice)
+
+        progressstring = ""
+        while True:
+            c = p.stdout.read(1)
+            # quit loop on eof
+            if not c:
+                break
+            # reading a percentage sign -> set progress and restart
+            if c == '%':
+                self.notifyProgress(int(progressstring))
+                progressstring = ""
+            # not reading a digit -> therefore restart
+            elif c not in digits:
+                progressstring = ""
+            # add digit to progressstring
+            else:
+                progressstring += c
+
+        # retrieve stderr
+        err = p.stderr.read()
+
+        if self.re_wrongpwd.search(err):
+            raise PasswordError
+
+        elif self.re_wrongcrc.search(err):
+            raise CRCError
+
+        elif err.strip():  #: raise error if anything is on stderr
+            raise ArchiveError(err.strip())
+
+        if p.returncode > 1:
+            raise ArchiveError("Process terminated")
+
+        if not self.files:
+            self.files = self.list(password)
+
+
+    def list(self, password=None):
+        command = "l" if self.fullpath else "l"
+
+        p = self.call_cmd(command, self.target, password=password)
+        out, err = p.communicate()
+        code     = p.returncode
+
+        if "Can not open" in err:
+            raise ArchiveError("Cannot open file")
+
+        if code != 0:
+            raise ArchiveError("Process terminated unsuccessful")
+
+        result = set()
+        for groups in self.re_filelist.findall(out):
+            f = groups[-1].strip()
+            result.add(save_join(self.out, f))
+
+        return list(result)
+
+
+    def call_cmd(self, command, *xargs, **kwargs):
+        args = []
+
+        #overwrite flag
+        if self.overwrite:
+            args.append("-y")
+
+        #set a password
+        if "password" in kwargs and kwargs["password"]:
+            args.append("-p%s" % kwargs["password"])
+        else:
+            args.append("-p-")
+
+        #@NOTE: return codes are not reliable, some kind of threading, cleanup whatever issue
+        call = [self.cmd, command] + args + list(xargs)
+
+        self.manager.logDebug(" ".join([decode(arg) for arg in call]))
+
+        p = Popen(call, stdout=PIPE, stderr=PIPE)
+        return p
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 43592c3de..7f1b08caf 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -4,110 +4,92 @@ import os
 import re
 
 from glob import glob
-from os.path import basename, join
 from string import digits
 from subprocess import Popen, PIPE
 
-from module.plugins.internal.Extractor import Extractor, WrongPassword, ArchiveError, CRCError
+from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
 from module.utils import save_join, decode
 
 
 def renice(pid, value):
-    if os.name != "nt" and value:
+    if value and os.name != "nt":
         try:
             Popen(["renice", str(value), str(pid)], stdout=PIPE, stderr=PIPE, bufsize=-1)
         except Exception:
-            print "Renice failed"
+            pass
 
 
 class UnRar(Extractor):
     __name__    = "UnRar"
-    __version__ = "1.03"
+    __version__ = "1.04"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
+    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
 
 
     CMD = "unrar"
 
-    # there are some more uncovered rar formats
-    re_version   = re.compile(r'UNRAR 5[\d.]+')
-    re_splitfile = re.compile(r'(.*)\.part(\d+)\.rar$', re.I)
-    re_partfiles = re.compile(r'.*\.(rar|r\d+)$', re.I)
-    re_filelist  = re.compile(r'(.+)\s+(\d+)\s+(\d+)\s+')
-    re_filelist5 = re.compile(r'(.+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)')
-    re_wrongpwd  = re.compile(r'Corrupt file or wrong password|password incorrect', re.I)
+    EXTENSIONS = [".rar", ".zip", ".cab", ".arj", ".lzh", ".tar", ".gz", ".bz2",
+                  ".ace", ".uue", ".jar", ".iso", ".7z", ".xz", ".z"]
+
+    #@NOTE: there are some more uncovered rar formats
+    re_rarpart1 = re.compile(r'\.part(\d+)\.rar$', re.I)
+    re_rarpart2 = re.compile(r'\.r(\d+)$', re.I)
+
+    re_filelist  = re.compile(r'(.+)\s+(\d+)\s+(\d+)\s+|(.+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)')
+    re_wrongpwd  = re.compile(r'password', re.I)
     re_wrongcrc  = re.compile(r'encrypted|damaged|CRC failed|checksum error', re.I)
 
 
-    @staticmethod
-    def checkDeps():
+    @classmethod
+    def checkDeps(cls):
         if os.name == "nt":
-            UnRar.CMD = join(pypath, "UnRAR.exe")
-            p = Popen([UnRar.CMD], stdout=PIPE, stderr=PIPE)
+            cls.CMD = os.path.join(pypath, "UnRAR.exe")
+            p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
             p.communicate()
         else:
             try:
-                p = Popen([UnRar.CMD], stdout=PIPE, stderr=PIPE)
+                p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
                 p.communicate()
-            except OSError:
 
-                # fallback to rar
-                UnRar.CMD = "rar"
-                p = Popen([UnRar.CMD], stdout=PIPE, stderr=PIPE)
+            except OSError:  #: fallback to rar
+                cls.CMD = "rar"
+                p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
                 p.communicate()
 
         return True
 
 
-    @staticmethod
-    def getTargets(files_ids):
-        result = []
+    @classmethod
+    def getTargets(cls, files_ids):
+        targets = []
 
-        for file, id in files_ids:
-            if not file.endswith(".rar"):
+        for filename, id in files_ids:
+            if not cls.isArchive(filename):
                 continue
 
-            match = UnRar.re_splitfile.findall(file)
-            if match:
-                # only add first parts
-                if int(match[0][1]) == 1:
-                    result.append((file, id))
-            else:
-                result.append((file, id))
-
-        return result
-
+            m = cls.re_rarpart1.match(filename)
+            if not m or int(m.group(1)) is 1:  #@NOTE: only add first part file
+                targets.append((filename, id))
 
-    def init(self):
-        self.passwordProtected = False
-        self.headerProtected   = False  #: list files will not work without password
-        self.smallestFile      = None  #: small file to test passwords
-        self.password          = ""  #: save the correct password
+        return targets
 
 
     def checkArchive(self):
-        p = self.call_unrar("l", "-v", self.file)
+        p = self.call_cmd("l", "-v", self.target)
         out, err = p.communicate()
+
         if self.re_wrongpwd.search(err):
-            self.passwordProtected = True
-            self.headerProtected = True
             return True
 
         # output only used to check if passworded files are present
-        if self.re_version.search(out):
-            for attr, size, name in self.re_filelist5.findall(out):
-                if attr.startswith("*"):
-                    self.passwordProtected = True
-                    return True
-        else:
-            for name, size, packed in self.re_filelist.findall(out):
-                if name.startswith("*"):
-                    self.passwordProtected = True
-                    return True
+        for attr in self.re_filelist.findall(out):
+            if attr[0].startswith("*"):
+                return True
 
-        self.listContent()
+        self.files = self.list()
         if not self.files:
             raise ArchiveError("Empty Archive")
 
@@ -116,22 +98,18 @@ class UnRar(Extractor):
 
     def checkPassword(self, password):
         # at this point we can only verify header protected files
-        if self.headerProtected:
-            p = self.call_unrar("l", "-v", self.file, password=password)
-            out, err = p.communicate()
-            if self.re_wrongpwd.search(err):
-                return False
-
-        return True
+        p = self.call_cmd("l", "-v", self.target, password=password)
+        out, err = p.communicate()
+        return False if self.re_wrongpwd.search(err) else True
 
 
-    def extract(self, progress, password=None):
+    def extract(self, password=None):
         command = "x" if self.fullpath else "e"
 
-        p = self.call_unrar(command, self.file, self.out, password=password)
+        p = self.call_cmd(command, self.target, self.out, password=password)
+
         renice(p.pid, self.renice)
 
-        progress(0)
         progressstring = ""
         while True:
             c = p.stdout.read(1)
@@ -140,21 +118,20 @@ class UnRar(Extractor):
                 break
             # reading a percentage sign -> set progress and restart
             if c == '%':
-                progress(int(progressstring))
+                self.notifyProgress(int(progressstring))
                 progressstring = ""
             # not reading a digit -> therefore restart
             elif c not in digits:
                 progressstring = ""
             # add digit to progressstring
             else:
-                progressstring = progressstring + c
-        progress(100)
+                progressstring += c
 
         # retrieve stderr
         err = p.stderr.read()
 
         if self.re_wrongpwd.search(err):
-            raise WrongPassword
+            raise PasswordError
 
         elif self.re_wrongcrc.search(err):
             raise CRCError
@@ -162,50 +139,65 @@ class UnRar(Extractor):
         elif err.strip():  #: raise error if anything is on stderr
             raise ArchiveError(err.strip())
 
-        if p.returncode:
+        if p.returncode != 0:
             raise ArchiveError("Process terminated")
 
         if not self.files:
-            self.password = password
-            self.listContent()
+            self.files = self.list(password)
 
 
     def getDeleteFiles(self):
-        if ".part" in basename(self.file):
-            return glob(re.sub("(?<=\.part)([01]+)", "*", self.file, re.I))
-        # get files which matches .r* and filter unsuited files out
-        parts = glob(re.sub(r"(?<=\.r)ar$", "*", self.file, re.I))
-        return filter(lambda x: self.re_partfiles.match(x), parts)
+        files = []
+
+        for i in [1, 2]:
+            try:
+                dir, name = os.path.split(self.target)
+                part      = self.getattr(self, "re_rarpart%d" % i).match(name).group(1)
+                filename  = os.path.join(dir, name.replace(part, '*', 1))
+                files.extend(glob(filename))
+
+            except Exception:
+                continue
 
+        if self.target not in files:
+            files.insert(0, self.target)
 
-    def listContent(self):
+        return files
+
+
+    def list(self, password=None):
         command = "vb" if self.fullpath else "lb"
-        p = self.call_unrar(command, "-v", self.file, password=self.password)
+
+        p = self.call_cmd(command, "-v", self.target, password=password)
         out, err = p.communicate()
 
         if "Cannot open" in err:
             raise ArchiveError("Cannot open file")
 
         if err.strip():  #: only log error at this point
-            self.m.logError(err.strip())
+            self.manager.logError(err.strip())
 
         result = set()
-
         for f in decode(out).splitlines():
             f = f.strip()
             result.add(save_join(self.out, f))
 
-        self.files = result
+        return list(result)
 
 
-    def call_unrar(self, command, *xargs, **kwargs):
+    def call_cmd(self, command, *xargs, **kwargs):
         args = []
+
         # overwrite flag
-        args.append("-o+") if self.overwrite else args.append("-o-")
+        if self.overwrite:
+            args.append("-o+")
+        else:
+            args.append("-o-")
+            if self.delete:
+                args.append("-or")
 
-        if self.excludefiles:
-            for word in self.excludefiles.split(';'):
-                args.append("-x%s" % word)
+        for word in self.excludefiles:
+            args.append("-x%s" % word.strip())
 
         # assume yes on all queries
         args.append("-y")
@@ -216,10 +208,13 @@ class UnRar(Extractor):
         else:
             args.append("-p-")
 
+        if self.keepbroken:
+            args.append("-kb")
+
         # NOTE: return codes are not reliable, some kind of threading, cleanup whatever issue
         call = [self.CMD, command] + args + list(xargs)
-        self.m.logDebug(" ".join(call))
 
-        p = Popen(call, stdout=PIPE, stderr=PIPE)
+        self.manager.logDebug(" ".join(call))
 
+        p = Popen(call, stdout=PIPE, stderr=PIPE)
         return p
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 888ae7ebe..026503be5 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -1,51 +1,52 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import with_statement
+
+import os
 import sys
 import zipfile
 
-from module.plugins.internal.Extractor import Extractor, WrongPassword, ArchiveError
+from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
 
 
 class UnZip(Extractor):
     __name__    = "UnZip"
-    __version__ = "1.02"
+    __version__ = "1.03"
 
     __description__ = """Zip extractor plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
+    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    @staticmethod
-    def checkDeps():
-        return sys.version_info[:2] >= (2, 6)
+    EXTENSIONS = [".zip", ".zip64"]
 
 
-    @staticmethod
-    def getTargets(files_ids):
-        result = []
+    @classmethod
+    def checkDeps(cls):
+        return sys.version_info[:2] >= (2, 6)
 
-        for file, id in files_ids:
-            if file.endswith(".zip"):
-                result.append((file, id))
 
-        return result
+    @classmethod
+    def getTargets(cls, files_ids):
+        return [(filename, id) for filename, id in files_ids if cls.isArchive(filename)]
 
 
-    def extract(self, progress, password=None):
+    def extract(self, password=None):
         try:
-            z = zipfile.ZipFile(self.file)
-            self.files = z.namelist()
-            z.extractall(self.out, pwd=password)
+            with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z:
+                z.setpassword(self.password)
+                if not z.testzip():
+                    z.extractall(self.out)
+                    self.files = z.namelist()
+                else:
+                    raise CRCError
 
         except (BadZipfile, LargeZipFile), e:
             raise ArchiveError(e)
 
         except RuntimeError, e:
-            if e is "Bad password for file":
-                raise WrongPassword
+            if "encrypted" in e:
+                raise PasswordError
             else:
                 raise ArchiveError(e)
-
-
-    def getDeleteFiles(self):
-        return [self.file]
-- 
cgit v1.2.3


From e704a6cdd07c01a2f79eb851d7f2ecdf78da77fd Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 28 Jan 2015 01:18:23 +0100
Subject: [UploadedTo] Rewritten

---
 module/plugins/internal/SimpleHoster.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 5c9d993e7..30add3f41 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -245,7 +245,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.10"
+    __version__ = "1.11"
 
     __pattern__ = r'^unmatchable$'
 
@@ -333,7 +333,7 @@ class SimpleHoster(Hoster):
     @classmethod
     def getInfo(cls, url="", html=""):
         info   = cls.apiInfo(url)
-        online = False
+        online = False if info['status'] != 2 else True
 
         try:
             info['pattern'] = re.match(cls.__pattern__, url).groupdict()  #: pattern groups will be saved here
@@ -341,7 +341,7 @@ class SimpleHoster(Hoster):
         except Exception:
             info['pattern'] = {}
 
-        if not html:
+        if not html and not online:
             if not url:
                 info['error']  = "missing url"
                 info['status'] = 1
-- 
cgit v1.2.3


From 31b5cf3426accb16268ce0d968b619c4893cd34f Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 29 Jan 2015 00:25:13 +0100
Subject: [SimpleDereferer][SimpleHoster] Revert renewHTTPRequest

---
 module/plugins/internal/SimpleDereferer.py | 3 +--
 module/plugins/internal/SimpleHoster.py    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 4c5e67a4c..bd00f5d25 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import fileUrl, set_cookies
 class SimpleDereferer(Crypter):
     __name__    = "SimpleDereferer"
     __type__    = "crypter"
-    __version__ = "0.06"
+    __version__ = "0.07"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -76,7 +76,6 @@ class SimpleDereferer(Crypter):
 
 
     def preload(self):
-        self.req.renewHTTPRequest()  #@NOTE: Remove in 0.4.10
         self.html = self.load(self.pyfile.url, cookies=bool(self.COOKIES), decode=not self.TEXT_ENCODING)
 
         if isinstance(self.TEXT_ENCODING, basestring):
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 30add3f41..c74e33d59 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -245,7 +245,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.11"
+    __version__ = "1.12"
 
     __pattern__ = r'^unmatchable$'
 
@@ -453,7 +453,6 @@ class SimpleHoster(Hoster):
 
 
     def preload(self):
-        self.req.renewHTTPRequest()  #@NOTE: Remove in 0.4.10
         self.html = self.load(self.pyfile.url, cookies=bool(self.COOKIES), decode=not self.TEXT_ENCODING)
 
         if isinstance(self.TEXT_ENCODING, basestring):
-- 
cgit v1.2.3


From 788a06132882300a22f6db3aa7ac3a6009d4d762 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 29 Jan 2015 23:13:54 +0100
Subject: Update Extractor (2)

---
 module/plugins/internal/Extractor.py | 17 ++++++----
 module/plugins/internal/SevenZip.py  | 24 +++++++-------
 module/plugins/internal/UnRar.py     | 64 +++++++++++++++++++++++++-----------
 module/plugins/internal/UnZip.py     | 12 ++++---
 4 files changed, 73 insertions(+), 44 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index ddf0f8a85..3ea634ec8 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -3,7 +3,6 @@
 import os
 
 from module.PyFile import PyFile
-from module.utils import fs_encode
 
 
 class ArchiveError(Exception):
@@ -20,7 +19,7 @@ class PasswordError(Exception):
 
 class Extractor:
     __name__    = "Extractor"
-    __version__ = "0.15"
+    __version__ = "0.16"
 
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
@@ -64,7 +63,7 @@ class Extractor:
                  fid=None):
         """ Initialize extractor for specific file """
         self.manager        = manager
-        self.target         = fs_encode(filename)
+        self.filename       = filename
         self.out            = out
         self.fullpath       = fullpath
         self.overwrite      = overwrite
@@ -83,17 +82,17 @@ class Extractor:
         pass
 
 
-    def checkArchive(self):
+    def check(self):
         """Check if password if needed. Raise ArchiveError if integrity is
         questionable.
 
         :return: boolean
         :raises ArchiveError
         """
-        return False
+        raise PasswordError
 
 
-    def checkPassword(self, password):
+    def isPassword(self, password):
         """ Check if the given password is/might be correct.
         If it can not be decided at this point return true.
 
@@ -103,6 +102,10 @@ class Extractor:
         return True
 
 
+    def repair(self):
+        return False
+
+
     def extract(self, password=None):
         """Extract the archive. Raise specific errors in case of failure.
 
@@ -121,7 +124,7 @@ class Extractor:
 
         :return: List with paths of files to delete
         """
-        return [self.target]
+        return [self.filename]
 
 
     def getExtractedFiles(self):
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 508cf9c8d..e808e0d88 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -5,13 +5,13 @@ import re
 
 from subprocess import Popen, PIPE
 
-from module.plugins.internal.UnRar import UnRar, renice
-from module.utils import save_join
+from module.plugins.internal.UnRar import ArchiveError, CRCError, PasswordError, UnRar, renice
+from module.utils import fs_encode, save_join
 
 
 class SevenZip(UnRar):
     __name__    = "SevenZip"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __description__ = """7-Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -48,8 +48,8 @@ class SevenZip(UnRar):
         return True
 
 
-    def checkArchive(self):
-        p = self.call_cmd("l", "-slt", self.target)
+    def check(self):
+        p = self.call_cmd("l", "-slt", fs_encode(self.filename))
         out, err = p.communicate()
 
         if p.returncode > 1:
@@ -57,22 +57,20 @@ class SevenZip(UnRar):
 
         # check if output or error macthes the 'wrong password'-Regexp
         if self.re_wrongpwd.search(out):
-            return True
+            raise PasswordError
 
         # check if output matches 'Encrypted = +'
         if self.re_wrongcrc.search(out):
-            return True
+            raise CRCError
 
         # check if archive is empty
         self.files = self.list()
         if not self.files:
             raise ArchiveError("Empty Archive")
 
-        return False
-
 
-    def checkPassword(self, password):
-        p = self.call_cmd("l", self.target, password=password)
+    def isPassword(self, password):
+        p = self.call_cmd("l", fs_encode(self.filename), password=password)
         p.communicate()
         return p.returncode == 0
 
@@ -80,7 +78,7 @@ class SevenZip(UnRar):
     def extract(self, password=None):
         command = "x" if self.fullpath else "e"
 
-        p = self.call_cmd(command, '-o' + self.out, self.target, password=password)
+        p = self.call_cmd(command, '-o' + self.out, fs_encode(self.filename), password=password)
 
         renice(p.pid, self.renice)
 
@@ -123,7 +121,7 @@ class SevenZip(UnRar):
     def list(self, password=None):
         command = "l" if self.fullpath else "l"
 
-        p = self.call_cmd(command, self.target, password=password)
+        p = self.call_cmd(command, fs_encode(self.filename), password=password)
         out, err = p.communicate()
         code     = p.returncode
 
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 7f1b08caf..b8e2c3606 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -8,20 +8,21 @@ from string import digits
 from subprocess import Popen, PIPE
 
 from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
-from module.utils import save_join, decode
+from module.utils import decode, fs_encode, save_join, uniqify
 
 
 def renice(pid, value):
     if value and os.name != "nt":
         try:
             Popen(["renice", str(value), str(pid)], stdout=PIPE, stderr=PIPE, bufsize=-1)
+
         except Exception:
             pass
 
 
 class UnRar(Extractor):
     __name__    = "UnRar"
-    __version__ = "1.04"
+    __version__ = "1.05"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -71,42 +72,65 @@ class UnRar(Extractor):
                 continue
 
             m = cls.re_rarpart1.match(filename)
-            if not m or int(m.group(1)) is 1:  #@NOTE: only add first part file
+            if not m or int(m.group(1)) == 1:  #@NOTE: only add first part file
                 targets.append((filename, id))
 
         return targets
 
 
-    def checkArchive(self):
-        p = self.call_cmd("l", "-v", self.target)
+    def check(self):
+        p = self.call_cmd("l", "-v", fs_encode(self.filename))
         out, err = p.communicate()
 
         if self.re_wrongpwd.search(err):
-            return True
+            raise PasswordError
+
+        if self.re_wrongcrc.search(err):
+            raise CRCError
 
         # output only used to check if passworded files are present
         for attr in self.re_filelist.findall(out):
             if attr[0].startswith("*"):
-                return True
+                raise PasswordError
 
         self.files = self.list()
         if not self.files:
             raise ArchiveError("Empty Archive")
 
-        return False
 
-
-    def checkPassword(self, password):
+    def isPassword(self, password):
         # at this point we can only verify header protected files
-        p = self.call_cmd("l", "-v", self.target, password=password)
+        p = self.call_cmd("l", "-v", fs_encode(self.filename), password=password)
         out, err = p.communicate()
         return False if self.re_wrongpwd.search(err) else True
 
 
+    def repair(self):
+        p = self.call_cmd("rc", fs_encode(self.filename))
+        out, err = p.communicate()
+
+        if p.returncode or err.strip():
+            p = self.call_cmd("r", fs_encode(self.filename))
+            out, err = p.communicate()
+
+            if p.returncode or err.strip():
+                return False
+            else:
+                dir, name = os.path.split(filename)
+
+                if 'fixed' in out:
+                    self.filename = os.path.join(dir, 'fixed.' + name)
+
+                elif 'rebuild' in out:
+                    self.filename = os.path.join(dir, 'rebuild.' + name)
+
+        return True
+
+
     def extract(self, password=None):
         command = "x" if self.fullpath else "e"
 
-        p = self.call_cmd(command, self.target, self.out, password=password)
+        p = self.call_cmd(command, fs_encode(self.filename), self.out, password=password)
 
         renice(p.pid, self.renice)
 
@@ -139,7 +163,7 @@ class UnRar(Extractor):
         elif err.strip():  #: raise error if anything is on stderr
             raise ArchiveError(err.strip())
 
-        if p.returncode != 0:
+        if p.returncode:
             raise ArchiveError("Process terminated")
 
         if not self.files:
@@ -149,18 +173,18 @@ class UnRar(Extractor):
     def getDeleteFiles(self):
         files = []
 
-        for i in [1, 2]:
+        for i in (1, 2):
             try:
-                dir, name = os.path.split(self.target)
+                dir, name = os.path.split(self.filename)
                 part      = self.getattr(self, "re_rarpart%d" % i).match(name).group(1)
-                filename  = os.path.join(dir, name.replace(part, '*', 1))
-                files.extend(glob(filename))
+                file      = fs_encode(os.path.join(dir, name.replace(part, '*', 1)))
+                files.extend(glob(file))
 
             except Exception:
                 continue
 
-        if self.target not in files:
-            files.insert(0, self.target)
+        if self.filename not in files:
+            files.insert(0, self.filename)
 
         return files
 
@@ -168,7 +192,7 @@ class UnRar(Extractor):
     def list(self, password=None):
         command = "vb" if self.fullpath else "lb"
 
-        p = self.call_cmd(command, "-v", self.target, password=password)
+        p = self.call_cmd(command, "-v", fs_encode(self.filename), 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 026503be5..4f3f1ca32 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -7,16 +7,16 @@ import sys
 import zipfile
 
 from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
+from module.utils import fs_encode
 
 
 class UnZip(Extractor):
     __name__    = "UnZip"
-    __version__ = "1.03"
+    __version__ = "1.04"
 
     __description__ = """Zip extractor plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     EXTENSIONS = [".zip", ".zip64"]
@@ -32,9 +32,13 @@ class UnZip(Extractor):
         return [(filename, id) for filename, id in files_ids if cls.isArchive(filename)]
 
 
+    def repair(self):
+        return False
+
+
     def extract(self, password=None):
         try:
-            with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z:
+            with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
                 z.setpassword(self.password)
                 if not z.testzip():
                     z.extractall(self.out)
-- 
cgit v1.2.3


From 32b3cb9d9fa6851de35f52d01f78c26012043baa Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 29 Jan 2015 23:30:56 +0100
Subject: [SevenZip] Repair not supported

---
 module/plugins/internal/SevenZip.py | 6 +++++-
 module/plugins/internal/UnRar.py    | 2 +-
 module/plugins/internal/UnZip.py    | 4 ----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index e808e0d88..6ba7cfc1f 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -11,7 +11,7 @@ from module.utils import fs_encode, save_join
 
 class SevenZip(UnRar):
     __name__    = "SevenZip"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __description__ = """7-Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -75,6 +75,10 @@ class SevenZip(UnRar):
         return p.returncode == 0
 
 
+    def repair(self):
+        return False
+
+
     def extract(self, password=None):
         command = "x" if self.fullpath else "e"
 
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index b8e2c3606..0738aa63b 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -8,7 +8,7 @@ from string import digits
 from subprocess import Popen, PIPE
 
 from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
-from module.utils import decode, fs_encode, save_join, uniqify
+from module.utils import decode, fs_encode, save_join
 
 
 def renice(pid, value):
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 4f3f1ca32..a086d9db1 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -32,10 +32,6 @@ class UnZip(Extractor):
         return [(filename, id) for filename, id in files_ids if cls.isArchive(filename)]
 
 
-    def repair(self):
-        return False
-
-
     def extract(self, password=None):
         try:
             with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
-- 
cgit v1.2.3


From 5061a5e1034ee8a26203036fca00e264a62d6905 Mon Sep 17 00:00:00 2001
From: zapp-brannigan <zapp-brannigan@users.noreply.github.com>
Date: Fri, 30 Jan 2015 16:37:47 +0100
Subject: [CaptchaService.py] Fix ReCaptchaV2

Some small changes to make ReCaptchaV2 work again.
---
 module/plugins/internal/CaptchaService.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index c6e83fe7d..c7dab2a0a 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -12,7 +12,7 @@ from module.common.json_layer import json_loads
 
 class CaptchaService:
     __name__    = "CaptchaService"
-    __version__ = "0.20"
+    __version__ = "0.21"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
@@ -40,7 +40,7 @@ class CaptchaService:
 
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
-    __version__ = "0.11"
+    __version__ = "0.12"
 
     __description__ = """ReCaptcha captcha service plugin"""
     __license__     = "GPLv3"
@@ -190,32 +190,34 @@ class ReCaptcha(CaptchaService):
 
         token1 = re.search(r'id="recaptcha-token" value="(.*?)">', html)
         self.plugin.logDebug("ReCaptcha token #1: %s" % token1.group(1))
-
+                
         html = self.plugin.req.load("https://www.google.com/recaptcha/api2/frame",
                                     get={'c'      : token1.group(1),
                                          'hl'     : language,
                                          'v'      : vers,
                                          'bg'     : botguardstring,
+                                         'k'      : key,
                                          'usegapi': "1",
                                          'jsh'    : jsh}).decode('unicode-escape')
 
         token2 = re.search(r'"finput","(.*?)",', html)
         self.plugin.logDebug("ReCaptcha token #2: %s" % token2.group(1))
 
-        token3 = re.search(r'."asconf".\s.\s,"(.*?)".', html)
+        token3 = re.search(r'."asconf".\s,".*?".\s,"(.*?)".', html)
         self.plugin.logDebug("ReCaptcha token #3: %s" % token3.group(1))
 
         html = self.plugin.req.load("https://www.google.com/recaptcha/api2/reload",
-                                    post={'c'     : token2.group(1),
+                                    post={'k'     : key,
+                                          'c'     : token2.group(1),
                                           'reason': "fi",
                                           'fbg'   : token3.group(1)})
 
         token4 = re.search(r'"rresp","(.*?)",', html)
         self.plugin.logDebug("ReCaptcha token #4: %s" % token4.group(1))
-
+        
         millis_captcha_loading = int(round(time.time() * 1000))
         captcha_response       = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload",
-                                                            get={'c':token4.group(1)}, forceUser=True)
+                                                            get={'c':token4.group(1), 'k':key}, forceUser=True)
         response               = b64encode('{"response":"%s"}' % captcha_response)
 
         self.plugin.logDebug("ReCaptcha result: %s" % response)
@@ -224,7 +226,8 @@ class ReCaptcha(CaptchaService):
         timeToSolveMore = timeToSolve + int(float("0." + str(randint(1, 99999999))) * 500)
 
         html = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify",
-                                    post={'c'       : token4.group(1),
+                                    post={'k'       : key,
+                                          'c'       : token4.group(1),
                                           'response': response,
                                           't'       : timeToSolve,
                                           'ct'      : timeToSolveMore,
-- 
cgit v1.2.3


From ddccf7b36d7a941e4ab5539ff0c35b1367fe5337 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 31 Jan 2015 03:45:19 +0100
Subject: [ExtractArchive] Fix typo

Fix https://github.com/pyload/pyload/issues/1011#issuecomment-72268195, https://github.com/pyload/pyload/issues/1113, https://github.com/pyload/pyload/issues/1115
---
 module/plugins/internal/CaptchaService.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index c7dab2a0a..45672ce70 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -190,7 +190,7 @@ class ReCaptcha(CaptchaService):
 
         token1 = re.search(r'id="recaptcha-token" value="(.*?)">', html)
         self.plugin.logDebug("ReCaptcha token #1: %s" % token1.group(1))
-                
+
         html = self.plugin.req.load("https://www.google.com/recaptcha/api2/frame",
                                     get={'c'      : token1.group(1),
                                          'hl'     : language,
@@ -214,7 +214,7 @@ class ReCaptcha(CaptchaService):
 
         token4 = re.search(r'"rresp","(.*?)",', html)
         self.plugin.logDebug("ReCaptcha token #4: %s" % token4.group(1))
-        
+
         millis_captcha_loading = int(round(time.time() * 1000))
         captcha_response       = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload",
                                                             get={'c':token4.group(1), 'k':key}, forceUser=True)
-- 
cgit v1.2.3


From b2904e3e704ece4e891f3d2bfbcc8af2d6d8c2e1 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 31 Jan 2015 20:13:28 +0100
Subject: [SevenZip] Better check method + fix list method

---
 module/plugins/internal/Extractor.py |  4 ++--
 module/plugins/internal/SevenZip.py  | 17 ++++++++++++-----
 module/plugins/internal/UnZip.py     |  6 +++---
 3 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 3ea634ec8..4c38760f2 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -19,7 +19,7 @@ class PasswordError(Exception):
 
 class Extractor:
     __name__    = "Extractor"
-    __version__ = "0.16"
+    __version__ = "0.17"
 
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
@@ -37,7 +37,7 @@ class Extractor:
 
 
     @classmethod
-    def checkDeps(cls):
+    def isUsable(cls):
         """ Check if system statisfy dependencies
         :return: boolean
         """
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 6ba7cfc1f..05be90702 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -11,7 +11,7 @@ from module.utils import fs_encode, save_join
 
 class SevenZip(UnRar):
     __name__    = "SevenZip"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __description__ = """7-Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -36,7 +36,7 @@ class SevenZip(UnRar):
 
 
     @classmethod
-    def checkDeps(cls):
+    def isUsable(cls):
         if os.name == "nt":
             cls.CMD = os.path.join(pypath, "7z.exe")
             p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
@@ -49,7 +49,15 @@ class SevenZip(UnRar):
 
 
     def check(self):
-        p = self.call_cmd("l", "-slt", fs_encode(self.filename))
+        file = fs_encode(self.filename)
+
+        p = self.call_cmd("t", file)
+        p.communicate()
+
+        if p.returncode > 1:
+            raise CRCError
+
+        p = self.call_cmd("l", "-slt", file)
         out, err = p.communicate()
 
         if p.returncode > 1:
@@ -127,12 +135,11 @@ class SevenZip(UnRar):
 
         p = self.call_cmd(command, fs_encode(self.filename), password=password)
         out, err = p.communicate()
-        code     = p.returncode
 
         if "Can not open" in err:
             raise ArchiveError("Cannot open file")
 
-        if code != 0:
+        if p.returncode > 1:
             raise ArchiveError("Process terminated unsuccessful")
 
         result = set()
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index a086d9db1..83ed3a233 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.04"
+    __version__ = "1.05"
 
     __description__ = """Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -23,13 +23,13 @@ class UnZip(Extractor):
 
 
     @classmethod
-    def checkDeps(cls):
+    def isUsable(cls):
         return sys.version_info[:2] >= (2, 6)
 
 
     @classmethod
     def getTargets(cls, files_ids):
-        return [(filename, id) for filename, id in files_ids if cls.isArchive(filename)]
+        return [(fname, id) for fname, id in files_ids if cls.isArchive(fname)]
 
 
     def extract(self, password=None):
-- 
cgit v1.2.3


From 79725268402043906f619f7c09e848e02ab8a17b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 31 Jan 2015 22:00:59 +0100
Subject: Spare code cosmetics

---
 module/plugins/internal/SevenZip.py     |  2 +-
 module/plugins/internal/SimpleHoster.py |  4 ++--
 module/plugins/internal/UnRar.py        | 12 ++++++------
 module/plugins/internal/XFSHoster.py    | 13 ++++++++++---
 4 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 05be90702..476348083 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -166,7 +166,7 @@ class SevenZip(UnRar):
         #@NOTE: return codes are not reliable, some kind of threading, cleanup whatever issue
         call = [self.cmd, command] + args + list(xargs)
 
-        self.manager.logDebug(" ".join([decode(arg) for arg in call]))
+        self.manager.logDebug(" ".join(map(decode, call)))
 
         p = Popen(call, stdout=PIPE, stderr=PIPE)
         return p
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index c74e33d59..da178ef9c 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -547,8 +547,8 @@ class SimpleHoster(Hoster):
         elif hasattr(self, 'WAIT_PATTERN'):
             m = re.search(self.WAIT_PATTERN, self.html)
             if m:
-                wait_time = sum([int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
-                                 re.findall(r'(\d+)\s*(hr|hour|min|sec)', m.group(0), re.I)])
+                wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
+                                re.findall(r'(\d+)\s*(hr|hour|min|sec)', m.group(0), re.I))
                 self.wait(wait_time, wait_time > 300)
                 return
 
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 0738aa63b..f92a2ddd4 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.05"
+    __version__ = "1.06"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -45,7 +45,7 @@ class UnRar(Extractor):
 
 
     @classmethod
-    def checkDeps(cls):
+    def isUsable(cls):
         if os.name == "nt":
             cls.CMD = os.path.join(pypath, "UnRAR.exe")
             p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
@@ -67,13 +67,13 @@ class UnRar(Extractor):
     def getTargets(cls, files_ids):
         targets = []
 
-        for filename, id in files_ids:
-            if not cls.isArchive(filename):
+        for fname, id in files_ids:
+            if not cls.isArchive(fname):
                 continue
 
-            m = cls.re_rarpart1.match(filename)
+            m = cls.re_rarpart1.match(fname)
             if not m or int(m.group(1)) == 1:  #@NOTE: only add first part file
-                targets.append((filename, id))
+                targets.append((fname, id))
 
         return targets
 
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 2054b1824..624534dbd 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -218,8 +218,8 @@ class XFSHoster(SimpleHoster):
             self.logWarning(re.sub(r"<.*?>", " ", self.errmsg))
 
             if 'wait' in self.errmsg:
-                wait_time = sum([int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
-                                 re.findall(r'(\d+)\s*(hr|hour|min|sec)', self.errmsg, re.I)])
+                wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
+                                re.findall(r'(\d+)\s*(hr|hour|min|sec)', self.errmsg, re.I))
                 self.wait(wait_time, True)
 
             elif 'country' in self.errmsg:
@@ -318,16 +318,21 @@ class XFSHoster(SimpleHoster):
         if m:
             captcha_div = m.group(1)
             numerals    = re.findall(r'<span.*?padding-left\s*:\s*(\d+).*?>(\d)</span>', html_unescape(captcha_div))
+
             self.logDebug(captcha_div)
-            inputs['code'] = "".join([a[1] for a in sorted(numerals, key=lambda num: int(num[0]))])
+
+            inputs['code'] = "".join(a[1] for a in sorted(numerals, key=lambda num: int(num[0])))
+
             self.logDebug("Captcha code: %s" % inputs['code'], numerals)
             return 2
 
         recaptcha = ReCaptcha(self)
         try:
             captcha_key = re.search(self.RECAPTCHA_PATTERN, self.html).group(1)
+
         except Exception:
             captcha_key = recaptcha.detect_key()
+
         else:
             self.logDebug("ReCaptcha key: %s" % captcha_key)
 
@@ -338,8 +343,10 @@ class XFSHoster(SimpleHoster):
         solvemedia = SolveMedia(self)
         try:
             captcha_key = re.search(self.SOLVEMEDIA_PATTERN, self.html).group(1)
+
         except Exception:
             captcha_key = solvemedia.detect_key()
+
         else:
             self.logDebug("SolveMedia key: %s" % captcha_key)
 
-- 
cgit v1.2.3


From 7368881d2ba95cca3f47afbb0f4ef5861f2774df Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 31 Jan 2015 23:19:30 +0100
Subject: Extractor final fixup

---
 module/plugins/internal/Extractor.py |  2 +-
 module/plugins/internal/SevenZip.py  | 23 +++++++++--------------
 module/plugins/internal/UnRar.py     | 23 +++++++++++------------
 module/plugins/internal/UnZip.py     | 12 +++++-------
 4 files changed, 26 insertions(+), 34 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 4c38760f2..719dc613c 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -50,7 +50,7 @@ class Extractor:
         :param files_ids: List of filepathes
         :return: List of targets, id tuple list
         """
-        raise NotImplementedError
+        return [(fname, id) for fname, id in files_ids if cls.isArchive(fname)]
 
 
     def __init__(self, manager, filename, out,
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 476348083..126958829 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -52,16 +52,16 @@ class SevenZip(UnRar):
         file = fs_encode(self.filename)
 
         p = self.call_cmd("t", file)
-        p.communicate()
+        out, err = p.communicate()
 
         if p.returncode > 1:
-            raise CRCError
+            raise CRCError(err)
 
         p = self.call_cmd("l", "-slt", file)
         out, err = p.communicate()
 
         if p.returncode > 1:
-            raise ArchiveError("Process terminated")
+            raise ArchiveError(_("Process return code: %d") % p.returncode)
 
         # check if output or error macthes the 'wrong password'-Regexp
         if self.re_wrongpwd.search(out):
@@ -69,12 +69,7 @@ class SevenZip(UnRar):
 
         # check if output matches 'Encrypted = +'
         if self.re_wrongcrc.search(out):
-            raise CRCError
-
-        # check if archive is empty
-        self.files = self.list()
-        if not self.files:
-            raise ArchiveError("Empty Archive")
+            raise CRCError(_("Header protected"))
 
 
     def isPassword(self, password):
@@ -118,13 +113,13 @@ class SevenZip(UnRar):
             raise PasswordError
 
         elif self.re_wrongcrc.search(err):
-            raise CRCError
+            raise CRCError(err)
 
         elif err.strip():  #: raise error if anything is on stderr
-            raise ArchiveError(err.strip())
+            raise ArchiveError(err)
 
         if p.returncode > 1:
-            raise ArchiveError("Process terminated")
+            raise ArchiveError(_("Process return code: %d") % p.returncode)
 
         if not self.files:
             self.files = self.list(password)
@@ -137,10 +132,10 @@ class SevenZip(UnRar):
         out, err = p.communicate()
 
         if "Can not open" in err:
-            raise ArchiveError("Cannot open file")
+            raise ArchiveError(_("Cannot open file"))
 
         if p.returncode > 1:
-            raise ArchiveError("Process terminated unsuccessful")
+            raise ArchiveError(_("Process return code: %d") % p.returncode)
 
         result = set()
         for groups in self.re_filelist.findall(out):
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index f92a2ddd4..fbb1c6a3e 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -71,7 +71,7 @@ class UnRar(Extractor):
             if not cls.isArchive(fname):
                 continue
 
-            m = cls.re_rarpart1.match(fname)
+            m = cls.re_rarpart1.search(fname)
             if not m or int(m.group(1)) == 1:  #@NOTE: only add first part file
                 targets.append((fname, id))
 
@@ -86,17 +86,13 @@ class UnRar(Extractor):
             raise PasswordError
 
         if self.re_wrongcrc.search(err):
-            raise CRCError
+            raise CRCError(err)
 
         # output only used to check if passworded files are present
         for attr in self.re_filelist.findall(out):
             if attr[0].startswith("*"):
                 raise PasswordError
 
-        self.files = self.list()
-        if not self.files:
-            raise ArchiveError("Empty Archive")
-
 
     def isPassword(self, password):
         # at this point we can only verify header protected files
@@ -158,13 +154,13 @@ class UnRar(Extractor):
             raise PasswordError
 
         elif self.re_wrongcrc.search(err):
-            raise CRCError
+            raise CRCError(err)
 
         elif err.strip():  #: raise error if anything is on stderr
-            raise ArchiveError(err.strip())
+            raise ArchiveError(err)
 
         if p.returncode:
-            raise ArchiveError("Process terminated")
+            raise ArchiveError(_("Process return code: %d") % p.returncode)
 
         if not self.files:
             self.files = self.list(password)
@@ -176,8 +172,11 @@ class UnRar(Extractor):
         for i in (1, 2):
             try:
                 dir, name = os.path.split(self.filename)
-                part      = self.getattr(self, "re_rarpart%d" % i).match(name).group(1)
-                file      = fs_encode(os.path.join(dir, name.replace(part, '*', 1)))
+
+                part     = self.getattr(self, "re_rarpart%d" % i).search(name).group(1)
+                new_name = name[::-1].replace((".part%s.rar" % part)[::-1], ".part*.rar"[::-1], 1)[::-1]
+                file     = fs_encode(os.path.join(dir, new_name)
+
                 files.extend(glob(file))
 
             except Exception:
@@ -196,7 +195,7 @@ class UnRar(Extractor):
         out, err = p.communicate()
 
         if "Cannot open" in err:
-            raise ArchiveError("Cannot open file")
+            raise ArchiveError(_("Cannot open file"))
 
         if err.strip():  #: only log error at this point
             self.manager.logError(err.strip())
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 83ed3a233..2ab9597ef 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -27,20 +27,18 @@ class UnZip(Extractor):
         return sys.version_info[:2] >= (2, 6)
 
 
-    @classmethod
-    def getTargets(cls, files_ids):
-        return [(fname, id) for fname, id in files_ids if cls.isArchive(fname)]
-
-
     def extract(self, password=None):
         try:
             with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
                 z.setpassword(self.password)
-                if not z.testzip():
+
+                badfile = z.testzip():
+
+                if not badfile:
                     z.extractall(self.out)
                     self.files = z.namelist()
                 else:
-                    raise CRCError
+                    raise CRCError(badfile)
 
         except (BadZipfile, LargeZipFile), e:
             raise ArchiveError(e)
-- 
cgit v1.2.3


From ddca2529cf0ff79ea9e1721a15493407c23a57d9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 31 Jan 2015 23:40:36 +0100
Subject: Fix https://github.com/pyload/pyload/issues/1120

---
 module/plugins/internal/UnRar.py | 4 ++--
 module/plugins/internal/UnZip.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index fbb1c6a3e..1b6816a9f 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.06"
+    __version__ = "1.07"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -175,7 +175,7 @@ class UnRar(Extractor):
 
                 part     = self.getattr(self, "re_rarpart%d" % i).search(name).group(1)
                 new_name = name[::-1].replace((".part%s.rar" % part)[::-1], ".part*.rar"[::-1], 1)[::-1]
-                file     = fs_encode(os.path.join(dir, new_name)
+                file     = fs_encode(os.path.join(dir, new_name))
 
                 files.extend(glob(file))
 
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 2ab9597ef..8093c1ba8 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.05"
+    __version__ = "1.06"
 
     __description__ = """Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -32,7 +32,7 @@ class UnZip(Extractor):
             with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
                 z.setpassword(self.password)
 
-                badfile = z.testzip():
+                badfile = z.testzip()
 
                 if not badfile:
                     z.extractall(self.out)
-- 
cgit v1.2.3


From d622107c1c869dd27f2104f97184e24bc35c48be Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 2 Feb 2015 01:41:15 +0100
Subject: [MultiHoster][SimpleHoster] Improve info stuff

---
 module/plugins/internal/MultiHoster.py  |  5 ++--
 module/plugins/internal/SimpleHoster.py | 43 +++++++++++++++------------------
 2 files changed, 21 insertions(+), 27 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index ad5b6283e..63b7d76b1 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.36"
+    __version__ = "0.37"
 
     __pattern__ = r'^unmatchable$'
 
@@ -45,8 +45,7 @@ class MultiHoster(SimpleHoster):
         else:
             self.directDL = self.DIRECT_LINK
 
-        self.pyfile.url = replace_patterns(self.pyfile.url,
-                                           self.FILE_URL_REPLACEMENTS if hasattr(self, "FILE_URL_REPLACEMENTS") else self.URL_REPLACEMENTS)  #@TODO: Remove FILE_URL_REPLACEMENTS check in 0.4.10
+        self.pyfile.url = replace_patterns(self.pyfile.url, self.URL_REPLACEMENTS)
 
 
     def process(self, pyfile):
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index da178ef9c..4a1f62395 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -108,13 +108,14 @@ def parseFileInfo(plugin, url="", html=""):
         info = plugin.getInfo(url, html)
         res  = info['name'], info['size'], info['status'], info['url']
     else:
-        url  = unquote(url)
-        res  = ((urlparse(url).path.split('/')[-1]
-                 or urlparse(url).query.split('=', 1)[::-1][0].split('&', 1)[0]
-                 or _("Unknown")),
-                0,
-                3 if url else 8,
-                url)
+        url   = unquote(url)
+        url_p = urlparse(url)
+        res   = ((url_p.path.split('/')[-1]
+                  or url_p.query.split('=', 1)[::-1][0].split('&', 1)[0]
+                  or url_p.netloc.split('.', 1)[0]),
+                 0,
+                 3 if url else 8,
+                 url)
 
     return res
 
@@ -245,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.12"
+    __version__ = "1.13"
 
     __pattern__ = r'^unmatchable$'
 
@@ -315,16 +316,17 @@ class SimpleHoster(Hoster):
     @classmethod
     def parseInfos(cls, urls):  #@TODO: Built-in in 0.4.10 core, then remove from plugins
         for url in urls:
-            url = replace_patterns(url, cls.FILE_URL_REPLACEMENTS if hasattr(cls, "FILE_URL_REPLACEMENTS") else cls.URL_REPLACEMENTS)  #@TODO: Remove FILE_URL_REPLACEMENTS check in 0.4.10
+            url = replace_patterns(url, cls.URL_REPLACEMENTS)
             yield cls.getInfo(url)
 
 
     @classmethod
     def apiInfo(cls, url="", get={}, post={}):
-        url = unquote(url)
-        return {'name'  : (urlparse(url).path.split('/')[-1]
-                           or urlparse(url).query.split('=', 1)[::-1][0].split('&', 1)[0]
-                           or _("Unknown")),
+        url   = unquote(url)
+        url_p = urlparse(url)
+        return {'name'  : (url_p.path.split('/')[-1]
+                           or url_p.query.split('=', 1)[::-1][0].split('&', 1)[0]
+                           or url_p.netloc.split('.', 1)[0]),
                 'size'  : 0,
                 'status': 3 if url else 8,
                 'url'   : url}
@@ -366,17 +368,11 @@ class SimpleHoster(Hoster):
             if hasattr(cls, "OFFLINE_PATTERN") and re.search(cls.OFFLINE_PATTERN, html):
                 info['status'] = 1
 
-            elif hasattr(cls, "FILE_OFFLINE_PATTERN") and re.search(cls.FILE_OFFLINE_PATTERN, html):  #@TODO: Remove in 0.4.10
-                info['status'] = 1
-
             elif hasattr(cls, "TEMP_OFFLINE_PATTERN") and re.search(cls.TEMP_OFFLINE_PATTERN, html):
                 info['status'] = 6
 
             else:
-                for pattern in ("FILE_INFO_PATTERN", "INFO_PATTERN",
-                                "FILE_NAME_PATTERN", "NAME_PATTERN",
-                                "FILE_SIZE_PATTERN", "SIZE_PATTERN",
-                                "HASHSUM_PATTERN"):  #@TODO: Remove old patterns starting with "FILE_" in 0.4.10
+                for pattern in ("INFO_PATTERN", "NAME_PATTERN", "SIZE_PATTERN", "HASHSUM_PATTERN"):
                     try:
                         attr  = getattr(cls, pattern)
                         pdict = re.search(attr, html).groupdict()
@@ -395,11 +391,11 @@ class SimpleHoster(Hoster):
 
             if 'N' in info['pattern']:
                 info['name'] = replace_patterns(unquote(info['pattern']['N'].strip()),
-                                                cls.FILE_NAME_REPLACEMENTS if hasattr(cls, "FILE_NAME_REPLACEMENTS") else cls.NAME_REPLACEMENTS)  #@TODO: Remove FILE_NAME_REPLACEMENTS check in 0.4.10
+                                                cls.NAME_REPLACEMENTS)
 
             if 'S' in info['pattern']:
                 size = replace_patterns(info['pattern']['S'] + info['pattern']['U'] if 'U' in info['pattern'] else info['pattern']['S'],
-                                        cls.FILE_SIZE_REPLACEMENTS if hasattr(cls, "FILE_SIZE_REPLACEMENTS") else cls.SIZE_REPLACEMENTS)  #@TODO: Remove FILE_SIZE_REPLACEMENTS check in 0.4.10
+                                        cls.SIZE_REPLACEMENTS)
                 info['size'] = parseFileSize(size)
 
             elif isinstance(info['size'], basestring):
@@ -448,8 +444,7 @@ class SimpleHoster(Hoster):
         else:
             self.directDL = self.DIRECT_LINK
 
-        self.pyfile.url = replace_patterns(self.pyfile.url,
-                                           self.FILE_URL_REPLACEMENTS if hasattr(self, "FILE_URL_REPLACEMENTS") else self.URL_REPLACEMENTS)  #@TODO: Remove FILE_URL_REPLACEMENTS check in 0.4.10
+        self.pyfile.url = replace_patterns(self.pyfile.url, self.URL_REPLACEMENTS)
 
 
     def preload(self):
-- 
cgit v1.2.3


From 7b6a9a68dfbf67f075bfe86e67be5390da4b8c1d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 2 Feb 2015 18:48:06 +0100
Subject: Fix https://github.com/pyload/pyload/issues/1134

---
 module/plugins/internal/SimpleCrypter.py |  6 +++---
 module/plugins/internal/SimpleHoster.py  | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index b2622b5e0..856b548f0 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -12,7 +12,7 @@ from module.utils import fixup
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.42"
+    __version__ = "0.43"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
@@ -129,8 +129,8 @@ class SimpleCrypter(Crypter, SimpleHoster):
             self.logDebug("File info (AFTER): %s"  % self.info)
 
         try:
-            url  = self.info['url']
-            name = self.info['name']
+            url  = self.info['url'].strip()
+            name = self.info['name'].strip()
             if name and name != url:
                 self.pyfile.name = name
 
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 4a1f62395..0ac49de19 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.13"
+    __version__ = "1.14"
 
     __pattern__ = r'^unmatchable$'
 
@@ -552,8 +552,10 @@ class SimpleHoster(Hoster):
 
     def checkStatus(self, getinfo=True):
         if not self.info or getinfo:
-            self.logDebug("File info (BEFORE): %s" % self.info)
+            self.logDebug("Update file info...")
+            self.logDebug("Previous file info: %s" % self.info)
             self.info.update(self.getInfo(self.pyfile.url, self.html))
+            self.logDebug("Current file info: %s"  % self.info)
 
         try:
             status = self.info['status']
@@ -568,19 +570,19 @@ class SimpleHoster(Hoster):
                 self.fail()
 
         finally:
-            self.logDebug("File status: %s" % statusMap[status],
-                          "File info: %s"   % self.info)
+            self.logDebug("File status: %s" % statusMap[status])
 
 
     def checkNameSize(self, getinfo=True):
         if not self.info or getinfo:
-            self.logDebug("File info (BEFORE): %s" % self.info)
+            self.logDebug("Update file info...")
+            self.logDebug("Previous file info: %s" % self.info)
             self.info.update(self.getInfo(self.pyfile.url, self.html))
-            self.logDebug("File info (AFTER): %s"  % self.info)
+            self.logDebug("Current file info: %s"  % self.info)
 
         try:
-            url  = self.info['url']
-            name = self.info['name']
+            url  = self.info['url'].strip()
+            name = self.info['name'].strip()
             if name and name != url:
                 self.pyfile.name = name
 
-- 
cgit v1.2.3


From 44025fa7cb7b7f9b601ec9f654d1f58a788294c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= <jens.hoernlein@googlemail.com>
Date: Mon, 2 Feb 2015 21:13:19 +0100
Subject: [UnZip] Fixed Typo

---
 module/plugins/internal/UnZip.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 8093c1ba8..eb8259e47 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -4,15 +4,15 @@ from __future__ import with_statement
 
 import os
 import sys
-import zipfile
 
+from zipfile import ZipFile, BadZipfile, LargeZipFile
 from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
 from module.utils import fs_encode
 
 
 class UnZip(Extractor):
     __name__    = "UnZip"
-    __version__ = "1.06"
+    __version__ = "1.07"
 
     __description__ = """Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -29,8 +29,8 @@ class UnZip(Extractor):
 
     def extract(self, password=None):
         try:
-            with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
-                z.setpassword(self.password)
+            with ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
+                z.setpassword(password)
 
                 badfile = z.testzip()
 
-- 
cgit v1.2.3


From 8dfb7adc0fc3c858c0ddf9371c2f4580bb8be3c7 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 3 Feb 2015 00:10:11 +0100
Subject: Update Extractor (3)

---
 module/plugins/internal/Extractor.py | 10 ++--
 module/plugins/internal/SevenZip.py  | 42 ++++++-----------
 module/plugins/internal/UnRar.py     | 91 +++++++++++++++++-------------------
 module/plugins/internal/UnZip.py     | 27 +++++++++--
 4 files changed, 82 insertions(+), 88 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 719dc613c..45c13c159 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -19,7 +19,7 @@ class PasswordError(Exception):
 
 class Extractor:
     __name__    = "Extractor"
-    __version__ = "0.17"
+    __version__ = "0.18"
 
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
@@ -41,7 +41,7 @@ class Extractor:
         """ Check if system statisfy dependencies
         :return: boolean
         """
-        return True
+        return None
 
 
     @classmethod
@@ -99,11 +99,11 @@ class Extractor:
         :param password:
         :return: boolean
         """
-        return True
+        return None
 
 
     def repair(self):
-        return False
+        return None
 
 
     def extract(self, password=None):
@@ -127,6 +127,6 @@ class Extractor:
         return [self.filename]
 
 
-    def getExtractedFiles(self):
+    def list(self, password=None):
         """Populate self.files at some point while extracting"""
         return self.files
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 126958829..2f4dc5565 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -11,7 +11,7 @@ from module.utils import fs_encode, save_join
 
 class SevenZip(UnRar):
     __name__    = "SevenZip"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __description__ = """7-Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -89,40 +89,24 @@ class SevenZip(UnRar):
 
         renice(p.pid, self.renice)
 
-        progressstring = ""
-        while True:
-            c = p.stdout.read(1)
-            # quit loop on eof
-            if not c:
-                break
-            # reading a percentage sign -> set progress and restart
-            if c == '%':
-                self.notifyProgress(int(progressstring))
-                progressstring = ""
-            # not reading a digit -> therefore restart
-            elif c not in digits:
-                progressstring = ""
-            # add digit to progressstring
-            else:
-                progressstring += c
-
-        # retrieve stderr
-        err = p.stderr.read()
-
-        if self.re_wrongpwd.search(err):
-            raise PasswordError
+        # communicate and retrieve stderr
+        self._progress(p)
+        err = p.stderr.read().strip()
 
-        elif self.re_wrongcrc.search(err):
-            raise CRCError(err)
+        if err:
+            if self.re_wrongpwd.search(err):
+                raise PasswordError
+
+            elif self.re_wrongcrc.search(err):
+                raise CRCError(err)
 
-        elif err.strip():  #: raise error if anything is on stderr
-            raise ArchiveError(err)
+            else:  #: raise error if anything is on stderr
+                raise ArchiveError(err)
 
         if p.returncode > 1:
             raise ArchiveError(_("Process return code: %d") % p.returncode)
 
-        if not self.files:
-            self.files = self.list(password)
+        self.files = self.list(password)
 
 
     def list(self, password=None):
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 1b6816a9f..d378bf167 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.07"
+    __version__ = "1.08"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -39,7 +39,9 @@ class UnRar(Extractor):
     re_rarpart1 = re.compile(r'\.part(\d+)\.rar$', re.I)
     re_rarpart2 = re.compile(r'\.r(\d+)$', re.I)
 
+    re_filefixed = re.compile(r'Building (.+)')
     re_filelist  = re.compile(r'(.+)\s+(\d+)\s+(\d+)\s+|(.+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)')
+
     re_wrongpwd  = re.compile(r'password', re.I)
     re_wrongcrc  = re.compile(r'encrypted|damaged|CRC failed|checksum error', re.I)
 
@@ -63,21 +65,6 @@ class UnRar(Extractor):
         return True
 
 
-    @classmethod
-    def getTargets(cls, files_ids):
-        targets = []
-
-        for fname, id in files_ids:
-            if not cls.isArchive(fname):
-                continue
-
-            m = cls.re_rarpart1.search(fname)
-            if not m or int(m.group(1)) == 1:  #@NOTE: only add first part file
-                targets.append((fname, id))
-
-        return targets
-
-
     def check(self):
         p = self.call_cmd("l", "-v", fs_encode(self.filename))
         out, err = p.communicate()
@@ -103,67 +90,73 @@ class UnRar(Extractor):
 
     def repair(self):
         p = self.call_cmd("rc", fs_encode(self.filename))
-        out, err = p.communicate()
 
-        if p.returncode or err.strip():
+        # communicate and retrieve stderr
+        self._progress(p)
+        err = p.stderr.read().strip()
+
+        if err or p.returncode:
             p = self.call_cmd("r", fs_encode(self.filename))
-            out, err = p.communicate()
 
-            if p.returncode or err.strip():
+            # communicate and retrieve stderr
+            self._progress(p)
+            err = p.stderr.read().strip()
+
+            if err or p.returncode:
                 return False
             else:
-                dir, name = os.path.split(filename)
-
-                if 'fixed' in out:
-                    self.filename = os.path.join(dir, 'fixed.' + name)
+                dir  = os.path.dirname(filename)
+                name = re_filefixed.search(out).group(1)
 
-                elif 'rebuild' in out:
-                    self.filename = os.path.join(dir, 'rebuild.' + name)
+                self.filename = os.path.join(dir, name)
 
         return True
 
 
-    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)
-
-        renice(p.pid, self.renice)
-
-        progressstring = ""
+    def _progress(self, process):
+        s = ""
         while True:
-            c = p.stdout.read(1)
+            c = process.stdout.read(1)
             # quit loop on eof
             if not c:
                 break
             # reading a percentage sign -> set progress and restart
             if c == '%':
-                self.notifyProgress(int(progressstring))
-                progressstring = ""
+                self.notifyProgress(int(s))
+                s = ""
             # not reading a digit -> therefore restart
             elif c not in digits:
-                progressstring = ""
+                s = ""
             # add digit to progressstring
             else:
-                progressstring += c
+                s += c
 
-        # retrieve stderr
-        err = p.stderr.read()
 
-        if self.re_wrongpwd.search(err):
-            raise PasswordError
+    def extract(self, password=None):
+        command = "x" if self.fullpath else "e"
 
-        elif self.re_wrongcrc.search(err):
-            raise CRCError(err)
+        p = self.call_cmd(command, fs_encode(self.filename), self.out, password=password)
+
+        renice(p.pid, self.renice)
+
+        # communicate and retrieve stderr
+        self._progress(p)
+        err = p.stderr.read().strip()
+
+        if err:
+            if self.re_wrongpwd.search(err):
+                raise PasswordError
+
+            elif self.re_wrongcrc.search(err):
+                raise CRCError(err)
 
-        elif err.strip():  #: raise error if anything is on stderr
-            raise ArchiveError(err)
+            else:  #: raise error if anything is on stderr
+                raise ArchiveError(err)
 
         if p.returncode:
             raise ArchiveError(_("Process return code: %d") % p.returncode)
 
-        if not self.files:
-            self.files = self.list(password)
+        self.files = self.list(password)
 
 
     def getDeleteFiles(self):
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index eb8259e47..781c47d7b 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -4,15 +4,15 @@ from __future__ import with_statement
 
 import os
 import sys
+import zipfile
 
-from zipfile import ZipFile, BadZipfile, LargeZipFile
 from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
 from module.utils import fs_encode
 
 
 class UnZip(Extractor):
     __name__    = "UnZip"
-    __version__ = "1.07"
+    __version__ = "1.08"
 
     __description__ = """Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -27,20 +27,35 @@ class UnZip(Extractor):
         return sys.version_info[:2] >= (2, 6)
 
 
+    def list(self, password=None):
+        with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
+            z.setpassword(password)
+            return z.namelist()
+
+
+    def check(self):
+        with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
+            badfile = z.testzip()
+
+            if badfile:
+                raise CRCError(badfile)
+            else:
+                raise PasswordError
+
+
     def extract(self, password=None):
         try:
-            with ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
+            with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
                 z.setpassword(password)
 
                 badfile = z.testzip()
 
                 if not badfile:
                     z.extractall(self.out)
-                    self.files = z.namelist()
                 else:
                     raise CRCError(badfile)
 
-        except (BadZipfile, LargeZipFile), e:
+        except (zipfile.BadZipfile, zipfile.LargeZipFile), e:
             raise ArchiveError(e)
 
         except RuntimeError, e:
@@ -48,3 +63,5 @@ class UnZip(Extractor):
                 raise PasswordError
             else:
                 raise ArchiveError(e)
+        else:
+            self.files = z.namelist()
-- 
cgit v1.2.3


From 8d8cfd57fa44cb84eb9709871bf14a3b4d13d994 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 3 Feb 2015 01:10:04 +0100
Subject: Update Extractor (4)

---
 module/plugins/internal/SevenZip.py | 4 ++--
 module/plugins/internal/UnRar.py    | 6 +++---
 module/plugins/internal/UnZip.py    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 2f4dc5565..96e664573 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -11,7 +11,7 @@ from module.utils import fs_encode, save_join
 
 class SevenZip(UnRar):
     __name__    = "SevenZip"
-    __version__ = "0.06"
+    __version__ = "0.07"
 
     __description__ = """7-Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -138,7 +138,7 @@ class SevenZip(UnRar):
 
         #set a password
         if "password" in kwargs and kwargs["password"]:
-            args.append("-p%s" % kwargs["password"])
+            args.append("-p'%s'" % kwargs["password"])
         else:
             args.append("-p-")
 
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index d378bf167..c1cc0fa31 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.08"
+    __version__ = "1.09"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -213,14 +213,14 @@ class UnRar(Extractor):
                 args.append("-or")
 
         for word in self.excludefiles:
-            args.append("-x%s" % word.strip())
+            args.append("-x'%s'" % word.strip())
 
         # assume yes on all queries
         args.append("-y")
 
         # set a password
         if "password" in kwargs and kwargs['password']:
-            args.append("-p%s" % kwargs['password'])
+            args.append("-p'%s'" % kwargs['password'])
         else:
             args.append("-p-")
 
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 781c47d7b..f81c235c1 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -50,10 +50,10 @@ class UnZip(Extractor):
 
                 badfile = z.testzip()
 
-                if not badfile:
-                    z.extractall(self.out)
-                else:
+                if badfile:
                     raise CRCError(badfile)
+                else:
+                    z.extractall(self.out)
 
         except (zipfile.BadZipfile, zipfile.LargeZipFile), e:
             raise ArchiveError(e)
-- 
cgit v1.2.3


From 896f1f1437442bb9a93a0664f3d447bbc0f444cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= <jens.hoernlein@googlemail.com>
Date: Wed, 4 Feb 2015 00:02:27 +0100
Subject: Addressed some Extractor Issues

---
 module/plugins/internal/UnRar.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index c1cc0fa31..7126c960b 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.09"
+    __version__ = "1.10"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -32,7 +32,8 @@ class UnRar(Extractor):
 
     CMD = "unrar"
 
-    EXTENSIONS = [".rar", ".zip", ".cab", ".arj", ".lzh", ".tar", ".gz", ".bz2",
+    # TODO: Find out what Filetypes Unrar supports exactly
+    EXTENSIONS = [".rar", ".cab", ".arj", ".lzh", ".tar", ".gz", ".bz2",
                   ".ace", ".uue", ".jar", ".iso", ".7z", ".xz", ".z"]
 
     #@NOTE: there are some more uncovered rar formats
@@ -40,7 +41,7 @@ class UnRar(Extractor):
     re_rarpart2 = re.compile(r'\.r(\d+)$', re.I)
 
     re_filefixed = re.compile(r'Building (.+)')
-    re_filelist  = re.compile(r'(.+)\s+(\d+)\s+(\d+)\s+|(.+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)')
+    re_filelist  = re.compile(r'(.+)\s+(\D+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)')
 
     re_wrongpwd  = re.compile(r'password', re.I)
     re_wrongcrc  = re.compile(r'encrypted|damaged|CRC failed|checksum error', re.I)
@@ -220,7 +221,7 @@ class UnRar(Extractor):
 
         # set a password
         if "password" in kwargs and kwargs['password']:
-            args.append("-p'%s'" % kwargs['password'])
+            args.append("-p%s" % kwargs['password'])
         else:
             args.append("-p-")
 
-- 
cgit v1.2.3


From 0df373e5da9d33e4dea3e709521d4883ef7f9b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= <jens.hoernlein@googlemail.com>
Date: Wed, 4 Feb 2015 20:41:03 +0100
Subject: [Unrar] Fix: Deleting All Files after Extraction

---
 module/plugins/internal/UnRar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 7126c960b..81cfb38a7 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -167,7 +167,7 @@ class UnRar(Extractor):
             try:
                 dir, name = os.path.split(self.filename)
 
-                part     = self.getattr(self, "re_rarpart%d" % i).search(name).group(1)
+                part     = getattr(self, "re_rarpart%d" % i).search(name).group(1)
                 new_name = name[::-1].replace((".part%s.rar" % part)[::-1], ".part*.rar"[::-1], 1)[::-1]
                 file     = fs_encode(os.path.join(dir, new_name))
 
-- 
cgit v1.2.3


From b25bc61dd47d8d3c42969bd0f72443b21c4b059e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 8 Feb 2015 02:09:45 +0100
Subject: Spare code cosmetics

---
 module/plugins/internal/SimpleHoster.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 0ac49de19..ca8fce05f 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -667,8 +667,7 @@ class SimpleHoster(Hoster):
 
         self.logInfo(_("Download limit reached, reconnect or wait %s") % time_str)
 
-        self.setWait(wait_time, True)
-        self.wait()
+        self.wait(wait_time, True)
         self.retry(max_tries=max_tries, reason=_("Download limit reached"))
 
 
-- 
cgit v1.2.3


From c02543ecc3436972b5d34325787c41a5c2884dd5 Mon Sep 17 00:00:00 2001
From: stickell <l.stickell@yahoo.it>
Date: Sun, 8 Feb 2015 14:28:31 +0100
Subject: [UptoboxCom] Fixed login Fixes #1047

---
 module/plugins/internal/XFSAccount.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index c3bd91e52..845ea3230 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies
 class XFSAccount(Account):
     __name__    = "XFSAccount"
     __type__    = "account"
-    __version__ = "0.35"
+    __version__ = "0.36"
 
     __description__ = """XFileSharing account plugin"""
     __license__     = "GPLv3"
@@ -22,6 +22,7 @@ class XFSAccount(Account):
 
     HOSTER_DOMAIN = None
     HOSTER_URL    = None
+    LOGIN_URL     = None
 
     COOKIES = True
 
@@ -158,8 +159,9 @@ class XFSAccount(Account):
         if not self.HOSTER_URL:  #@TODO: Remove in 0.4.10
             raise Exception(_("Missing HOSTER_DOMAIN"))
 
-        url  = urljoin(self.HOSTER_URL, "login.html")
-        html = req.load(url, decode=True)
+        if not self.LOGIN_URL:
+            self.LOGIN_URL  = urljoin(self.HOSTER_URL, "login.html")
+        html = req.load(self.LOGIN_URL, decode=True)
 
         action, inputs = parseHtmlForm('name="FL"', html)
         if not inputs:
@@ -169,7 +171,9 @@ class XFSAccount(Account):
         inputs.update({'login'   : user,
                        'password': data['password']})
 
-        html = req.load(self.HOSTER_URL, post=inputs, decode=True)
+        if not action:
+            action = self.HOSTER_URL
+        html = req.load(action, post=inputs, decode=True)
 
         if re.search(self.LOGIN_FAIL_PATTERN, html):
             self.wrongPassword()
-- 
cgit v1.2.3


From 78e902d280648a9776327ed717e23ec300c6792f Mon Sep 17 00:00:00 2001
From: zapp-brannigan <zapp-brannigan@users.noreply.github.com>
Date: Mon, 9 Feb 2015 12:47:44 +0100
Subject: [CaptchaService.py] Updated Solvemedia

Some additional requests to make it work again.
---
 module/plugins/internal/CaptchaService.py | 40 +++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 7 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 45672ce70..ecf8385c8 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -12,7 +12,7 @@ from module.common.json_layer import json_loads
 
 class CaptchaService:
     __name__    = "CaptchaService"
-    __version__ = "0.21"
+    __version__ = "0.22"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
@@ -190,7 +190,7 @@ class ReCaptcha(CaptchaService):
 
         token1 = re.search(r'id="recaptcha-token" value="(.*?)">', html)
         self.plugin.logDebug("ReCaptcha token #1: %s" % token1.group(1))
-
+                
         html = self.plugin.req.load("https://www.google.com/recaptcha/api2/frame",
                                     get={'c'      : token1.group(1),
                                          'hl'     : language,
@@ -214,7 +214,7 @@ class ReCaptcha(CaptchaService):
 
         token4 = re.search(r'"rresp","(.*?)",', html)
         self.plugin.logDebug("ReCaptcha token #4: %s" % token4.group(1))
-
+        
         millis_captcha_loading = int(round(time.time() * 1000))
         captcha_response       = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload",
                                                             get={'c':token4.group(1), 'k':key}, forceUser=True)
@@ -311,7 +311,7 @@ class AdsCaptcha(CaptchaService):
 
 class SolveMedia(CaptchaService):
     __name__    = "SolveMedia"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __description__ = """SolveMedia captcha service plugin"""
     __license__     = "GPLv3"
@@ -331,6 +331,7 @@ class SolveMedia(CaptchaService):
                 raise TypeError(errmsg)
 
         m = re.search(self.KEY_PATTERN, html)
+        magic = re.search(r'name="magic" value="(.*?)"',html)
         if m:
             self.key = m.group(1).strip()
             self.plugin.logDebug("SolveMedia key: %s" % self.key)
@@ -340,7 +341,7 @@ class SolveMedia(CaptchaService):
             return None
 
 
-    def challenge(self, key=None, html=None):
+    def challenge(self, key=None, html=None, pyfile_url=""):
         if not key:
             if self.detect_key(html):
                 key = self.key
@@ -361,9 +362,34 @@ class SolveMedia(CaptchaService):
             raise AttributeError(errmsg)
 
         self.plugin.logDebug("SolveMedia challenge: %s" % challenge)
+        
+        try:
+            magic = re.search(r'name="magic" value="(.*?)"',html).group(1)
+        except AttributeError:
+            errmsg = _("SolveMedia magic string not found")
+            self.plugin.fail(errmsg)
+            raise AttributeError(errmsg)
 
-        return self.result(server, challenge), challenge
-
+        result = self.result(server, challenge)
+        
+        html = self.plugin.req.load("http://api.solvemedia.com/papi/verify.noscript", 
+                                    cookies=True,
+                                    post={"adcopy_response"  : result,
+                                          "k"                : key,
+                                          "l"                : "en",
+                                          "t"                : "img",
+                                          "s"                : "standard",
+                                          "magic"            : magic,
+                                          "adcopy_challenge" : challenge,
+                                          "ref"              : pyfile_url})
+        try:
+            url = re.search(r'URL=(.*?)">',html).group(1)
+            html = self.plugin.req.load(url,cookies=True)
+            gibberish = re.search(r'id=gibberish>(.*?)</textarea>',html).group(1)
+        except:
+            self.plugin.logDebug("Wrong captcha answer!")
+            
+        return result,challenge
 
     def result(self, server, challenge):
         result = self.plugin.decryptCaptcha(server, get={'c': challenge}, imgtype="gif")
-- 
cgit v1.2.3


From 5a0adb38f6ed5eaba0fab771b3f1308e65df14a6 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 9 Feb 2015 17:21:49 +0100
Subject: [CaptchaService] Cleanup

---
 module/plugins/internal/CaptchaService.py | 147 +++++++++++++++++-------------
 1 file changed, 83 insertions(+), 64 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index ecf8385c8..664d10fb7 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -10,9 +10,9 @@ from urlparse import urljoin, urlparse
 from module.common.json_layer import json_loads
 
 
-class CaptchaService:
+class CaptchaService(object):
     __name__    = "CaptchaService"
-    __version__ = "0.22"
+    __version__ = "0.23"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
@@ -40,7 +40,7 @@ class CaptchaService:
 
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
-    __version__ = "0.12"
+    __version__ = "0.13"
 
     __description__ = """ReCaptcha captcha service plugin"""
     __license__     = "GPLv3"
@@ -73,21 +73,6 @@ class ReCaptcha(CaptchaService):
 
 
     def challenge(self, key=None, html=None, version=None):
-        if not html:
-            if hasattr(self.plugin, "html") and self.plugin.html:
-                html = self.plugin.html
-            else:
-                errmsg = _("ReCaptcha html not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
-
-        challenge = "challenge_v%s" % (version if version in (1, 2) else
-                                       2 if re.search(self.KEY_V2_PATTERN, html) else 1)
-
-        return getattr(self, challenge)(key, html)
-
-
-    def challenge_v1(self, key=None, html=None):
         if not key:
             if self.detect_key(html):
                 key = self.key
@@ -96,7 +81,22 @@ class ReCaptcha(CaptchaService):
                 self.plugin.fail(errmsg)
                 raise TypeError(errmsg)
 
-        html = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={'k': key})
+        if version in (1, 2):
+            return getattr(self, "_challenge_v%s" % version)(key, html)
+
+        elif not html and hasattr(self.plugin, "html") and self.plugin.html:
+            version = 2 if re.search(self.KEY_V2_PATTERN, self.plugin.html) else 1
+            return self.challenge(key, self.plugin.html, version)
+
+        else:
+            errmsg = _("ReCaptcha html not found")
+            self.plugin.fail(errmsg)
+            raise TypeError(errmsg)
+
+
+    def _challenge_v1(self, key):
+        html = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge",
+                                    get={'k': key})
         try:
             challenge = re.search("challenge : '(.+?)',", html).group(1)
             server    = re.search("server : '(.+?)',", html).group(1)
@@ -159,20 +159,13 @@ class ReCaptcha(CaptchaService):
         return millis, rpc
 
 
-    def challenge_v2(self, key=None, html=None):
-        if not key:
-            if self.detect_key(html):
-                key = self.key
-            else:
-                errmsg = _("ReCaptcha key not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
+    def _challenge_v2(self, key, parent=None):
+        if parent is None:
+            try:
+                parent = urljoin("http://", urlparse(self.plugin.pyfile.url).netloc)
 
-        try:
-            parent = urljoin("http://", urlparse(self.plugin.pyfile.url).netloc)
-
-        except Exception:
-            parent = ""
+            except Exception:
+                parent = ""
 
         botguardstring      = "!A"
         vers, language, jsh = self._collectApiInfo()
@@ -190,7 +183,7 @@ class ReCaptcha(CaptchaService):
 
         token1 = re.search(r'id="recaptcha-token" value="(.*?)">', html)
         self.plugin.logDebug("ReCaptcha token #1: %s" % token1.group(1))
-                
+
         html = self.plugin.req.load("https://www.google.com/recaptcha/api2/frame",
                                     get={'c'      : token1.group(1),
                                          'hl'     : language,
@@ -214,10 +207,12 @@ class ReCaptcha(CaptchaService):
 
         token4 = re.search(r'"rresp","(.*?)",', html)
         self.plugin.logDebug("ReCaptcha token #4: %s" % token4.group(1))
-        
+
         millis_captcha_loading = int(round(time.time() * 1000))
         captcha_response       = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload",
-                                                            get={'c':token4.group(1), 'k':key}, forceUser=True)
+                                                            get={'c':token4.group(1), 'k':key},
+                                                            cookies=True,
+                                                            forceUser=True)
         response               = b64encode('{"response":"%s"}' % captcha_response)
 
         self.plugin.logDebug("ReCaptcha result: %s" % response)
@@ -236,7 +231,10 @@ class ReCaptcha(CaptchaService):
         token5 = re.search(r'"uvresp","(.*?)",', html)
         self.plugin.logDebug("ReCaptcha token #5: %s" % token5.group(1))
 
-        return token5.group(1), None
+        result = token5.group(1)
+
+        return result, None
+
 
 
 class AdsCaptcha(CaptchaService):
@@ -283,7 +281,9 @@ class AdsCaptcha(CaptchaService):
 
         PublicKey, CaptchaId = key
 
-        html = self.plugin.req.load("http://api.adscaptcha.com/Get.aspx", get={'CaptchaId': CaptchaId, 'PublicKey': PublicKey})
+        html = self.plugin.req.load("http://api.adscaptcha.com/Get.aspx",
+                                    get={'CaptchaId': CaptchaId,
+                                         'PublicKey': PublicKey})
         try:
             challenge = re.search("challenge: '(.+?)',", html).group(1)
             server    = re.search("server: '(.+?)',", html).group(1)
@@ -311,7 +311,7 @@ class AdsCaptcha(CaptchaService):
 
 class SolveMedia(CaptchaService):
     __name__    = "SolveMedia"
-    __version__ = "0.09"
+    __version__ = "0.10"
 
     __description__ = """SolveMedia captcha service plugin"""
     __license__     = "GPLv3"
@@ -331,7 +331,6 @@ class SolveMedia(CaptchaService):
                 raise TypeError(errmsg)
 
         m = re.search(self.KEY_PATTERN, html)
-        magic = re.search(r'name="magic" value="(.*?)"',html)
         if m:
             self.key = m.group(1).strip()
             self.plugin.logDebug("SolveMedia key: %s" % self.key)
@@ -341,7 +340,7 @@ class SolveMedia(CaptchaService):
             return None
 
 
-    def challenge(self, key=None, html=None, pyfile_url=""):
+    def challenge(self, key=None, html=None):
         if not key:
             if self.detect_key(html):
                 key = self.key
@@ -350,7 +349,8 @@ class SolveMedia(CaptchaService):
                 self.plugin.fail(errmsg)
                 raise TypeError(errmsg)
 
-        html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript", get={'k': key})
+        html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript",
+                                    get={'k': key})
         try:
             challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="([^"]+)">',
                                   html).group(1)
@@ -362,37 +362,56 @@ class SolveMedia(CaptchaService):
             raise AttributeError(errmsg)
 
         self.plugin.logDebug("SolveMedia challenge: %s" % challenge)
-        
+
+        result = self.result(server, challenge)
+
+        if not self.verify(result, challenge, key):
+            self.plugin.logDebug("SolveMedia captcha code was invalid")
+
+        return result, challenge
+
+
+    def verify(self, result, challenge, key, ref=None):
+        if ref is None:
+            try:
+                ref = self.plugin.pyfile.url
+
+            except Exception:
+                ref = ""
+
         try:
-            magic = re.search(r'name="magic" value="(.*?)"',html).group(1)
+            magic = re.search(r'name="magic" value="(.+?)"', html).group(1)
+
         except AttributeError:
-            errmsg = _("SolveMedia magic string not found")
+            errmsg = _("SolveMedia magic key not found")
             self.plugin.fail(errmsg)
             raise AttributeError(errmsg)
 
-        result = self.result(server, challenge)
-        
-        html = self.plugin.req.load("http://api.solvemedia.com/papi/verify.noscript", 
-                                    cookies=True,
-                                    post={"adcopy_response"  : result,
-                                          "k"                : key,
-                                          "l"                : "en",
-                                          "t"                : "img",
-                                          "s"                : "standard",
-                                          "magic"            : magic,
-                                          "adcopy_challenge" : challenge,
-                                          "ref"              : pyfile_url})
+        html = self.plugin.req.load("http://api.solvemedia.com/papi/verify.noscript",
+                                    post={'adcopy_response'  : result,
+                                          'k'                : key,
+                                          'l'                : "en",
+                                          't'                : "img",
+                                          's'                : "standard",
+                                          'magic'            : magic,
+                                          'adcopy_challenge' : challenge,
+                                          'ref'              : ref)
         try:
-            url = re.search(r'URL=(.*?)">',html).group(1)
-            html = self.plugin.req.load(url,cookies=True)
-            gibberish = re.search(r'id=gibberish>(.*?)</textarea>',html).group(1)
-        except:
-            self.plugin.logDebug("Wrong captcha answer!")
-            
-        return result,challenge
+            html      = self.plugin.req.load(re.search(r'URL=(.+?)">', html).group(1))
+            gibberish = re.search(r'id=gibberish>(.+?)</textarea>', html).group(1)
+
+        except Exception:
+            return False
+
+        else:
+            return True
+
 
     def result(self, server, challenge):
-        result = self.plugin.decryptCaptcha(server, get={'c': challenge}, imgtype="gif")
+        result = self.plugin.decryptCaptcha(server,
+                                            get={'c': challenge},
+                                            cookies=True,
+                                            imgtype="gif")
 
         self.plugin.logDebug("SolveMedia result: %s" % result)
 
-- 
cgit v1.2.3


From 6616c00ba1c40f5d56959bd0e4725f26250e1292 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 9 Feb 2015 17:42:31 +0100
Subject: Spare code cosmetics

---
 module/plugins/internal/SimpleHoster.py | 9 +++++----
 module/plugins/internal/XFSHoster.py    | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index ca8fce05f..e820ab141 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.14"
+    __version__ = "1.15"
 
     __pattern__ = r'^unmatchable$'
 
@@ -309,6 +309,7 @@ class SimpleHoster(Hoster):
     DIRECT_LINK   = None   #: Set to True to looking for direct link (as defined in handleDirect method), set to None to do it if self.account is True else False
     MULTI_HOSTER  = False  #: Set to True to leech other hoster link (as defined in handleMulti method)
     LOGIN_ACCOUNT = False  #: Set to True to require account login
+    DISPOSITION   = True   #: Work-around to `filename*=UTF-8` bug; remove in 0.4.10
 
     directLink = fileUrl  #@TODO: Remove in 0.4.10
 
@@ -482,11 +483,11 @@ class SimpleHoster(Hoster):
                 self.logDebug("Handled as free download")
                 self.handleFree(pyfile)
 
-        self.downloadLink(self.link)
+        self.downloadLink(self.link, self.DISPOSITION)  #: Remove `DISPOSITION` in 0.4.10
         self.checkFile()
 
 
-    def downloadLink(self, link, disposition=False):  #@TODO: Set `disposition=True` in 0.4.10
+    def downloadLink(self, link, disposition=True):
         if link and isinstance(link, basestring):
             self.correctCaptcha()
 
@@ -598,7 +599,7 @@ class SimpleHoster(Hoster):
             pass
 
         self.logDebug("File name: %s" % self.pyfile.name,
-                      "File size: %s" % self.pyfile.size if self.pyfile.size > 0 else "Unknown")
+                      "File size: %s" % (self.pyfile.size if self.pyfile.size > 0 else "Unknown"))
 
 
     def checkInfo(self):
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 624534dbd..624db87b7 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -16,7 +16,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.41"
+    __version__ = "0.42"
 
     __pattern__ = r'^unmatchable$'
 
@@ -89,7 +89,7 @@ class XFSHoster(SimpleHoster):
             self.directDL = self.premium
 
 
-    def downloadLink(self, link, disposition=False):  #@TODO: Set `disposition=True` in 0.4.10
+    def downloadLink(self, link, disposition=True):
         if link and isinstance(link, basestring):
             self.correctCaptcha()
 
-- 
cgit v1.2.3


From 04f3273f59d9bb2259d43422ba10ed5e682b8926 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 9 Feb 2015 18:16:37 +0100
Subject: [CaptchaService] Fix https://github.com/pyload/pyload/issues/1162

---
 module/plugins/internal/CaptchaService.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 664d10fb7..8f6a5086d 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -12,7 +12,7 @@ from module.common.json_layer import json_loads
 
 class CaptchaService(object):
     __name__    = "CaptchaService"
-    __version__ = "0.23"
+    __version__ = "0.24"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
@@ -311,7 +311,7 @@ class AdsCaptcha(CaptchaService):
 
 class SolveMedia(CaptchaService):
     __name__    = "SolveMedia"
-    __version__ = "0.10"
+    __version__ = "0.11"
 
     __description__ = """SolveMedia captcha service plugin"""
     __license__     = "GPLv3"
@@ -395,7 +395,7 @@ class SolveMedia(CaptchaService):
                                           's'                : "standard",
                                           'magic'            : magic,
                                           'adcopy_challenge' : challenge,
-                                          'ref'              : ref)
+                                          'ref'              : ref})
         try:
             html      = self.plugin.req.load(re.search(r'URL=(.+?)">', html).group(1))
             gibberish = re.search(r'id=gibberish>(.+?)</textarea>', html).group(1)
-- 
cgit v1.2.3


From 2a809297f288a585d96af0d8afd894c2a2f695fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= <jens.hoernlein@googlemail.com>
Date: Sun, 8 Feb 2015 13:47:59 +0100
Subject: [ExtractArchive] correct fullpath behavior, bugfix

---
 module/plugins/internal/Extractor.py |  4 ++--
 module/plugins/internal/UnRar.py     | 26 +++++++++++++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 45c13c159..a5a8756d8 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -19,7 +19,7 @@ class PasswordError(Exception):
 
 class Extractor:
     __name__    = "Extractor"
-    __version__ = "0.18"
+    __version__ = "0.19"
 
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
@@ -50,7 +50,7 @@ class Extractor:
         :param files_ids: List of filepathes
         :return: List of targets, id tuple list
         """
-        return [(fname, id) for fname, id in files_ids if cls.isArchive(fname)]
+        return [(fname, id, fout) for fname, id, fout in files_ids if cls.isArchive(fname)]
 
 
     def __init__(self, manager, filename, out,
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 81cfb38a7..0ba990006 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.10"
+    __version__ = "1.11"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -37,15 +37,16 @@ class UnRar(Extractor):
                   ".ace", ".uue", ".jar", ".iso", ".7z", ".xz", ".z"]
 
     #@NOTE: there are some more uncovered rar formats
-    re_rarpart1 = re.compile(r'\.part(\d+)\.rar$', re.I)
-    re_rarpart2 = re.compile(r'\.r(\d+)$', re.I)
+    re_rarpart1  = re.compile(r'\.part(\d+)\.rar$', re.I)
+    re_rarpart2  = re.compile(r'\.r(\d+)$', re.I)
 
     re_filefixed = re.compile(r'Building (.+)')
-    re_filelist  = re.compile(r'(.+)\s+(\D+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)')
+    re_filelist  = re.compile(r'(.+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)')
 
     re_wrongpwd  = re.compile(r'password', re.I)
     re_wrongcrc  = re.compile(r'encrypted|damaged|CRC failed|checksum error', re.I)
 
+    re_version   = re.compile(r'UNRAR\s(\d+)\.\d+', re.I)
 
     @classmethod
     def isUsable(cls):
@@ -185,6 +186,10 @@ class UnRar(Extractor):
     def list(self, password=None):
         command = "vb" if self.fullpath else "lb"
 
+        p = self.call_cmd("", "", fs_encode(self.filename))
+        out, err = p.communicate()
+        version = self.re_version.search(out).group(1)
+
         p = self.call_cmd(command, "-v", fs_encode(self.filename), password=password)
         out, err = p.communicate()
 
@@ -195,9 +200,16 @@ class UnRar(Extractor):
             self.manager.logError(err.strip())
 
         result = set()
-        for f in decode(out).splitlines():
-            f = f.strip()
-            result.add(save_join(self.out, f))
+        if not self.fullpath and version =='5':
+            # NOTE: Unrar 5 always list full path
+            for f in decode(out).splitlines():
+                f = save_join(self.out, os.path.basename(f.strip()))
+                if os.path.isfile(f):
+                    result.add(save_join(self.out, os.path.basename(f)))
+        else:
+            for f in decode(out).splitlines():
+                f = f.strip()
+                result.add(save_join(self.out, f))
 
         return list(result)
 
-- 
cgit v1.2.3


From 2dc3536e36956eab99fa5f7945dcf60073b5fd57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= <jens.hoernlein@googlemail.com>
Date: Mon, 9 Feb 2015 23:36:10 +0100
Subject: [ExtractArchive] better Multipart behavior, new version output

---
 module/plugins/internal/Extractor.py | 10 ++++--
 module/plugins/internal/SevenZip.py  | 16 ++++++----
 module/plugins/internal/UnRar.py     | 62 +++++++++++++++++-------------------
 module/plugins/internal/UnZip.py     |  3 +-
 4 files changed, 50 insertions(+), 41 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index a5a8756d8..56860ad53 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -19,7 +19,7 @@ class PasswordError(Exception):
 
 class Extractor:
     __name__    = "Extractor"
-    __version__ = "0.19"
+    __version__ = "0.20"
 
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
@@ -28,12 +28,18 @@ class Extractor:
 
 
     EXTENSIONS = []
+    VERSION    = ""
 
 
     @classmethod
     def isArchive(cls, filename):
         name = os.path.basename(filename).lower()
-        return any(name.endswith(ext) for ext in cls.EXTENSIONS)
+        return any(name.endswith(ext) for ext in cls.EXTENSIONS) and not cls.isMultipart(filename)
+
+
+    @classmethod
+    def isMultipart(cls,filename):
+        return False
 
 
     @classmethod
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 96e664573..7ad6b0d7a 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -11,7 +11,7 @@ from module.utils import fs_encode, save_join
 
 class SevenZip(UnRar):
     __name__    = "SevenZip"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __description__ = """7-Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -19,7 +19,8 @@ class SevenZip(UnRar):
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    CMD = "7z"
+    CMD     = "7z"
+    VERSION = ""
 
     EXTENSIONS = [".7z", ".xz", ".zip", ".gz", ".gzip", ".tgz", ".bz2", ".bzip2",
                   ".tbz2", ".tbz", ".tar", ".wim", ".swm", ".lzma", ".rar", ".cab",
@@ -33,6 +34,7 @@ class SevenZip(UnRar):
     re_filelist = re.compile(r'([\d\:]+)\s+([\d\:]+)\s+([\w\.]+)\s+(\d+)\s+(\d+)\s+(.+)')
     re_wrongpwd = re.compile(r'(Can not open encrypted archive|Wrong password)', re.I)
     re_wrongcrc = re.compile(r'Encrypted\s+\=\s+\+', re.I)
+    re_version   = re.compile(r'7-Zip\s(?:\[64\]\s)?(\d+\.\d+)', re.I)
 
 
     @classmethod
@@ -40,10 +42,12 @@ class SevenZip(UnRar):
         if os.name == "nt":
             cls.CMD = os.path.join(pypath, "7z.exe")
             p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
-            p.communicate()
+            out,err = p.communicate()
         else:
             p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
-            p.communicate()
+            out, err = p.communicate()
+        
+        cls.VERSION = cls.re_version.search(out).group(1)
 
         return True
 
@@ -143,9 +147,9 @@ class SevenZip(UnRar):
             args.append("-p-")
 
         #@NOTE: return codes are not reliable, some kind of threading, cleanup whatever issue
-        call = [self.cmd, command] + args + list(xargs)
+        call = [self.CMD, command] + args + list(xargs)
 
-        self.manager.logDebug(" ".join(map(decode, call)))
+        self.manager.logDebug(" ".join(call))
 
         p = Popen(call, stdout=PIPE, stderr=PIPE)
         return p
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 0ba990006..f6ca5a2eb 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.11"
+    __version__ = "1.12"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -31,42 +31,53 @@ class UnRar(Extractor):
 
 
     CMD = "unrar"
+    VERSION = ""
 
-    # TODO: Find out what Filetypes Unrar supports exactly
-    EXTENSIONS = [".rar", ".cab", ".arj", ".lzh", ".tar", ".gz", ".bz2",
-                  ".ace", ".uue", ".jar", ".iso", ".7z", ".xz", ".z"]
+    EXTENSIONS = [".rar"]
 
-    #@NOTE: there are some more uncovered rar formats
-    re_rarpart1  = re.compile(r'\.part(\d+)\.rar$', re.I)
-    re_rarpart2  = re.compile(r'\.r(\d+)$', re.I)
+
+    re_multipart = re.compile(r'\.(part|r)(\d+)(?:\.rar)?',re.I)
 
     re_filefixed = re.compile(r'Building (.+)')
-    re_filelist  = re.compile(r'(.+)\s+(\d+)\s+\d\d-\d\d-\d\d\s+\d\d:\d\d\s+(.+)')
+    re_filelist  = re.compile(r'^(.)(\s*[\w\.\-]+)\s+(\d+\s+)+(?:\d+\%\s+)?[\d\-]{8}\s+[\d\:]{5}', re.M|re.I)
 
     re_wrongpwd  = re.compile(r'password', re.I)
     re_wrongcrc  = re.compile(r'encrypted|damaged|CRC failed|checksum error', re.I)
 
-    re_version   = re.compile(r'UNRAR\s(\d+)\.\d+', re.I)
+    re_version   = re.compile(r'UNRAR\s(\d+\.\d+)', re.I)
+
 
     @classmethod
     def isUsable(cls):
         if os.name == "nt":
             cls.CMD = os.path.join(pypath, "UnRAR.exe")
             p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
-            p.communicate()
+            out, err = p.communicate()
         else:
             try:
                 p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
-                p.communicate()
+                out, err = p.communicate()
 
             except OSError:  #: fallback to rar
                 cls.CMD = "rar"
                 p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
-                p.communicate()
+                out, err = p.communicate()
+
+        cls.VERSION = cls.re_version.search(out).group(1)
 
         return True
 
 
+    @classmethod
+    def isMultipart(cls,filename):
+        multipart = cls.re_multipart.search(filename)
+        if multipart:
+            # First Multipart file (part1.rar for *.part1-9.rar format or *.rar for .r1-9 format) handled as normal Archive
+            return False if (multipart.group(1) == "part" and int(multipart.group(2)) == 1) else True
+
+        return False
+
+
     def check(self):
         p = self.call_cmd("l", "-v", fs_encode(self.filename))
         out, err = p.communicate()
@@ -162,23 +173,14 @@ class UnRar(Extractor):
 
 
     def getDeleteFiles(self):
-        files = []
+        dir, name = os.path.split(self.filename)
 
-        for i in (1, 2):
-            try:
-                dir, name = os.path.split(self.filename)
-
-                part     = getattr(self, "re_rarpart%d" % i).search(name).group(1)
-                new_name = name[::-1].replace((".part%s.rar" % part)[::-1], ".part*.rar"[::-1], 1)[::-1]
-                file     = fs_encode(os.path.join(dir, new_name))
-
-                files.extend(glob(file))
+        # actually extracted file
+        files = [self.filename]
 
-            except Exception:
-                continue
-
-        if self.filename not in files:
-            files.insert(0, self.filename)
+        # eventually Multipart Files
+        files.extend(save_join(self.out, os.path.basename(file)) for file in filter(self.isMultipart, os.listdir(dir))
+                     if re.sub(self.re_multipart,".rar",name) == re.sub(self.re_multipart,".rar",file))
 
         return files
 
@@ -186,10 +188,6 @@ class UnRar(Extractor):
     def list(self, password=None):
         command = "vb" if self.fullpath else "lb"
 
-        p = self.call_cmd("", "", fs_encode(self.filename))
-        out, err = p.communicate()
-        version = self.re_version.search(out).group(1)
-
         p = self.call_cmd(command, "-v", fs_encode(self.filename), password=password)
         out, err = p.communicate()
 
@@ -200,7 +198,7 @@ class UnRar(Extractor):
             self.manager.logError(err.strip())
 
         result = set()
-        if not self.fullpath and version =='5':
+        if not self.fullpath and self.rarversion.startswith('5'):
             # NOTE: Unrar 5 always list full path
             for f in decode(out).splitlines():
                 f = save_join(self.out, os.path.basename(f.strip()))
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index f81c235c1..caa0ecc0c 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.08"
+    __version__ = "1.09"
 
     __description__ = """Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -20,6 +20,7 @@ class UnZip(Extractor):
 
 
     EXTENSIONS = [".zip", ".zip64"]
+    VERSION ="(python %s.%s.%s)" % (sys.version_info.major, sys.version_info.minor, sys.version_info.micro)
 
 
     @classmethod
-- 
cgit v1.2.3


From e89ab5a01a986b815102c17ee04bdaceb4eb1ebf Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 10 Feb 2015 02:22:44 +0100
Subject: [CaptchaService] Fix https://github.com/pyload/pyload/issues/1166

---
 module/plugins/internal/CaptchaService.py | 92 ++++++++++++++++---------------
 1 file changed, 47 insertions(+), 45 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 8f6a5086d..6f2c8e06d 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -8,11 +8,13 @@ from random import random, randint
 from urlparse import urljoin, urlparse
 
 from module.common.json_layer import json_loads
+from module.plugins.Plugin import Base
 
 
-class CaptchaService(object):
+#@TODO: Extend (new) Plugin class; remove all `html` args
+class CaptchaService(Base):
     __name__    = "CaptchaService"
-    __version__ = "0.24"
+    __version__ = "0.25"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
@@ -24,6 +26,7 @@ class CaptchaService(object):
 
     def __init__(self, plugin):
         self.plugin = plugin
+        super(CaptchaService, self).__init__(plugin.core)
 
 
     def detect_key(self, html=None):
@@ -40,7 +43,7 @@ class CaptchaService(object):
 
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
-    __version__ = "0.13"
+    __version__ = "0.14"
 
     __description__ = """ReCaptcha captcha service plugin"""
     __license__     = "GPLv3"
@@ -65,10 +68,10 @@ class ReCaptcha(CaptchaService):
         m = re.search(self.KEY_V2_PATTERN, html) or re.search(self.KEY_V1_PATTERN, html)
         if m:
             self.key = m.group(1).strip()
-            self.plugin.logDebug("ReCaptcha key: %s" % self.key)
+            self.logDebug("Key: %s" % self.key)
             return self.key
         else:
-            self.plugin.logDebug("ReCaptcha key not found")
+            self.logDebug("Key not found")
             return None
 
 
@@ -82,7 +85,7 @@ class ReCaptcha(CaptchaService):
                 raise TypeError(errmsg)
 
         if version in (1, 2):
-            return getattr(self, "_challenge_v%s" % version)(key, html)
+            return getattr(self, "_challenge_v%s" % version)(key)
 
         elif not html and hasattr(self.plugin, "html") and self.plugin.html:
             version = 2 if re.search(self.KEY_V2_PATTERN, self.plugin.html) else 1
@@ -106,7 +109,7 @@ class ReCaptcha(CaptchaService):
             self.plugin.fail(errmsg)
             raise AttributeError(errmsg)
 
-        self.plugin.logDebug("ReCaptcha challenge: %s" % challenge)
+        self.logDebug("Challenge: %s" % challenge)
 
         return self.result(server, challenge), challenge
 
@@ -118,7 +121,7 @@ class ReCaptcha(CaptchaService):
                                             forceUser=True,
                                             imgtype="jpg")
 
-        self.plugin.logDebug("ReCaptcha result: %s" % result)
+        self.logDebug("Result: %s" % result)
 
         return result
 
@@ -128,17 +131,17 @@ class ReCaptcha(CaptchaService):
         a    = re.search(r'po.src = \'(.*?)\';', html).group(1)
         vers = a.split("/")[5]
 
-        self.plugin.logDebug("ReCaptcha API version: %s" %vers)
+        self.logDebug("API version: %s" %vers)
 
         language = a.split("__")[1].split(".")[0]
 
-        self.plugin.logDebug("ReCaptcha API language: %s" % language)
+        self.logDebug("API language: %s" % language)
 
         html = self.plugin.req.load("https://apis.google.com/js/api.js")
         b    = re.search(r'"h":"(.*?)","', html).group(1)
         jsh  = b.decode('unicode-escape')
 
-        self.plugin.logDebug("ReCaptcha API jsh-string: %s" % jsh)
+        self.logDebug("API jsh-string: %s" % jsh)
 
         return vers, language, jsh
 
@@ -148,13 +151,13 @@ class ReCaptcha(CaptchaService):
 
         millis = int(round(time.time() * 1000))
 
-        self.plugin.logDebug("ReCaptcha time: %s" % millis)
+        self.logDebug("Time: %s" % millis)
 
         rand = randint(1, 99999999)
         a    = "0.%s" % str(rand * 2147483647)
         rpc  = int(100000000 * float(a))
 
-        self.plugin.logDebug("ReCaptcha rpc-token: %s" % rpc)
+        self.logDebug("Rpc-token: %s" % rpc)
 
         return millis, rpc
 
@@ -182,7 +185,7 @@ class ReCaptcha(CaptchaService):
                                          'rpctoken': rpc})
 
         token1 = re.search(r'id="recaptcha-token" value="(.*?)">', html)
-        self.plugin.logDebug("ReCaptcha token #1: %s" % token1.group(1))
+        self.logDebug("Token #1: %s" % token1.group(1))
 
         html = self.plugin.req.load("https://www.google.com/recaptcha/api2/frame",
                                     get={'c'      : token1.group(1),
@@ -194,10 +197,10 @@ class ReCaptcha(CaptchaService):
                                          'jsh'    : jsh}).decode('unicode-escape')
 
         token2 = re.search(r'"finput","(.*?)",', html)
-        self.plugin.logDebug("ReCaptcha token #2: %s" % token2.group(1))
+        self.logDebug("Token #2: %s" % token2.group(1))
 
         token3 = re.search(r'."asconf".\s,".*?".\s,"(.*?)".', html)
-        self.plugin.logDebug("ReCaptcha token #3: %s" % token3.group(1))
+        self.logDebug("Token #3: %s" % token3.group(1))
 
         html = self.plugin.req.load("https://www.google.com/recaptcha/api2/reload",
                                     post={'k'     : key,
@@ -206,7 +209,7 @@ class ReCaptcha(CaptchaService):
                                           'fbg'   : token3.group(1)})
 
         token4 = re.search(r'"rresp","(.*?)",', html)
-        self.plugin.logDebug("ReCaptcha token #4: %s" % token4.group(1))
+        self.logDebug("Token #4: %s" % token4.group(1))
 
         millis_captcha_loading = int(round(time.time() * 1000))
         captcha_response       = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload",
@@ -215,7 +218,7 @@ class ReCaptcha(CaptchaService):
                                                             forceUser=True)
         response               = b64encode('{"response":"%s"}' % captcha_response)
 
-        self.plugin.logDebug("ReCaptcha result: %s" % response)
+        self.logDebug("Result: %s" % response)
 
         timeToSolve     = int(round(time.time() * 1000)) - millis_captcha_loading
         timeToSolveMore = timeToSolve + int(float("0." + str(randint(1, 99999999))) * 500)
@@ -229,7 +232,7 @@ class ReCaptcha(CaptchaService):
                                           'bg'      : botguardstring})
 
         token5 = re.search(r'"uvresp","(.*?)",', html)
-        self.plugin.logDebug("ReCaptcha token #5: %s" % token5.group(1))
+        self.logDebug("Token #5: %s" % token5.group(1))
 
         result = token5.group(1)
 
@@ -239,7 +242,7 @@ class ReCaptcha(CaptchaService):
 
 class AdsCaptcha(CaptchaService):
     __name__    = "AdsCaptcha"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __description__ = """AdsCaptcha captcha service plugin"""
     __license__     = "GPLv3"
@@ -263,10 +266,10 @@ class AdsCaptcha(CaptchaService):
         n = re.search(self.CAPTCHAID_PATTERN, html)
         if m and n:
             self.key = (m.group(1).strip(), n.group(1).strip())  #: key is the tuple(PublicKey, CaptchaId)
-            self.plugin.logDebug("AdsCaptcha key|id: %s | %s" % self.key)
+            self.logDebug("Key|id: %s | %s" % self.key)
             return self.key
         else:
-            self.plugin.logDebug("AdsCaptcha key or id not found")
+            self.logDebug("Key or id not found")
             return None
 
 
@@ -293,7 +296,7 @@ class AdsCaptcha(CaptchaService):
             self.plugin.fail(errmsg)
             raise AttributeError(errmsg)
 
-        self.plugin.logDebug("AdsCaptcha challenge: %s" % challenge)
+        self.logDebug("Challenge: %s" % challenge)
 
         return self.result(server, challenge), challenge
 
@@ -304,14 +307,14 @@ class AdsCaptcha(CaptchaService):
                                             cookies=True,
                                             imgtype="jpg")
 
-        self.plugin.logDebug("AdsCaptcha result: %s" % result)
+        self.logDebug("Result: %s" % result)
 
         return result
 
 
 class SolveMedia(CaptchaService):
     __name__    = "SolveMedia"
-    __version__ = "0.11"
+    __version__ = "0.12"
 
     __description__ = """SolveMedia captcha service plugin"""
     __license__     = "GPLv3"
@@ -333,10 +336,10 @@ class SolveMedia(CaptchaService):
         m = re.search(self.KEY_PATTERN, html)
         if m:
             self.key = m.group(1).strip()
-            self.plugin.logDebug("SolveMedia key: %s" % self.key)
+            self.logDebug("Key: %s" % self.key)
             return self.key
         else:
-            self.plugin.logDebug("SolveMedia key not found")
+            self.logDebug("Key not found")
             return None
 
 
@@ -361,17 +364,24 @@ class SolveMedia(CaptchaService):
             self.plugin.fail(errmsg)
             raise AttributeError(errmsg)
 
-        self.plugin.logDebug("SolveMedia challenge: %s" % challenge)
+        self.logDebug("Challenge: %s" % challenge)
 
         result = self.result(server, challenge)
 
-        if not self.verify(result, challenge, key):
-            self.plugin.logDebug("SolveMedia captcha code was invalid")
+        try:
+            magic = re.search(r'name="magic" value="(.+?)"', html).group(1)
+
+        except AttributeError:
+            self.logDebug("Magic code not found")
+
+        else:
+            if not self._verify(key, magic, result, challenge):
+                self.logDebug("Captcha code was invalid")
 
         return result, challenge
 
 
-    def verify(self, result, challenge, key, ref=None):
+    def _verify(self, key, magic, result, challenge, ref=None):  #@TODO: Clean up
         if ref is None:
             try:
                 ref = self.plugin.pyfile.url
@@ -379,14 +389,6 @@ class SolveMedia(CaptchaService):
             except Exception:
                 ref = ""
 
-        try:
-            magic = re.search(r'name="magic" value="(.+?)"', html).group(1)
-
-        except AttributeError:
-            errmsg = _("SolveMedia magic key not found")
-            self.plugin.fail(errmsg)
-            raise AttributeError(errmsg)
-
         html = self.plugin.req.load("http://api.solvemedia.com/papi/verify.noscript",
                                     post={'adcopy_response'  : result,
                                           'k'                : key,
@@ -413,14 +415,14 @@ class SolveMedia(CaptchaService):
                                             cookies=True,
                                             imgtype="gif")
 
-        self.plugin.logDebug("SolveMedia result: %s" % result)
+        self.logDebug("Result: %s" % result)
 
         return result
 
 
 class AdYouLike(CaptchaService):
     __name__    = "AdYouLike"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __description__ = """AdYouLike captcha service plugin"""
     __license__     = "GPLv3"
@@ -444,10 +446,10 @@ class AdYouLike(CaptchaService):
         n = re.search(self.CALLBACK_PATTERN, html)
         if m and n:
             self.key = (m.group(1).strip(), n.group(1).strip())
-            self.plugin.logDebug("AdYouLike ayl|callback: %s | %s" % self.key)
+            self.logDebug("Ayl|callback: %s | %s" % self.key)
             return self.key   #: key is the tuple(ayl, callback)
         else:
-            self.plugin.logDebug("AdYouLike ayl or callback not found")
+            self.logDebug("Ayl or callback not found")
             return None
 
 
@@ -478,7 +480,7 @@ class AdYouLike(CaptchaService):
             self.plugin.fail(errmsg)
             raise AttributeError(errmsg)
 
-        self.plugin.logDebug("AdYouLike challenge: %s" % challenge)
+        self.logDebug("Challenge: %s" % challenge)
 
         return self.result(ayl, challenge), challenge
 
@@ -515,6 +517,6 @@ class AdYouLike(CaptchaService):
                   '_ayl_token_challenge': challenge['token'],
                   '_ayl_response'       : response}
 
-        self.plugin.logDebug("AdYouLike result: %s" % result)
+        self.logDebug("Result: %s" % result)
 
         return result
-- 
cgit v1.2.3


From d952efb58d72b0add82efe34a7f2fbdc51423490 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 11 Feb 2015 03:58:19 +0100
Subject: [XFSHoster] Fix https://github.com/pyload/pyload/issues/1112

---
 module/plugins/internal/SimpleHoster.py |  4 ++--
 module/plugins/internal/XFSHoster.py    | 27 +--------------------------
 2 files changed, 3 insertions(+), 28 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index e820ab141..e4ff1a2d8 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -483,7 +483,7 @@ class SimpleHoster(Hoster):
                 self.logDebug("Handled as free download")
                 self.handleFree(pyfile)
 
-        self.downloadLink(self.link, self.DISPOSITION)  #: Remove `DISPOSITION` in 0.4.10
+        self.downloadLink(self.link, self.DISPOSITION)  #: Remove `self.DISPOSITION` in 0.4.10
         self.checkFile()
 
 
@@ -599,7 +599,7 @@ class SimpleHoster(Hoster):
             pass
 
         self.logDebug("File name: %s" % self.pyfile.name,
-                      "File size: %s" % (self.pyfile.size if self.pyfile.size > 0 else "Unknown"))
+                      "File size: %s byte" % self.pyfile.size if self.pyfile.size > 0 else "File size: Unknown")
 
 
     def checkInfo(self):
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 624db87b7..a4e9b413c 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -16,7 +16,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.42"
+    __version__ = "0.43"
 
     __pattern__ = r'^unmatchable$'
 
@@ -89,27 +89,6 @@ class XFSHoster(SimpleHoster):
             self.directDL = self.premium
 
 
-    def downloadLink(self, link, disposition=True):
-        if link and isinstance(link, basestring):
-            self.correctCaptcha()
-
-            if not urlparse(link).scheme:
-                url_p   = urlparse(self.pyfile.url)
-                baseurl = "%s://%s" % (url_p.scheme, url_p.netloc)
-                link    = urljoin(baseurl, link)
-
-            self.download(link, ref=False, disposition=disposition)
-
-        elif self.errmsg:
-            if 'captcha' in self.errmsg:
-                self.fail(_("No valid captcha code entered"))
-            else:
-                self.fail(self.errmsg)
-
-        else:
-            self.fail(_("Download link not found"))
-
-
     def handleFree(self, pyfile):
         for i in xrange(1, 6):
             self.logDebug("Getting download link: #%d" % i)
@@ -139,8 +118,6 @@ class XFSHoster(SimpleHoster):
             self.logError(data['op'] if 'op' in data else _("UNKNOWN"))
             return ""
 
-        self.errmsg = None
-
         self.link = m.group(1).strip()  #@TODO: Remove .strip() in 0.4.10
 
 
@@ -204,8 +181,6 @@ class XFSHoster(SimpleHoster):
 
         if 'location' in header:  #: Direct download link
             self.link = header['location']
-        else:
-            self.fail(_("Download link not found"))
 
 
     def checkErrors(self):
-- 
cgit v1.2.3


From f2ac32085922f739343bac3cf396e703833323f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= <jens.hoernlein@googlemail.com>
Date: Wed, 11 Feb 2015 16:32:55 +0100
Subject: [UnRar] bugfixes

---
 module/plugins/internal/Extractor.py | 3 ++-
 module/plugins/internal/UnRar.py     | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 56860ad53..b445f1497 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -24,7 +24,8 @@ class Extractor:
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
     __authors__     = [("RaNaN", "ranan@pyload.org"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
+                       ("Walter Purcaro", "vuolter@gmail.com"),
+                       ("Immenz", "immenz@gmx.net")]
 
 
     EXTENSIONS = []
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index f6ca5a2eb..54d64c430 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -22,12 +22,13 @@ def renice(pid, value):
 
 class UnRar(Extractor):
     __name__    = "UnRar"
-    __version__ = "1.12"
+    __version__ = "1.13"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
     __authors__     = [("RaNaN", "RaNaN@pyload.org"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
+                       ("Walter Purcaro", "vuolter@gmail.com"),
+                       ("Immenz", "immenz@gmx.net"),]
 
 
     CMD = "unrar"
@@ -179,7 +180,7 @@ class UnRar(Extractor):
         files = [self.filename]
 
         # eventually Multipart Files
-        files.extend(save_join(self.out, os.path.basename(file)) for file in filter(self.isMultipart, os.listdir(dir))
+        files.extend(save_join(dir, os.path.basename(file)) for file in filter(self.isMultipart, os.listdir(dir))
                      if re.sub(self.re_multipart,".rar",name) == re.sub(self.re_multipart,".rar",file))
 
         return files
@@ -198,7 +199,7 @@ class UnRar(Extractor):
             self.manager.logError(err.strip())
 
         result = set()
-        if not self.fullpath and self.rarversion.startswith('5'):
+        if not self.fullpath and self.VERSION.startswith('5'):
             # NOTE: Unrar 5 always list full path
             for f in decode(out).splitlines():
                 f = save_join(self.out, os.path.basename(f.strip()))
-- 
cgit v1.2.3


From ee6746b16c8f56d24f48f55387fee799d8e28b4d Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Wed, 11 Feb 2015 18:40:04 +0100
Subject: [UpdateManager] Bump version number to refresh broken plugins See
 #1168

---
 module/plugins/internal/XFSHoster.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index a4e9b413c..c4fc969ba 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -16,7 +16,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.43"
+    __version__ = "0.44"
 
     __pattern__ = r'^unmatchable$'
 
-- 
cgit v1.2.3


From 4fb1da8725038ee2894e9fb47af4d58a8834993d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= <jens.hoernlein@googlemail.com>
Date: Thu, 12 Feb 2015 20:50:09 +0100
Subject: [Unzip] fix Version Info

---
 module/plugins/internal/UnZip.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index caa0ecc0c..704b49ca0 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.09"
+    __version__ = "1.10"
 
     __description__ = """Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -20,7 +20,7 @@ class UnZip(Extractor):
 
 
     EXTENSIONS = [".zip", ".zip64"]
-    VERSION ="(python %s.%s.%s)" % (sys.version_info.major, sys.version_info.minor, sys.version_info.micro)
+    VERSION ="(python %s.%s.%s)" % (sys.version_info[0], sys.version_info[1], sys.version_info[2])
 
 
     @classmethod
-- 
cgit v1.2.3


From 56caf611ab8f733ac8a7ea09d2a3d492bd485762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= <jens.hoernlein@googlemail.com>
Date: Sun, 22 Feb 2015 03:09:40 +0100
Subject: Some more changes

---
 module/plugins/internal/Extractor.py | 30 ++++++++-------
 module/plugins/internal/SevenZip.py  | 38 ++++++++++---------
 module/plugins/internal/UnRar.py     | 71 +++++++++++++++++-------------------
 module/plugins/internal/UnZip.py     |  8 +++-
 4 files changed, 76 insertions(+), 71 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index b445f1497..8bf1875cf 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -19,7 +19,7 @@ class PasswordError(Exception):
 
 class Extractor:
     __name__    = "Extractor"
-    __version__ = "0.20"
+    __version__ = "0.21"
 
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
@@ -30,6 +30,7 @@ class Extractor:
 
     EXTENSIONS = []
     VERSION    = ""
+    REPAIR     = False
 
 
     @classmethod
@@ -90,23 +91,24 @@ class Extractor:
 
 
     def check(self):
-        """Check if password if needed. Raise ArchiveError if integrity is
-        questionable.
+        """Quick Check by listing content of archive.
+        Raises error if password is needed, integrity is questionable or else.
 
-        :return: boolean
+        :raises PasswordError
+        :raises CRCError
         :raises ArchiveError
         """
-        raise PasswordError
-
-
-    def isPassword(self, password):
-        """ Check if the given password is/might be correct.
-        If it can not be decided at this point return true.
-
-        :param password:
-        :return: boolean
+        raise NotImplementedError
+        
+    def test(self):
+        """Testing with Extractors buildt-in method
+        Raises error if password is needed, integrity is questionable or else.
+        
+        :raises PasswordError
+        :raises CRCError
+        :raises ArchiveError
         """
-        return None
+        raise NotImplementedError
 
 
     def repair(self):
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 7ad6b0d7a..bfa7f3943 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -11,7 +11,7 @@ from module.utils import fs_encode, save_join
 
 class SevenZip(UnRar):
     __name__    = "SevenZip"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __description__ = """7-Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -32,9 +32,9 @@ class SevenZip(UnRar):
 
     #@NOTE: there are some more uncovered 7z formats
     re_filelist = re.compile(r'([\d\:]+)\s+([\d\:]+)\s+([\w\.]+)\s+(\d+)\s+(\d+)\s+(.+)')
-    re_wrongpwd = re.compile(r'(Can not open encrypted archive|Wrong password)', re.I)
-    re_wrongcrc = re.compile(r'Encrypted\s+\=\s+\+', re.I)
-    re_version   = re.compile(r'7-Zip\s(?:\[64\]\s)?(\d+\.\d+)', re.I)
+    re_wrongpwd = re.compile(r'(Can not open encrypted archive|Wrong password|Encrypted\s+\=\s+\+)', re.I)
+    re_wrongcrc = re.compile(r'CRC Failed|Can not open file', re.I)
+    re_version  = re.compile(r'7-Zip\s(?:\[64\]\s)?(\d+\.\d+)', re.I)
 
 
     @classmethod
@@ -52,36 +52,38 @@ class SevenZip(UnRar):
         return True
 
 
-    def check(self):
+    def test(self, password):
         file = fs_encode(self.filename)
 
-        p = self.call_cmd("t", file)
+        # 7z can't distinguish crc and pw error in test
+        p = self.call_cmd("l", "-slt", file)
         out, err = p.communicate()
 
-        if p.returncode > 1:
+        if self.re_wrongpwd.search(out):
+            raise PasswordError
+
+        if self.re_wrongpwd.search(err):
+            raise PasswordError
+
+        if self.re_wrongcrc.search(err):
             raise CRCError(err)
 
+
+
+    def check(self, password):
+        file = fs_encode(self.filename)
+
         p = self.call_cmd("l", "-slt", file)
         out, err = p.communicate()
 
-        if p.returncode > 1:
-            raise ArchiveError(_("Process return code: %d") % p.returncode)
-
         # check if output or error macthes the 'wrong password'-Regexp
         if self.re_wrongpwd.search(out):
             raise PasswordError
 
-        # check if output matches 'Encrypted = +'
         if self.re_wrongcrc.search(out):
             raise CRCError(_("Header protected"))
 
 
-    def isPassword(self, password):
-        p = self.call_cmd("l", fs_encode(self.filename), password=password)
-        p.communicate()
-        return p.returncode == 0
-
-
     def repair(self):
         return False
 
@@ -142,7 +144,7 @@ class SevenZip(UnRar):
 
         #set a password
         if "password" in kwargs and kwargs["password"]:
-            args.append("-p'%s'" % kwargs["password"])
+            args.append("-p%s" % kwargs["password"])
         else:
             args.append("-p-")
 
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 54d64c430..ca8fdd326 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.13"
+    __version__ = "1.14"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -33,34 +33,40 @@ class UnRar(Extractor):
 
     CMD = "unrar"
     VERSION = ""
-
     EXTENSIONS = [".rar"]
 
 
-    re_multipart = re.compile(r'\.(part|r)(\d+)(?:\.rar)?',re.I)
+    re_multipart = re.compile(r'\.(part|r)(\d+)(?:\.rar)?(\.rev|\.bad)?',re.I)
 
     re_filefixed = re.compile(r'Building (.+)')
     re_filelist  = re.compile(r'^(.)(\s*[\w\.\-]+)\s+(\d+\s+)+(?:\d+\%\s+)?[\d\-]{8}\s+[\d\:]{5}', re.M|re.I)
 
     re_wrongpwd  = re.compile(r'password', re.I)
-    re_wrongcrc  = re.compile(r'encrypted|damaged|CRC failed|checksum error', re.I)
+    re_wrongcrc  = re.compile(r'encrypted|damaged|CRC failed|checksum error|corrupt', re.I)
 
-    re_version   = re.compile(r'UNRAR\s(\d+\.\d+)', re.I)
+    re_version   = re.compile(r'(?:UN)?RAR\s(\d+\.\d+)', re.I)
 
 
     @classmethod
     def isUsable(cls):
         if os.name == "nt":
-            cls.CMD = os.path.join(pypath, "UnRAR.exe")
-            p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
-            out, err = p.communicate()
-        else:
             try:
+                cls.CMD = os.path.join(pypath, "RAR.exe")
                 p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
                 out, err = p.communicate()
-
-            except OSError:  #: fallback to rar
-                cls.CMD = "rar"
+                cls.__name__ = "RAR"
+                cls.REPAIR = True
+            except OSError:
+                cls.CMD = os.path.join(pypath, "UnRAR.exe")
+                p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
+                out, err = p.communicate()
+        else:
+            try:
+                p = Popen(["rar"], stdout=PIPE, stderr=PIPE)
+                out, err = p.communicate()
+                cls.__name__ = "RAR"
+                cls.REPAIR = True
+            except OSError:  #: fallback to unrar
                 p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
                 out, err = p.communicate()
 
@@ -74,13 +80,25 @@ class UnRar(Extractor):
         multipart = cls.re_multipart.search(filename)
         if multipart:
             # First Multipart file (part1.rar for *.part1-9.rar format or *.rar for .r1-9 format) handled as normal Archive
-            return False if (multipart.group(1) == "part" and int(multipart.group(2)) == 1) else True
+            return False if (multipart.group(1) == "part" and int(multipart.group(2)) == 1 and not multipart.group(3)) else True
 
         return False
 
 
-    def check(self):
-        p = self.call_cmd("l", "-v", fs_encode(self.filename))
+    def test(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)
         out, err = p.communicate()
 
         if self.re_wrongpwd.search(err):
@@ -95,35 +113,14 @@ class UnRar(Extractor):
                 raise PasswordError
 
 
-    def isPassword(self, password):
-        # at this point we can only verify header protected files
-        p = self.call_cmd("l", "-v", fs_encode(self.filename), password=password)
-        out, err = p.communicate()
-        return False if self.re_wrongpwd.search(err) else True
-
-
     def repair(self):
         p = self.call_cmd("rc", fs_encode(self.filename))
 
         # communicate and retrieve stderr
         self._progress(p)
         err = p.stderr.read().strip()
-
         if err or p.returncode:
-            p = self.call_cmd("r", fs_encode(self.filename))
-
-            # 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 False
         return True
 
 
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 704b49ca0..d95afbc70 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.10"
+    __version__ = "1.11"
 
     __description__ = """Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -34,7 +34,11 @@ class UnZip(Extractor):
             return z.namelist()
 
 
-    def check(self):
+    def check(self, password):
+        pass
+
+
+    def test(self):
         with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
             badfile = z.testzip()
 
-- 
cgit v1.2.3


From dbeb21da8cb2eca52bcfcf8e8686947f41f71683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= <jens.hoernlein@googlemail.com>
Date: Wed, 25 Feb 2015 20:55:13 +0100
Subject: * [ExtractArchive] fixes 'Could not activate UnRar'

---
 module/plugins/internal/SevenZip.py | 5 +++--
 module/plugins/internal/UnRar.py    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index bfa7f3943..8a3c67f0e 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -11,7 +11,7 @@ from module.utils import fs_encode, save_join
 
 class SevenZip(UnRar):
     __name__    = "SevenZip"
-    __version__ = "0.09"
+    __version__ = "0.10"
 
     __description__ = """7-Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -47,7 +47,8 @@ class SevenZip(UnRar):
             p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
             out, err = p.communicate()
         
-        cls.VERSION = cls.re_version.search(out).group(1)
+        m = cls.re_version.search(out)
+        cls.VERSION = m.group(1) if m else '(version unknown)'
 
         return True
 
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index ca8fdd326..7a02ba6bd 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.14"
+    __version__ = "1.15"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -70,7 +70,8 @@ class UnRar(Extractor):
                 p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
                 out, err = p.communicate()
 
-        cls.VERSION = cls.re_version.search(out).group(1)
+        m = cls.re_version.search(out)
+        cls.VERSION = m.group(1) if m else '(version unknown)'
 
         return True
 
-- 
cgit v1.2.3


From 93eb54614d512396a5505cb9bdea4e201920b434 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 1 Mar 2015 00:33:21 +0100
Subject: Spare code cosmetics

---
 module/plugins/internal/CaptchaService.py | 6 +++++-
 module/plugins/internal/Extractor.py      | 4 ++--
 module/plugins/internal/SevenZip.py       | 2 +-
 module/plugins/internal/UnRar.py          | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 6f2c8e06d..fcb8f0095 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -14,6 +14,7 @@ from module.plugins.Plugin import Base
 #@TODO: Extend (new) Plugin class; remove all `html` args
 class CaptchaService(Base):
     __name__    = "CaptchaService"
+    __type__    = "captcha"
     __version__ = "0.25"
 
     __description__ = """Base captcha service plugin"""
@@ -43,6 +44,7 @@ class CaptchaService(Base):
 
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
+    __type__    = "captcha"
     __version__ = "0.14"
 
     __description__ = """ReCaptcha captcha service plugin"""
@@ -239,9 +241,9 @@ class ReCaptcha(CaptchaService):
         return result, None
 
 
-
 class AdsCaptcha(CaptchaService):
     __name__    = "AdsCaptcha"
+    __type__    = "captcha"
     __version__ = "0.08"
 
     __description__ = """AdsCaptcha captcha service plugin"""
@@ -314,6 +316,7 @@ class AdsCaptcha(CaptchaService):
 
 class SolveMedia(CaptchaService):
     __name__    = "SolveMedia"
+    __type__    = "captcha"
     __version__ = "0.12"
 
     __description__ = """SolveMedia captcha service plugin"""
@@ -422,6 +425,7 @@ class SolveMedia(CaptchaService):
 
 class AdYouLike(CaptchaService):
     __name__    = "AdYouLike"
+    __type__    = "captcha"
     __version__ = "0.05"
 
     __description__ = """AdYouLike captcha service plugin"""
diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 8bf1875cf..ee62ebcb7 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -99,11 +99,11 @@ class Extractor:
         :raises ArchiveError
         """
         raise NotImplementedError
-        
+
     def test(self):
         """Testing with Extractors buildt-in method
         Raises error if password is needed, integrity is questionable or else.
-        
+
         :raises PasswordError
         :raises CRCError
         :raises ArchiveError
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 8a3c67f0e..a3df52559 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -46,7 +46,7 @@ class SevenZip(UnRar):
         else:
             p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
             out, err = p.communicate()
-        
+
         m = cls.re_version.search(out)
         cls.VERSION = m.group(1) if m else '(version unknown)'
 
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 7a02ba6bd..eb969bb60 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -90,7 +90,7 @@ class UnRar(Extractor):
         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
 
-- 
cgit v1.2.3


From 3a9c167ceca27d57dbef927626fe853a3d0e30b2 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 1 Mar 2015 22:41:08 +0100
Subject: [Extractor] Use self.target

---
 module/plugins/internal/Extractor.py |  2 ++
 module/plugins/internal/SevenZip.py  | 14 +++++---------
 module/plugins/internal/UnRar.py     | 18 ++++++++++--------
 module/plugins/internal/UnZip.py     |  7 +++----
 4 files changed, 20 insertions(+), 21 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index ee62ebcb7..bc8e67c6d 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -3,6 +3,7 @@
 import os
 
 from module.PyFile import PyFile
+from module.utils import fs_encode
 
 
 class ArchiveError(Exception):
@@ -71,6 +72,7 @@ class Extractor:
                  fid=None):
         """ Initialize extractor for specific file """
         self.manager        = manager
+        self.target         = "'%s'" % fs_encode(filename)
         self.filename       = filename
         self.out            = out
         self.fullpath       = fullpath
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index a3df52559..5280338dc 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -6,7 +6,7 @@ import re
 from subprocess import Popen, PIPE
 
 from module.plugins.internal.UnRar import ArchiveError, CRCError, PasswordError, UnRar, renice
-from module.utils import fs_encode, save_join
+from module.utils import save_join
 
 
 class SevenZip(UnRar):
@@ -54,10 +54,8 @@ class SevenZip(UnRar):
 
 
     def test(self, password):
-        file = fs_encode(self.filename)
-
         # 7z can't distinguish crc and pw error in test
-        p = self.call_cmd("l", "-slt", file)
+        p = self.call_cmd("l", "-slt", self.target)
         out, err = p.communicate()
 
         if self.re_wrongpwd.search(out):
@@ -72,9 +70,7 @@ class SevenZip(UnRar):
 
 
     def check(self, password):
-        file = fs_encode(self.filename)
-
-        p = self.call_cmd("l", "-slt", file)
+        p = self.call_cmd("l", "-slt", self.target)
         out, err = p.communicate()
 
         # check if output or error macthes the 'wrong password'-Regexp
@@ -92,7 +88,7 @@ class SevenZip(UnRar):
     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)
 
@@ -119,7 +115,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/UnRar.py b/module/plugins/internal/UnRar.py
index eb969bb60..188fc88bb 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -8,7 +8,7 @@ from string import digits
 from subprocess import Popen, PIPE
 
 from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
-from module.utils import decode, fs_encode, save_join
+from module.utils import fs_decode, save_join
 
 
 def renice(pid, value):
@@ -56,6 +56,7 @@ class UnRar(Extractor):
                 out, err = p.communicate()
                 cls.__name__ = "RAR"
                 cls.REPAIR = True
+
             except OSError:
                 cls.CMD = os.path.join(pypath, "UnRAR.exe")
                 p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
@@ -66,6 +67,7 @@ class UnRar(Extractor):
                 out, err = p.communicate()
                 cls.__name__ = "RAR"
                 cls.REPAIR = True
+
             except OSError:  #: fallback to unrar
                 p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
                 out, err = p.communicate()
@@ -87,7 +89,7 @@ class UnRar(Extractor):
 
 
     def test(self, password):
-        p = self.call_cmd("t", "-v", fs_encode(self.filename), password=password)
+        p = self.call_cmd("t", "-v", self.target, password=password)
         self._progress(p)
         err = p.stderr.read().strip()
 
@@ -99,7 +101,7 @@ class UnRar(Extractor):
 
 
     def check(self, password):
-        p = self.call_cmd("l", "-v", fs_encode(self.filename), password=password)
+        p = self.call_cmd("l", "-v", self.target, password=password)
         out, err = p.communicate()
 
         if self.re_wrongpwd.search(err):
@@ -115,7 +117,7 @@ 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)
@@ -147,7 +149,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)
 
@@ -187,7 +189,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:
@@ -199,12 +201,12 @@ class UnRar(Extractor):
         result = set()
         if not self.fullpath and self.VERSION.startswith('5'):
             # NOTE: Unrar 5 always list full path
-            for f in decode(out).splitlines():
+            for f in fs_decode(out).splitlines():
                 f = save_join(self.out, os.path.basename(f.strip()))
                 if os.path.isfile(f):
                     result.add(save_join(self.out, os.path.basename(f)))
         else:
-            for f in decode(out).splitlines():
+            for f in fs_decode(out).splitlines():
                 f = f.strip()
                 result.add(save_join(self.out, f))
 
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index d95afbc70..dd57a54a7 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -7,7 +7,6 @@ import sys
 import zipfile
 
 from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
-from module.utils import fs_encode
 
 
 class UnZip(Extractor):
@@ -29,7 +28,7 @@ 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()
 
@@ -39,7 +38,7 @@ class UnZip(Extractor):
 
 
     def test(self):
-        with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
+        with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z:
             badfile = z.testzip()
 
             if badfile:
@@ -50,7 +49,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()
-- 
cgit v1.2.3


From 8b432eb80715f84800febb88620d943211e28051 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 4 Mar 2015 02:21:50 +0100
Subject: Revert 3a9c167ceca27d57dbef927626fe853a3d0e30b2

---
 module/plugins/internal/Extractor.py | 22 ++++++++++------------
 module/plugins/internal/SevenZip.py  | 10 +++++-----
 module/plugins/internal/UnRar.py     | 12 ++++++------
 module/plugins/internal/UnZip.py     |  7 ++++---
 4 files changed, 25 insertions(+), 26 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index bc8e67c6d..4b21cc49c 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -3,7 +3,6 @@
 import os
 
 from module.PyFile import PyFile
-from module.utils import fs_encode
 
 
 class ArchiveError(Exception):
@@ -71,17 +70,16 @@ class Extractor:
                  keepbroken=False,
                  fid=None):
         """ Initialize extractor for specific file """
-        self.manager        = manager
-        self.target         = "'%s'" % fs_encode(filename)
-        self.filename       = filename
-        self.out            = out
-        self.fullpath       = fullpath
-        self.overwrite      = overwrite
-        self.excludefiles   = excludefiles
-        self.renice         = renice
-        self.delete         = delete
-        self.keepbroken     = keepbroken
-        self.files          = []  #: Store extracted files here
+        self.manager      = manager
+        self.filename     = filename
+        self.out          = out
+        self.fullpath     = fullpath
+        self.overwrite    = overwrite
+        self.excludefiles = excludefiles
+        self.renice       = renice
+        self.delete       = delete
+        self.keepbroken   = keepbroken
+        self.files        = []  #: Store extracted files here
 
         pyfile = self.manager.core.files.getFile(fid) if fid else None
         self.notifyProgress = lambda x: pyfile.setProgress(x) if pyfile else lambda x: None
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 5280338dc..b5b113566 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -6,7 +6,7 @@ import re
 from subprocess import Popen, PIPE
 
 from module.plugins.internal.UnRar import ArchiveError, CRCError, PasswordError, UnRar, renice
-from module.utils import save_join
+from module.utils import fs_encode, save_join
 
 
 class SevenZip(UnRar):
@@ -55,7 +55,7 @@ class SevenZip(UnRar):
 
     def test(self, password):
         # 7z can't distinguish crc and pw error in test
-        p = self.call_cmd("l", "-slt", self.target)
+        p = self.call_cmd("l", "-slt", fs_encode(self.filename))
         out, err = p.communicate()
 
         if self.re_wrongpwd.search(out):
@@ -70,7 +70,7 @@ class SevenZip(UnRar):
 
 
     def check(self, password):
-        p = self.call_cmd("l", "-slt", self.target)
+        p = self.call_cmd("l", "-slt", fs_encode(self.filename))
         out, err = p.communicate()
 
         # check if output or error macthes the 'wrong password'-Regexp
@@ -88,7 +88,7 @@ class SevenZip(UnRar):
     def extract(self, password=None):
         command = "x" if self.fullpath else "e"
 
-        p = self.call_cmd(command, '-o' + self.out, self.target, password=password)
+        p = self.call_cmd(command, '-o' + self.out, fs_encode(self.filename), password=password)
 
         renice(p.pid, self.renice)
 
@@ -115,7 +115,7 @@ class SevenZip(UnRar):
     def list(self, password=None):
         command = "l" if self.fullpath else "l"
 
-        p = self.call_cmd(command, self.target, password=password)
+        p = self.call_cmd(command, fs_encode(self.filename), password=password)
         out, err = p.communicate()
 
         if "Can not open" in err:
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 188fc88bb..220dd6365 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -8,7 +8,7 @@ from string import digits
 from subprocess import Popen, PIPE
 
 from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
-from module.utils import fs_decode, save_join
+from module.utils import fs_decode, fs_encode, save_join
 
 
 def renice(pid, value):
@@ -89,7 +89,7 @@ class UnRar(Extractor):
 
 
     def test(self, password):
-        p = self.call_cmd("t", "-v", self.target, password=password)
+        p = self.call_cmd("t", "-v", fs_encode(self.filename), password=password)
         self._progress(p)
         err = p.stderr.read().strip()
 
@@ -101,7 +101,7 @@ class UnRar(Extractor):
 
 
     def check(self, password):
-        p = self.call_cmd("l", "-v", self.target, password=password)
+        p = self.call_cmd("l", "-v", fs_encode(self.filename), password=password)
         out, err = p.communicate()
 
         if self.re_wrongpwd.search(err):
@@ -117,7 +117,7 @@ class UnRar(Extractor):
 
 
     def repair(self):
-        p = self.call_cmd("rc", self.target)
+        p = self.call_cmd("rc", fs_encode(self.filename))
 
         # communicate and retrieve stderr
         self._progress(p)
@@ -149,7 +149,7 @@ class UnRar(Extractor):
     def extract(self, password=None):
         command = "x" if self.fullpath else "e"
 
-        p = self.call_cmd(command, self.target, self.out, password=password)
+        p = self.call_cmd(command, fs_encode(self.filename), self.out, password=password)
 
         renice(p.pid, self.renice)
 
@@ -189,7 +189,7 @@ class UnRar(Extractor):
     def list(self, password=None):
         command = "vb" if self.fullpath else "lb"
 
-        p = self.call_cmd(command, "-v", self.target, password=password)
+        p = self.call_cmd(command, "-v", fs_encode(self.filename), 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 dd57a54a7..d95afbc70 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -7,6 +7,7 @@ import sys
 import zipfile
 
 from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
+from module.utils import fs_encode
 
 
 class UnZip(Extractor):
@@ -28,7 +29,7 @@ class UnZip(Extractor):
 
 
     def list(self, password=None):
-        with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z:
+        with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
             z.setpassword(password)
             return z.namelist()
 
@@ -38,7 +39,7 @@ class UnZip(Extractor):
 
 
     def test(self):
-        with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z:
+        with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
             badfile = z.testzip()
 
             if badfile:
@@ -49,7 +50,7 @@ class UnZip(Extractor):
 
     def extract(self, password=None):
         try:
-            with zipfile.ZipFile(self.target, 'r', allowZip64=True) as z:
+            with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
                 z.setpassword(password)
 
                 badfile = z.testzip()
-- 
cgit v1.2.3


From 3551cd44c7fad9cf5159d5920b6e8ec7aa3d1b9b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 7 Mar 2015 18:33:23 +0100
Subject: Spare code cosmetics

---
 module/plugins/internal/SevenZip.py |  9 ++++-----
 module/plugins/internal/UnRar.py    | 14 +++++++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index b5b113566..82901f8cc 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -2,8 +2,7 @@
 
 import os
 import re
-
-from subprocess import Popen, PIPE
+import subprocess
 
 from module.plugins.internal.UnRar import ArchiveError, CRCError, PasswordError, UnRar, renice
 from module.utils import fs_encode, save_join
@@ -41,10 +40,10 @@ class SevenZip(UnRar):
     def isUsable(cls):
         if os.name == "nt":
             cls.CMD = os.path.join(pypath, "7z.exe")
-            p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
+            p = subprocess.Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             out,err = p.communicate()
         else:
-            p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
+            p = subprocess.Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             out, err = p.communicate()
 
         m = cls.re_version.search(out)
@@ -150,5 +149,5 @@ class SevenZip(UnRar):
 
         self.manager.logDebug(" ".join(call))
 
-        p = Popen(call, stdout=PIPE, stderr=PIPE)
+        p = subprocess.Popen(call, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         return p
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 220dd6365..baa5d3115 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -2,10 +2,10 @@
 
 import os
 import re
+import subprocess
 
 from glob import glob
 from string import digits
-from subprocess import Popen, PIPE
 
 from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError
 from module.utils import fs_decode, fs_encode, save_join
@@ -14,7 +14,7 @@ from module.utils import fs_decode, fs_encode, save_join
 def renice(pid, value):
     if value and os.name != "nt":
         try:
-            Popen(["renice", str(value), str(pid)], stdout=PIPE, stderr=PIPE, bufsize=-1)
+            subprocess.Popen(["renice", str(value), str(pid)], stdout=subprocess.PIPE, stderr=subprocess.PIPE, bufsize=-1)
 
         except Exception:
             pass
@@ -52,24 +52,24 @@ class UnRar(Extractor):
         if os.name == "nt":
             try:
                 cls.CMD = os.path.join(pypath, "RAR.exe")
-                p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
+                p = subprocess.Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 out, err = p.communicate()
                 cls.__name__ = "RAR"
                 cls.REPAIR = True
 
             except OSError:
                 cls.CMD = os.path.join(pypath, "UnRAR.exe")
-                p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
+                p = Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 out, err = p.communicate()
         else:
             try:
-                p = Popen(["rar"], stdout=PIPE, stderr=PIPE)
+                p = Popen(["rar"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 out, err = p.communicate()
                 cls.__name__ = "RAR"
                 cls.REPAIR = True
 
             except OSError:  #: fallback to unrar
-                p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
+                p = Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 out, err = p.communicate()
 
         m = cls.re_version.search(out)
@@ -244,5 +244,5 @@ class UnRar(Extractor):
 
         self.manager.logDebug(" ".join(call))
 
-        p = Popen(call, stdout=PIPE, stderr=PIPE)
+        p = Popen(call, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         return p
-- 
cgit v1.2.3


From 89b5cafa4e435d1b42b6bbfadd6c5c38dc9ab970 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 9 Mar 2015 17:28:34 +0100
Subject: [UnRar] Fix https://github.com/pyload/pyload/issues/1234

---
 module/plugins/internal/UnRar.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index baa5d3115..45e1640bf 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.15"
+    __version__ = "1.16"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -59,17 +59,17 @@ class UnRar(Extractor):
 
             except OSError:
                 cls.CMD = os.path.join(pypath, "UnRAR.exe")
-                p = Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                p = subprocess.Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 out, err = p.communicate()
         else:
             try:
-                p = Popen(["rar"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                p = subprocess.Popen(["rar"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 out, err = p.communicate()
                 cls.__name__ = "RAR"
                 cls.REPAIR = True
 
             except OSError:  #: fallback to unrar
-                p = Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                p = subprocess.Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 out, err = p.communicate()
 
         m = cls.re_version.search(out)
@@ -244,5 +244,5 @@ class UnRar(Extractor):
 
         self.manager.logDebug(" ".join(call))
 
-        p = Popen(call, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        p = subprocess.Popen(call, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         return p
-- 
cgit v1.2.3


From 2d302677064dd5996add552ee214093c6d73acea Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 9 Mar 2015 18:20:24 +0100
Subject: Rename fileUrl to getFileURL

---
 module/plugins/internal/SimpleDereferer.py | 6 +++---
 module/plugins/internal/SimpleHoster.py    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index bd00f5d25..577d56f75 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -5,13 +5,13 @@ import re
 from urllib import unquote
 
 from module.plugins.Crypter import Crypter
-from module.plugins.internal.SimpleHoster import fileUrl, set_cookies
+from module.plugins.internal.SimpleHoster import getFileURL, set_cookies
 
 
 class SimpleDereferer(Crypter):
     __name__    = "SimpleDereferer"
     __type__    = "crypter"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -45,7 +45,7 @@ class SimpleDereferer(Crypter):
 
 
     def decrypt(self, pyfile):
-        link = fileUrl(self, pyfile.url)
+        link = getFileURL(self, pyfile.url)
 
         if not link:
             try:
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index e4ff1a2d8..0adfc64b3 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -141,7 +141,7 @@ def timestamp():
 
 
 #@TODO: Move to hoster class in 0.4.10
-def fileUrl(self, url, follow_location=None):
+def getFileURL(self, url, follow_location=None):
     link     = ""
     redirect = 1
 
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.15"
+    __version__ = "1.16"
 
     __pattern__ = r'^unmatchable$'
 
@@ -311,7 +311,7 @@ class SimpleHoster(Hoster):
     LOGIN_ACCOUNT = False  #: Set to True to require account login
     DISPOSITION   = True   #: Work-around to `filename*=UTF-8` bug; remove in 0.4.10
 
-    directLink = fileUrl  #@TODO: Remove in 0.4.10
+    directLink = getFileURL  #@TODO: Remove in 0.4.10
 
 
     @classmethod
@@ -349,7 +349,7 @@ class SimpleHoster(Hoster):
                 info['error']  = "missing url"
                 info['status'] = 1
 
-            elif info['status'] is 3 and not fileUrl(None, url):
+            elif info['status'] is 3 and not getFileURL(None, url):
                 try:
                     html = getURL(url, cookies=cls.COOKIES, decode=not cls.TEXT_ENCODING)
 
-- 
cgit v1.2.3


From 29dec4b608c8d2df3a4b963d17e652d20381b1b0 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 9 Mar 2015 22:45:21 +0100
Subject: [MultiHook] No freezes + better list error handling

---
 module/plugins/internal/MultiHook.py | 40 ++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 13 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 652443098..7e6462d9d 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -11,7 +11,7 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.37"
+    __version__ = "0.38"
 
     __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
@@ -27,7 +27,7 @@ class MultiHook(Hook):
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    MIN_INTERVAL = 1 * 60 * 60
+    MIN_INTERVAL = 1 * 60 * 60  #: 1 hour
 
     DOMAIN_REPLACEMENTS = [(r'180upload\.com'  , "hundredeightyupload.com"),
                            (r'1fichier\.com'   , "onefichier.com"         ),
@@ -119,17 +119,17 @@ class MultiHook(Hook):
         if self.plugins:
             return self.plugins
 
-        for _i in xrange(3):
+        for _i in xrange(2):
             try:
                 pluginset = self._pluginSet(self.getHosters() if self.plugintype == "hoster" else self.getCrypters())
+                break
 
             except Exception, e:
-                self.logError(e, "Waiting 1 minute and retry")
+                self.logDebug(e, "Waiting 1 minute and retry")
                 sleep(60)
-
-            else:
-                break
         else:
+            self.logWarning(_("Fallback to default reload interval due plugin"))
+            self.interval = self.MIN_INTERVAL
             return list()
 
         try:
@@ -181,8 +181,28 @@ class MultiHook(Hook):
         raise NotImplementedError
 
 
+    #: Threaded _periodical, remove in 0.4.10 and use built-in flag for that
+    def _periodical(self):
+        try:
+            if self.isActivated():
+                self.periodical()
+
+        except Exception, e:
+            self.core.log.error(_("Error executing hooks: %s") % str(e))
+            if self.core.debug:
+                print_exc()
+
+        self.cb = self.core.scheduler.addJob(self.interval, self._periodical)
+
+
     def periodical(self):
         """reload plugin list periodically"""
+        if self.getConfig("reload", True):
+            self.interval = max(self.getConfig("reloadinterval", 12) * 60 * 60, self.MIN_INTERVAL)
+        else:
+            self.core.scheduler.removeJob(self.cb)
+            self.cb = None
+
         self.logInfo(_("Reloading supported %s list") % self.plugintype)
 
         old_supported = self.supported
@@ -200,12 +220,6 @@ class MultiHook(Hook):
             for plugin in old_supported:
                 self.unloadPlugin(plugin)
 
-        if self.getConfig("reload", True):
-            self.interval = max(self.getConfig("reloadinterval", 12) * 60 * 60, self.MIN_INTERVAL)
-        else:
-            self.core.scheduler.removeJob(self.cb)
-            self.cb = None
-
 
     def overridePlugins(self):
         excludedList = []
-- 
cgit v1.2.3


From f85e28e565a1e0a76e6271d0b0853d6d48b4a043 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 10 Mar 2015 01:16:29 +0100
Subject: [MultiHook] Fix _pluginSet (fix LinkdecrypterCom issue)

---
 module/plugins/internal/MultiHook.py | 48 +++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 22 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 7e6462d9d..e69f56c32 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -11,7 +11,7 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.38"
+    __version__ = "0.39"
 
     __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
                   ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
@@ -23,16 +23,13 @@ class MultiHook(Hook):
 
     __description__ = """Hook plugin for multi hoster/crypter"""
     __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org"),
+    __authors__     = [("pyLoad Team"   , "admin@pyload.org" ),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    MIN_INTERVAL = 1 * 60 * 60  #: 1 hour
+    MIN_RELOAD_INTERVAL = 1 * 60 * 60  #: 1 hour
 
     DOMAIN_REPLACEMENTS = [(r'180upload\.com'  , "hundredeightyupload.com"),
-                           (r'1fichier\.com'   , "onefichier.com"         ),
-                           (r'2shared\.com'    , "twoshared.com"          ),
-                           (r'4shared\.com'    , "fourshared.com"         ),
                            (r'bayfiles\.net'   , "bayfiles.com"           ),
                            (r'cloudnator\.com' , "shragle.com"            ),
                            (r'dfiles\.eu'      , "depositfiles.com"       ),
@@ -48,7 +45,16 @@ class MultiHook(Hook):
                            (r'uploaded\.net'   , "uploaded.to"            ),
                            (r'uploadhero\.co'  , "uploadhero.com"         ),
                            (r'zshares\.net'    , "zshare.net"             ),
-                           (r'(\d+.+)'         , "X\1"                    )]
+                           (r'^1'              , "one"                    ),
+                           (r'^2'              , "two"                    ),
+                           (r'^3'              , "three"                  ),
+                           (r'^4'              , "four"                   ),
+                           (r'^5'              , "five"                   ),
+                           (r'^6'              , "six"                    ),
+                           (r'^7'              , "seven"                  ),
+                           (r'^8'              , "eight"                  ),
+                           (r'^9'              , "nine"                   ),
+                           (r'^0'              , "zero"                   )]
 
 
     def setup(self):
@@ -129,7 +135,7 @@ class MultiHook(Hook):
                 sleep(60)
         else:
             self.logWarning(_("Fallback to default reload interval due plugin"))
-            self.interval = self.MIN_INTERVAL
+            self.interval = self.MIN_RELOAD_INTERVAL
             return list()
 
         try:
@@ -152,17 +158,15 @@ class MultiHook(Hook):
 
 
     def _pluginSet(self, plugins):
-        plugins = set((decode(x).strip().lower() for x in plugins if '.' in x))
+        regexp  = re.compile(r'^[\w\-.^_]{3,63}\.[a-zA-Z]{2,}$', re.U)
+        plugins = [decode(p.strip()).lower() for p in plugins if regexp.match(p.strip())]
 
-        for rf, rt in self.DOMAIN_REPLACEMENTS:
-            regex = re.compile(rf)
-            for p in filter(lambda x: regex.match(x), plugins):
-                plugins.remove(p)
-                plugins.add(re.sub(rf, rt, p))
+        for r in self.DOMAIN_REPLACEMENTS:
+            rf, rt  = r
+            repr    = re.compile(rf, re.I|re.U)
+            plugins = [re.sub(rf, rt, p) if repr.match(p) else p for p in plugins]
 
-        plugins.discard('')
-
-        return plugins
+        return set(plugins)
 
 
     def getHosters(self):
@@ -198,7 +202,7 @@ class MultiHook(Hook):
     def periodical(self):
         """reload plugin list periodically"""
         if self.getConfig("reload", True):
-            self.interval = max(self.getConfig("reloadinterval", 12) * 60 * 60, self.MIN_INTERVAL)
+            self.interval = max(self.getConfig("reloadinterval", 12) * 60 * 60, self.MIN_RELOAD_INTERVAL)
         else:
             self.core.scheduler.removeJob(self.cb)
             self.cb = None
@@ -263,7 +267,7 @@ class MultiHook(Hook):
             self.logDebug("New %ss: %s" % (self.plugintype, ", ".join(plugins)))
 
             # create new regexp
-            regexp = r'.*(?P<DOMAIN>%s).*' % "|".join([x.replace(".", "\.") for x in plugins])
+            regexp = r'.*(?P<DOMAIN>%s).*' % "|".join(x.replace('.', '\.') for x in plugins)
             if hasattr(self.pluginclass, "__pattern__") and isinstance(self.pluginclass.__pattern__, basestring) and '://' in self.pluginclass.__pattern__:
                 regexp = r'%s|%s' % (self.pluginclass.__pattern__, regexp)
 
@@ -277,11 +281,11 @@ class MultiHook(Hook):
     def unloadPlugin(self, plugin):
         hdict = self.core.pluginManager.plugins[self.plugintype][plugin]
         if "module" in hdict:
-            del hdict['module']
+            hdict.pop('module', None)
 
         if "new_module" in hdict:
-            del hdict['new_module']
-            del hdict['new_name']
+            hdict.pop('new_module', None)
+            hdict.pop('new_name', None)
 
 
     def unload(self):
-- 
cgit v1.2.3


From 7beb65e991bc6d1913c3b5bb2ef69e659d5b8342 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 10 Mar 2015 01:55:52 +0100
Subject: Spare code cosmetics

---
 module/plugins/internal/Extractor.py     |  6 +++---
 module/plugins/internal/SevenZip.py      |  4 ++--
 module/plugins/internal/SimpleCrypter.py |  6 +++---
 module/plugins/internal/SimpleHoster.py  | 10 +++++-----
 module/plugins/internal/UnRar.py         |  6 +++---
 module/plugins/internal/XFSAccount.py    |  4 ++--
 module/plugins/internal/XFSHoster.py     |  8 ++++----
 7 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 4b21cc49c..79864818e 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -23,9 +23,9 @@ class Extractor:
 
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "ranan@pyload.org"),
+    __authors__     = [("RaNaN"         , "ranan@pyload.org" ),
                        ("Walter Purcaro", "vuolter@gmail.com"),
-                       ("Immenz", "immenz@gmx.net")]
+                       ("Immenz"        , "immenz@gmx.net"   )]
 
 
     EXTENSIONS = []
@@ -40,7 +40,7 @@ class Extractor:
 
 
     @classmethod
-    def isMultipart(cls,filename):
+    def isMultipart(cls, filename):
         return False
 
 
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 82901f8cc..482b1802c 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -14,7 +14,7 @@ class SevenZip(UnRar):
 
     __description__ = """7-Zip extractor plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("Michael Nowak", ""),
+    __authors__     = [("Michael Nowak" , ""                 ),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
@@ -41,7 +41,7 @@ class SevenZip(UnRar):
         if os.name == "nt":
             cls.CMD = os.path.join(pypath, "7z.exe")
             p = subprocess.Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            out,err = p.communicate()
+            out, err = p.communicate()
         else:
             p = subprocess.Popen([cls.CMD], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             out, err = p.communicate()
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 856b548f0..696cc0848 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -20,9 +20,9 @@ class SimpleCrypter(Crypter, SimpleHoster):
 
     __description__ = """Simple decrypter plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it"),
-                       ("zoidberg", "zoidberg@mujmail.cz"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
+    __authors__     = [("stickell"      , "l.stickell@yahoo.it"),
+                       ("zoidberg"      , "zoidberg@mujmail.cz"),
+                       ("Walter Purcaro", "vuolter@gmail.com"  )]
 
 
     """
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 0adfc64b3..df6e78485 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -153,11 +153,11 @@ def getFileURL(self, url, follow_location=None):
     for i in xrange(redirect):
         try:
             self.logDebug("Redirect #%d to: %s" % (i, url))
-            header = self.load(url, ref=True, cookies=True, just_header=True, decode=True)
+            header = self.load(url, just_header=True, decode=True)
 
         except Exception:  #: Bad bad bad...
             req = pyreq.getHTTPRequest()
-            res = req.load(url, cookies=True, just_header=True, decode=True)
+            res = req.load(url, just_header=True, decode=True)
 
             req.close()
 
@@ -252,9 +252,9 @@ class SimpleHoster(Hoster):
 
     __description__ = """Simple hoster plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
-                       ("stickell", "l.stickell@yahoo.it"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
+    __authors__     = [("zoidberg"      , "zoidberg@mujmail.cz"),
+                       ("stickell"      , "l.stickell@yahoo.it"),
+                       ("Walter Purcaro", "vuolter@gmail.com"  )]
 
 
     """
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 45e1640bf..2ba6ff90d 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -26,9 +26,9 @@ class UnRar(Extractor):
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+    __authors__     = [("RaNaN"         , "RaNaN@pyload.org" ),
                        ("Walter Purcaro", "vuolter@gmail.com"),
-                       ("Immenz", "immenz@gmx.net"),]
+                       ("Immenz"        , "immenz@gmx.net"   )]
 
 
     CMD = "unrar"
@@ -79,7 +79,7 @@ class UnRar(Extractor):
 
 
     @classmethod
-    def isMultipart(cls,filename):
+    def isMultipart(cls, filename):
         multipart = cls.re_multipart.search(filename)
         if multipart:
             # First Multipart file (part1.rar for *.part1-9.rar format or *.rar for .r1-9 format) handled as normal Archive
diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 845ea3230..9315fb68f 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -16,8 +16,8 @@ class XFSAccount(Account):
 
     __description__ = """XFileSharing account plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
+    __authors__     = [("zoidberg"      , "zoidberg@mujmail.cz"),
+                       ("Walter Purcaro", "vuolter@gmail.com"  )]
 
 
     HOSTER_DOMAIN = None
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index c4fc969ba..e0c6d8824 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -22,9 +22,9 @@ class XFSHoster(SimpleHoster):
 
     __description__ = """XFileSharing hoster plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
-                       ("stickell", "l.stickell@yahoo.it"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
+    __authors__     = [("zoidberg"      , "zoidberg@mujmail.cz"),
+                       ("stickell"      , "l.stickell@yahoo.it"),
+                       ("Walter Purcaro", "vuolter@gmail.com"  )]
 
 
     HOSTER_DOMAIN = None
@@ -103,7 +103,7 @@ class XFSHoster(SimpleHoster):
 
             self.req.http.c.setopt(FOLLOWLOCATION, 0)
 
-            self.html = self.load(pyfile.url, post=data, ref=True, decode=True)
+            self.html = self.load(pyfile.url, post=data, decode=True)
 
             self.req.http.c.setopt(FOLLOWLOCATION, 1)
 
-- 
cgit v1.2.3


From cfd5dcb231d55478442c7b80517064b377eda43d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 10 Mar 2015 03:01:47 +0100
Subject: [RapidgatorNet] Fix https://github.com/pyload/pyload/issues/1237

---
 module/plugins/internal/SimpleHoster.py | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index df6e78485..2754b0b18 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -237,7 +237,7 @@ def secondsToMidnight(gmt=0):
 
     if hasattr(td, 'total_seconds'):
         res = td.total_seconds()
-    else:  #@NOTE: work-around for python 2.5 and 2.6 missing timedelta.total_seconds
+    else:  #: work-around for python 2.5 and 2.6 missing timedelta.total_seconds
         res = (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
 
     return int(res)
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.16"
+    __version__ = "1.17"
 
     __pattern__ = r'^unmatchable$'
 
@@ -537,8 +537,22 @@ class SimpleHoster(Hoster):
         elif hasattr(self, 'ERROR_PATTERN'):
             m = re.search(self.ERROR_PATTERN, self.html)
             if m:
-                errmsg = self.info['error'] = m.group(1)
-                self.error(errmsg)
+                errmsg
+                try:
+                    errmsg = m.group(1)
+                except Exception:
+                    errmsg = m.group(0)
+
+                self.info['error'] = errmsg
+
+                if "hour" in errmsg
+                    self.wait(secondsToMidnight(gmt=2), True)
+
+                elif re.search("da(il)?y|today", errmsg):
+                    self.wait(1 * 60 * 60, True)
+
+                else:
+                    self.error(errmsg)
 
         elif hasattr(self, 'WAIT_PATTERN'):
             m = re.search(self.WAIT_PATTERN, self.html)
@@ -546,7 +560,6 @@ class SimpleHoster(Hoster):
                 wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
                                 re.findall(r'(\d+)\s*(hr|hour|min|sec)', m.group(0), re.I))
                 self.wait(wait_time, wait_time > 300)
-                return
 
         self.info.pop('error', None)
 
-- 
cgit v1.2.3


From 3e81879d0c472c1079e75a12c7a8584f8304a8db Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 10 Mar 2015 03:35:47 +0100
Subject: [SimpleHoster] Fixup

---
 module/plugins/internal/SimpleHoster.py | 14 +++++++++-----
 module/plugins/internal/XFSHoster.py    |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 2754b0b18..4777d0641 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.17"
+    __version__ = "1.18"
 
     __pattern__ = r'^unmatchable$'
 
@@ -537,11 +537,10 @@ class SimpleHoster(Hoster):
         elif hasattr(self, 'ERROR_PATTERN'):
             m = re.search(self.ERROR_PATTERN, self.html)
             if m:
-                errmsg
                 try:
-                    errmsg = m.group(1)
+                    errmsg = m.group(1).strip()
                 except Exception:
-                    errmsg = m.group(0)
+                    errmsg = m.group(0).strip()
 
                 self.info['error'] = errmsg
 
@@ -557,8 +556,13 @@ class SimpleHoster(Hoster):
         elif hasattr(self, 'WAIT_PATTERN'):
             m = re.search(self.WAIT_PATTERN, self.html)
             if m:
+                try:
+                    waitmsg = m.group(1).strip()
+                except Exception:
+                    waitmsg = m.group(0).strip()
+
                 wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
-                                re.findall(r'(\d+)\s*(hr|hour|min|sec)', m.group(0), re.I))
+                                re.findall(r'(\d+)\s*(hr|hour|min|sec)', waitmsg, re.I))
                 self.wait(wait_time, wait_time > 300)
 
         self.info.pop('error', None)
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index e0c6d8824..6e0b5e4ab 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -16,7 +16,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.44"
+    __version__ = "0.45"
 
     __pattern__ = r'^unmatchable$'
 
@@ -195,7 +195,7 @@ class XFSHoster(SimpleHoster):
             if 'wait' in self.errmsg:
                 wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
                                 re.findall(r'(\d+)\s*(hr|hour|min|sec)', self.errmsg, re.I))
-                self.wait(wait_time, True)
+                self.wait(wait_time, wait_time > 300)
 
             elif 'country' in self.errmsg:
                 self.fail(_("Downloads are disabled for your country"))
-- 
cgit v1.2.3


From badb1317968331206d409ec8abf0c40ffc980bf8 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 10 Mar 2015 03:56:31 +0100
Subject: [SimpleHoster] Fix https://github.com/pyload/pyload/issues/1242

---
 module/plugins/internal/SimpleHoster.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 4777d0641..b2c40a828 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.18"
+    __version__ = "1.19"
 
     __pattern__ = r'^unmatchable$'
 
@@ -544,7 +544,7 @@ class SimpleHoster(Hoster):
 
                 self.info['error'] = errmsg
 
-                if "hour" in errmsg
+                if "hour" in errmsg:
                     self.wait(secondsToMidnight(gmt=2), True)
 
                 elif re.search("da(il)?y|today", errmsg):
-- 
cgit v1.2.3


From 58e98ab99bd7672492109786c4db7076d231631b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 10 Mar 2015 15:32:24 +0100
Subject: [FileSharkPl] Fix https://github.com/pyload/pyload/issues/1040 (2)

---
 module/plugins/internal/SimpleHoster.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index b2c40a828..3a38c4eea 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.19"
+    __version__ = "1.20"
 
     __pattern__ = r'^unmatchable$'
 
@@ -516,6 +516,9 @@ class SimpleHoster(Hoster):
             if hasattr(self, 'ERROR_PATTERN'):
                 rules['error'] = re.compile(self.ERROR_PATTERN)
 
+            if hasattr(self, 'WAIT_PATTERN'):
+                rules['wait error'] = re.compile(self.WAIT_PATTERN)
+
             check = self.checkDownload(rules)
             if check:  #@TODO: Move to hoster in 0.4.10
                 errmsg = check.strip().capitalize()
-- 
cgit v1.2.3


From ebb9910a25dbf0fc0d16242e9b4e9ffaa418656e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 10 Mar 2015 20:01:17 +0100
Subject: [SimpleHoster] Improve checkFile routine

---
 module/plugins/internal/SimpleHoster.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 3a38c4eea..ac25423fc 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.20"
+    __version__ = "1.21"
 
     __pattern__ = r'^unmatchable$'
 
@@ -499,7 +499,7 @@ class SimpleHoster(Hoster):
             self.download(link, ref=False, disposition=disposition)
 
 
-    def checkFile(self):
+    def checkFile(self, rules={}):
         if self.cTask and not self.lastDownload:
             self.invalidCaptcha()
             self.retry(10, reason=_("Wrong captcha"))
@@ -509,24 +509,28 @@ class SimpleHoster(Hoster):
             self.error(self.pyfile.error or _("No file downloaded"))
 
         else:
-            rules = {'empty file': re.compile(r'\A\Z'),
-                     'html file' : re.compile(r'\A\s*<!DOCTYPE html'),
-                     'html error': re.compile(r'\A\s*(<.+>)?\d{3}(\Z|\s+)')}
+            errmsg = self.checkDownload({'Empty file': re.compile(r'\A\s*\Z')})
 
-            if hasattr(self, 'ERROR_PATTERN'):
-                rules['error'] = re.compile(self.ERROR_PATTERN)
+            if errmsg:
+                self.lastDownload = ""
+            else:
+                for r, p in [('html file' , re.compile(r'\A\s*<!DOCTYPE html'      )),
+                             ('html error', re.compile(r'\A\s*(<.+>)?\d{3}(\Z|\s+)'))]:
+                    if r not in rules:
+                        rules[r] = p
 
-            if hasattr(self, 'WAIT_PATTERN'):
-                rules['wait error'] = re.compile(self.WAIT_PATTERN)
+                for r, a in [('error'     , 'ERROR_PATTERN'),
+                             ('wait error', 'WAIT_PATTERN' )]:
+                    if r not in rules and hasattr(self, a):
+                        rules[r] = getattr(self, a)
 
-            check = self.checkDownload(rules)
-            if check:  #@TODO: Move to hoster in 0.4.10
-                errmsg = check.strip().capitalize()
+                errmsg = self.checkDownload(rules, delete=not self.core.debug).strip().capitalize()
                 if self.lastCheck:
                     errmsg += " | " + self.lastCheck.group(0).strip()
 
-                self.lastDownload = ""
-                self.retry(10, 60, errmsg)
+            if errmsg:
+                self.logWarning("Bad file", "Waiting 1 minute and retry")
+                self.retry(3, 60, errmsg)
 
 
     def checkErrors(self):
-- 
cgit v1.2.3


From 7f357700f340db51a0de65a8dcc0726a6965ecd3 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 10 Mar 2015 22:37:29 +0100
Subject: [SimpleHoster] Improve checkFile routine (2)

---
 module/plugins/internal/SimpleHoster.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index ac25423fc..393af86f5 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.21"
+    __version__ = "1.22"
 
     __pattern__ = r'^unmatchable$'
 
@@ -509,24 +509,27 @@ class SimpleHoster(Hoster):
             self.error(self.pyfile.error or _("No file downloaded"))
 
         else:
-            errmsg = self.checkDownload({'Empty file': re.compile(r'\A\s*\Z')})
+            errmsg = self.checkDownload({'Empty file': re.compile(r'\A\s*\Z'),
+                                         'Html error': re.compile(r'\A(\s*<.+>)?([\w\s]*([Ee]rror|ERROR)\s*:?)?\s*\d{3}(\Z|\s+)')})
 
-            if errmsg:
-                self.lastDownload = ""
-            else:
-                for r, p in [('html file' , re.compile(r'\A\s*<!DOCTYPE html'      )),
-                             ('html error', re.compile(r'\A\s*(<.+>)?\d{3}(\Z|\s+)'))]:
+            if not errmsg:
+                for r, p in [('Html file'    , re.compile(r'\A\s*<!DOCTYPE html')                              ),
+                             ('Unknown error', re.compile(r'[Aa]n error occured while processing your request'))]:
                     if r not in rules:
                         rules[r] = p
 
-                for r, a in [('error'     , 'ERROR_PATTERN'),
-                             ('wait error', 'WAIT_PATTERN' )]:
+                for r, a in [('Error'       , "ERROR_PATTERN"       ),
+                             ('Premium only', "PREMIUM_ONLY_PATTERN"),
+                             ('Wait error'  , "WAIT_PATTERN"        )]:
                     if r not in rules and hasattr(self, a):
                         rules[r] = getattr(self, a)
 
-                errmsg = self.checkDownload(rules, delete=not self.core.debug).strip().capitalize()
-                if self.lastCheck:
-                    errmsg += " | " + self.lastCheck.group(0).strip()
+                errmsg = self.checkDownload(rules).strip().capitalize()
+
+            try:
+                errmsg += " | " + self.lastCheck.group(1).strip()
+            except Exception:
+                pass
 
             if errmsg:
                 self.logWarning("Bad file", "Waiting 1 minute and retry")
-- 
cgit v1.2.3


From daddc7e36dba956d2623626ed0079694940f1b9e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 10 Mar 2015 23:05:38 +0100
Subject: [BasePlugin][SimpleHoster] Improve checkDownload rules

---
 module/plugins/internal/SimpleHoster.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 393af86f5..13a9c134f 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.22"
+    __version__ = "1.23"
 
     __pattern__ = r'^unmatchable$'
 
@@ -510,11 +510,11 @@ class SimpleHoster(Hoster):
 
         else:
             errmsg = self.checkDownload({'Empty file': re.compile(r'\A\s*\Z'),
-                                         'Html error': re.compile(r'\A(\s*<.+>)?([\w\s]*([Ee]rror|ERROR)\s*:?)?\s*\d{3}(\Z|\s+)')})
+                                         'Html error': re.compile(r'\A(?:\s*<.+>)?((?:[\w\s]*(?:[Ee]rror|ERROR)\s*\:?)?\s*\d{3})(?:\Z|\s+)')})
 
             if not errmsg:
                 for r, p in [('Html file'    , re.compile(r'\A\s*<!DOCTYPE html')                              ),
-                             ('Unknown error', re.compile(r'[Aa]n error occured while processing your request'))]:
+                             ('Unknown error', re.compile(r'([Aa]n error occured while processing your request)'))]:
                     if r not in rules:
                         rules[r] = p
 
@@ -526,12 +526,12 @@ class SimpleHoster(Hoster):
 
                 errmsg = self.checkDownload(rules).strip().capitalize()
 
-            try:
-                errmsg += " | " + self.lastCheck.group(1).strip()
-            except Exception:
-                pass
-
             if errmsg:
+                try:
+                    errmsg += " | " + self.lastCheck.group(1).strip()
+                except Exception:
+                    pass
+
                 self.logWarning("Bad file", "Waiting 1 minute and retry")
                 self.retry(3, 60, errmsg)
 
-- 
cgit v1.2.3


From 6f36b6314cecb7ff32e4f038751a18b7d4abd3d2 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 11 Mar 2015 14:22:45 +0100
Subject: [SimpleHoster] Fix https://github.com/pyload/pyload/issues/1248

---
 module/plugins/internal/SimpleHoster.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 13a9c134f..a1825a73e 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.23"
+    __version__ = "1.24"
 
     __pattern__ = r'^unmatchable$'
 
@@ -524,16 +524,20 @@ class SimpleHoster(Hoster):
                     if r not in rules and hasattr(self, a):
                         rules[r] = getattr(self, a)
 
-                errmsg = self.checkDownload(rules).strip().capitalize()
+                errmsg = self.checkDownload(rules)
 
-            if errmsg:
-                try:
-                    errmsg += " | " + self.lastCheck.group(1).strip()
-                except Exception:
-                    pass
+            if not errmsg:
+                return
+
+            errmsg = errmsg.strip().capitalize()
+
+            try:
+                errmsg += " | " + self.lastCheck.group(1).strip()
+            except Exception:
+                pass
 
-                self.logWarning("Bad file", "Waiting 1 minute and retry")
-                self.retry(3, 60, errmsg)
+            self.logWarning("Bad file", "Waiting 1 minute and retry")
+            self.retry(3, 60, errmsg)
 
 
     def checkErrors(self):
-- 
cgit v1.2.3


From c4719b75e43bed931f79ba763b8e8d81a2318710 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 14 Mar 2015 10:31:05 +0100
Subject: [BasePlugin][SimpleHoster] Better checkDownload warning

---
 module/plugins/internal/SimpleHoster.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index a1825a73e..114128c63 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.24"
+    __version__ = "1.25"
 
     __pattern__ = r'^unmatchable$'
 
@@ -514,7 +514,7 @@ class SimpleHoster(Hoster):
 
             if not errmsg:
                 for r, p in [('Html file'    , re.compile(r'\A\s*<!DOCTYPE html')                              ),
-                             ('Unknown error', re.compile(r'([Aa]n error occured while processing your request)'))]:
+                             ('Request error', re.compile(r'([Aa]n error occured while processing your request)'))]:
                     if r not in rules:
                         rules[r] = p
 
@@ -536,7 +536,7 @@ class SimpleHoster(Hoster):
             except Exception:
                 pass
 
-            self.logWarning("Bad file", "Waiting 1 minute and retry")
+            self.logWarning("Check result: " + errmsg, "Waiting 1 minute and retry")
             self.retry(3, 60, errmsg)
 
 
-- 
cgit v1.2.3


From e65d19ee3a1e435bf2896ed829e5581eeef92dd2 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 14 Mar 2015 11:07:54 +0100
Subject: Import cleanup for datetime and time modules

---
 module/plugins/internal/MultiHook.py    |  5 ++---
 module/plugins/internal/SimpleHoster.py | 12 ++++++------
 module/plugins/internal/XFSAccount.py   |  6 +++---
 module/plugins/internal/XFSHoster.py    |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index e69f56c32..d4369da9b 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-
-from time import sleep
+import time
 
 from module.plugins.Hook import Hook
 from module.utils import decode, remove_chars
@@ -132,7 +131,7 @@ class MultiHook(Hook):
 
             except Exception, e:
                 self.logDebug(e, "Waiting 1 minute and retry")
-                sleep(60)
+                time.sleep(60)
         else:
             self.logWarning(_("Fallback to default reload interval due plugin"))
             self.interval = self.MIN_RELOAD_INTERVAL
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 114128c63..5defd028d 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
+import datetime
 import mimetypes
 import os
 import re
+import time
 
-from datetime import datetime, timedelta
 from inspect import isclass
-from time import time
 from urllib import unquote
 from urlparse import urljoin, urlparse
 
@@ -137,7 +137,7 @@ def create_getInfo(plugin):
 
 
 def timestamp():
-    return int(time() * 1000)
+    return int(time.time() * 1000)
 
 
 #@TODO: Move to hoster class in 0.4.10
@@ -226,18 +226,18 @@ def getFileURL(self, url, follow_location=None):
 
 
 def secondsToMidnight(gmt=0):
-    now = datetime.utcnow() + timedelta(hours=gmt)
+    now = datetime.datetime.utcnow() + datetime.timedelta(hours=gmt)
 
     if now.hour is 0 and now.minute < 10:
         midnight = now
     else:
-        midnight = now + timedelta(days=1)
+        midnight = now + datetime.timedelta(days=1)
 
     td = midnight.replace(hour=0, minute=10, second=0, microsecond=0) - now
 
     if hasattr(td, 'total_seconds'):
         res = td.total_seconds()
-    else:  #: work-around for python 2.5 and 2.6 missing timedelta.total_seconds
+    else:  #: work-around for python 2.5 and 2.6 missing datetime.timedelta.total_seconds
         res = (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
 
     return int(res)
diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 9315fb68f..31d1b7e2f 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 import re
+import time
 
-from time import gmtime, mktime, strptime
 from urlparse import urljoin
 
 from module.plugins.Account import Account
@@ -80,7 +80,7 @@ class XFSAccount(Account):
             self.logDebug("Expire date: " + expiredate)
 
             try:
-                validuntil = mktime(strptime(expiredate, "%d %B %Y"))
+                validuntil = time.mktime(time.strptime(expiredate, "%d %B %Y"))
 
             except Exception, e:
                 self.logError(e)
@@ -88,7 +88,7 @@ class XFSAccount(Account):
             else:
                 self.logDebug("Valid until: %s" % validuntil)
 
-                if validuntil > mktime(gmtime()):
+                if validuntil > time.mktime(time.gmtime()):
                     premium     = True
                     trafficleft = -1
                 else:
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 6e0b5e4ab..9e60a5aa5 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import re
+import time
 
 from random import random
-from time import sleep
 from urlparse import urljoin, urlparse
 
 from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME
-- 
cgit v1.2.3


From 2bc144adb6bc2759b635e09687b27bf96074827f Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 18 Mar 2015 13:39:07 +0100
Subject: Spare code cosmetics

---
 module/plugins/internal/Extractor.py     | 3 +--
 module/plugins/internal/MultiHook.py     | 2 ++
 module/plugins/internal/SimpleCrypter.py | 6 ++----
 module/plugins/internal/SimpleHoster.py  | 4 +---
 4 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 79864818e..f32329e37 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -23,8 +23,7 @@ class Extractor:
 
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("RaNaN"         , "ranan@pyload.org" ),
-                       ("Walter Purcaro", "vuolter@gmail.com"),
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"),
                        ("Immenz"        , "immenz@gmx.net"   )]
 
 
diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index d4369da9b..35bb9c65d 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -57,6 +57,8 @@ class MultiHook(Hook):
 
 
     def setup(self):
+        self.info = {}  #@TODO: Remove in 0.4.10
+
         self.plugins       = []
         self.supported     = []
         self.new_supported = []
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 696cc0848..ef6d3fc0e 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -15,14 +15,12 @@ class SimpleCrypter(Crypter, SimpleHoster):
     __version__ = "0.43"
 
     __pattern__ = r'^unmatchable$'
-    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config['general']['folder_per_package']
+    __config__  = [("use_subfolder"        , "bool", "Save package to subfolder"          , True),  #: Overrides core.config['general']['folder_per_package']
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
     __description__ = """Simple decrypter plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("stickell"      , "l.stickell@yahoo.it"),
-                       ("zoidberg"      , "zoidberg@mujmail.cz"),
-                       ("Walter Purcaro", "vuolter@gmail.com"  )]
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"  )]
 
 
     """
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 5defd028d..103dc9a19 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -252,9 +252,7 @@ class SimpleHoster(Hoster):
 
     __description__ = """Simple hoster plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("zoidberg"      , "zoidberg@mujmail.cz"),
-                       ("stickell"      , "l.stickell@yahoo.it"),
-                       ("Walter Purcaro", "vuolter@gmail.com"  )]
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"  )]
 
 
     """
-- 
cgit v1.2.3


From edd7019034e191a754211a2a949b449b2d40ed3c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 18 Mar 2015 22:15:54 +0100
Subject: [SimpleHoster] retryFree feature

---
 module/plugins/internal/SimpleHoster.py | 63 +++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 23 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 103dc9a19..54872a088 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -15,7 +15,7 @@ from module.network.CookieJar import CookieJar
 from module.network.HTTPRequest import BadHeader
 from module.network.RequestFactory import getURL
 from module.plugins.Hoster import Hoster
-from module.plugins.Plugin import Fail
+from module.plugins.Plugin import Fail, Retry
 from module.utils import fixup, fs_encode, parseFileSize
 
 
@@ -246,9 +246,10 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.25"
+    __version__ = "1.26"
 
     __pattern__ = r'^unmatchable$'
+    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Simple hoster plugin"""
     __license__     = "GPLv3"
@@ -424,6 +425,9 @@ class SimpleHoster(Hoster):
         self.directDL  = False  #@TODO: Move to hoster class in 0.4.10
         self.multihost = False  #@TODO: Move to hoster class in 0.4.10
 
+        if not self.getConfig('use_premium', True):
+            self.retryFree()
+
         if self.LOGIN_ACCOUNT and not self.account:
             self.fail(_("Required account not found"))
 
@@ -454,35 +458,42 @@ class SimpleHoster(Hoster):
 
 
     def process(self, pyfile):
-        self.prepare()
-        self.checkInfo()
+        try:
+            self.prepare()
+            self.checkInfo()
+
+            if self.directDL:
+                self.logDebug("Looking for direct download link...")
+                self.handleDirect(pyfile)
 
-        if self.directDL:
-            self.logDebug("Looking for direct download link...")
-            self.handleDirect(pyfile)
+            if self.multihost and not self.link and not self.lastDownload:
+                self.logDebug("Looking for leeched download link...")
+                self.handleMulti(pyfile)
 
-        if self.multihost and not self.link and not self.lastDownload:
-            self.logDebug("Looking for leeched download link...")
-            self.handleMulti(pyfile)
+                if not self.link and not self.lastDownload:
+                    self.MULTI_HOSTER = False
+                    self.retry(1, reason="Multi hoster fails")
 
             if not self.link and not self.lastDownload:
-                self.MULTI_HOSTER = False
-                self.retry(1, reason="Multi hoster fails")
+                self.preload()
+                self.checkInfo()
 
-        if not self.link and not self.lastDownload:
-            self.preload()
-            self.checkInfo()
+                if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
+                    self.logDebug("Handled as premium download")
+                    self.handlePremium(pyfile)
 
-            if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
-                self.logDebug("Handled as premium download")
-                self.handlePremium(pyfile)
+                elif not self.LOGIN_ACCOUNT or (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
+                    self.logDebug("Handled as free download")
+                    self.handleFree(pyfile)
 
-            elif not self.LOGIN_ACCOUNT or (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
-                self.logDebug("Handled as free download")
-                self.handleFree(pyfile)
+            self.downloadLink(self.link, self.DISPOSITION)  #: Remove `self.DISPOSITION` in 0.4.10
+            self.checkFile()
 
-        self.downloadLink(self.link, self.DISPOSITION)  #: Remove `self.DISPOSITION` in 0.4.10
-        self.checkFile()
+        except Fail, e:  #@TODO: Move to PluginThread in 0.4.10
+            if self.premium:
+                self.retryFree()
+            else:
+                raise Fail(e)
 
 
     def downloadLink(self, link, disposition=True):
@@ -721,6 +732,12 @@ class SimpleHoster(Hoster):
             return size <= traffic
 
 
+    def retryFree(self):
+        self.account = None
+        self.req     = self.core.requestFactory.getRequest(self.__name__)
+        raise Retry(_("Fallback to free download"))
+
+
     #@TODO: Remove in 0.4.10
     def wait(self, seconds=0, reconnect=None):
         return _wait(self, seconds, reconnect)
-- 
cgit v1.2.3


From e19feb3a3b961d3e1f1a86f2366c3b71c85bc8db Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 18 Mar 2015 22:16:38 +0100
Subject: [MultiHoster] Fix revertfailed feature

---
 module/plugins/internal/MultiHook.py   | 41 ++++-----------------
 module/plugins/internal/MultiHoster.py | 66 ++++++++++++++++++++++++----------
 2 files changed, 54 insertions(+), 53 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 35bb9c65d..9ba1fc2c8 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -10,15 +10,12 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.39"
+    __version__ = "0.40"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"                     , "all"),
-                  ("pluginlist"    , "str"                , "Plugin list (comma separated)"       , ""   ),
-                  ("revertfailed"  , "bool"               , "Revert to standard download if fails", True ),
-                  ("retry"         , "int"                , "Number of retries before revert"     , 10   ),
-                  ("retryinterval" , "int"                , "Retry interval in minutes"           , 1    ),
-                  ("reload"        , "bool"               , "Reload plugin list"                  , True ),
-                  ("reloadinterval", "int"                , "Reload interval in hours"            , 12   )]
+    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
+                  ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
+                  ("reload"        , "bool"               , "Reload plugin list"           , True ),
+                  ("reloadinterval", "int"                , "Reload interval in hours"     , 12   )]
 
     __description__ = """Hook plugin for multi hoster/crypter"""
     __license__     = "GPLv3"
@@ -135,7 +132,7 @@ class MultiHook(Hook):
                 self.logDebug(e, "Waiting 1 minute and retry")
                 time.sleep(60)
         else:
-            self.logWarning(_("Fallback to default reload interval due plugin"))
+            self.logWarning(_("Fallback to default reload interval due plugin parse error"))
             self.interval = self.MIN_RELOAD_INTERVAL
             return list()
 
@@ -299,29 +296,3 @@ class MultiHook(Hook):
 
         hdict['pattern'] = getattr(self.pluginclass, "__pattern__", r'^unmatchable$')
         hdict['re']      = re.compile(hdict['pattern'])
-
-
-    def downloadFailed(self, pyfile):
-        """remove plugin override if download fails but not if file is offline/temp.offline"""
-        if pyfile.status != 8 or not self.getConfig("revertfailed", True):
-            return
-
-        hdict = self.core.pluginManager.plugins[self.plugintype][pyfile.pluginname]
-        if "new_name" in hdict and hdict['new_name'] == self.pluginname:
-            if pyfile.error == "MultiHook":
-                self.logDebug("Unload MultiHook", pyfile.pluginname, hdict)
-                self.unloadPlugin(pyfile.pluginname)
-                pyfile.setStatus("queued")
-                pyfile.sync()
-            else:
-                retries   = max(self.getConfig("retry", 10), 0)
-                wait_time = max(self.getConfig("retryinterval", 1), 0)
-
-                if 0 < retries > pyfile.plugin.retries:
-                    self.logInfo(_("Retrying: %s") % pyfile.name)
-                    pyfile.setCustomStatus("MultiHook", "queued")
-                    pyfile.sync()
-
-                    pyfile.plugin.retries += 1
-                    pyfile.plugin.setWait(wait_time)
-                    pyfile.plugin.wait()
diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 63b7d76b1..fb76c58f4 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -2,15 +2,18 @@
 
 import re
 
+from module.plugins.Plugin import Fail, Retry
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, replace_patterns, set_cookies
 
 
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.37"
+    __version__ = "0.38"
 
     __pattern__ = r'^unmatchable$'
+    __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
+                   ("revertfailed", "bool", "Revert to standard download if fails", True)]
 
     __description__ = """Multi hoster plugin"""
     __license__     = "GPLv3"
@@ -32,6 +35,9 @@ class MultiHoster(SimpleHoster):
         self.link     = ""     #@TODO: Move to hoster class in 0.4.10
         self.directDL = False  #@TODO: Move to hoster class in 0.4.10
 
+        if not self.getConfig('use_premium', True):
+            self.retryFree()
+
         if self.LOGIN_ACCOUNT and not self.account:
             self.fail(_("Required account not found"))
 
@@ -49,29 +55,53 @@ class MultiHoster(SimpleHoster):
 
 
     def process(self, pyfile):
-        self.prepare()
+        try:
+            self.prepare()
+
+            if self.directDL:
+                self.checkInfo()
+                self.logDebug("Looking for direct download link...")
+                self.handleDirect(pyfile)
+
+            if not self.link and not self.lastDownload:
+                self.preload()
+
+                self.checkErrors()
+                self.checkStatus(getinfo=False)
+
+                if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
+                    self.logDebug("Handled as premium download")
+                    self.handlePremium(pyfile)
+
+                elif not self.LOGIN_ACCOUNT or (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
+                    self.logDebug("Handled as free download")
+                    self.handleFree(pyfile)
+
+            self.downloadLink(self.link, True)
+            self.checkFile()
+
+        except Fail, e:  #@TODO: Move to PluginThread in 0.4.10
+            if self.premium:
+                self.retryFree()
 
-        if self.directDL:
-            self.checkInfo()
-            self.logDebug("Looking for direct download link...")
-            self.handleDirect(pyfile)
+            elif self.getConfig("revertfailed", True) \
+                 and "new_module" in self.core.pluginManager.hosterPlugins[self.__name__]:
+                hdict = self.core.pluginManager.hosterPlugins[self.__name__]
 
-        if not self.link and not self.lastDownload:
-            self.preload()
+                tmp_module = hdict['new_module']
+                tmp_name   = hdict['new_name']
+                hdict.pop('new_module', None)
+                hdict.pop('new_name', None)
 
-            self.checkErrors()
-            self.checkStatus(getinfo=False)
+                pyfile.initPlugin()
 
-            if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
-                self.logDebug("Handled as premium download")
-                self.handlePremium(pyfile)
+                hdict['new_module'] = tmp_module
+                hdict['new_name']   = tmp_name
 
-            elif not self.LOGIN_ACCOUNT or (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
-                self.logDebug("Handled as free download")
-                self.handleFree(pyfile)
+                raise Retry(_("Revert to original hoster plugin"))
 
-        self.downloadLink(self.link, True)
-        self.checkFile()
+            else:
+                raise Fail(e)
 
 
     def handlePremium(self, pyfile):
-- 
cgit v1.2.3


From b4a43ec54dbd327d46692c7425695adc91fff3d7 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 18 Mar 2015 23:14:24 +0100
Subject: [SimpleHoster] Fix https://github.com/pyload/pyload/issues/1263

---
 module/plugins/internal/MultiHook.py    |  2 +-
 module/plugins/internal/SimpleHoster.py | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 9ba1fc2c8..ef7f47ed1 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -110,7 +110,7 @@ class MultiHook(Hook):
         return rep
 
 
-    def getConfig(self, option, default=''):
+    def getConfig(self, option, default=''):  #@TODO: Remove in 0.4.10
         """getConfig with default value - sublass may not implements all config options"""
         try:
             return self.getConf(option)
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 54872a088..1b6b330b6 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.26"
+    __version__ = "1.27"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -732,6 +732,15 @@ class SimpleHoster(Hoster):
             return size <= traffic
 
 
+    def getConfig(self, option, default=''):  #@TODO: Remove in 0.4.10
+        """getConfig with default value - sublass may not implements all config options"""
+        try:
+            return self.getConf(option)
+
+        except KeyError:
+            return default
+
+
     def retryFree(self):
         self.account = None
         self.req     = self.core.requestFactory.getRequest(self.__name__)
-- 
cgit v1.2.3


From e4e743646a20d24077a8f1f95a0e5aa772771ff7 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 20 Mar 2015 12:00:54 +0100
Subject: [SimpleHoster] Fix checkErrors

---
 module/plugins/internal/SimpleHoster.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 1b6b330b6..047d9edde 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.27"
+    __version__ = "1.28"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -522,7 +522,7 @@ class SimpleHoster(Hoster):
                                          'Html error': re.compile(r'\A(?:\s*<.+>)?((?:[\w\s]*(?:[Ee]rror|ERROR)\s*\:?)?\s*\d{3})(?:\Z|\s+)')})
 
             if not errmsg:
-                for r, p in [('Html file'    , re.compile(r'\A\s*<!DOCTYPE html')                              ),
+                for r, p in [('Html file'    , re.compile(r'\A\s*<!DOCTYPE html')                                ),
                              ('Request error', re.compile(r'([Aa]n error occured while processing your request)'))]:
                     if r not in rules:
                         rules[r] = p
@@ -567,12 +567,15 @@ class SimpleHoster(Hoster):
 
                 self.info['error'] = errmsg
 
-                if "hour" in errmsg:
-                    self.wait(secondsToMidnight(gmt=2), True)
+                if "min" in errmsg:
+                    self.wait(1 * 60)
 
-                elif re.search("da(il)?y|today", errmsg):
+                elif "hour" in errmsg:
                     self.wait(1 * 60 * 60, True)
 
+                elif re.search("da(il)?y|today", errmsg):
+                    self.wait(secondsToMidnight(gmt=2), True)
+
                 else:
                     self.error(errmsg)
 
-- 
cgit v1.2.3


From 73aeac3f1411fb8b9797856d0bf1730414915791 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 21 Mar 2015 17:15:08 +0100
Subject: [SimpleHoster] Fix checkErrors (2)

---
 module/plugins/internal/MultiHoster.py  |  3 ++-
 module/plugins/internal/SimpleHoster.py | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index fb76c58f4..350397f8b 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.38"
+    __version__ = "0.39"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
@@ -82,6 +82,7 @@ class MultiHoster(SimpleHoster):
 
         except Fail, e:  #@TODO: Move to PluginThread in 0.4.10
             if self.premium:
+                self.logWarning(_("Premium download failed"))
                 self.retryFree()
 
             elif self.getConfig("revertfailed", True) \
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 047d9edde..8a3381c53 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.28"
+    __version__ = "1.29"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -491,6 +491,7 @@ class SimpleHoster(Hoster):
 
         except Fail, e:  #@TODO: Move to PluginThread in 0.4.10
             if self.premium:
+                self.logWarning(_("Premium download failed"))
                 self.retryFree()
             else:
                 raise Fail(e)
@@ -567,15 +568,15 @@ class SimpleHoster(Hoster):
 
                 self.info['error'] = errmsg
 
-                if "min" in errmsg:
-                    self.wait(1 * 60)
-
-                elif "hour" in errmsg:
+                if "hour" in errmsg:
                     self.wait(1 * 60 * 60, True)
 
                 elif re.search("da(il)?y|today", errmsg):
                     self.wait(secondsToMidnight(gmt=2), True)
 
+                elif "minute" in errmsg:
+                    self.wait(1 * 60)
+
                 else:
                     self.error(errmsg)
 
-- 
cgit v1.2.3


From d0ef13775925f15811d2a6744d29190c313b3820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= <jens.hoernlein@googlemail.com>
Date: Mon, 23 Mar 2015 00:32:56 +0100
Subject: [ExtractArchive] extract archive even if first part is not in package

---
 module/plugins/internal/Extractor.py | 16 +++++++++++++---
 module/plugins/internal/UnRar.py     |  5 ++---
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index f32329e37..dad57dc7f 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
+import re
 
 from module.PyFile import PyFile
 
@@ -19,7 +20,7 @@ class PasswordError(Exception):
 
 class Extractor:
     __name__    = "Extractor"
-    __version__ = "0.21"
+    __version__ = "0.22"
 
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
@@ -35,7 +36,7 @@ class Extractor:
     @classmethod
     def isArchive(cls, filename):
         name = os.path.basename(filename).lower()
-        return any(name.endswith(ext) for ext in cls.EXTENSIONS) and not cls.isMultipart(filename)
+        return any(name.endswith(ext) for ext in cls.EXTENSIONS)
 
 
     @classmethod
@@ -57,7 +58,16 @@ class Extractor:
         :param files_ids: List of filepathes
         :return: List of targets, id tuple list
         """
-        return [(fname, id, fout) for fname, id, fout in files_ids if cls.isArchive(fname)]
+        targets = []
+        processed = []
+
+        for fname, id, fout in files_ids:
+            if cls.isArchive(fname):
+                pname = re.sub(cls.re_multipart, '', fname) if cls.isMultipart(fname) else os.path.splitext(fname)[0]
+                if pname not in processed:
+                    processed.append(pname)
+                    targets.append((fname, id, fout))
+        return targets
 
 
     def __init__(self, manager, filename, out,
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 2ba6ff90d..b75e21f57 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.16"
+    __version__ = "1.17"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -82,8 +82,7 @@ class UnRar(Extractor):
     def isMultipart(cls, filename):
         multipart = cls.re_multipart.search(filename)
         if multipart:
-            # First Multipart file (part1.rar for *.part1-9.rar format or *.rar for .r1-9 format) handled as normal Archive
-            return False if (multipart.group(1) == "part" and int(multipart.group(2)) == 1 and not multipart.group(3)) else True
+            return True if not multipart.group(3) else False
 
         return False
 
-- 
cgit v1.2.3


From 86ad6441ac4f88ab78e8dec6f2ca8879982f6012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= <jens.hoernlein@googlemail.com>
Date: Tue, 24 Mar 2015 18:55:50 +0100
Subject: [ExtractArchive] Bugfix

---
 module/plugins/internal/UnRar.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index b75e21f57..87cf61a62 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.17"
+    __version__ = "1.18"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -80,11 +80,7 @@ class UnRar(Extractor):
 
     @classmethod
     def isMultipart(cls, filename):
-        multipart = cls.re_multipart.search(filename)
-        if multipart:
-            return True if not multipart.group(3) else False
-
-        return False
+        return True if cls.re_multipart.search(filename) else False
 
 
     def test(self, password):
-- 
cgit v1.2.3


From f9132006cf8875d5cdcce2bf2432671d529ee584 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 25 Mar 2015 03:11:01 +0100
Subject: [SimpleHoster] Fix retryFree

---
 module/plugins/internal/SimpleHoster.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 8a3381c53..a42947970 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.29"
+    __version__ = "1.30"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -746,8 +746,12 @@ class SimpleHoster(Hoster):
 
 
     def retryFree(self):
+        if not self.premium:
+            return
+        self.premium = False
         self.account = None
         self.req     = self.core.requestFactory.getRequest(self.__name__)
+        self.retries = 0
         raise Retry(_("Fallback to free download"))
 
 
-- 
cgit v1.2.3


From ffb46ab200df55303836cc49e61b971b02e67ec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20H=C3=B6rnlein?= <jens.hoernlein@googlemail.com>
Date: Wed, 25 Mar 2015 18:39:54 +0100
Subject: [ExtractArchive] Send2Trash Integration

---
 module/plugins/internal/Extractor.py | 4 ++--
 module/plugins/internal/UnRar.py     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index dad57dc7f..ec6a4e175 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -20,7 +20,7 @@ class PasswordError(Exception):
 
 class Extractor:
     __name__    = "Extractor"
-    __version__ = "0.22"
+    __version__ = "0.23"
 
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
@@ -75,7 +75,7 @@ class Extractor:
                  overwrite=False,
                  excludefiles=[],
                  renice=0,
-                 delete=False,
+                 delete='No',
                  keepbroken=False,
                  fid=None):
         """ Initialize extractor for specific file """
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 87cf61a62..75c192bac 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.18"
+    __version__ = "1.19"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -216,7 +216,7 @@ class UnRar(Extractor):
             args.append("-o+")
         else:
             args.append("-o-")
-            if self.delete:
+            if self.delete != 'No':
                 args.append("-or")
 
         for word in self.excludefiles:
-- 
cgit v1.2.3


From 7d90803262ccbb4fc5296a4dc3ce30fe98f55631 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 25 Mar 2015 23:10:07 +0100
Subject: __config__ cosmetics

---
 module/plugins/internal/MultiHook.py       | 8 ++++----
 module/plugins/internal/SimpleCrypter.py   | 4 ++--
 module/plugins/internal/SimpleDereferer.py | 4 ++--
 module/plugins/internal/SimpleHoster.py    | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index ef7f47ed1..5855f7ece 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -12,10 +12,10 @@ class MultiHook(Hook):
     __type__    = "hook"
     __version__ = "0.40"
 
-    __config__ = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
-                  ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
-                  ("reload"        , "bool"               , "Reload plugin list"           , True ),
-                  ("reloadinterval", "int"                , "Reload interval in hours"     , 12   )]
+    __config__  = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
+                   ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
+                   ("reload"        , "bool"               , "Reload plugin list"           , True ),
+                   ("reloadinterval", "int"                , "Reload interval in hours"     , 12   )]
 
     __description__ = """Hook plugin for multi hoster/crypter"""
     __license__     = "GPLv3"
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index ef6d3fc0e..9946bb115 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -15,8 +15,8 @@ class SimpleCrypter(Crypter, SimpleHoster):
     __version__ = "0.43"
 
     __pattern__ = r'^unmatchable$'
-    __config__  = [("use_subfolder"        , "bool", "Save package to subfolder"          , True),  #: Overrides core.config['general']['folder_per_package']
-                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
+    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),  #: Overrides core.config['general']['folder_per_package']
+                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
     __description__ = """Simple decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 577d56f75..360cd7c30 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -14,8 +14,8 @@ class SimpleDereferer(Crypter):
     __version__ = "0.08"
 
     __pattern__ = r'^unmatchable$'
-    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
-                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
+    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
     __description__ = """Simple dereferer plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index a42947970..bcdd1cbef 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -148,7 +148,7 @@ def getFileURL(self, url, follow_location=None):
     if type(follow_location) is int:
         redirect = max(follow_location, 1)
     else:
-        redirect = 5
+        redirect = 10
 
     for i in xrange(redirect):
         try:
@@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.30"
+    __version__ = "1.31"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
-- 
cgit v1.2.3


From 329293e0bb0cf4008688d8c73d4b98caa7082141 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Thu, 26 Mar 2015 10:40:32 +0100
Subject: [Extractor] Rename method 'test' to 'verify'

---
 module/plugins/internal/Extractor.py | 4 ++--
 module/plugins/internal/SevenZip.py  | 4 ++--
 module/plugins/internal/UnRar.py     | 4 ++--
 module/plugins/internal/UnZip.py     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index ec6a4e175..159b65ffe 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -20,7 +20,7 @@ class PasswordError(Exception):
 
 class Extractor:
     __name__    = "Extractor"
-    __version__ = "0.23"
+    __version__ = "0.24"
 
     __description__ = """Base extractor plugin"""
     __license__     = "GPLv3"
@@ -109,7 +109,7 @@ class Extractor:
         """
         raise NotImplementedError
 
-    def test(self):
+    def verify(self):
         """Testing with Extractors buildt-in method
         Raises error if password is needed, integrity is questionable or else.
 
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 482b1802c..624f6c939 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
 
 class SevenZip(UnRar):
     __name__    = "SevenZip"
-    __version__ = "0.10"
+    __version__ = "0.11"
 
     __description__ = """7-Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -52,7 +52,7 @@ class SevenZip(UnRar):
         return True
 
 
-    def test(self, password):
+    def verify(self, password):
         # 7z can't distinguish crc and pw error in test
         p = self.call_cmd("l", "-slt", fs_encode(self.filename))
         out, err = p.communicate()
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 75c192bac..5b9f2e1c3 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.19"
+    __version__ = "1.20"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -83,7 +83,7 @@ class UnRar(Extractor):
         return True if cls.re_multipart.search(filename) else False
 
 
-    def test(self, password):
+    def verify(self, password):
         p = self.call_cmd("t", "-v", fs_encode(self.filename), password=password)
         self._progress(p)
         err = p.stderr.read().strip()
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index d95afbc70..8d3fec370 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.11"
+    __version__ = "1.12"
 
     __description__ = """Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -38,7 +38,7 @@ class UnZip(Extractor):
         pass
 
 
-    def test(self):
+    def verify(self):
         with zipfile.ZipFile(fs_encode(self.filename), 'r', allowZip64=True) as z:
             badfile = z.testzip()
 
-- 
cgit v1.2.3


From e60aecc0973c21a22807b3eb16023e64efcbb503 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 28 Mar 2015 00:45:36 +0100
Subject: [MultiHook] Periodically loadAccount

---
 module/plugins/internal/MultiHook.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 5855f7ece..291063268 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -10,7 +10,7 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.40"
+    __version__ = "0.41"
 
     __config__  = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
                    ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
@@ -66,10 +66,10 @@ class MultiHook(Hook):
         self.pluginname   = None
         self.plugintype   = None
 
-        self._initPlugin()
+        self.initPlugin()
 
 
-    def _initPlugin(self):
+    def initPlugin(self):
         plugin, type = self.core.pluginManager.findPlugin(self.__name__)
 
         if not plugin:
@@ -82,7 +82,7 @@ class MultiHook(Hook):
             self.pluginclass  = getattr(self.pluginmodule, self.__name__)
 
 
-    def _loadAccount(self):
+    def loadAccount(self):
         self.account = self.core.accountManager.getAccountPlugin(self.pluginname)
 
         if self.account and not self.account.canUse():
@@ -93,10 +93,6 @@ class MultiHook(Hook):
             self.setConfig('activated', False)
 
 
-    def coreReady(self):
-        self._loadAccount()
-
-
     def getURL(self, *args, **kwargs):  #@TODO: Remove in 0.4.10
         """ see HTTPRequest for argument list """
         h = pyreq.getHTTPRequest(timeout=120)
@@ -199,6 +195,8 @@ class MultiHook(Hook):
 
     def periodical(self):
         """reload plugin list periodically"""
+        self.loadAccount()
+
         if self.getConfig("reload", True):
             self.interval = max(self.getConfig("reloadinterval", 12) * 60 * 60, self.MIN_RELOAD_INTERVAL)
         else:
-- 
cgit v1.2.3


From 589121e80835c63aea0880a53c6678de5c31c16e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 28 Mar 2015 01:59:01 +0100
Subject: Spare code cosmetics

---
 module/plugins/internal/CaptchaService.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index fcb8f0095..3978a96c4 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -251,8 +251,8 @@ class AdsCaptcha(CaptchaService):
     __authors__     = [("pyLoad Team", "admin@pyload.org")]
 
 
-    CAPTCHAID_PATTERN  = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*CaptchaId=(\d+)'
-    PUBLICKEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*PublicKey=([\w-]+)'
+    CAPTCHAID_PATTERN  = r'api\.adscaptcha\.com/Get\.aspx\?.*?CaptchaId=(\d+)'
+    PUBLICKEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?.*?PublicKey=([\w-]+)'
 
 
     def detect_key(self, html=None):
@@ -358,7 +358,7 @@ class SolveMedia(CaptchaService):
         html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript",
                                     get={'k': key})
         try:
-            challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="([^"]+)">',
+            challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="(.+?)">',
                                   html).group(1)
             server    = "http://api.solvemedia.com/papi/media"
 
-- 
cgit v1.2.3


From d15eb15645a91185a0eef553653df19e1e3858ff Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 30 Mar 2015 01:08:22 +0200
Subject: [GoogledriveCom] Fix handleDirect

---
 module/plugins/internal/SimpleCrypter.py | 2 +-
 module/plugins/internal/SimpleHoster.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 9946bb115..892144ef4 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -20,7 +20,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
 
     __description__ = """Simple decrypter plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"  )]
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     """
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index bcdd1cbef..f9a273d5e 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -253,7 +253,7 @@ class SimpleHoster(Hoster):
 
     __description__ = """Simple hoster plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"  )]
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     """
-- 
cgit v1.2.3


From fcaf6c9e4c5c618b8c2741ca7ee5676787b4c3f0 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 31 Mar 2015 23:58:33 +0200
Subject: Temp fixup to `filename*=UTF-8` bug

---
 module/plugins/internal/SimpleHoster.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index f9a273d5e..9f3e56eb8 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -5,6 +5,7 @@ import mimetypes
 import os
 import re
 import time
+import urllib2
 
 from inspect import isclass
 from urllib import unquote
@@ -246,7 +247,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.31"
+    __version__ = "1.32"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -308,7 +309,7 @@ class SimpleHoster(Hoster):
     DIRECT_LINK   = None   #: Set to True to looking for direct link (as defined in handleDirect method), set to None to do it if self.account is True else False
     MULTI_HOSTER  = False  #: Set to True to leech other hoster link (as defined in handleMulti method)
     LOGIN_ACCOUNT = False  #: Set to True to require account login
-    DISPOSITION   = True   #: Work-around to `filename*=UTF-8` bug; remove in 0.4.10
+    DISPOSITION   = True   #: Set to True to use any content-disposition value in http header as file name
 
     directLink = getFileURL  #@TODO: Remove in 0.4.10
 
@@ -486,7 +487,7 @@ class SimpleHoster(Hoster):
                     self.logDebug("Handled as free download")
                     self.handleFree(pyfile)
 
-            self.downloadLink(self.link, self.DISPOSITION)  #: Remove `self.DISPOSITION` in 0.4.10
+            self.downloadLink(self.link, self.DISPOSITION)
             self.checkFile()
 
         except Fail, e:  #@TODO: Move to PluginThread in 0.4.10
@@ -497,6 +498,16 @@ class SimpleHoster(Hoster):
                 raise Fail(e)
 
 
+    #: Work-around to `filename*=UTF-8` bug; remove in 0.4.10
+    def download(self, url, get={}, post={}, ref=True, cookies=True, disposition=False):
+        try:
+            if disposition:
+                content = urllib2.urlopen(self.link).info()['Content-Disposition'].split(';')
+                self.pyfile.name = content[1].split('filename=')[1][1:-1]
+        finally:
+            return super(SimpleHoster, self).download(url, get, post, ref, cookies, False)
+
+
     def downloadLink(self, link, disposition=True):
         if link and isinstance(link, basestring):
             self.correctCaptcha()
-- 
cgit v1.2.3


From 8e498789b5015896fe8d8e7a8379ce6be139bf92 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 1 Apr 2015 00:08:24 +0200
Subject: Temp fixup to `filename*=UTF-8` bug (2)

---
 module/plugins/internal/SimpleHoster.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 9f3e56eb8..6f1c7409d 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -247,7 +247,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.32"
+    __version__ = "1.33"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -502,8 +502,8 @@ class SimpleHoster(Hoster):
     def download(self, url, get={}, post={}, ref=True, cookies=True, disposition=False):
         try:
             if disposition:
-                content = urllib2.urlopen(self.link).info()['Content-Disposition'].split(';')
-                self.pyfile.name = content[1].split('filename=')[1][1:-1]
+                content = urllib2.urlopen(url).info()['Content-Disposition'].split(';')
+                self.pyfile.name = content[1].split('filename=')[1][1:-1] or self.pyfile.name
         finally:
             return super(SimpleHoster, self).download(url, get, post, ref, cookies, False)
 
-- 
cgit v1.2.3


From 1cfc960fd3ec384364ffb1e09d3ee98fc657eddb Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 7 Apr 2015 16:51:14 +0200
Subject: [SimpleDereferer][SimpleHoster] Update user-agent

---
 module/plugins/internal/SimpleDereferer.py | 3 ++-
 module/plugins/internal/SimpleHoster.py    | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 360cd7c30..41c6aa985 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import getFileURL, set_cookies
 class SimpleDereferer(Crypter):
     __name__    = "SimpleDereferer"
     __type__    = "crypter"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
@@ -70,6 +70,7 @@ class SimpleDereferer(Crypter):
         self.html = ""
 
         self.req.setOption("timeout", 120)
+        self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0")
 
         if isinstance(self.COOKIES, list):
             set_cookies(self.req.cj, self.COOKIES)
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 6f1c7409d..4446eed00 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -3,6 +3,7 @@
 import datetime
 import mimetypes
 import os
+import pycurl
 import re
 import time
 import urllib2
@@ -247,7 +248,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.33"
+    __version__ = "1.34"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -315,7 +316,7 @@ class SimpleHoster(Hoster):
 
 
     @classmethod
-    def parseInfos(cls, urls):  #@TODO: Built-in in 0.4.10 core, then remove from plugins
+    def parseInfos(cls, urls):  #@TODO: Built-in in 0.4.10 core (remove from plugins)
         for url in urls:
             url = replace_patterns(url, cls.URL_REPLACEMENTS)
             yield cls.getInfo(url)
@@ -433,6 +434,7 @@ class SimpleHoster(Hoster):
             self.fail(_("Required account not found"))
 
         self.req.setOption("timeout", 120)
+        self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0")
 
         if isinstance(self.COOKIES, list):
             set_cookies(self.req.cj, self.COOKIES)
-- 
cgit v1.2.3


From 665770b16e6ace161e9c358c6b23f1f269b5dd4b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 7 Apr 2015 16:59:23 +0200
Subject: [SimpleDereferer] Update user-agent (2)

---
 module/plugins/internal/SimpleDereferer.py | 5 +++--
 module/plugins/internal/SimpleHoster.py    | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 41c6aa985..bdb2d773c 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import pycurl
 import re
 
 from urllib import unquote
@@ -11,7 +12,7 @@ from module.plugins.internal.SimpleHoster import getFileURL, set_cookies
 class SimpleDereferer(Crypter):
     __name__    = "SimpleDereferer"
     __type__    = "crypter"
-    __version__ = "0.09"
+    __version__ = "0.10"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
@@ -70,7 +71,7 @@ class SimpleDereferer(Crypter):
         self.html = ""
 
         self.req.setOption("timeout", 120)
-        self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0")
+        self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0")  #@NOTE: Work-around to old user-agent bug; remove in 0.4.10
 
         if isinstance(self.COOKIES, list):
             set_cookies(self.req.cj, self.COOKIES)
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 4446eed00..0474a5af5 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -239,7 +239,7 @@ def secondsToMidnight(gmt=0):
 
     if hasattr(td, 'total_seconds'):
         res = td.total_seconds()
-    else:  #: work-around for python 2.5 and 2.6 missing datetime.timedelta.total_seconds
+    else:  #@NOTE: work-around for python 2.5 and 2.6 missing datetime.timedelta.total_seconds
         res = (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
 
     return int(res)
@@ -434,7 +434,7 @@ class SimpleHoster(Hoster):
             self.fail(_("Required account not found"))
 
         self.req.setOption("timeout", 120)
-        self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0")
+        self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0")  #@NOTE: Work-around to old user-agent bug; remove in 0.4.10
 
         if isinstance(self.COOKIES, list):
             set_cookies(self.req.cj, self.COOKIES)
@@ -500,7 +500,7 @@ class SimpleHoster(Hoster):
                 raise Fail(e)
 
 
-    #: Work-around to `filename*=UTF-8` bug; remove in 0.4.10
+    #@NOTE: Work-around to `filename*=UTF-8` bug; remove in 0.4.10
     def download(self, url, get={}, post={}, ref=True, cookies=True, disposition=False):
         try:
             if disposition:
-- 
cgit v1.2.3


From 2f763ffd0c6f87c25ba814db3ed12e3504531efd Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 7 Apr 2015 19:22:11 +0200
Subject: [SimpleDereferer][SimpleHoster] Update user-agent (3)

---
 module/plugins/internal/SimpleDereferer.py | 3 ++-
 module/plugins/internal/SimpleHoster.py    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index bdb2d773c..99077bfc3 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -71,7 +71,8 @@ class SimpleDereferer(Crypter):
         self.html = ""
 
         self.req.setOption("timeout", 120)
-        self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0")  #@NOTE: Work-around to old user-agent bug; remove in 0.4.10
+        self.req.http.c.setopt(pycurl.USERAGENT,
+                               "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:37.0) Gecko/20100101 Firefox/37.0")  #@NOTE: Work-around to old user-agent bug; remove in 0.4.10
 
         if isinstance(self.COOKIES, list):
             set_cookies(self.req.cj, self.COOKIES)
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 0474a5af5..87e136f08 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -434,7 +434,8 @@ class SimpleHoster(Hoster):
             self.fail(_("Required account not found"))
 
         self.req.setOption("timeout", 120)
-        self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0")  #@NOTE: Work-around to old user-agent bug; remove in 0.4.10
+        self.req.http.c.setopt(pycurl.USERAGENT,
+                               "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:37.0) Gecko/20100101 Firefox/37.0")  #@NOTE: Work-around to old user-agent bug; remove in 0.4.10
 
         if isinstance(self.COOKIES, list):
             set_cookies(self.req.cj, self.COOKIES)
-- 
cgit v1.2.3


From c99421d6385e0f6b8bd9095c705becbc35f873a0 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 7 Apr 2015 22:08:58 +0200
Subject: Traceback code cosmetics

---
 module/plugins/internal/MultiHook.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 291063268..942c044c2 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -2,6 +2,7 @@
 
 import re
 import time
+import traceback
 
 from module.plugins.Hook import Hook
 from module.utils import decode, remove_chars
@@ -10,7 +11,7 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.41"
+    __version__ = "0.42"
 
     __config__  = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
                    ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
@@ -188,7 +189,7 @@ class MultiHook(Hook):
         except Exception, e:
             self.core.log.error(_("Error executing hooks: %s") % str(e))
             if self.core.debug:
-                print_exc()
+                traceback.print_exc()
 
         self.cb = self.core.scheduler.addJob(self.interval, self._periodical)
 
-- 
cgit v1.2.3


From 48abd898139b3f40d52b17680c9d5b8a674545c6 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 8 Apr 2015 00:10:43 +0200
Subject: [UserAgentSwitcher] Default activated set to True

---
 module/plugins/internal/SimpleDereferer.py | 5 +----
 module/plugins/internal/SimpleHoster.py    | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 99077bfc3..743a98721 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import pycurl
 import re
 
 from urllib import unquote
@@ -12,7 +11,7 @@ from module.plugins.internal.SimpleHoster import getFileURL, set_cookies
 class SimpleDereferer(Crypter):
     __name__    = "SimpleDereferer"
     __type__    = "crypter"
-    __version__ = "0.10"
+    __version__ = "0.11"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
@@ -71,8 +70,6 @@ class SimpleDereferer(Crypter):
         self.html = ""
 
         self.req.setOption("timeout", 120)
-        self.req.http.c.setopt(pycurl.USERAGENT,
-                               "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:37.0) Gecko/20100101 Firefox/37.0")  #@NOTE: Work-around to old user-agent bug; remove in 0.4.10
 
         if isinstance(self.COOKIES, list):
             set_cookies(self.req.cj, self.COOKIES)
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 87e136f08..79b7c0534 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -3,7 +3,6 @@
 import datetime
 import mimetypes
 import os
-import pycurl
 import re
 import time
 import urllib2
@@ -248,7 +247,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.34"
+    __version__ = "1.35"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -434,8 +433,6 @@ class SimpleHoster(Hoster):
             self.fail(_("Required account not found"))
 
         self.req.setOption("timeout", 120)
-        self.req.http.c.setopt(pycurl.USERAGENT,
-                               "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:37.0) Gecko/20100101 Firefox/37.0")  #@NOTE: Work-around to old user-agent bug; remove in 0.4.10
 
         if isinstance(self.COOKIES, list):
             set_cookies(self.req.cj, self.COOKIES)
-- 
cgit v1.2.3


From 02e3ede3edcf4415ac466fbea9d4f25d9ccc8671 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 8 Apr 2015 15:38:01 +0200
Subject: Spare code cosmetics

---
 module/plugins/internal/SimpleHoster.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 79b7c0534..8b1527b3e 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -30,7 +30,7 @@ def _error(self, reason, type):
             type = "unknown"
 
         msg  = _("%s error") % type.strip().capitalize() if type else _("Error")
-        msg += ": %s" % reason.strip() if reason else ""
+        msg += (": %s" % reason.strip()) if reason else ""
         msg += _(" | Plugin may be out of date")
 
         raise Fail(msg)
-- 
cgit v1.2.3


From 348a386486d081d86363774e64525484ef159cd6 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 8 Apr 2015 19:23:06 +0200
Subject: Fix https://github.com/pyload/pyload/issues/1157

---
 module/plugins/internal/MultiHook.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 942c044c2..6ef803f7a 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -11,7 +11,7 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.42"
+    __version__ = "0.43"
 
     __config__  = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
                    ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
@@ -71,16 +71,15 @@ class MultiHook(Hook):
 
 
     def initPlugin(self):
-        plugin, type = self.core.pluginManager.findPlugin(self.__name__)
+        self.pluginname         = self.__name__.rsplit("Hook", 1)[0]
+        plugin, self.plugintype = self.core.pluginManager.findPlugin(self.pluginname)
 
-        if not plugin:
+        if plugin:
+            self.pluginmodule = self.core.pluginManager.loadModule(type, self.pluginname)
+            self.pluginclass  = getattr(self.pluginmodule, self.pluginname)
+        else:
             self.logWarning("Hook plugin will be deactivated due missing plugin reference")
             self.setConfig('activated', False)
-        else:
-            self.pluginname   = self.__name__
-            self.plugintype   = type
-            self.pluginmodule = self.core.pluginManager.loadModule(type, self.__name__)
-            self.pluginclass  = getattr(self.pluginmodule, self.__name__)
 
 
     def loadAccount(self):
-- 
cgit v1.2.3


From 944f0d42fcc335e5727e6e2e0b42f1177d9c6a18 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 8 Apr 2015 19:43:51 +0200
Subject: Fix https://github.com/pyload/pyload/issues/1157 (2)

---
 module/plugins/internal/MultiHook.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 6ef803f7a..51c8ea89f 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -11,7 +11,7 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.43"
+    __version__ = "0.44"
 
     __config__  = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
                    ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
@@ -75,7 +75,7 @@ class MultiHook(Hook):
         plugin, self.plugintype = self.core.pluginManager.findPlugin(self.pluginname)
 
         if plugin:
-            self.pluginmodule = self.core.pluginManager.loadModule(type, self.pluginname)
+            self.pluginmodule = self.core.pluginManager.loadModule(self.plugintype, self.pluginname)
             self.pluginclass  = getattr(self.pluginmodule, self.pluginname)
         else:
             self.logWarning("Hook plugin will be deactivated due missing plugin reference")
-- 
cgit v1.2.3


From 73f99ea811d01a2e113a882fe5ab86b0aa9c4f4c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Thu, 9 Apr 2015 00:22:51 +0200
Subject: [SimpleHoster] Improve file name handling

---
 module/plugins/internal/SimpleHoster.py | 37 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 8b1527b3e..ac5fbf391 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -5,11 +5,9 @@ import mimetypes
 import os
 import re
 import time
+import urllib
 import urllib2
-
-from inspect import isclass
-from urllib import unquote
-from urlparse import urljoin, urlparse
+import urlparse
 
 from module.PyFile import statusMap as _statusMap
 from module.network.CookieJar import CookieJar
@@ -109,8 +107,8 @@ def parseFileInfo(plugin, url="", html=""):
         info = plugin.getInfo(url, html)
         res  = info['name'], info['size'], info['status'], info['url']
     else:
-        url   = unquote(url)
-        url_p = urlparse(url)
+        url   = urllib.unquote(url)
+        url_p = urlparse.urlparse(url)
         res   = ((url_p.path.split('/')[-1]
                   or url_p.query.split('=', 1)[::-1][0].split('&', 1)[0]
                   or url_p.netloc.split('.', 1)[0]),
@@ -186,10 +184,10 @@ def getFileURL(self, url, follow_location=None):
         elif 'location' in header and header['location'].strip():
             location = header['location']
 
-            if not urlparse(location).scheme:
-                url_p    = urlparse(url)
+            if not urlparse.urlparse(location).scheme:
+                url_p    = urlparse.urlparse(url)
                 baseurl  = "%s://%s" % (url_p.scheme, url_p.netloc)
-                location = urljoin(baseurl, location)
+                location = urlparse.urljoin(baseurl, location)
 
             if 'code' in header and header['code'] == 302:
                 link = location
@@ -199,7 +197,7 @@ def getFileURL(self, url, follow_location=None):
                 continue
 
         else:
-            extension = os.path.splitext(urlparse(url).path.split('/')[-1])[-1]
+            extension = os.path.splitext(urlparse.urlparse(url).path.split('/')[-1])[-1]
 
             if 'content-type' in header and header['content-type'].strip():
                 mimetype = header['content-type'].split(';')[0].strip()
@@ -247,7 +245,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.35"
+    __version__ = "1.36"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -323,8 +321,8 @@ class SimpleHoster(Hoster):
 
     @classmethod
     def apiInfo(cls, url="", get={}, post={}):
-        url   = unquote(url)
-        url_p = urlparse(url)
+        url   = urllib.unquote(url)
+        url_p = urlparse.urlparse(url)
         return {'name'  : (url_p.path.split('/')[-1]
                            or url_p.query.split('=', 1)[::-1][0].split('&', 1)[0]
                            or url_p.netloc.split('.', 1)[0]),
@@ -391,7 +389,7 @@ class SimpleHoster(Hoster):
             info['status'] = 2
 
             if 'N' in info['pattern']:
-                info['name'] = replace_patterns(unquote(info['pattern']['N'].strip()),
+                info['name'] = replace_patterns(urllib.unquote(info['pattern']['N'].strip()),
                                                 cls.NAME_REPLACEMENTS)
 
             if 'S' in info['pattern']:
@@ -503,7 +501,9 @@ class SimpleHoster(Hoster):
         try:
             if disposition:
                 content = urllib2.urlopen(url).info()['Content-Disposition'].split(';')
-                self.pyfile.name = content[1].split('filename=')[1][1:-1] or self.pyfile.name
+                self.pyfile.name = (content[1].split('filename=')[1][1:-1]
+                                    or urlparse.urlparse(urllib.unquote(url)).path.split('/')[-1]
+                                    or self.pyfile.name)
         finally:
             return super(SimpleHoster, self).download(url, get, post, ref, cookies, False)
 
@@ -512,10 +512,10 @@ class SimpleHoster(Hoster):
         if link and isinstance(link, basestring):
             self.correctCaptcha()
 
-            if not urlparse(link).scheme:
-                url_p   = urlparse(self.pyfile.url)
+            if not urlparse.urlparse(link).scheme:
+                url_p   = urlparse.urlparse(self.pyfile.url)
                 baseurl = "%s://%s" % (url_p.scheme, url_p.netloc)
-                link    = urljoin(baseurl, link)
+                link    = urlparse.urljoin(baseurl, link)
 
             self.download(link, ref=False, disposition=disposition)
 
@@ -679,7 +679,6 @@ class SimpleHoster(Hoster):
 
         if link:
             self.logInfo(_("Direct download link detected"))
-
             self.link = link
         else:
             self.logDebug("Direct download link not found")
-- 
cgit v1.2.3


From 0099cce1f73598ad271bbb8685362f8e10a6c3ba Mon Sep 17 00:00:00 2001
From: zapp-brannigan <zapp-brannigan@users.noreply.github.com>
Date: Thu, 9 Apr 2015 11:28:01 +0200
Subject: Update CaptchaService.py

Fix ReCaptchaV2
---
 module/plugins/internal/CaptchaService.py | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 3978a96c4..ec938079a 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -15,7 +15,7 @@ from module.plugins.Plugin import Base
 class CaptchaService(Base):
     __name__    = "CaptchaService"
     __type__    = "captcha"
-    __version__ = "0.25"
+    __version__ = "0.26"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
@@ -45,7 +45,7 @@ class CaptchaService(Base):
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
     __type__    = "captcha"
-    __version__ = "0.14"
+    __version__ = "0.15"
 
     __description__ = """ReCaptcha captcha service plugin"""
     __license__     = "GPLv3"
@@ -201,21 +201,12 @@ class ReCaptcha(CaptchaService):
         token2 = re.search(r'"finput","(.*?)",', html)
         self.logDebug("Token #2: %s" % token2.group(1))
 
-        token3 = re.search(r'."asconf".\s,".*?".\s,"(.*?)".', html)
+        token3 = re.search(r'"rresp","(.*?)",', html)
         self.logDebug("Token #3: %s" % token3.group(1))
 
-        html = self.plugin.req.load("https://www.google.com/recaptcha/api2/reload",
-                                    post={'k'     : key,
-                                          'c'     : token2.group(1),
-                                          'reason': "fi",
-                                          'fbg'   : token3.group(1)})
-
-        token4 = re.search(r'"rresp","(.*?)",', html)
-        self.logDebug("Token #4: %s" % token4.group(1))
-
         millis_captcha_loading = int(round(time.time() * 1000))
         captcha_response       = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload",
-                                                            get={'c':token4.group(1), 'k':key},
+                                                            get={'c':token3.group(1), 'k':key},
                                                             cookies=True,
                                                             forceUser=True)
         response               = b64encode('{"response":"%s"}' % captcha_response)
@@ -227,16 +218,16 @@ class ReCaptcha(CaptchaService):
 
         html = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify",
                                     post={'k'       : key,
-                                          'c'       : token4.group(1),
+                                          'c'       : token3.group(1),
                                           'response': response,
                                           't'       : timeToSolve,
                                           'ct'      : timeToSolveMore,
                                           'bg'      : botguardstring})
 
-        token5 = re.search(r'"uvresp","(.*?)",', html)
-        self.logDebug("Token #5: %s" % token5.group(1))
+        token4 = re.search(r'"uvresp","(.*?)",', html)
+        self.logDebug("Token #4: %s" % token4.group(1))
 
-        result = token5.group(1)
+        result = token4.group(1)
 
         return result, None
 
-- 
cgit v1.2.3


From ac24e99387460201cad5848bf325638aef2fed0b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 10 Apr 2015 11:50:06 +0200
Subject: [SimpleHoster] Fix https://github.com/pyload/pyload/issues/1341

---
 module/plugins/internal/SimpleHoster.py | 6 +++---
 module/plugins/internal/XFSHoster.py    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index ac5fbf391..910731f95 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -245,7 +245,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.36"
+    __version__ = "1.37"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -599,8 +599,8 @@ class SimpleHoster(Hoster):
                 except Exception:
                     waitmsg = m.group(0).strip()
 
-                wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
-                                re.findall(r'(\d+)\s*(hr|hour|min|sec)', waitmsg, re.I))
+                wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1, "": 1}[u.lower()] for v, u in
+                                re.findall(r'(\d+)\s*(hr|hour|min|sec|)', waitmsg, re.I))
                 self.wait(wait_time, wait_time > 300)
 
         self.info.pop('error', None)
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 9e60a5aa5..027e68236 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -16,7 +16,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.45"
+    __version__ = "0.46"
 
     __pattern__ = r'^unmatchable$'
 
@@ -193,8 +193,8 @@ class XFSHoster(SimpleHoster):
             self.logWarning(re.sub(r"<.*?>", " ", self.errmsg))
 
             if 'wait' in self.errmsg:
-                wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
-                                re.findall(r'(\d+)\s*(hr|hour|min|sec)', self.errmsg, re.I))
+                wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1, "": 1}[u.lower()] for v, u in
+                                re.findall(r'(\d+)\s*(hr|hour|min|sec|)', self.errmsg, re.I))
                 self.wait(wait_time, wait_time > 300)
 
             elif 'country' in self.errmsg:
-- 
cgit v1.2.3


From 856e3e90b7863807c040faadd313adcbe45fc013 Mon Sep 17 00:00:00 2001
From: GammaC0de <GammaC0de@users.noreply.github.com>
Date: Tue, 14 Apr 2015 02:54:11 +0300
Subject: Update SimpleHoster.py

---
 module/plugins/internal/SimpleHoster.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 910731f95..dc4f480b9 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -623,7 +623,10 @@ class SimpleHoster(Hoster):
                 self.tempOffline()
 
             elif status is 8:
-                self.fail()
+                if 'error' in self.info:
+                    self.fail(self.info['error'])
+                else:
+                    self.fail("Failed")
 
         finally:
             self.logDebug("File status: %s" % statusMap[status])
-- 
cgit v1.2.3


From e0860ec5345d2392ab8a982d8e1fcf9a9986a587 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 14 Apr 2015 03:23:01 +0200
Subject: [SimpleHoster] Improve latest change a little

---
 module/plugins/internal/SimpleHoster.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index dc4f480b9..1400fd2b6 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -623,10 +623,7 @@ class SimpleHoster(Hoster):
                 self.tempOffline()
 
             elif status is 8:
-                if 'error' in self.info:
-                    self.fail(self.info['error'])
-                else:
-                    self.fail("Failed")
+                self.fail(self.info['error'] if 'error' in self.info else "Failed")
 
         finally:
             self.logDebug("File status: %s" % statusMap[status])
-- 
cgit v1.2.3


From 4d3e0b374ccb1dfac1c9370c3ec824890c4dd0b8 Mon Sep 17 00:00:00 2001
From: GammaC0de <GammaC0de@users.noreply.github.com>
Date: Tue, 14 Apr 2015 11:43:44 +0300
Subject: Version bump

---
 module/plugins/internal/SimpleHoster.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 1400fd2b6..d65d12403 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -245,7 +245,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.37"
+    __version__ = "1.38"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
-- 
cgit v1.2.3


From 7a4dfbcee41395e10c622aae0d015f550978df30 Mon Sep 17 00:00:00 2001
From: GammaC0de <GammaC0de@users.noreply.github.com>
Date: Wed, 29 Apr 2015 23:31:10 +0300
Subject: fix 'Content-Disposition' filename cutting first and last chars

---
 module/plugins/internal/SimpleHoster.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index d65d12403..f32d7c036 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -245,7 +245,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.38"
+    __version__ = "1.39"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -501,7 +501,7 @@ class SimpleHoster(Hoster):
         try:
             if disposition:
                 content = urllib2.urlopen(url).info()['Content-Disposition'].split(';')
-                self.pyfile.name = (content[1].split('filename=')[1][1:-1]
+                self.pyfile.name = (content[1].split('filename=')[1].strip('"')
                                     or urlparse.urlparse(urllib.unquote(url)).path.split('/')[-1]
                                     or self.pyfile.name)
         finally:
-- 
cgit v1.2.3


From 831e1cd10f97b890d980ba0b5708284bb23b0f64 Mon Sep 17 00:00:00 2001
From: GammaC0de <GammaC0de@users.noreply.github.com>
Date: Wed, 29 Apr 2015 23:48:34 +0300
Subject: Update SimpleHoster.py

---
 module/plugins/internal/SimpleHoster.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index f32d7c036..0bc529cbe 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -501,7 +501,7 @@ class SimpleHoster(Hoster):
         try:
             if disposition:
                 content = urllib2.urlopen(url).info()['Content-Disposition'].split(';')
-                self.pyfile.name = (content[1].split('filename=')[1].strip('"')
+                self.pyfile.name = (content[1].split('filename=')[1].strip('"\'')
                                     or urlparse.urlparse(urllib.unquote(url)).path.split('/')[-1]
                                     or self.pyfile.name)
         finally:
-- 
cgit v1.2.3


From 416acbd2adb459a04a52c3270ea0a31bfa40fd84 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Thu, 30 Apr 2015 22:04:29 +0200
Subject: Fix https://github.com/pyload/pyload/issues/1374

---
 module/plugins/internal/SimpleHoster.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 0bc529cbe..df3d66ea2 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -6,7 +6,6 @@ import os
 import re
 import time
 import urllib
-import urllib2
 import urlparse
 
 from module.PyFile import statusMap as _statusMap
@@ -245,7 +244,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.39"
+    __version__ = "1.40"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -496,18 +495,6 @@ class SimpleHoster(Hoster):
                 raise Fail(e)
 
 
-    #@NOTE: Work-around to `filename*=UTF-8` bug; remove in 0.4.10
-    def download(self, url, get={}, post={}, ref=True, cookies=True, disposition=False):
-        try:
-            if disposition:
-                content = urllib2.urlopen(url).info()['Content-Disposition'].split(';')
-                self.pyfile.name = (content[1].split('filename=')[1].strip('"\'')
-                                    or urlparse.urlparse(urllib.unquote(url)).path.split('/')[-1]
-                                    or self.pyfile.name)
-        finally:
-            return super(SimpleHoster, self).download(url, get, post, ref, cookies, False)
-
-
     def downloadLink(self, link, disposition=True):
         if link and isinstance(link, basestring):
             self.correctCaptcha()
-- 
cgit v1.2.3


From 1ef93e913238275f7657d496ba3d2e7eeb5a30a2 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 1 May 2015 01:06:01 +0200
Subject: Use 'import' instead 'from'

---
 module/plugins/internal/CaptchaService.py  | 12 ++++++------
 module/plugins/internal/SimpleCrypter.py   |  7 +++----
 module/plugins/internal/SimpleDereferer.py |  5 ++---
 module/plugins/internal/XFSAccount.py      |  5 ++---
 module/plugins/internal/XFSHoster.py       | 15 ++++++---------
 5 files changed, 19 insertions(+), 25 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index ec938079a..b6afad22a 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
+import random
 import re
 import time
+import urlparse
 
 from base64 import b64encode
-from random import random, randint
-from urlparse import urljoin, urlparse
 
 from module.common.json_layer import json_loads
 from module.plugins.Plugin import Base
@@ -155,7 +155,7 @@ class ReCaptcha(CaptchaService):
 
         self.logDebug("Time: %s" % millis)
 
-        rand = randint(1, 99999999)
+        rand = random.randint(1, 99999999)
         a    = "0.%s" % str(rand * 2147483647)
         rpc  = int(100000000 * float(a))
 
@@ -167,7 +167,7 @@ class ReCaptcha(CaptchaService):
     def _challenge_v2(self, key, parent=None):
         if parent is None:
             try:
-                parent = urljoin("http://", urlparse(self.plugin.pyfile.url).netloc)
+                parent = urlparse.urljoin("http://", urlparse.urlparse(self.plugin.pyfile.url).netloc)
 
             except Exception:
                 parent = ""
@@ -214,7 +214,7 @@ class ReCaptcha(CaptchaService):
         self.logDebug("Result: %s" % response)
 
         timeToSolve     = int(round(time.time() * 1000)) - millis_captcha_loading
-        timeToSolveMore = timeToSolve + int(float("0." + str(randint(1, 99999999))) * 500)
+        timeToSolveMore = timeToSolve + int(float("0." + str(random.randint(1, 99999999))) * 500)
 
         html = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify",
                                     post={'k'       : key,
@@ -296,7 +296,7 @@ class AdsCaptcha(CaptchaService):
 
     def result(self, server, challenge):
         result = self.plugin.decryptCaptcha("%sChallenge.aspx" % server,
-                                            get={'cid': challenge, 'dummy': random()},
+                                            get={'cid': challenge, 'dummy': random.random()},
                                             cookies=True,
                                             imgtype="jpg")
 
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 892144ef4..09805cf1a 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-
-from urlparse import urljoin, urlparse
+import urlparse
 
 from module.plugins.Crypter import Crypter
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, replace_patterns, set_cookies
@@ -150,10 +149,10 @@ class SimpleCrypter(Crypter, SimpleHoster):
         Returns the links extracted from self.html
         You should override this only if it's impossible to extract links using only the LINK_PATTERN.
         """
-        url_p   = urlparse(self.pyfile.url)
+        url_p   = urlparse.urlparse(self.pyfile.url)
         baseurl = "%s://%s" % (url_p.scheme, url_p.netloc)
 
-        return [urljoin(baseurl, link) if not urlparse(link).scheme else link \
+        return [urlparse.urljoin(baseurl, link) if not urlparse.urlparse(link).scheme else link \
                 for link in re.findall(self.LINK_PATTERN, self.html)]
 
 
diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 743a98721..fad1559c7 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-
-from urllib import unquote
+import urllib
 
 from module.plugins.Crypter import Crypter
 from module.plugins.internal.SimpleHoster import getFileURL, set_cookies
@@ -49,7 +48,7 @@ class SimpleDereferer(Crypter):
 
         if not link:
             try:
-                link = unquote(re.match(self.__pattern__, pyfile.url).group('LINK'))
+                link = urllib.unquote(re.match(self.__pattern__, pyfile.url).group('LINK'))
 
             except Exception:
                 self.prepare()
diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 31d1b7e2f..41e1bde4d 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -2,8 +2,7 @@
 
 import re
 import time
-
-from urlparse import urljoin
+import urlparse
 
 from module.plugins.Account import Account
 from module.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies
@@ -160,7 +159,7 @@ class XFSAccount(Account):
             raise Exception(_("Missing HOSTER_DOMAIN"))
 
         if not self.LOGIN_URL:
-            self.LOGIN_URL  = urljoin(self.HOSTER_URL, "login.html")
+            self.LOGIN_URL  = urlparse.urljoin(self.HOSTER_URL, "login.html")
         html = req.load(self.LOGIN_URL, decode=True)
 
         action, inputs = parseHtmlForm('name="FL"', html)
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 027e68236..33dc6d16b 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -1,12 +1,9 @@
 # -*- coding: utf-8 -*-
 
+import pycurl
+import random
 import re
-import time
-
-from random import random
-from urlparse import urljoin, urlparse
-
-from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME
+import urlparse
 
 from module.plugins.internal.CaptchaService import ReCaptcha, SolveMedia
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, secondsToMidnight
@@ -101,11 +98,11 @@ class XFSHoster(SimpleHoster):
 
             data = self.getPostParameters()
 
-            self.req.http.c.setopt(FOLLOWLOCATION, 0)
+            self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 0)
 
             self.html = self.load(pyfile.url, post=data, decode=True)
 
-            self.req.http.c.setopt(FOLLOWLOCATION, 1)
+            self.req.http.c.setopt(pycurl.FOLLOWLOCATION, 1)
 
             m = re.search(r'Location\s*:\s*(.+)', self.req.http.header, re.I)
             if m and not "op=" in m.group(1):
@@ -134,7 +131,7 @@ class XFSHoster(SimpleHoster):
 
         action, inputs = self.parseHtmlForm()
 
-        upload_id = "%012d" % int(random() * 10 ** 12)
+        upload_id = "%012d" % int(random.random() * 10 ** 12)
         action += upload_id + "&js_on=1&utype=prem&upload_type=url"
 
         inputs['tos'] = '1'
-- 
cgit v1.2.3


From ebceffbb7b225a3be8f3dcd75b3699112b0af373 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 1 May 2015 02:44:58 +0200
Subject: [XFSCrypter] Improve LINK_PATTERN

---
 module/plugins/internal/XFSCrypter.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py
index 665e13b18..0612be876 100644
--- a/module/plugins/internal/XFSCrypter.py
+++ b/module/plugins/internal/XFSCrypter.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 class XFSCrypter(SimpleCrypter):
     __name__    = "XFSCrypter"
     __type__    = "crypter"
-    __version__ = "0.06"
+    __version__ = "0.07"
 
     __pattern__ = r'^unmatchable$'
 
@@ -19,7 +19,7 @@ class XFSCrypter(SimpleCrypter):
 
     URL_REPLACEMENTS = [(r'&?per_page=\d+', ""), (r'[?/&]+$', ""), (r'(.+/[^?]+)$', r'\1?'), (r'$', r'&per_page=10000')]
 
-    LINK_PATTERN = r'<(?:td|TD).*?>\s*<a href="(.+?)".*?>.+?(?:</a>)?\s*</(?:td|TD)>'
+    LINK_PATTERN = r'<a href="(.+?)".*?>.+?(?:</a>)?\s*</(?:td|TD)>'
     NAME_PATTERN = r'<[tT]itle>.*?\: (?P<N>.+) folder</[tT]itle>'
 
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
-- 
cgit v1.2.3


From 4160919db621472e85460d0f4ec0052e3536ec93 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 5 May 2015 01:43:10 +0200
Subject: [SimpleHoster] Why Premium download fails?

---
 module/plugins/internal/SimpleHoster.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index df3d66ea2..f77a31ae2 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -244,7 +244,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.40"
+    __version__ = "1.41"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -489,7 +489,7 @@ class SimpleHoster(Hoster):
 
         except Fail, e:  #@TODO: Move to PluginThread in 0.4.10
             if self.premium:
-                self.logWarning(_("Premium download failed"))
+                self.logWarning(_("Premium download failed"), e)
                 self.retryFree()
             else:
                 raise Fail(e)
-- 
cgit v1.2.3


From 3f84c0b2defeb5298e8cc63381e274d8bad66e80 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 5 May 2015 23:34:08 +0200
Subject: [XFSCrypter] Improve LINK_PATTERN (2)

---
 module/plugins/internal/XFSCrypter.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py
index 0612be876..c4809ec46 100644
--- a/module/plugins/internal/XFSCrypter.py
+++ b/module/plugins/internal/XFSCrypter.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 class XFSCrypter(SimpleCrypter):
     __name__    = "XFSCrypter"
     __type__    = "crypter"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __pattern__ = r'^unmatchable$'
 
@@ -19,8 +19,8 @@ class XFSCrypter(SimpleCrypter):
 
     URL_REPLACEMENTS = [(r'&?per_page=\d+', ""), (r'[?/&]+$', ""), (r'(.+/[^?]+)$', r'\1?'), (r'$', r'&per_page=10000')]
 
-    LINK_PATTERN = r'<a href="(.+?)".*?>.+?(?:</a>)?\s*</(?:td|TD)>'
-    NAME_PATTERN = r'<[tT]itle>.*?\: (?P<N>.+) folder</[tT]itle>'
+    LINK_PATTERN = r'<a href="(.+?)".*?>.+?(?:</a>)?\s*(<.+>\s*)?</(?:td|TD)>'
+    NAME_PATTERN = r'<[Tt]itle>.*?\: (?P<N>.+) folder</[Tt]itle>'
 
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
-- 
cgit v1.2.3


From 93c4b9c09745f7cf583341991eb475ee84d2361b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 6 May 2015 00:12:00 +0200
Subject: [XFSHoster] Fix WAIT_PATTERN

---
 module/plugins/internal/XFSHoster.py | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 33dc6d16b..8dab0bb4f 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -13,7 +13,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.46"
+    __version__ = "0.47"
 
     __pattern__ = r'^unmatchable$'
 
@@ -36,7 +36,7 @@ class XFSHoster(SimpleHoster):
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
 
-    WAIT_PATTERN         = r'<span id="countdown_str">.*?>(\d+)</span>|id="countdown" value=".*?(\d+).*?"'
+    WAIT_PATTERN         = r'<span id="countdown_str".*>(\d+)</span>|id="countdown" value=".*?(\d+).*?"'
     PREMIUM_ONLY_PATTERN = r'>This file is available for Premium Users only'
     ERROR_PATTERN        = r'(?:class=["\']err["\'].*?>|<[Cc]enter><b>|>Error</td>|>\(ERROR:)(?:\s*<.+?>\s*)*(.+?)(?:["\']|<|\))'
 
@@ -148,10 +148,7 @@ class XFSHoster(SimpleHoster):
 
         action, inputs = self.parseHtmlForm('F1')
         if not inputs:
-            if self.errmsg:
-                self.retry(reason=self.errmsg)
-            else:
-                self.error(_("TEXTAREA F1 not found"))
+            self.retry(reason=self.errmsg or _("TEXTAREA F1 not found"))
 
         self.logDebug(inputs)
 
@@ -204,7 +201,7 @@ class XFSHoster(SimpleHoster):
                 self.fail(_("File can be downloaded by premium users only"))
 
             elif 'limit' in self.errmsg:
-                if 'days' in self.errmsg:
+                if 'day' in self.errmsg:
                     delay   = secondsToMidnight(gmt=2)
                     retries = 3
                 else:
@@ -242,10 +239,7 @@ class XFSHoster(SimpleHoster):
         if not inputs:
             action, inputs = self.parseHtmlForm('F1')
             if not inputs:
-                if self.errmsg:
-                    self.retry(reason=self.errmsg)
-                else:
-                    self.error(_("TEXTAREA F1 not found"))
+                self.retry(reason=self.errmsg or _("TEXTAREA F1 not found"))
 
         self.logDebug(inputs)
 
-- 
cgit v1.2.3


From 5c153e02a6eaebb721c85202b54401fa2c1f08fc Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 6 May 2015 00:14:25 +0200
Subject: [SimpleHoster] Fallback option

---
 module/plugins/internal/SimpleHoster.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index f77a31ae2..0039d3f8e 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -244,10 +244,11 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.41"
+    __version__ = "1.42"
 
     __pattern__ = r'^unmatchable$'
-    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
+    __config__  = [("use_premium", "bool", "Use premium account if available"          , True),
+                   ("fallback"   , "bool", "Fallback to free download if premium fails", True)]
 
     __description__ = """Simple hoster plugin"""
     __license__     = "GPLv3"
@@ -488,7 +489,7 @@ class SimpleHoster(Hoster):
             self.checkFile()
 
         except Fail, e:  #@TODO: Move to PluginThread in 0.4.10
-            if self.premium:
+            if self.getConfig('fallback', True) and self.premium:
                 self.logWarning(_("Premium download failed"), e)
                 self.retryFree()
             else:
@@ -748,7 +749,7 @@ class SimpleHoster(Hoster):
         self.premium = False
         self.account = None
         self.req     = self.core.requestFactory.getRequest(self.__name__)
-        self.retries = 0
+        self.retries = -1
         raise Retry(_("Fallback to free download"))
 
 
-- 
cgit v1.2.3


From 7b095378cba22aa2cfadfd62699d77bf1724da41 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 6 May 2015 01:24:17 +0200
Subject: [XFSCrypter] Fix LINK_PATTERN (thx GammaC0de)

---
 module/plugins/internal/XFSCrypter.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py
index c4809ec46..80eff53ea 100644
--- a/module/plugins/internal/XFSCrypter.py
+++ b/module/plugins/internal/XFSCrypter.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 class XFSCrypter(SimpleCrypter):
     __name__    = "XFSCrypter"
     __type__    = "crypter"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __pattern__ = r'^unmatchable$'
 
@@ -19,7 +19,7 @@ class XFSCrypter(SimpleCrypter):
 
     URL_REPLACEMENTS = [(r'&?per_page=\d+', ""), (r'[?/&]+$', ""), (r'(.+/[^?]+)$', r'\1?'), (r'$', r'&per_page=10000')]
 
-    LINK_PATTERN = r'<a href="(.+?)".*?>.+?(?:</a>)?\s*(<.+>\s*)?</(?:td|TD)>'
+    LINK_PATTERN = r'<(?:td|TD).*?>\s*(?:<.+>\s*)?<a href="(.+?)".*?>.+?(?:</a>)?\s*(?:<.+>\s*)?</(?:td|TD)>'
     NAME_PATTERN = r'<[Tt]itle>.*?\: (?P<N>.+) folder</[Tt]itle>'
 
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
-- 
cgit v1.2.3


From d52ddee1d43b4be610b265fbe87911494d1364ad Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 9 May 2015 03:29:27 +0200
Subject: [MultiHook] Remove unbound method 'getCrypters'

---
 module/plugins/internal/MultiHook.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHook.py b/module/plugins/internal/MultiHook.py
index 51c8ea89f..01ff4b07d 100644
--- a/module/plugins/internal/MultiHook.py
+++ b/module/plugins/internal/MultiHook.py
@@ -11,7 +11,7 @@ from module.utils import decode, remove_chars
 class MultiHook(Hook):
     __name__    = "MultiHook"
     __type__    = "hook"
-    __version__ = "0.44"
+    __version__ = "0.45"
 
     __config__  = [("pluginmode"    , "all;listed;unlisted", "Use for plugins"              , "all"),
                    ("pluginlist"    , "str"                , "Plugin list (comma separated)", ""   ),
@@ -121,7 +121,7 @@ class MultiHook(Hook):
 
         for _i in xrange(2):
             try:
-                pluginset = self._pluginSet(self.getHosters() if self.plugintype == "hoster" else self.getCrypters())
+                pluginset = self._pluginSet(self.getHosters())
                 break
 
             except Exception, e:
@@ -171,14 +171,6 @@ class MultiHook(Hook):
         raise NotImplementedError
 
 
-    def getCrypters(self):
-        """Load list of supported crypters
-
-        :return: List of domain names
-        """
-        raise NotImplementedError
-
-
     #: Threaded _periodical, remove in 0.4.10 and use built-in flag for that
     def _periodical(self):
         try:
-- 
cgit v1.2.3


From f9fe2b162568417003bf9c1d2e2a45ffa9cf5098 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 18 May 2015 03:44:03 +0200
Subject: [XFSHoster] HAPPY_HOUR_PATTERN

---
 module/plugins/internal/XFSHoster.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 8dab0bb4f..5e5d4111f 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -13,7 +13,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.47"
+    __version__ = "0.48"
 
     __pattern__ = r'^unmatchable$'
 
@@ -38,6 +38,7 @@ class XFSHoster(SimpleHoster):
 
     WAIT_PATTERN         = r'<span id="countdown_str".*>(\d+)</span>|id="countdown" value=".*?(\d+).*?"'
     PREMIUM_ONLY_PATTERN = r'>This file is available for Premium Users only'
+    HAPPY_HOUR_PATTERN   = r'>[Hh]appy hour'
     ERROR_PATTERN        = r'(?:class=["\']err["\'].*?>|<[Cc]enter><b>|>Error</td>|>\(ERROR:)(?:\s*<.+?>\s*)*(.+?)(?:["\']|<|\))'
 
     LINK_LEECH_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
@@ -181,6 +182,12 @@ class XFSHoster(SimpleHoster):
         m = re.search(self.ERROR_PATTERN, self.html)
         if m is None:
             self.errmsg = None
+
+            if re.search(self.HAPPY_HOUR_PATTERN, self.html):
+                self.multiDL = True
+            else:
+                self.setup()
+
         else:
             self.errmsg = m.group(1).strip()
 
-- 
cgit v1.2.3


From 854adf6dd5c0742c4801f9779c038e12ee6b23cf Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 18 May 2015 05:24:41 +0200
Subject: [SimpleHoster] Improve checkErrors

---
 module/plugins/internal/SimpleHoster.py | 86 ++++++++++++++++++++++++++++-----
 module/plugins/internal/XFSHoster.py    | 66 ++-----------------------
 2 files changed, 77 insertions(+), 75 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 0039d3f8e..27327c918 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -244,7 +244,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.42"
+    __version__ = "1.43"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available"          , True),
@@ -284,6 +284,18 @@ class SimpleHoster(Hoster):
       PREMIUM_ONLY_PATTERN: (optional) Check if the file can be downloaded only with a premium account
         example: PREMIUM_ONLY_PATTERN = r'Premium account required'
 
+      HAPPY_HOUR_PATTERN: (optional)
+        example:
+
+      IP_BLOCKED_PATTERN: (optional)
+        example:
+
+      DOWNLOAD_LIMIT_PATTERN: (optional)
+        example:
+
+      SIZE_LIMIT_PATTERN: (optional)
+        example:
+
       ERROR_PATTERN: (optional) Detect any error preventing download
         example: ERROR_PATTERN = r''
 
@@ -554,10 +566,39 @@ class SimpleHoster(Hoster):
             self.logWarning(_("No html code to check"))
             return
 
-        if hasattr(self, 'PREMIUM_ONLY_PATTERN') and not self.premium and re.search(self.PREMIUM_ONLY_PATTERN, self.html):
-            self.fail(_("Link require a premium account to be handled"))
+        if hasattr(self, 'IP_BLOCKED_PATTERN') and re.search(self.IP_BLOCKED_PATTERN, self.html):
+            self.fail(_("Connection from your current IP address is not allowed"))
+
+        elif not self.premium:
+            if hasattr(self, 'PREMIUM_ONLY_PATTERN') and re.search(self.PREMIUM_ONLY_PATTERN, self.html):
+                self.fail(_("File can be downloaded by premium users only"))
+
+            elif hasattr(self, 'SIZE_LIMIT_PATTERN') and re.search(self.SIZE_LIMIT_PATTERN, self.html):
+                self.fail(_("File too large for free download"))
 
-        elif hasattr(self, 'ERROR_PATTERN'):
+            elif hasattr(self, 'DOWNLOAD_LIMIT_PATTERN') and re.search(self.DOWNLOAD_LIMIT_PATTERN, self.html):
+                m = re.search(self.DOWNLOAD_LIMIT_PATTERN, self.html)
+                try:
+                    errmsg = m.group(1).strip()
+                except Exception:
+                    errmsg = m.group(0).strip()
+
+                self.logWarning(re.sub(r'<.*?>', " ", self.errmsg))
+                self.info['error'] = errmsg
+
+                if re.search('da(il)?y|today', errmsg, re.I):
+                    wait_time = secondsToMidnight(gmt=2)
+                else:
+                    wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1, "": 1}[u.lower()] for v, u in
+                                re.findall(r'(\d+)\s*(hr|hour|min|sec|)', errmsg, re.I))
+
+                self.wantReconnect = wait_time > 300
+                self.retry(1, wait_time, _("Download limit exceeded"))
+
+        if hasattr(self, 'HAPPY_HOUR_PATTERN') and re.search(self.HAPPY_HOUR_PATTERN, self.html):
+            self.multiDL = True
+
+        if hasattr(self, 'ERROR_PATTERN'):
             m = re.search(self.ERROR_PATTERN, self.html)
             if m:
                 try:
@@ -565,19 +606,40 @@ class SimpleHoster(Hoster):
                 except Exception:
                     errmsg = m.group(0).strip()
 
+                self.logWarning(re.sub(r'<.*?>', " ", self.errmsg))
                 self.info['error'] = errmsg
 
-                if "hour" in errmsg:
-                    self.wait(1 * 60 * 60, True)
+                if re.search('limit|wait', errmsg, re.I):
+                    if re.search("da(il)?y|today", errmsg):
+                        wait_time = secondsToMidnight(gmt=2)
+                    else:
+                        wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1, "": 1}[u.lower()] for v, u in
+                                    re.findall(r'(\d+)\s*(hr|hour|min|sec|)', errmsg, re.I))
+
+                    self.wantReconnect = wait_time > 300
+                    self.retry(1, wait_time, _("Download limit exceeded"))
+
+                elif re.search('country', errmsg, re.I):
+                    self.fail(_("Connection from your current IP address is not allowed"))
+
+                elif re.search('captcha', errmsg, re.I):
+                    self.invalidCaptcha()
+
+                elif re.search('countdown|expired', errmsg, re.I):
+                    self.retry(wait_time=60, reason=_("Link expired"))
+
+                elif re.search('maintenance|maintainance', errmsg, re.I):
+                    self.tempOffline()
 
-                elif re.search("da(il)?y|today", errmsg):
-                    self.wait(secondsToMidnight(gmt=2), True)
+                elif re.search('up to', errmsg, re.I):
+                    self.fail(_("File too large for free download"))
 
-                elif "minute" in errmsg:
-                    self.wait(1 * 60)
+                elif re.search('premium', errmsg, re.I):
+                    self.fail(_("File can be downloaded by premium users only"))
 
                 else:
-                    self.error(errmsg)
+                    self.wantReconnect = True
+                    self.retry(wait_time=60, reason=errmsg)
 
         elif hasattr(self, 'WAIT_PATTERN'):
             m = re.search(self.WAIT_PATTERN, self.html)
@@ -611,7 +673,7 @@ class SimpleHoster(Hoster):
                 self.tempOffline()
 
             elif status is 8:
-                self.fail(self.info['error'] if 'error' in self.info else "Failed")
+                self.fail(self.info['error'] if 'error' in self.info else _("Failed"))
 
         finally:
             self.logDebug("File status: %s" % statusMap[status])
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 5e5d4111f..e8b79c8cd 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -13,7 +13,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.48"
+    __version__ = "0.49"
 
     __pattern__ = r'^unmatchable$'
 
@@ -79,7 +79,6 @@ class XFSHoster(SimpleHoster):
             self.LINK_PATTERN = pattern % self.HOSTER_DOMAIN.replace('.', '\.')
 
         self.captcha = None
-        self.errmsg  = None
 
         super(XFSHoster, self).prepare()
 
@@ -149,7 +148,7 @@ class XFSHoster(SimpleHoster):
 
         action, inputs = self.parseHtmlForm('F1')
         if not inputs:
-            self.retry(reason=self.errmsg or _("TEXTAREA F1 not found"))
+            self.retry(reason=self.info['error'] if 'error' in self.info else _("TEXTAREA F1 not found"))
 
         self.logDebug(inputs)
 
@@ -178,65 +177,6 @@ class XFSHoster(SimpleHoster):
             self.link = header['location']
 
 
-    def checkErrors(self):
-        m = re.search(self.ERROR_PATTERN, self.html)
-        if m is None:
-            self.errmsg = None
-
-            if re.search(self.HAPPY_HOUR_PATTERN, self.html):
-                self.multiDL = True
-            else:
-                self.setup()
-
-        else:
-            self.errmsg = m.group(1).strip()
-
-            self.logWarning(re.sub(r"<.*?>", " ", self.errmsg))
-
-            if 'wait' in self.errmsg:
-                wait_time = sum(int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1, "": 1}[u.lower()] for v, u in
-                                re.findall(r'(\d+)\s*(hr|hour|min|sec|)', self.errmsg, re.I))
-                self.wait(wait_time, wait_time > 300)
-
-            elif 'country' in self.errmsg:
-                self.fail(_("Downloads are disabled for your country"))
-
-            elif 'captcha' in self.errmsg:
-                self.invalidCaptcha()
-
-            elif 'premium' in self.errmsg and 'require' in self.errmsg:
-                self.fail(_("File can be downloaded by premium users only"))
-
-            elif 'limit' in self.errmsg:
-                if 'day' in self.errmsg:
-                    delay   = secondsToMidnight(gmt=2)
-                    retries = 3
-                else:
-                    delay   = 1 * 60 * 60
-                    retries = 24
-
-                self.wantReconnect = True
-                self.retry(retries, delay, _("Download limit exceeded"))
-
-            elif 'countdown' in self.errmsg or 'Expired' in self.errmsg:
-                self.retry(reason=_("Link expired"))
-
-            elif 'maintenance' in self.errmsg or 'maintainance' in self.errmsg:
-                self.tempOffline()
-
-            elif 'up to' in self.errmsg:
-                self.fail(_("File too large for free download"))
-
-            else:
-                self.wantReconnect = True
-                self.retry(wait_time=60, reason=self.errmsg)
-
-        if self.errmsg:
-            self.info['error'] = self.errmsg
-        else:
-            self.info.pop('error', None)
-
-
     def getPostParameters(self):
         if self.FORM_PATTERN or self.FORM_INPUTS_MAP:
             action, inputs = self.parseHtmlForm(self.FORM_PATTERN or "", self.FORM_INPUTS_MAP or {})
@@ -246,7 +186,7 @@ class XFSHoster(SimpleHoster):
         if not inputs:
             action, inputs = self.parseHtmlForm('F1')
             if not inputs:
-                self.retry(reason=self.errmsg or _("TEXTAREA F1 not found"))
+                self.retry(reason=self.info['error'] if 'error' in self.info else _("TEXTAREA F1 not found"))
 
         self.logDebug(inputs)
 
-- 
cgit v1.2.3


From 623b63aa5449232738b938aff83e4d693750f4f7 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 18 May 2015 08:24:00 +0200
Subject: [SimpleHoster] Fix https://github.com/pyload/pyload/issues/1421

---
 module/plugins/internal/SimpleHoster.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 27327c918..fddd6b677 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -244,7 +244,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.43"
+    __version__ = "1.44"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available"          , True),
@@ -583,7 +583,7 @@ class SimpleHoster(Hoster):
                 except Exception:
                     errmsg = m.group(0).strip()
 
-                self.logWarning(re.sub(r'<.*?>', " ", self.errmsg))
+                self.logWarning(re.sub(r'<.*?>', " ", errmsg))
                 self.info['error'] = errmsg
 
                 if re.search('da(il)?y|today', errmsg, re.I):
@@ -606,7 +606,7 @@ class SimpleHoster(Hoster):
                 except Exception:
                     errmsg = m.group(0).strip()
 
-                self.logWarning(re.sub(r'<.*?>', " ", self.errmsg))
+                self.logWarning(re.sub(r'<.*?>', " ", errmsg))
                 self.info['error'] = errmsg
 
                 if re.search('limit|wait', errmsg, re.I):
-- 
cgit v1.2.3


From d86120df4f413c309ec87a3bc1ae7bd63d399e7b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 18 May 2015 08:53:40 +0200
Subject: [XFSAccount] Fix https://github.com/pyload/pyload/issues/1420

---
 module/plugins/internal/SimpleHoster.py | 10 +++++-----
 module/plugins/internal/XFSAccount.py   | 11 +++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index fddd6b677..9303bcf2e 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -74,7 +74,7 @@ def parseHtmlForm(attr_str, html, input_names={}):
             if name:
                 value = parseHtmlTagAttrValue("value", inputtag.group(1))
                 if not value:
-                    inputs[name] = inputtag.group(3) or ''
+                    inputs[name] = inputtag.group(3) or ""
                 else:
                     inputs[name] = value
 
@@ -583,8 +583,8 @@ class SimpleHoster(Hoster):
                 except Exception:
                     errmsg = m.group(0).strip()
 
-                self.logWarning(re.sub(r'<.*?>', " ", errmsg))
-                self.info['error'] = errmsg
+                self.info['error'] = re.sub(r'<.*?>', " ", errmsg)
+                self.logWarning(self.info['error'])
 
                 if re.search('da(il)?y|today', errmsg, re.I):
                     wait_time = secondsToMidnight(gmt=2)
@@ -606,8 +606,8 @@ class SimpleHoster(Hoster):
                 except Exception:
                     errmsg = m.group(0).strip()
 
-                self.logWarning(re.sub(r'<.*?>', " ", errmsg))
-                self.info['error'] = errmsg
+                self.info['error'] = re.sub(r'<.*?>', " ", errmsg)
+                self.logWarning(self.info['error'])
 
                 if re.search('limit|wait', errmsg, re.I):
                     if re.search("da(il)?y|today", errmsg):
diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py
index 41e1bde4d..e619cb038 100644
--- a/module/plugins/internal/XFSAccount.py
+++ b/module/plugins/internal/XFSAccount.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import parseHtmlForm, set_cookies
 class XFSAccount(Account):
     __name__    = "XFSAccount"
     __type__    = "account"
-    __version__ = "0.36"
+    __version__ = "0.37"
 
     __description__ = """XFileSharing account plugin"""
     __license__     = "GPLv3"
@@ -170,9 +170,12 @@ class XFSAccount(Account):
         inputs.update({'login'   : user,
                        'password': data['password']})
 
-        if not action:
-            action = self.HOSTER_URL
-        html = req.load(action, post=inputs, decode=True)
+        if action:
+            url = urlparse.urljoin("http://", action)
+        else:
+            url = self.HOSTER_URL
+
+        html = req.load(url, post=inputs, decode=True)
 
         if re.search(self.LOGIN_FAIL_PATTERN, html):
             self.wrongPassword()
-- 
cgit v1.2.3


From 41faf73af4deb8dcd73e0c2e55073f1ef7656a7f Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 18 May 2015 09:48:07 +0200
Subject: [XFSHoster] Fix https://github.com/pyload/pyload/issues/1296

---
 module/plugins/internal/XFSHoster.py | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index e8b79c8cd..57357c06e 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -13,7 +13,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.49"
+    __version__ = "0.50"
 
     __pattern__ = r'^unmatchable$'
 
@@ -78,8 +78,6 @@ class XFSHoster(SimpleHoster):
             pattern = r'(https?://(?:www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<]'
             self.LINK_PATTERN = pattern % self.HOSTER_DOMAIN.replace('.', '\.')
 
-        self.captcha = None
-
         super(XFSHoster, self).prepare()
 
         if self.DIRECT_LINK is None:
@@ -204,8 +202,7 @@ class XFSHoster(SimpleHoster):
                     wait_time = int(m.group(1))
                     self.setWait(wait_time, False)
 
-                self.captcha = self.handleCaptcha(inputs)
-
+                self.handleCaptcha(inputs)
                 self.wait()
         else:
             inputs['referer'] = self.pyfile.url
@@ -225,7 +222,7 @@ class XFSHoster(SimpleHoster):
         if m:
             captcha_url = m.group(1)
             inputs['code'] = self.decryptCaptcha(captcha_url)
-            return 1
+            return
 
         m = re.search(self.CAPTCHA_BLOCK_PATTERN, self.html, re.S)
         if m:
@@ -237,7 +234,7 @@ class XFSHoster(SimpleHoster):
             inputs['code'] = "".join(a[1] for a in sorted(numerals, key=lambda num: int(num[0])))
 
             self.logDebug("Captcha code: %s" % inputs['code'], numerals)
-            return 2
+            return
 
         recaptcha = ReCaptcha(self)
         try:
@@ -251,7 +248,7 @@ class XFSHoster(SimpleHoster):
 
         if captcha_key:
             inputs['recaptcha_response_field'], inputs['recaptcha_challenge_field'] = recaptcha.challenge(captcha_key)
-            return 3
+            return
 
         solvemedia = SolveMedia(self)
         try:
@@ -265,6 +262,3 @@ class XFSHoster(SimpleHoster):
 
         if captcha_key:
             inputs['adcopy_response'], inputs['adcopy_challenge'] = solvemedia.challenge(captcha_key)
-            return 4
-
-        return 0
-- 
cgit v1.2.3


From 339b2e07d78b15ca014ee12f1501cdb235d9b064 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 18 May 2015 11:50:43 +0200
Subject: [SimpleHoster] Fix create_getInfo

---
 module/plugins/internal/DeadCrypter.py  |  6 +++---
 module/plugins/internal/DeadHoster.py   |  6 +++---
 module/plugins/internal/SimpleHoster.py | 30 +++++++++---------------------
 3 files changed, 15 insertions(+), 27 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/DeadCrypter.py b/module/plugins/internal/DeadCrypter.py
index 866d177cf..c93447164 100644
--- a/module/plugins/internal/DeadCrypter.py
+++ b/module/plugins/internal/DeadCrypter.py
@@ -7,7 +7,7 @@ from module.plugins.Crypter import Crypter as _Crypter
 class DeadCrypter(_Crypter):
     __name__    = "DeadCrypter"
     __type__    = "crypter"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __pattern__ = r'^unmatchable$'
 
@@ -17,8 +17,8 @@ class DeadCrypter(_Crypter):
 
 
     @classmethod
-    def apiInfo(cls, url="", get={}, post={}):
-        api = super(DeadCrypter, self).apiInfo(url, get, post)
+    def apiInfo(cls, url):
+        api = super(DeadCrypter, cls).apiInfo(url)
         api['status'] = 1
         return api
 
diff --git a/module/plugins/internal/DeadHoster.py b/module/plugins/internal/DeadHoster.py
index a6ad92607..f159ae5fa 100644
--- a/module/plugins/internal/DeadHoster.py
+++ b/module/plugins/internal/DeadHoster.py
@@ -7,7 +7,7 @@ from module.plugins.Hoster import Hoster as _Hoster
 class DeadHoster(_Hoster):
     __name__    = "DeadHoster"
     __type__    = "hoster"
-    __version__ = "0.14"
+    __version__ = "0.15"
 
     __pattern__ = r'^unmatchable$'
 
@@ -17,8 +17,8 @@ class DeadHoster(_Hoster):
 
 
     @classmethod
-    def apiInfo(cls, url="", get={}, post={}):
-        api = super(DeadHoster, self).apiInfo(url, get, post)
+    def apiInfo(cls, url):
+        api = super(DeadHoster, cls).apiInfo(url)
         api['status'] = 1
         return api
 
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 9303bcf2e..aae3bac8c 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -100,7 +100,7 @@ def parseHtmlForm(attr_str, html, input_names={}):
     return {}, None  #: no matching form found
 
 
-#: Deprecated
+#@TODO: Remove in 0.4.10
 def parseFileInfo(plugin, url="", html=""):
     if hasattr(plugin, "getInfo"):
         info = plugin.getInfo(url, html)
@@ -119,19 +119,14 @@ def parseFileInfo(plugin, url="", html=""):
 
 
 #@TODO: Remove in 0.4.10
-#@NOTE: Every plugin must have own parseInfos classmethod to work with 0.4.10
 def create_getInfo(plugin):
+    def getInfo(urls):
+        for url in urls:
+            if hasattr(plugin, "URL_REPLACEMENTS"):
+                url = replace_patterns(url, plugin.URL_REPLACEMENTS)
+            yield parseFileInfo(plugin, url)
 
-    def generator(list):
-        for x in list:
-            yield x
-
-    if hasattr(plugin, "parseInfos"):
-        fn = lambda urls: generator((info['name'], info['size'], info['status'], info['url']) for info in plugin.parseInfos(urls))
-    else:
-        fn = lambda urls: generator(parseFileInfo(url) for url in urls)
-
-    return fn
+    return getInfo
 
 
 def timestamp():
@@ -244,7 +239,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.44"
+    __version__ = "1.45"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available"          , True),
@@ -325,14 +320,7 @@ class SimpleHoster(Hoster):
 
 
     @classmethod
-    def parseInfos(cls, urls):  #@TODO: Built-in in 0.4.10 core (remove from plugins)
-        for url in urls:
-            url = replace_patterns(url, cls.URL_REPLACEMENTS)
-            yield cls.getInfo(url)
-
-
-    @classmethod
-    def apiInfo(cls, url="", get={}, post={}):
+    def apiInfo(cls, url):
         url   = urllib.unquote(url)
         url_p = urlparse.urlparse(url)
         return {'name'  : (url_p.path.split('/')[-1]
-- 
cgit v1.2.3


From 66946591842ec27705bcc015e04016a7dabc388c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 18 May 2015 12:06:22 +0200
Subject: [SimpleHoster] Fix https://github.com/pyload/pyload/issues/1404

---
 module/plugins/internal/SimpleHoster.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index aae3bac8c..4bf41a478 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -148,7 +148,7 @@ def getFileURL(self, url, follow_location=None):
             self.logDebug("Redirect #%d to: %s" % (i, url))
             header = self.load(url, just_header=True, decode=True)
 
-        except Exception:  #: Bad bad bad...
+        except Exception:  #: Bad bad bad... rewrite this part in 0.4.10
             req = pyreq.getHTTPRequest()
             res = req.load(url, just_header=True, decode=True)
 
@@ -239,7 +239,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.45"
+    __version__ = "1.46"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available"          , True),
@@ -334,7 +334,7 @@ class SimpleHoster(Hoster):
     @classmethod
     def getInfo(cls, url="", html=""):
         info   = cls.apiInfo(url)
-        online = False if info['status'] != 2 else True
+        online = True if info['status'] is 2 else False
 
         try:
             info['pattern'] = re.match(cls.__pattern__, url).groupdict()  #: pattern groups will be saved here
@@ -347,7 +347,7 @@ class SimpleHoster(Hoster):
                 info['error']  = "missing url"
                 info['status'] = 1
 
-            elif info['status'] is 3 and not getFileURL(None, url):
+            elif info['status'] is 3:
                 try:
                     html = getURL(url, cookies=cls.COOKIES, decode=not cls.TEXT_ENCODING)
 
@@ -363,6 +363,9 @@ class SimpleHoster(Hoster):
                     elif e.code is 503:
                         info['status'] = 6
 
+                except Exception:
+                    pass
+
         if html:
             if hasattr(cls, "OFFLINE_PATTERN") and re.search(cls.OFFLINE_PATTERN, html):
                 info['status'] = 1
-- 
cgit v1.2.3


From c27b60578e661a24dfe49a0c285fd58751711587 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 20 May 2015 17:31:43 +0200
Subject: [SimpleHoster] Tiny code cosmetics

---
 module/plugins/internal/SimpleHoster.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 4bf41a478..547c412ad 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -251,27 +251,27 @@ class SimpleHoster(Hoster):
 
 
     """
-    Info patterns should be defined by each hoster:
+    Info patterns:
 
-      INFO_PATTERN: (optional) Name and Size of the file
+      INFO_PATTERN: (mandatory) Name and Size of the file
         example: INFO_PATTERN = r'(?P<N>file_name) (?P<S>file_size) (?P<U>size_unit)'
       or
-        NAME_PATTERN: (optional) Name that will be set for the file
+        NAME_PATTERN: (mandatory) Name that will be set for the file
           example: NAME_PATTERN = r'(?P<N>file_name)'
-        SIZE_PATTERN: (optional) Size that will be checked for the file
+        SIZE_PATTERN: (mandatory) Size that will be checked for the file
           example: SIZE_PATTERN = r'(?P<S>file_size) (?P<U>size_unit)'
 
       HASHSUM_PATTERN: (optional) Hash code and type of the file
         example: HASHSUM_PATTERN = r'(?P<H>hash_code) (?P<T>MD5)'
 
-      OFFLINE_PATTERN: (optional) Check if the page is unreachable
+      OFFLINE_PATTERN: (mandatory) Check if the page is unreachable
         example: OFFLINE_PATTERN = r'File (deleted|not found)'
 
       TEMP_OFFLINE_PATTERN: (optional) Check if the page is temporarily unreachable
         example: TEMP_OFFLINE_PATTERN = r'Server (maintenance|maintainance)'
 
 
-    Error handling patterns are all optional:
+    Error patterns:
 
       WAIT_PATTERN: (optional) Detect waiting time
         example: WAIT_PATTERN = r''
@@ -280,22 +280,22 @@ class SimpleHoster(Hoster):
         example: PREMIUM_ONLY_PATTERN = r'Premium account required'
 
       HAPPY_HOUR_PATTERN: (optional)
-        example:
+        example: HAPPY_HOUR_PATTERN = r'Happy hour'
 
       IP_BLOCKED_PATTERN: (optional)
-        example:
+        example: IP_BLOCKED_PATTERN = r'in your country'
 
       DOWNLOAD_LIMIT_PATTERN: (optional)
-        example:
+        example: DOWNLOAD_LIMIT_PATTERN = r'download limit'
 
       SIZE_LIMIT_PATTERN: (optional)
-        example:
+        example: SIZE_LIMIT_PATTERN = r'up to'
 
       ERROR_PATTERN: (optional) Detect any error preventing download
         example: ERROR_PATTERN = r''
 
 
-    Instead overriding handleFree and handlePremium methods you can define the following patterns for direct download:
+    Instead overriding handleFree and handlePremium methods you may define the following patterns for basic link handling:
 
       LINK_FREE_PATTERN: (optional) group(1) should be the direct link for free download
         example: LINK_FREE_PATTERN = r'<div class="link"><a href="(.+?)"'
-- 
cgit v1.2.3


From 5b0ca09cc32d8c1d49b8899b2989a3c7d0050ab4 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 22 May 2015 17:59:23 +0200
Subject: [SimpleHoster] Improve checkErrors

---
 module/plugins/internal/SimpleHoster.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 547c412ad..ff718984e 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -239,7 +239,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.46"
+    __version__ = "1.47"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available"          , True),
@@ -610,21 +610,24 @@ class SimpleHoster(Hoster):
                     self.wantReconnect = wait_time > 300
                     self.retry(1, wait_time, _("Download limit exceeded"))
 
-                elif re.search('country', errmsg, re.I):
+                elif re.search('country|ip|region|nation', errmsg, re.I):
                     self.fail(_("Connection from your current IP address is not allowed"))
 
-                elif re.search('captcha', errmsg, re.I):
+                elif re.search('captcha|code', errmsg, re.I):
                     self.invalidCaptcha()
 
                 elif re.search('countdown|expired', errmsg, re.I):
                     self.retry(wait_time=60, reason=_("Link expired"))
 
-                elif re.search('maintenance|maintainance', errmsg, re.I):
+                elif re.search('maintenance|maintainance|temp', errmsg, re.I):
                     self.tempOffline()
 
                 elif re.search('up to', errmsg, re.I):
                     self.fail(_("File too large for free download"))
 
+                elif re.search('offline|delet|remov|not (found|available)', errmsg, re.I):
+                    self.offline()
+
                 elif re.search('premium', errmsg, re.I):
                     self.fail(_("File can be downloaded by premium users only"))
 
-- 
cgit v1.2.3


From 9bb3bff1a97c11ee887446d24015d0def499e18c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 22 May 2015 22:49:11 +0200
Subject: [SimpleHoster] Fix captcha retrying

---
 module/plugins/internal/SimpleHoster.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index ff718984e..11c6c64f2 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -239,7 +239,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.47"
+    __version__ = "1.48"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available"          , True),
@@ -492,9 +492,13 @@ class SimpleHoster(Hoster):
             self.checkFile()
 
         except Fail, e:  #@TODO: Move to PluginThread in 0.4.10
-            if self.getConfig('fallback', True) and self.premium:
+            if str(e) == _("No captcha result obtained in appropiate time by any of the plugins."):  #@TODO: Fix in 0.4.10
+                self.checkFile()
+
+            elif self.getConfig('fallback', True) and self.premium:
                 self.logWarning(_("Premium download failed"), e)
                 self.retryFree()
+
             else:
                 raise Fail(e)
 
-- 
cgit v1.2.3


From 1293f4c3aaf0744b98fcd538bd2ddb8cb1d1733c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 22 May 2015 23:26:46 +0200
Subject: [XFSHoster] Handle videoplayer

---
 module/plugins/internal/XFSHoster.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 57357c06e..24d06d993 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -13,7 +13,7 @@ from module.utils import html_unescape
 class XFSHoster(SimpleHoster):
     __name__    = "XFSHoster"
     __type__    = "hoster"
-    __version__ = "0.50"
+    __version__ = "0.51"
 
     __pattern__ = r'^unmatchable$'
 
@@ -75,7 +75,7 @@ class XFSHoster(SimpleHoster):
             self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english"))
 
         if not self.LINK_PATTERN:
-            pattern = r'(https?://(?:www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<]'
+            pattern = r'(?:file: "(.+?)"|(https?://(?:www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<])'
             self.LINK_PATTERN = pattern % self.HOSTER_DOMAIN.replace('.', '\.')
 
         super(XFSHoster, self).prepare()
-- 
cgit v1.2.3


From 15b1c2636c24d0345bf1c86a43c4a235a0b44455 Mon Sep 17 00:00:00 2001
From: zapp-brannigan <zapp-brannigan@users.noreply.github.com>
Date: Sun, 24 May 2015 11:14:04 +0200
Subject: [CaptchaService.py] Update ReCaptchaV1

Fix https://github.com/pyload/pyload/issues/1423
---
 module/plugins/internal/CaptchaService.py | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index b6afad22a..e349b5b42 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -15,7 +15,7 @@ from module.plugins.Plugin import Base
 class CaptchaService(Base):
     __name__    = "CaptchaService"
     __type__    = "captcha"
-    __version__ = "0.26"
+    __version__ = "0.27"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
@@ -45,7 +45,7 @@ class CaptchaService(Base):
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
     __type__    = "captcha"
-    __version__ = "0.15"
+    __version__ = "0.16"
 
     __description__ = """ReCaptcha captcha service plugin"""
     __license__     = "GPLv3"
@@ -113,10 +113,26 @@ class ReCaptcha(CaptchaService):
 
         self.logDebug("Challenge: %s" % challenge)
 
-        return self.result(server, challenge), challenge
+        return self.result(server, challenge, key) #, challenge
 
 
-    def result(self, server, challenge):
+    def result(self, server, challenge, key):
+        self.plugin.req.load("http://www.google.com/recaptcha/api/js/recaptcha.js", cookies=True)
+        html = self.plugin.req.load("http://www.google.com/recaptcha/api/reload",
+                                    get={"c":challenge,
+                                         "k":key,
+                                         "reason":"i",
+                                         "type":"image"},
+                                    cookies=True)
+        
+        try:
+            challenge = re.search('\(\'(.+?)\',',html).group(1)
+        except AttributeError:
+            errmsg = _("ReCaptcha second challenge pattern not found")
+            self.plugin.fail(errmsg)
+            raise AttributeError(errmsg)
+        
+        self.logDebug("Second challenge: %s" %challenge)
         result = self.plugin.decryptCaptcha("%simage" % server,
                                             get={'c': challenge},
                                             cookies=True,
@@ -125,7 +141,7 @@ class ReCaptcha(CaptchaService):
 
         self.logDebug("Result: %s" % result)
 
-        return result
+        return result, challenge
 
 
     def _collectApiInfo(self):
-- 
cgit v1.2.3


From 46b1695da26e6fab544844fc46ad352037396d62 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 25 May 2015 03:07:02 +0200
Subject: [CaptchaService] Improve SolveMedia

---
 module/plugins/internal/CaptchaService.py | 175 +++++++++++++-----------------
 module/plugins/internal/XFSHoster.py      |   2 +-
 2 files changed, 77 insertions(+), 100 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index e349b5b42..5badea344 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -15,7 +15,7 @@ from module.plugins.Plugin import Base
 class CaptchaService(Base):
     __name__    = "CaptchaService"
     __type__    = "captcha"
-    __version__ = "0.27"
+    __version__ = "0.28"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
@@ -30,6 +30,12 @@ class CaptchaService(Base):
         super(CaptchaService, self).__init__(plugin.core)
 
 
+    #@TODO: Recheck in 0.4.10
+    def fail(self, reason):
+        self.plugin.fail(reason)
+        raise AttributeError(reason)
+
+
     def detect_key(self, html=None):
         raise NotImplementedError
 
@@ -45,7 +51,7 @@ class CaptchaService(Base):
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
     __type__    = "captcha"
-    __version__ = "0.16"
+    __version__ = "0.17"
 
     __description__ = """ReCaptcha captcha service plugin"""
     __license__     = "GPLv3"
@@ -63,9 +69,7 @@ class ReCaptcha(CaptchaService):
             if hasattr(self.plugin, "html") and self.plugin.html:
                 html = self.plugin.html
             else:
-                errmsg = _("ReCaptcha html not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
+                self.fail(_("ReCaptcha html not found"))
 
         m = re.search(self.KEY_V2_PATTERN, html) or re.search(self.KEY_V1_PATTERN, html)
         if m:
@@ -82,9 +86,7 @@ class ReCaptcha(CaptchaService):
             if self.detect_key(html):
                 key = self.key
             else:
-                errmsg = _("ReCaptcha key not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
+                self.fail(_("ReCaptcha key not found"))
 
         if version in (1, 2):
             return getattr(self, "_challenge_v%s" % version)(key)
@@ -94,9 +96,7 @@ class ReCaptcha(CaptchaService):
             return self.challenge(key, self.plugin.html, version)
 
         else:
-            errmsg = _("ReCaptcha html not found")
-            self.plugin.fail(errmsg)
-            raise TypeError(errmsg)
+            self.fail(_("ReCaptcha html not found"))
 
 
     def _challenge_v1(self, key):
@@ -107,31 +107,27 @@ class ReCaptcha(CaptchaService):
             server    = re.search("server : '(.+?)',", html).group(1)
 
         except AttributeError:
-            errmsg = _("ReCaptcha challenge pattern not found")
-            self.plugin.fail(errmsg)
-            raise AttributeError(errmsg)
+            self.fail(_("ReCaptcha challenge pattern not found"))
 
         self.logDebug("Challenge: %s" % challenge)
 
-        return self.result(server, challenge, key) #, challenge
+        return self.result(server, challenge, key)
 
 
     def result(self, server, challenge, key):
-        self.plugin.req.load("http://www.google.com/recaptcha/api/js/recaptcha.js", cookies=True)
+        self.plugin.req.load("http://www.google.com/recaptcha/api/js/recaptcha.js")
         html = self.plugin.req.load("http://www.google.com/recaptcha/api/reload",
-                                    get={"c":challenge,
-                                         "k":key,
-                                         "reason":"i",
-                                         "type":"image"},
-                                    cookies=True)
-        
+                                    get={'c'     : challenge,
+                                         'k'     : key,
+                                         'reason': "i",
+                                         'type'  : "image"})
+
         try:
             challenge = re.search('\(\'(.+?)\',',html).group(1)
+
         except AttributeError:
-            errmsg = _("ReCaptcha second challenge pattern not found")
-            self.plugin.fail(errmsg)
-            raise AttributeError(errmsg)
-        
+            self.fail(_("ReCaptcha second challenge pattern not found"))
+
         self.logDebug("Second challenge: %s" %challenge)
         result = self.plugin.decryptCaptcha("%simage" % server,
                                             get={'c': challenge},
@@ -251,7 +247,7 @@ class ReCaptcha(CaptchaService):
 class AdsCaptcha(CaptchaService):
     __name__    = "AdsCaptcha"
     __type__    = "captcha"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __description__ = """AdsCaptcha captcha service plugin"""
     __license__     = "GPLv3"
@@ -267,15 +263,13 @@ class AdsCaptcha(CaptchaService):
             if hasattr(self.plugin, "html") and self.plugin.html:
                 html = self.plugin.html
             else:
-                errmsg = _("AdsCaptcha html not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
+                self.fail(_("AdsCaptcha html not found"))
 
         m = re.search(self.PUBLICKEY_PATTERN, html)
         n = re.search(self.CAPTCHAID_PATTERN, html)
         if m and n:
             self.key = (m.group(1).strip(), n.group(1).strip())  #: key is the tuple(PublicKey, CaptchaId)
-            self.logDebug("Key|id: %s | %s" % self.key)
+            self.logDebug("Key: %s | ID: %s" % self.key)
             return self.key
         else:
             self.logDebug("Key or id not found")
@@ -287,9 +281,7 @@ class AdsCaptcha(CaptchaService):
             if self.detect_key(html):
                 key = self.key
             else:
-                errmsg = _("AdsCaptcha key not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
+                self.fail(_("AdsCaptcha key not found"))
 
         PublicKey, CaptchaId = key
 
@@ -301,9 +293,7 @@ class AdsCaptcha(CaptchaService):
             server    = re.search("server: '(.+?)',", html).group(1)
 
         except AttributeError:
-            errmsg = _("AdsCaptcha challenge pattern not found")
-            self.plugin.fail(errmsg)
-            raise AttributeError(errmsg)
+            self.fail(_("AdsCaptcha challenge pattern not found"))
 
         self.logDebug("Challenge: %s" % challenge)
 
@@ -324,7 +314,7 @@ class AdsCaptcha(CaptchaService):
 class SolveMedia(CaptchaService):
     __name__    = "SolveMedia"
     __type__    = "captcha"
-    __version__ = "0.12"
+    __version__ = "0.13"
 
     __description__ = """SolveMedia captcha service plugin"""
     __license__     = "GPLv3"
@@ -339,9 +329,7 @@ class SolveMedia(CaptchaService):
             if hasattr(self.plugin, "html") and self.plugin.html:
                 html = self.plugin.html
             else:
-                errmsg = _("SolveMedia html not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
+                self.fail(_("SolveMedia html not found"))
 
         m = re.search(self.KEY_PATTERN, html)
         if m:
@@ -358,65 +346,62 @@ class SolveMedia(CaptchaService):
             if self.detect_key(html):
                 key = self.key
             else:
-                errmsg = _("SolveMedia key not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
+                self.fail(_("SolveMedia key not found"))
 
         html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript",
                                     get={'k': key})
-        try:
-            challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="(.+?)">',
-                                  html).group(1)
-            server    = "http://api.solvemedia.com/papi/media"
 
-        except AttributeError:
-            errmsg = _("SolveMedia challenge pattern not found")
-            self.plugin.fail(errmsg)
-            raise AttributeError(errmsg)
-
-        self.logDebug("Challenge: %s" % challenge)
-
-        result = self.result(server, challenge)
-
-        try:
-            magic = re.search(r'name="magic" value="(.+?)"', html).group(1)
+        for i in xrange(1, 11):
+            try:
+                magic = re.search(r'name="magic" value="(.+?)"', html).group(1)
 
-        except AttributeError:
-            self.logDebug("Magic code not found")
+            except AttributeError:
+                self.logWarning("Magic pattern not found")
+                magic = None
 
-        else:
-            if not self._verify(key, magic, result, challenge):
-                self.logDebug("Captcha code was invalid")
+            try:
+                challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="(.+?)">',
+                                      html).group(1)
 
-        return result, challenge
+            except AttributeError:
+                self.fail(_("SolveMedia challenge pattern not found"))
 
+            else:
+                self.logDebug("Challenge: %s" % challenge)
 
-    def _verify(self, key, magic, result, challenge, ref=None):  #@TODO: Clean up
-        if ref is None:
             try:
-                ref = self.plugin.pyfile.url
+                result = self.result("http://api.solvemedia.com/papi/media", challenge)
 
             except Exception:
-                ref = ""
-
-        html = self.plugin.req.load("http://api.solvemedia.com/papi/verify.noscript",
-                                    post={'adcopy_response'  : result,
-                                          'k'                : key,
-                                          'l'                : "en",
-                                          't'                : "img",
-                                          's'                : "standard",
-                                          'magic'            : magic,
-                                          'adcopy_challenge' : challenge,
-                                          'ref'              : ref})
-        try:
-            html      = self.plugin.req.load(re.search(r'URL=(.+?)">', html).group(1))
-            gibberish = re.search(r'id=gibberish>(.+?)</textarea>', html).group(1)
+                result = None
+
+            html = self.plugin.req.load("http://api.solvemedia.com/papi/verify.noscript",
+                                        post={'adcopy_response' : result,
+                                              'k'               : key,
+                                              'l'               : "en",
+                                              't'               : "img",
+                                              's'               : "standard",
+                                              'magic'           : magic,
+                                              'adcopy_challenge': challenge,
+                                              'ref'             : self.plugin.pyfile.url})
+            try:
+                redirect = re.search(r'URL=(.+?)">', html).group(1)
+
+            except AttributeError:
+                self.fail(_("SolveMedia verify pattern not found"))
 
-        except Exception:
-            return False
+            else:
+                if "error" in html:
+                    self.logError("Captcha code was invalid")
+                    self.logDebug("Retry #%d" % i)
+                    html = self.plugin.req.load(redirect)
+                else:
+                    break
 
         else:
-            return True
+            self.fail(_("SolveMedia max retries exceeded"))
+
+        return result, challenge
 
 
     def result(self, server, challenge):
@@ -433,7 +418,7 @@ class SolveMedia(CaptchaService):
 class AdYouLike(CaptchaService):
     __name__    = "AdYouLike"
     __type__    = "captcha"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __description__ = """AdYouLike captcha service plugin"""
     __license__     = "GPLv3"
@@ -449,15 +434,13 @@ class AdYouLike(CaptchaService):
             if hasattr(self.plugin, "html") and self.plugin.html:
                 html = self.plugin.html
             else:
-                errmsg = _("AdYouLike html not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
+                self.fail(_("AdYouLike html not found"))
 
         m = re.search(self.AYL_PATTERN, html)
         n = re.search(self.CALLBACK_PATTERN, html)
         if m and n:
             self.key = (m.group(1).strip(), n.group(1).strip())
-            self.logDebug("Ayl|callback: %s | %s" % self.key)
+            self.logDebug("Ayl: %s | Callback: %s" % self.key)
             return self.key   #: key is the tuple(ayl, callback)
         else:
             self.logDebug("Ayl or callback not found")
@@ -469,9 +452,7 @@ class AdYouLike(CaptchaService):
             if self.detect_key(html):
                 key = self.key
             else:
-                errmsg = _("AdYouLike key not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
+                self.fail(_("AdYouLike key not found"))
 
         ayl, callback = key
 
@@ -487,9 +468,7 @@ class AdYouLike(CaptchaService):
             challenge = json_loads(re.search(callback + r'\s*\((.+?)\)', html).group(1))
 
         except AttributeError:
-            errmsg = _("AdYouLike challenge pattern not found")
-            self.plugin.fail(errmsg)
-            raise AttributeError(errmsg)
+            self.fail(_("AdYouLike challenge pattern not found"))
 
         self.logDebug("Challenge: %s" % challenge)
 
@@ -518,9 +497,7 @@ class AdYouLike(CaptchaService):
             result = re.search(u'«(.+?)»', instructions_visual).group(1).strip()
 
         except AttributeError:
-            errmsg = _("AdYouLike result not found")
-            self.plugin.fail(errmsg)
-            raise AttributeError(errmsg)
+            self.fail(_("AdYouLike result not found"))
 
         result = {'_ayl_captcha_engine' : "adyoulike",
                   '_ayl_env'            : server['all']['env'],
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 24d06d993..e2818886c 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -86,7 +86,7 @@ class XFSHoster(SimpleHoster):
 
     def handleFree(self, pyfile):
         for i in xrange(1, 6):
-            self.logDebug("Getting download link: #%d" % i)
+            self.logDebug("Getting download link #%d" % i)
 
             self.checkErrors()
 
-- 
cgit v1.2.3


From 436b5d60fc52bc88e0973ec09527bb5907542142 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 25 May 2015 12:37:27 +0200
Subject: [CaptchaService] Improve SolveMedia (2)

---
 module/plugins/internal/CaptchaService.py | 379 ++++++++++++++----------------
 1 file changed, 179 insertions(+), 200 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 5badea344..e51844965 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -8,14 +8,14 @@ import urlparse
 from base64 import b64encode
 
 from module.common.json_layer import json_loads
-from module.plugins.Plugin import Base
+from module.plugins.Plugin import Base, Fail
 
 
 #@TODO: Extend (new) Plugin class; remove all `html` args
 class CaptchaService(Base):
     __name__    = "CaptchaService"
     __type__    = "captcha"
-    __version__ = "0.28"
+    __version__ = "0.29"
 
     __description__ = """Base captcha service plugin"""
     __license__     = "GPLv3"
@@ -36,6 +36,22 @@ class CaptchaService(Base):
         raise AttributeError(reason)
 
 
+    #@TODO: Recheck in 0.4.10
+    def retrieve_key(self, html):
+        if self.detect_key(html):
+            return self.key
+        else:
+            self.fail(_("%s key not found") % self.__name__)
+
+
+    #@TODO: Recheck in 0.4.10
+    def retrieve_html(self):
+        if hasattr(self.plugin, "html") and self.plugin.html:
+            return self.plugin.html
+        else:
+            self.fail(_("%s html not found") % self.__name__)
+
+
     def detect_key(self, html=None):
         raise NotImplementedError
 
@@ -48,6 +64,148 @@ class CaptchaService(Base):
         raise NotImplementedError
 
 
+class AdYouLike(CaptchaService):
+    __name__    = "AdYouLike"
+    __type__    = "captcha"
+    __version__ = "0.06"
+
+    __description__ = """AdYouLike captcha service plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    AYL_PATTERN      = r'Adyoulike\.create\s*\((.+?)\)'
+    CALLBACK_PATTERN = r'(Adyoulike\.g\._jsonp_\d+)'
+
+
+    def detect_key(self, html=None):
+        html = html or self.retrieve_html()
+
+        m = re.search(self.AYL_PATTERN, html)
+        n = re.search(self.CALLBACK_PATTERN, html)
+        if m and n:
+            self.key = (m.group(1).strip(), n.group(1).strip())
+            self.logDebug("Ayl: %s | Callback: %s" % self.key)
+            return self.key   #: key is the tuple(ayl, callback)
+        else:
+            self.logWarning("Ayl or callback pattern not found")
+            return None
+
+
+    def challenge(self, key=None, html=None):
+        ayl, callback = key or self.retrieve_key(html)
+
+        # {"adyoulike":{"key":"P~zQ~O0zV0WTiAzC-iw0navWQpCLoYEP"},
+        # "all":{"element_id":"ayl_private_cap_92300","lang":"fr","env":"prod"}}
+        ayl = json_loads(ayl)
+
+        html = self.plugin.req.load("http://api-ayl.appspot.com/challenge",
+                                    get={'key'     : ayl['adyoulike']['key'],
+                                         'env'     : ayl['all']['env'],
+                                         'callback': callback})
+        try:
+            challenge = json_loads(re.search(callback + r'\s*\((.+?)\)', html).group(1))
+
+        except AttributeError:
+            self.fail(_("AdYouLike challenge pattern not found"))
+
+        self.logDebug("Challenge: %s" % challenge)
+
+        return self.result(ayl, challenge), challenge
+
+
+    def result(self, server, challenge):
+        # Adyoulike.g._jsonp_5579316662423138
+        # ({"translations":{"fr":{"instructions_visual":"Recopiez « Soonnight » ci-dessous :"}},
+        # "site_under":true,"clickable":true,"pixels":{"VIDEO_050":[],"DISPLAY":[],"VIDEO_000":[],"VIDEO_100":[],
+        # "VIDEO_025":[],"VIDEO_075":[]},"medium_type":"image/adyoulike",
+        # "iframes":{"big":"<iframe src=\"http://www.soonnight.com/campagn.html\" scrolling=\"no\"
+        # height=\"250\" width=\"300\" frameborder=\"0\"></iframe>"},"shares":{},"id":256,
+        # "token":"e6QuI4aRSnbIZJg02IsV6cp4JQ9~MjA1","formats":{"small":{"y":300,"x":0,"w":300,"h":60},
+        # "big":{"y":0,"x":0,"w":300,"h":250},"hover":{"y":440,"x":0,"w":300,"h":60}},
+        # "tid":"SqwuAdxT1EZoi4B5q0T63LN2AkiCJBg5"})
+
+        if isinstance(server, basestring):
+            server = json_loads(server)
+
+        if isinstance(challenge, basestring):
+            challenge = json_loads(challenge)
+
+        try:
+            instructions_visual = challenge['translations'][server['all']['lang']]['instructions_visual']
+            result = re.search(u'«(.+?)»', instructions_visual).group(1).strip()
+
+        except AttributeError:
+            self.fail(_("AdYouLike result not found"))
+
+        result = {'_ayl_captcha_engine' : "adyoulike",
+                  '_ayl_env'            : server['all']['env'],
+                  '_ayl_tid'            : challenge['tid'],
+                  '_ayl_token_challenge': challenge['token'],
+                  '_ayl_response'       : response}
+
+        self.logDebug("Result: %s" % result)
+
+        return result
+
+
+class AdsCaptcha(CaptchaService):
+    __name__    = "AdsCaptcha"
+    __type__    = "captcha"
+    __version__ = "0.09"
+
+    __description__ = """AdsCaptcha captcha service plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+
+
+    CAPTCHAID_PATTERN  = r'api\.adscaptcha\.com/Get\.aspx\?.*?CaptchaId=(\d+)'
+    PUBLICKEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?.*?PublicKey=([\w-]+)'
+
+
+    def detect_key(self, html=None):
+        html = html or self.retrieve_html()
+
+        m = re.search(self.PUBLICKEY_PATTERN, html)
+        n = re.search(self.CAPTCHAID_PATTERN, html)
+        if m and n:
+            self.key = (m.group(1).strip(), n.group(1).strip())  #: key is the tuple(PublicKey, CaptchaId)
+            self.logDebug("Key: %s | ID: %s" % self.key)
+            return self.key
+        else:
+            self.logWarning("Key or id pattern not found")
+            return None
+
+
+    def challenge(self, key=None, html=None):
+        PublicKey, CaptchaId = key or self.retrieve_key(html)
+
+        html = self.plugin.req.load("http://api.adscaptcha.com/Get.aspx",
+                                    get={'CaptchaId': CaptchaId,
+                                         'PublicKey': PublicKey})
+        try:
+            challenge = re.search("challenge: '(.+?)',", html).group(1)
+            server    = re.search("server: '(.+?)',", html).group(1)
+
+        except AttributeError:
+            self.fail(_("AdsCaptcha challenge pattern not found"))
+
+        self.logDebug("Challenge: %s" % challenge)
+
+        return self.result(server, challenge), challenge
+
+
+    def result(self, server, challenge):
+        result = self.plugin.decryptCaptcha("%sChallenge.aspx" % server,
+                                            get={'cid': challenge, 'dummy': random.random()},
+                                            cookies=True,
+                                            imgtype="jpg")
+
+        self.logDebug("Result: %s" % result)
+
+        return result
+
+
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
     __type__    = "captcha"
@@ -65,11 +223,7 @@ class ReCaptcha(CaptchaService):
 
 
     def detect_key(self, html=None):
-        if not html:
-            if hasattr(self.plugin, "html") and self.plugin.html:
-                html = self.plugin.html
-            else:
-                self.fail(_("ReCaptcha html not found"))
+        html = html or self.retrieve_html()
 
         m = re.search(self.KEY_V2_PATTERN, html) or re.search(self.KEY_V1_PATTERN, html)
         if m:
@@ -77,26 +231,19 @@ class ReCaptcha(CaptchaService):
             self.logDebug("Key: %s" % self.key)
             return self.key
         else:
-            self.logDebug("Key not found")
+            self.logWarning("Key pattern not found")
             return None
 
 
     def challenge(self, key=None, html=None, version=None):
-        if not key:
-            if self.detect_key(html):
-                key = self.key
-            else:
-                self.fail(_("ReCaptcha key not found"))
+        key = key or self.retrieve_key(html)
 
         if version in (1, 2):
             return getattr(self, "_challenge_v%s" % version)(key)
 
-        elif not html and hasattr(self.plugin, "html") and self.plugin.html:
-            version = 2 if re.search(self.KEY_V2_PATTERN, self.plugin.html) else 1
-            return self.challenge(key, self.plugin.html, version)
-
         else:
-            self.fail(_("ReCaptcha html not found"))
+            return self.challenge(key,
+                                  version=2 if re.search(self.KEY_V2_PATTERN, html or self.retrieve_html()) else 1)
 
 
     def _challenge_v1(self, key):
@@ -128,7 +275,7 @@ class ReCaptcha(CaptchaService):
         except AttributeError:
             self.fail(_("ReCaptcha second challenge pattern not found"))
 
-        self.logDebug("Second challenge: %s" %challenge)
+        self.logDebug("Second challenge: %s" % challenge)
         result = self.plugin.decryptCaptcha("%simage" % server,
                                             get={'c': challenge},
                                             cookies=True,
@@ -145,7 +292,7 @@ class ReCaptcha(CaptchaService):
         a    = re.search(r'po.src = \'(.*?)\';', html).group(1)
         vers = a.split("/")[5]
 
-        self.logDebug("API version: %s" %vers)
+        self.logDebug("API version: %s" % vers)
 
         language = a.split("__")[1].split(".")[0]
 
@@ -217,11 +364,11 @@ class ReCaptcha(CaptchaService):
         self.logDebug("Token #3: %s" % token3.group(1))
 
         millis_captcha_loading = int(round(time.time() * 1000))
-        captcha_response       = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload",
-                                                            get={'c':token3.group(1), 'k':key},
-                                                            cookies=True,
-                                                            forceUser=True)
-        response               = b64encode('{"response":"%s"}' % captcha_response)
+        captcha_response = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload",
+                                                      get={'c':token3.group(1), 'k':key},
+                                                      cookies=True,
+                                                      forceUser=True)
+        response = b64encode('{"response":"%s"}' % captcha_response)
 
         self.logDebug("Result: %s" % response)
 
@@ -244,73 +391,6 @@ class ReCaptcha(CaptchaService):
         return result, None
 
 
-class AdsCaptcha(CaptchaService):
-    __name__    = "AdsCaptcha"
-    __type__    = "captcha"
-    __version__ = "0.09"
-
-    __description__ = """AdsCaptcha captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
-
-
-    CAPTCHAID_PATTERN  = r'api\.adscaptcha\.com/Get\.aspx\?.*?CaptchaId=(\d+)'
-    PUBLICKEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?.*?PublicKey=([\w-]+)'
-
-
-    def detect_key(self, html=None):
-        if not html:
-            if hasattr(self.plugin, "html") and self.plugin.html:
-                html = self.plugin.html
-            else:
-                self.fail(_("AdsCaptcha html not found"))
-
-        m = re.search(self.PUBLICKEY_PATTERN, html)
-        n = re.search(self.CAPTCHAID_PATTERN, html)
-        if m and n:
-            self.key = (m.group(1).strip(), n.group(1).strip())  #: key is the tuple(PublicKey, CaptchaId)
-            self.logDebug("Key: %s | ID: %s" % self.key)
-            return self.key
-        else:
-            self.logDebug("Key or id not found")
-            return None
-
-
-    def challenge(self, key=None, html=None):
-        if not key:
-            if self.detect_key(html):
-                key = self.key
-            else:
-                self.fail(_("AdsCaptcha key not found"))
-
-        PublicKey, CaptchaId = key
-
-        html = self.plugin.req.load("http://api.adscaptcha.com/Get.aspx",
-                                    get={'CaptchaId': CaptchaId,
-                                         'PublicKey': PublicKey})
-        try:
-            challenge = re.search("challenge: '(.+?)',", html).group(1)
-            server    = re.search("server: '(.+?)',", html).group(1)
-
-        except AttributeError:
-            self.fail(_("AdsCaptcha challenge pattern not found"))
-
-        self.logDebug("Challenge: %s" % challenge)
-
-        return self.result(server, challenge), challenge
-
-
-    def result(self, server, challenge):
-        result = self.plugin.decryptCaptcha("%sChallenge.aspx" % server,
-                                            get={'cid': challenge, 'dummy': random.random()},
-                                            cookies=True,
-                                            imgtype="jpg")
-
-        self.logDebug("Result: %s" % result)
-
-        return result
-
-
 class SolveMedia(CaptchaService):
     __name__    = "SolveMedia"
     __type__    = "captcha"
@@ -325,11 +405,7 @@ class SolveMedia(CaptchaService):
 
 
     def detect_key(self, html=None):
-        if not html:
-            if hasattr(self.plugin, "html") and self.plugin.html:
-                html = self.plugin.html
-            else:
-                self.fail(_("SolveMedia html not found"))
+        html = html or self.retrieve_html()
 
         m = re.search(self.KEY_PATTERN, html)
         if m:
@@ -337,16 +413,12 @@ class SolveMedia(CaptchaService):
             self.logDebug("Key: %s" % self.key)
             return self.key
         else:
-            self.logDebug("Key not found")
+            self.logWarning("Key pattern not found")
             return None
 
 
     def challenge(self, key=None, html=None):
-        if not key:
-            if self.detect_key(html):
-                key = self.key
-            else:
-                self.fail(_("SolveMedia key not found"))
+        key = key or self.retrieve_key(html)
 
         html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript",
                                     get={'k': key})
@@ -372,7 +444,9 @@ class SolveMedia(CaptchaService):
             try:
                 result = self.result("http://api.solvemedia.com/papi/media", challenge)
 
-            except Exception:
+            except Fail, e:
+                self.logWarning(e)
+                self.plugin.invalidCaptcha()
                 result = None
 
             html = self.plugin.req.load("http://api.solvemedia.com/papi/verify.noscript",
@@ -392,7 +466,7 @@ class SolveMedia(CaptchaService):
 
             else:
                 if "error" in html:
-                    self.logError("Captcha code was invalid")
+                    self.logWarning("Captcha code was invalid")
                     self.logDebug("Retry #%d" % i)
                     html = self.plugin.req.load(redirect)
                 else:
@@ -413,98 +487,3 @@ class SolveMedia(CaptchaService):
         self.logDebug("Result: %s" % result)
 
         return result
-
-
-class AdYouLike(CaptchaService):
-    __name__    = "AdYouLike"
-    __type__    = "captcha"
-    __version__ = "0.06"
-
-    __description__ = """AdYouLike captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    AYL_PATTERN      = r'Adyoulike\.create\s*\((.+?)\)'
-    CALLBACK_PATTERN = r'(Adyoulike\.g\._jsonp_\d+)'
-
-
-    def detect_key(self, html=None):
-        if not html:
-            if hasattr(self.plugin, "html") and self.plugin.html:
-                html = self.plugin.html
-            else:
-                self.fail(_("AdYouLike html not found"))
-
-        m = re.search(self.AYL_PATTERN, html)
-        n = re.search(self.CALLBACK_PATTERN, html)
-        if m and n:
-            self.key = (m.group(1).strip(), n.group(1).strip())
-            self.logDebug("Ayl: %s | Callback: %s" % self.key)
-            return self.key   #: key is the tuple(ayl, callback)
-        else:
-            self.logDebug("Ayl or callback not found")
-            return None
-
-
-    def challenge(self, key=None, html=None):
-        if not key:
-            if self.detect_key(html):
-                key = self.key
-            else:
-                self.fail(_("AdYouLike key not found"))
-
-        ayl, callback = key
-
-        # {"adyoulike":{"key":"P~zQ~O0zV0WTiAzC-iw0navWQpCLoYEP"},
-        # "all":{"element_id":"ayl_private_cap_92300","lang":"fr","env":"prod"}}
-        ayl = json_loads(ayl)
-
-        html = self.plugin.req.load("http://api-ayl.appspot.com/challenge",
-                                    get={'key'     : ayl['adyoulike']['key'],
-                                         'env'     : ayl['all']['env'],
-                                         'callback': callback})
-        try:
-            challenge = json_loads(re.search(callback + r'\s*\((.+?)\)', html).group(1))
-
-        except AttributeError:
-            self.fail(_("AdYouLike challenge pattern not found"))
-
-        self.logDebug("Challenge: %s" % challenge)
-
-        return self.result(ayl, challenge), challenge
-
-
-    def result(self, server, challenge):
-        # Adyoulike.g._jsonp_5579316662423138
-        # ({"translations":{"fr":{"instructions_visual":"Recopiez « Soonnight » ci-dessous :"}},
-        # "site_under":true,"clickable":true,"pixels":{"VIDEO_050":[],"DISPLAY":[],"VIDEO_000":[],"VIDEO_100":[],
-        # "VIDEO_025":[],"VIDEO_075":[]},"medium_type":"image/adyoulike",
-        # "iframes":{"big":"<iframe src=\"http://www.soonnight.com/campagn.html\" scrolling=\"no\"
-        # height=\"250\" width=\"300\" frameborder=\"0\"></iframe>"},"shares":{},"id":256,
-        # "token":"e6QuI4aRSnbIZJg02IsV6cp4JQ9~MjA1","formats":{"small":{"y":300,"x":0,"w":300,"h":60},
-        # "big":{"y":0,"x":0,"w":300,"h":250},"hover":{"y":440,"x":0,"w":300,"h":60}},
-        # "tid":"SqwuAdxT1EZoi4B5q0T63LN2AkiCJBg5"})
-
-        if isinstance(server, basestring):
-            server = json_loads(server)
-
-        if isinstance(challenge, basestring):
-            challenge = json_loads(challenge)
-
-        try:
-            instructions_visual = challenge['translations'][server['all']['lang']]['instructions_visual']
-            result = re.search(u'«(.+?)»', instructions_visual).group(1).strip()
-
-        except AttributeError:
-            self.fail(_("AdYouLike result not found"))
-
-        result = {'_ayl_captcha_engine' : "adyoulike",
-                  '_ayl_env'            : server['all']['env'],
-                  '_ayl_tid'            : challenge['tid'],
-                  '_ayl_token_challenge': challenge['token'],
-                  '_ayl_response'       : response}
-
-        self.logDebug("Result: %s" % result)
-
-        return result
-- 
cgit v1.2.3


From b66a9380e5efba5b7ec44a81eaa8be2cda8ad8f6 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 25 May 2015 13:49:57 +0200
Subject: New crypter: GoogledriveComFolder

---
 module/plugins/internal/SimpleCrypter.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 09805cf1a..bf024576f 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -5,13 +5,13 @@ import urlparse
 
 from module.plugins.Crypter import Crypter
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, replace_patterns, set_cookies
-from module.utils import fixup
+from module.utils import fixup, html_unescape
 
 
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.43"
+    __version__ = "0.44"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),  #: Overrides core.config['general']['folder_per_package']
@@ -152,7 +152,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
         url_p   = urlparse.urlparse(self.pyfile.url)
         baseurl = "%s://%s" % (url_p.scheme, url_p.netloc)
 
-        return [urlparse.urljoin(baseurl, link) if not urlparse.urlparse(link).scheme else link \
+        return [html_unescape(urlparse.urljoin(baseurl, link) if not urlparse.urlparse(link).scheme else link) \
                 for link in re.findall(self.LINK_PATTERN, self.html)]
 
 
-- 
cgit v1.2.3


From b9b3b917d353d0bd7ad62a10ac86332db62ebecf Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 25 May 2015 14:37:37 +0200
Subject: [SimpleCrypter] Fixup

---
 module/plugins/internal/SimpleCrypter.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index bf024576f..46ccb11b5 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -5,13 +5,13 @@ import urlparse
 
 from module.plugins.Crypter import Crypter
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, replace_patterns, set_cookies
-from module.utils import fixup, html_unescape
+from module.utils import fixup
 
 
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.44"
+    __version__ = "0.45"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),  #: Overrides core.config['general']['folder_per_package']
@@ -152,7 +152,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
         url_p   = urlparse.urlparse(self.pyfile.url)
         baseurl = "%s://%s" % (url_p.scheme, url_p.netloc)
 
-        return [html_unescape(urlparse.urljoin(baseurl, link) if not urlparse.urlparse(link).scheme else link) \
+        return [(urlparse.urljoin(baseurl, link) if not urlparse.urlparse(link).scheme else link).decode('unicode-escape') \
                 for link in re.findall(self.LINK_PATTERN, self.html)]
 
 
-- 
cgit v1.2.3


From 7e65484b60890bbfa39aa7631343dcfb5c379cf9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 26 May 2015 01:25:05 +0200
Subject: [GoogledriveCom] Fixup

---
 module/plugins/internal/SimpleCrypter.py | 10 ++++++----
 module/plugins/internal/SimpleHoster.py  | 25 +++++++++++++++----------
 2 files changed, 21 insertions(+), 14 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 46ccb11b5..48e1e0fab 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -5,13 +5,13 @@ import urlparse
 
 from module.plugins.Crypter import Crypter
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, replace_patterns, set_cookies
-from module.utils import fixup
+from module.utils import fixup, html_unescape
 
 
 class SimpleCrypter(Crypter, SimpleHoster):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.45"
+    __version__ = "0.46"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),  #: Overrides core.config['general']['folder_per_package']
@@ -152,8 +152,10 @@ class SimpleCrypter(Crypter, SimpleHoster):
         url_p   = urlparse.urlparse(self.pyfile.url)
         baseurl = "%s://%s" % (url_p.scheme, url_p.netloc)
 
-        return [(urlparse.urljoin(baseurl, link) if not urlparse.urlparse(link).scheme else link).decode('unicode-escape') \
-                for link in re.findall(self.LINK_PATTERN, self.html)]
+        links = [urlparse.urljoin(baseurl, link) if not urlparse.urlparse(link).scheme else link \
+                 for link in re.findall(self.LINK_PATTERN, self.html)]
+
+        return [html_unescape(l.decode('unicode-escape')) for l in links]
 
 
     def handlePages(self, pyfile):
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 11c6c64f2..d3c269548 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -14,7 +14,7 @@ from module.network.HTTPRequest import BadHeader
 from module.network.RequestFactory import getURL
 from module.plugins.Hoster import Hoster
 from module.plugins.Plugin import Fail, Retry
-from module.utils import fixup, fs_encode, parseFileSize
+from module.utils import fixup, fs_encode, html_unescape, parseFileSize
 
 
 #@TODO: Adapt and move to PyFile in 0.4.10
@@ -239,7 +239,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.48"
+    __version__ = "1.49"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available"          , True),
@@ -504,15 +504,19 @@ class SimpleHoster(Hoster):
 
 
     def downloadLink(self, link, disposition=True):
-        if link and isinstance(link, basestring):
-            self.correctCaptcha()
+        if not link or not isinstance(link, basestring):
+            return
+
+        self.correctCaptcha()
 
-            if not urlparse.urlparse(link).scheme:
-                url_p   = urlparse.urlparse(self.pyfile.url)
-                baseurl = "%s://%s" % (url_p.scheme, url_p.netloc)
-                link    = urlparse.urljoin(baseurl, link)
+        link = html_unescape(link.decode('unicode-escape'))  #@TODO: Move this check to plugin `load` method
 
-            self.download(link, ref=False, disposition=disposition)
+        if not urlparse.urlparse(link).scheme:
+            url_p   = urlparse.urlparse(self.pyfile.url)
+            baseurl = "%s://%s" % (url_p.scheme, url_p.netloc)
+            link    = urlparse.urljoin(baseurl, link)
+
+        self.download(link, ref=False, disposition=disposition)
 
 
     def checkFile(self, rules={}):
@@ -794,7 +798,8 @@ class SimpleHoster(Hoster):
             return size <= traffic
 
 
-    def getConfig(self, option, default=''):  #@TODO: Remove in 0.4.10
+    #@TODO: Remove in 0.4.10
+    def getConfig(self, option, default=''):
         """getConfig with default value - sublass may not implements all config options"""
         try:
             return self.getConf(option)
-- 
cgit v1.2.3


From 08252b978c699bae3493cf1bee4accc285fc30b5 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 29 May 2015 00:54:25 +0200
Subject: [GooGl] Update

---
 module/plugins/internal/SimpleDereferer.py | 10 +++++-----
 module/plugins/internal/SimpleHoster.py    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index fad1559c7..3a5f21900 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -4,17 +4,17 @@ import re
 import urllib
 
 from module.plugins.Crypter import Crypter
-from module.plugins.internal.SimpleHoster import getFileURL, set_cookies
+from module.plugins.internal.SimpleHoster import create_getInfo, getFileURL, set_cookies
+from module.utils import html_unescape
 
 
 class SimpleDereferer(Crypter):
     __name__    = "SimpleDereferer"
     __type__    = "crypter"
-    __version__ = "0.11"
+    __version__ = "0.12"
 
     __pattern__ = r'^unmatchable$'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
-                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Simple dereferer plugin"""
     __license__     = "GPLv3"
@@ -91,7 +91,7 @@ class SimpleDereferer(Crypter):
 
     def getLink(self):
         try:
-            return re.search(self.LINK_PATTERN, self.html).group(1)
+            return html_unescape(re.search(self.LINK_PATTERN, self.html).group(1).decode('unicode-escape'))  #@TODO: Move this check to plugin `load` method in 0.4.10
 
         except Exception:
             pass
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index d3c269548..0a9986d4c 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -509,7 +509,7 @@ class SimpleHoster(Hoster):
 
         self.correctCaptcha()
 
-        link = html_unescape(link.decode('unicode-escape'))  #@TODO: Move this check to plugin `load` method
+        link = html_unescape(link.decode('unicode-escape'))  #@TODO: Move this check to plugin `load` method in 0.4.10
 
         if not urlparse.urlparse(link).scheme:
             url_p   = urlparse.urlparse(self.pyfile.url)
-- 
cgit v1.2.3


From a51c92425e3b77b5a6b85babd29cc97411ee647c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 29 May 2015 01:53:28 +0200
Subject: [SimpleDereferer] Handle direct link

---
 module/plugins/internal/SimpleCrypter.py   |  2 +-
 module/plugins/internal/SimpleDereferer.py | 30 +++++++++++++++++-------------
 module/plugins/internal/SimpleHoster.py    |  6 +++---
 3 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 48e1e0fab..b843a28f0 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -155,7 +155,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
         links = [urlparse.urljoin(baseurl, link) if not urlparse.urlparse(link).scheme else link \
                  for link in re.findall(self.LINK_PATTERN, self.html)]
 
-        return [html_unescape(l.decode('unicode-escape')) for l in links]
+        return [html_unescape(l.strip().decode('unicode-escape')) for l in links]
 
 
     def handlePages(self, pyfile):
diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 3a5f21900..022f006f2 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -11,7 +11,7 @@ from module.utils import html_unescape
 class SimpleDereferer(Crypter):
     __name__    = "SimpleDereferer"
     __type__    = "crypter"
-    __version__ = "0.12"
+    __version__ = "0.13"
 
     __pattern__ = r'^unmatchable$'
     __config__  = []  #@TODO: Remove in 0.4.10
@@ -43,22 +43,28 @@ class SimpleDereferer(Crypter):
     COOKIES       = True
 
 
+    def handleDirect(self, pyfile):
+        header = self.load(pyfile.url, just_header=True, decode=True)
+        if 'location' in header and header['location']:
+            self.link = header['location']
+
+
     def decrypt(self, pyfile):
-        link = getFileURL(self, pyfile.url)
+        self.handleDirect(pyfile)
 
-        if not link:
+        if not self.link:
             try:
-                link = urllib.unquote(re.match(self.__pattern__, pyfile.url).group('LINK'))
+                self.link = urllib.unquote(re.match(self.__pattern__, pyfile.url).group('LINK'))
 
-            except Exception:
+            except AttributeError:
                 self.prepare()
                 self.preload()
                 self.checkStatus()
 
-                link = self.getLink()
+                self.link = self.getLink()
 
-        if link.strip():
-            self.urls = [link.strip()]  #@TODO: Remove `.strip()` in 0.4.10
+        if self.link:
+            self.urls = [self.link]
 
         elif not self.urls and not self.packages:  #@TODO: Remove in 0.4.10
             self.fail(_("No link grabbed"))
@@ -67,6 +73,7 @@ class SimpleDereferer(Crypter):
     def prepare(self):
         self.info = {}
         self.html = ""
+        self.link = ""  #@TODO: Move to hoster class in 0.4.10
 
         self.req.setOption("timeout", 120)
 
@@ -90,8 +97,5 @@ class SimpleDereferer(Crypter):
 
 
     def getLink(self):
-        try:
-            return html_unescape(re.search(self.LINK_PATTERN, self.html).group(1).decode('unicode-escape'))  #@TODO: Move this check to plugin `load` method in 0.4.10
-
-        except Exception:
-            pass
+        link = re.search(self.LINK_PATTERN, self.html).group(1)
+        return html_unescape(link.strip().decode('unicode-escape'))  #@TODO: Move this check to plugin `load` method in 0.4.10
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index 0a9986d4c..d362a9615 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -175,7 +175,7 @@ def getFileURL(self, url, follow_location=None):
         if 'content-disposition' in header:
             link = url
 
-        elif 'location' in header and header['location'].strip():
+        elif 'location' in header and header['location']:
             location = header['location']
 
             if not urlparse.urlparse(location).scheme:
@@ -193,7 +193,7 @@ def getFileURL(self, url, follow_location=None):
         else:
             extension = os.path.splitext(urlparse.urlparse(url).path.split('/')[-1])[-1]
 
-            if 'content-type' in header and header['content-type'].strip():
+            if 'content-type' in header and header['content-type']:
                 mimetype = header['content-type'].split(';')[0].strip()
 
             elif extension:
@@ -509,7 +509,7 @@ class SimpleHoster(Hoster):
 
         self.correctCaptcha()
 
-        link = html_unescape(link.decode('unicode-escape'))  #@TODO: Move this check to plugin `load` method in 0.4.10
+        link = html_unescape(link.strip().decode('unicode-escape'))  #@TODO: Move this check to plugin `load` method in 0.4.10
 
         if not urlparse.urlparse(link).scheme:
             url_p   = urlparse.urlparse(self.pyfile.url)
-- 
cgit v1.2.3


From bb213b7804c840ac66e88ab31768b2a57f6f5771 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 29 May 2015 05:49:51 +0200
Subject: [SimpleHoster] Fix DB error

---
 module/plugins/internal/MultiHoster.py     | 6 ++++--
 module/plugins/internal/SimpleDereferer.py | 2 +-
 module/plugins/internal/SimpleHoster.py    | 8 +++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'module/plugins/internal')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 350397f8b..ff4414034 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.39"
+    __version__ = "0.40"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium" , "bool", "Use premium account if available"    , True),
@@ -81,6 +81,8 @@ class MultiHoster(SimpleHoster):
             self.checkFile()
 
         except Fail, e:  #@TODO: Move to PluginThread in 0.4.10
+            err = str(e)  #@TODO: Recheck in 0.4.10
+
             if self.premium:
                 self.logWarning(_("Premium download failed"))
                 self.retryFree()
@@ -102,7 +104,7 @@ class MultiHoster(SimpleHoster):
                 raise Retry(_("Revert to original hoster plugin"))
 
             else:
-                raise Fail(e)
+                raise Fail(err)
 
 
     def handlePremium(self, pyfile):
diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py
index 022f006f2..1f04ab1c6 100644
--- a/module/plugins/internal/SimpleDereferer.py
+++ b/module/plugins/internal/SimpleDereferer.py
@@ -4,7 +4,7 @@ import re
 import urllib
 
 from module.plugins.Crypter import Crypter
-from module.plugins.internal.SimpleHoster import create_getInfo, getFileURL, set_cookies
+from module.plugins.internal.SimpleHoster import create_getInfo, set_cookies
 from module.utils import html_unescape
 
 
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index d362a9615..1d44a6642 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -239,7 +239,7 @@ def secondsToMidnight(gmt=0):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "1.49"
+    __version__ = "1.50"
 
     __pattern__ = r'^unmatchable$'
     __config__  = [("use_premium", "bool", "Use premium account if available"          , True),
@@ -492,7 +492,9 @@ class SimpleHoster(Hoster):
             self.checkFile()
 
         except Fail, e:  #@TODO: Move to PluginThread in 0.4.10
-            if str(e) == _("No captcha result obtained in appropiate time by any of the plugins."):  #@TODO: Fix in 0.4.10
+            err = str(e)  #@TODO: Recheck in 0.4.10
+
+            if err == _("No captcha result obtained in appropiate time by any of the plugins."):  #@TODO: Fix in 0.4.10
                 self.checkFile()
 
             elif self.getConfig('fallback', True) and self.premium:
@@ -500,7 +502,7 @@ class SimpleHoster(Hoster):
                 self.retryFree()
 
             else:
-                raise Fail(e)
+                raise Fail(err)
 
 
     def downloadLink(self, link, disposition=True):
-- 
cgit v1.2.3