From 48c0c42fd6faffc56432d5f037cd575979f180cc Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 14 Jul 2014 02:23:37 +0200
Subject: Removed all @author flags + key attributes cleanup for internal &
 hooks plugins

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 97f3a5996..0dea76109 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -7,12 +7,13 @@ from module.plugins.Hook import Hook
 
 
 class MultiHoster(Hook):
-    """
-    Generic MultiHoster plugin
-    """
-
+    __name__ = "AbtractExtractor"
     __version__ = "0.19"
 
+    __description__ = """Generic MultiHoster plugin"""
+    __author_name__ = "pyLoad Team"
+    __author_mail__ = "admin@pyload.org"
+
     replacements = [("2shared.com", "twoshared.com"), ("4shared.com", "fourshared.com"), ("cloudnator.com", "shragle.com"),
                     ("ifile.it", "filecloud.io"), ("easy-share.com", "crocko.com"), ("freakshare.net", "freakshare.com"),
                     ("hellshare.com", "hellshare.cz"), ("share-rapid.cz", "sharerapid.com"), ("sharerapid.cz", "sharerapid.com"),
@@ -20,6 +21,7 @@ class MultiHoster(Hook):
     ignored = []
     interval = 24 * 60 * 60  #: reload hosters daily
 
+
     def setup(self):
         self.hosters = []
         self.supported = []
-- 
cgit v1.2.3


From 7b8c458cca7d21a029620f98e453f746fce69cd1 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 14 Jul 2014 16:10:01 +0200
Subject: Prefer single quote for dict key name

---
 module/plugins/internal/MultiHoster.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 0dea76109..46d943bd7 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -141,8 +141,8 @@ class MultiHoster(Hook):
         self.logDebug("Overwritten Hosters: %s" % ", ".join(sorted(self.supported)))
         for hoster in self.supported:
             dict = self.core.pluginManager.hosterPlugins[hoster]
-            dict["new_module"] = module
-            dict["new_name"] = self.__name__
+            dict['new_module'] = module
+            dict['new_name'] = self.__name__
 
         if excludedList:
             self.logInfo("The following hosters were not overwritten - account exists: %s" % ", ".join(sorted(excludedList)))
@@ -158,17 +158,17 @@ class MultiHoster(Hook):
             self.logDebug("Regexp: %s" % regexp)
 
             dict = self.core.pluginManager.hosterPlugins[self.__name__]
-            dict["pattern"] = regexp
-            dict["re"] = re.compile(regexp)
+            dict['pattern'] = regexp
+            dict['re'] = re.compile(regexp)
 
     def unloadHoster(self, hoster):
         dict = self.core.pluginManager.hosterPlugins[hoster]
         if "module" in dict:
-            del dict["module"]
+            del dict['module']
 
         if "new_module" in dict:
-            del dict["new_module"]
-            del dict["new_name"]
+            del dict['new_module']
+            del dict['new_name']
 
     def unload(self):
         """Remove override for all hosters. Scheduler job is removed by hookmanager"""
@@ -178,8 +178,8 @@ class MultiHoster(Hook):
         # reset pattern
         klass = getattr(self.core.pluginManager.getPlugin(self.__name__), self.__name__)
         dict = self.core.pluginManager.hosterPlugins[self.__name__]
-        dict["pattern"] = getattr(klass, '__pattern__', r"^unmatchable$")
-        dict["re"] = re.compile(dict["pattern"])
+        dict['pattern'] = getattr(klass, "__pattern__", r'^unmatchable$')
+        dict['re'] = re.compile(dict['pattern'])
 
     def downloadFailed(self, pyfile):
         """remove plugin override if download fails but not if file is offline/temp.offline"""
-- 
cgit v1.2.3


From ba916633f2bedb04c7358000b91aed69f52e8e43 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 1 Aug 2014 19:35:59 +0200
Subject: Remove trailing whitespaces + remove license headers + import urllib
 methods directly + sort and fix key attributes + use save_join instead join +
 sort some import declarations + other minor code cosmetics

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 46d943bd7..f6d202ee9 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -2,8 +2,8 @@
 
 import re
 
-from module.utils import remove_chars
 from module.plugins.Hook import Hook
+from module.utils import remove_chars
 
 
 class MultiHoster(Hook):
-- 
cgit v1.2.3


From 0d220d634e512d89bda540f91c643b361c82ea8a Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 27 Sep 2014 01:38:32 +0200
Subject: Logging string cosmetics

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index f6d202ee9..7f1bb5103 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -40,7 +40,7 @@ class MultiHoster(Hook):
             try:
                 hosterSet = self.toHosterSet(self.getHoster()) - set(self.ignored)
             except Exception, e:
-                self.logError("%s" % str(e))
+                self.logError(e)
                 return []
 
             try:
@@ -54,7 +54,7 @@ class MultiHoster(Hook):
                         hosterSet -= configSet
 
             except Exception, e:
-                self.logError("%s" % str(e))
+                self.logError(e)
 
             self.hosters = list(hosterSet)
 
@@ -98,7 +98,7 @@ class MultiHoster(Hook):
 
     def periodical(self):
         """reload hoster list periodically"""
-        self.logInfo("Reloading supported hoster list")
+        self.logInfo(_("Reloading supported hoster list"))
 
         old_supported = self.supported
         self.supported, self.new_supported, self.hosters = [], [], []
@@ -107,7 +107,7 @@ class MultiHoster(Hook):
 
         old_supported = [hoster for hoster in old_supported if hoster not in self.supported]
         if old_supported:
-            self.logDebug("UNLOAD: %s" % ", ".join(old_supported))
+            self.logDebug("UNLOAD", ", ".join(old_supported))
             for hoster in old_supported:
                 self.unloadHoster(hoster)
 
@@ -138,24 +138,24 @@ class MultiHoster(Hook):
         klass = getattr(module, self.__name__)
 
         # inject plugin plugin
-        self.logDebug("Overwritten Hosters: %s" % ", ".join(sorted(self.supported)))
+        self.logDebug("Overwritten Hosters", ", ".join(sorted(self.supported)))
         for hoster in self.supported:
             dict = self.core.pluginManager.hosterPlugins[hoster]
             dict['new_module'] = module
             dict['new_name'] = self.__name__
 
         if excludedList:
-            self.logInfo("The following hosters were not overwritten - account exists: %s" % ", ".join(sorted(excludedList)))
+            self.logInfo(_("The following hosters were not overwritten - account exists"), ", ".join(sorted(excludedList)))
 
         if self.new_supported:
-            self.logDebug("New Hosters: %s" % ", ".join(sorted(self.new_supported)))
+            self.logDebug("New Hosters", ", ".join(sorted(self.new_supported)))
 
             # create new regexp
             regexp = r".*(%s).*" % "|".join([x.replace(".", "\\.") for x in self.new_supported])
             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)
+            self.logDebug("Regexp", regexp)
 
             dict = self.core.pluginManager.hosterPlugins[self.__name__]
             dict['pattern'] = regexp
-- 
cgit v1.2.3


From b0868ae6446078bacf1635dde5e4ab316b4a94cb Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 7 Oct 2014 18:57:59 +0200
Subject: New __authors__ key replaces __author_name__ and __author_mail__ +
 Whitespaces and EOF fixup

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 7f1bb5103..daab1e855 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -11,8 +11,8 @@ class MultiHoster(Hook):
     __version__ = "0.19"
 
     __description__ = """Generic MultiHoster plugin"""
-    __author_name__ = "pyLoad Team"
-    __author_mail__ = "admin@pyload.org"
+    __authors__ = [("pyLoad Team", "admin@pyload.org")]
+
 
     replacements = [("2shared.com", "twoshared.com"), ("4shared.com", "fourshared.com"), ("cloudnator.com", "shragle.com"),
                     ("ifile.it", "filecloud.io"), ("easy-share.com", "crocko.com"), ("freakshare.net", "freakshare.com"),
-- 
cgit v1.2.3


From ae7a7e66981456e5bbe2b54006d79b6f907be7a4 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 8 Oct 2014 20:18:13 +0200
Subject: Add __license__ key attribute to plugins

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index daab1e855..38a93c6af 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -11,6 +11,7 @@ class MultiHoster(Hook):
     __version__ = "0.19"
 
     __description__ = """Generic MultiHoster plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("pyLoad Team", "admin@pyload.org")]
 
 
-- 
cgit v1.2.3


From 8939f015a688a07ec7d0bd14b6a3704f6a2cb4a0 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 11 Oct 2014 15:12:40 +0200
Subject: Pattern update 3

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 38a93c6af..4ef43bc31 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -152,9 +152,9 @@ class MultiHoster(Hook):
             self.logDebug("New Hosters", ", ".join(sorted(self.new_supported)))
 
             # create new regexp
-            regexp = r".*(%s).*" % "|".join([x.replace(".", "\\.") for x in self.new_supported])
+            regexp = r'.*(%s).*' % "|".join([x.replace(".", "\\.") for x in self.new_supported])
             if hasattr(klass, "__pattern__") and isinstance(klass.__pattern__, basestring) and '://' in klass.__pattern__:
-                regexp = r"%s|%s" % (klass.__pattern__, regexp)
+                regexp = r'%s|%s' % (klass.__pattern__, regexp)
 
             self.logDebug("Regexp", regexp)
 
-- 
cgit v1.2.3


From 0eb6e7ec4a1144dcca824d8add049787d3da1762 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 22 Oct 2014 19:44:59 +0200
Subject: Two space before function declaration

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 4ef43bc31..5aadf6f2e 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -28,6 +28,7 @@ class MultiHoster(Hook):
         self.supported = []
         self.new_supported = []
 
+
     def getConfig(self, option, default=''):
         """getConfig with default value - sublass may not implements all config options"""
         try:
@@ -35,6 +36,7 @@ class MultiHoster(Hook):
         except KeyError:
             return default
 
+
     def getHosterCached(self):
         if not self.hosters:
 
@@ -61,6 +63,7 @@ class MultiHoster(Hook):
 
         return self.hosters
 
+
     def toHosterSet(self, hosters):
         hosters = set((str(x).strip().lower() for x in hosters))
 
@@ -72,6 +75,7 @@ class MultiHoster(Hook):
         hosters.discard('')
         return hosters
 
+
     def getHoster(self):
         """Load list of supported hoster
 
@@ -79,6 +83,7 @@ class MultiHoster(Hook):
         """
         raise NotImplementedError
 
+
     def coreReady(self):
         if self.cb:
             self.core.scheduler.removeJob(self.cb)
@@ -94,9 +99,11 @@ class MultiHoster(Hook):
         else:
             self.periodical()
 
+
     def initPeriodical(self):
         pass
 
+
     def periodical(self):
         """reload hoster list periodically"""
         self.logInfo(_("Reloading supported hoster list"))
@@ -112,6 +119,7 @@ class MultiHoster(Hook):
             for hoster in old_supported:
                 self.unloadHoster(hoster)
 
+
     def overridePlugins(self):
         pluginMap = {}
         for name in self.core.pluginManager.hosterPlugins.keys():
@@ -162,6 +170,7 @@ class MultiHoster(Hook):
             dict['pattern'] = regexp
             dict['re'] = re.compile(regexp)
 
+
     def unloadHoster(self, hoster):
         dict = self.core.pluginManager.hosterPlugins[hoster]
         if "module" in dict:
@@ -171,6 +180,7 @@ class MultiHoster(Hook):
             del dict['new_module']
             del dict['new_name']
 
+
     def unload(self):
         """Remove override for all hosters. Scheduler job is removed by hookmanager"""
         for hoster in self.supported:
@@ -182,6 +192,7 @@ class MultiHoster(Hook):
         dict['pattern'] = getattr(klass, "__pattern__", r'^unmatchable$')
         dict['re'] = re.compile(dict['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):
-- 
cgit v1.2.3


From aa0751bcfd995e308bcd586a6965c75e68b1274b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 27 Oct 2014 23:05:13 +0100
Subject: Code cosmetics

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 5aadf6f2e..112736b0c 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -7,12 +7,15 @@ from module.utils import remove_chars
 
 
 class MultiHoster(Hook):
-    __name__ = "AbtractExtractor"
+    __name__    = "AbtractExtractor"
+    __type__    = "hook"
     __version__ = "0.19"
 
+    __config__ = []
+
     __description__ = """Generic MultiHoster plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("pyLoad Team", "admin@pyload.org")]
+    __license__     = "GPLv3"
+    __authors__     = [("pyLoad Team", "admin@pyload.org")]
 
 
     replacements = [("2shared.com", "twoshared.com"), ("4shared.com", "fourshared.com"), ("cloudnator.com", "shragle.com"),
-- 
cgit v1.2.3


From 885f8ed782e64d9e73367905e642a84d0a8999f1 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 28 Oct 2014 04:01:38 +0100
Subject: Update __config__

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 112736b0c..5c787e2d6 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -11,8 +11,6 @@ class MultiHoster(Hook):
     __type__    = "hook"
     __version__ = "0.19"
 
-    __config__ = []
-
     __description__ = """Generic MultiHoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("pyLoad Team", "admin@pyload.org")]
-- 
cgit v1.2.3


From 302616d94f76ab8794b58d3d54b780cc58e86b06 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 28 Oct 2014 04:58:47 +0100
Subject: Code cosmetics: items() -> iteritems()

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 5c787e2d6..3596641b0 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -126,7 +126,7 @@ class MultiHoster(Hook):
         for name in self.core.pluginManager.hosterPlugins.keys():
             pluginMap[name.lower()] = name
 
-        accountList = [name.lower() for name, data in self.core.accountManager.accounts.items() if data]
+        accountList = [name.lower() for name, data in self.core.accountManager.accounts.iteritems() if data]
         excludedList = []
 
         for hoster in self.getHosterCached():
-- 
cgit v1.2.3


From 8e921a978e79d93da3036ce3bdc1fb176c74fabb Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 3 Nov 2014 12:09:04 +0100
Subject: Spare code cosmetics

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 3596641b0..24942f8a3 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -16,13 +16,14 @@ class MultiHoster(Hook):
     __authors__     = [("pyLoad Team", "admin@pyload.org")]
 
 
-    replacements = [("2shared.com", "twoshared.com"), ("4shared.com", "fourshared.com"), ("cloudnator.com", "shragle.com"),
-                    ("ifile.it", "filecloud.io"), ("easy-share.com", "crocko.com"), ("freakshare.net", "freakshare.com"),
-                    ("hellshare.com", "hellshare.cz"), ("share-rapid.cz", "sharerapid.com"), ("sharerapid.cz", "sharerapid.com"),
-                    ("ul.to", "uploaded.to"), ("uploaded.net", "uploaded.to"), ("1fichier.com", "onefichier.com")]
-    ignored = []
     interval = 24 * 60 * 60  #: reload hosters daily
 
+    HOSTER_REPLACEMENTS = [("2shared.com", "twoshared.com"), ("4shared.com", "fourshared.com"), ("cloudnator.com", "shragle.com"),
+                           ("ifile.it", "filecloud.io"), ("easy-share.com", "crocko.com"), ("freakshare.net", "freakshare.com"),
+                           ("hellshare.com", "hellshare.cz"), ("share-rapid.cz", "sharerapid.com"), ("sharerapid.cz", "sharerapid.com"),
+                           ("ul.to", "uploaded.to"), ("uploaded.net", "uploaded.to"), ("1fichier.com", "onefichier.com")]
+    HOSTER_EXCLUDED = []
+
 
     def setup(self):
         self.hosters = []
@@ -42,7 +43,7 @@ class MultiHoster(Hook):
         if not self.hosters:
 
             try:
-                hosterSet = self.toHosterSet(self.getHoster()) - set(self.ignored)
+                hosterSet = self.toHosterSet(self.getHoster()) - set(self.HOSTER_EXCLUDED)
             except Exception, e:
                 self.logError(e)
                 return []
@@ -68,7 +69,7 @@ class MultiHoster(Hook):
     def toHosterSet(self, hosters):
         hosters = set((str(x).strip().lower() for x in hosters))
 
-        for rep in self.replacements:
+        for rep in self.HOSTER_REPLACEMENTS:
             if rep[0] in hosters:
                 hosters.remove(rep[0])
                 hosters.add(rep[1])
-- 
cgit v1.2.3


From edfaaed90d59991ada592da31a65cc518d7d3871 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 4 Nov 2014 03:23:39 +0100
Subject: Code cosmetics

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 24942f8a3..f0d3993a7 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -22,7 +22,7 @@ class MultiHoster(Hook):
                            ("ifile.it", "filecloud.io"), ("easy-share.com", "crocko.com"), ("freakshare.net", "freakshare.com"),
                            ("hellshare.com", "hellshare.cz"), ("share-rapid.cz", "sharerapid.com"), ("sharerapid.cz", "sharerapid.com"),
                            ("ul.to", "uploaded.to"), ("uploaded.net", "uploaded.to"), ("1fichier.com", "onefichier.com")]
-    HOSTER_EXCLUDED = []
+    HOSTER_EXCLUDED     = []
 
 
     def setup(self):
-- 
cgit v1.2.3


From 4dfd0fe2f76e67218158d76644a48f58a95bcf8d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 22 Nov 2014 01:35:32 +0100
Subject: [MultiHoster] Fix __name__

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index f0d3993a7..c86f9b286 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -7,7 +7,7 @@ from module.utils import remove_chars
 
 
 class MultiHoster(Hook):
-    __name__    = "AbtractExtractor"
+    __name__    = "MultiHoster"
     __type__    = "hook"
     __version__ = "0.19"
 
-- 
cgit v1.2.3


From dcf495b582440c33d878115556ceddf0f523a1ab Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 6 Dec 2014 11:02:24 +0100
Subject: [MultiHoster] Code cosmetics

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index c86f9b286..6ec2e4b82 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -9,25 +9,28 @@ from module.utils import remove_chars
 class MultiHoster(Hook):
     __name__    = "MultiHoster"
     __type__    = "hook"
-    __version__ = "0.19"
+    __version__ = "0.20"
 
     __description__ = """Generic MultiHoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("pyLoad Team", "admin@pyload.org")]
 
 
-    interval = 24 * 60 * 60  #: reload hosters daily
+    interval = 12 * 60 * 60  #: reload hosters every 12h
 
-    HOSTER_REPLACEMENTS = [("2shared.com", "twoshared.com"), ("4shared.com", "fourshared.com"), ("cloudnator.com", "shragle.com"),
-                           ("ifile.it", "filecloud.io"), ("easy-share.com", "crocko.com"), ("freakshare.net", "freakshare.com"),
-                           ("hellshare.com", "hellshare.cz"), ("share-rapid.cz", "sharerapid.com"), ("sharerapid.cz", "sharerapid.com"),
-                           ("ul.to", "uploaded.to"), ("uploaded.net", "uploaded.to"), ("1fichier.com", "onefichier.com")]
+    HOSTER_REPLACEMENTS = [("1fichier.com", "onefichier.com"), ("2shared.com", "twoshared.com"),
+                           ("4shared.com", "fourshared.com"), ("cloudnator.com", "shragle.com"),
+                           ("easy-share.com", "crocko.com"), ("freakshare.net", "freakshare.com"),
+                           ("hellshare.com", "hellshare.cz"), ("ifile.it", "filecloud.io"),
+                           ("putlocker.com", "firedrive.com"), ("share-rapid.cz", "multishare.cz"),
+                           ("sharerapid.cz", "multishare.cz"), ("ul.to", "uploaded.to"),
+                           ("uploaded.net", "uploaded.to")]
     HOSTER_EXCLUDED     = []
 
 
     def setup(self):
-        self.hosters = []
-        self.supported = []
+        self.hosters       = []
+        self.supported     = []
         self.new_supported = []
 
 
@@ -41,7 +44,6 @@ class MultiHoster(Hook):
 
     def getHosterCached(self):
         if not self.hosters:
-
             try:
                 hosterSet = self.toHosterSet(self.getHoster()) - set(self.HOSTER_EXCLUDED)
             except Exception, e:
@@ -110,8 +112,10 @@ class MultiHoster(Hook):
         """reload hoster list periodically"""
         self.logInfo(_("Reloading supported hoster list"))
 
-        old_supported = self.supported
-        self.supported, self.new_supported, self.hosters = [], [], []
+        old_supported      = self.supported
+        self.supported     = []
+        self.new_supported = []
+        self.hosters       = []
 
         self.overridePlugins()
 
@@ -123,11 +127,8 @@ class MultiHoster(Hook):
 
 
     def overridePlugins(self):
-        pluginMap = {}
-        for name in self.core.pluginManager.hosterPlugins.keys():
-            pluginMap[name.lower()] = name
-
-        accountList = [name.lower() for name, data in self.core.accountManager.accounts.iteritems() if data]
+        pluginMap    = dict((name.lower(), name) for name in self.core.pluginManager.hosterPlugins.keys())
+        accountList  = [name.lower() for name, data in self.core.accountManager.accounts.iteritems() if data]
         excludedList = []
 
         for hoster in self.getHosterCached():
@@ -146,14 +147,14 @@ class MultiHoster(Hook):
             return
 
         module = self.core.pluginManager.getPlugin(self.__name__)
-        klass = getattr(module, self.__name__)
+        klass  = getattr(module, self.__name__)
 
         # inject plugin plugin
         self.logDebug("Overwritten Hosters", ", ".join(sorted(self.supported)))
         for hoster in self.supported:
             dict = self.core.pluginManager.hosterPlugins[hoster]
             dict['new_module'] = module
-            dict['new_name'] = self.__name__
+            dict['new_name']   = self.__name__
 
         if excludedList:
             self.logInfo(_("The following hosters were not overwritten - account exists"), ", ".join(sorted(excludedList)))
@@ -162,7 +163,7 @@ class MultiHoster(Hook):
             self.logDebug("New Hosters", ", ".join(sorted(self.new_supported)))
 
             # create new regexp
-            regexp = r'.*(%s).*' % "|".join([x.replace(".", "\\.") for x in self.new_supported])
+            regexp = r'.*(%s).*' % "|".join([x.replace(".", "\.") for x in self.new_supported])
             if hasattr(klass, "__pattern__") and isinstance(klass.__pattern__, basestring) and '://' in klass.__pattern__:
                 regexp = r'%s|%s' % (klass.__pattern__, regexp)
 
@@ -170,7 +171,7 @@ class MultiHoster(Hook):
 
             dict = self.core.pluginManager.hosterPlugins[self.__name__]
             dict['pattern'] = regexp
-            dict['re'] = re.compile(regexp)
+            dict['re']      = re.compile(regexp)
 
 
     def unloadHoster(self, hoster):
@@ -190,9 +191,9 @@ class MultiHoster(Hook):
 
         # reset pattern
         klass = getattr(self.core.pluginManager.getPlugin(self.__name__), self.__name__)
-        dict = self.core.pluginManager.hosterPlugins[self.__name__]
+        dict  = self.core.pluginManager.hosterPlugins[self.__name__]
         dict['pattern'] = getattr(klass, "__pattern__", r'^unmatchable$')
-        dict['re'] = re.compile(dict['pattern'])
+        dict['re']      = re.compile(dict['pattern'])
 
 
     def downloadFailed(self, pyfile):
-- 
cgit v1.2.3


From 3d27f5ccee412d38102873a5b02e3f236375eb97 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 16 Dec 2014 03:44:15 +0100
Subject: Update plugins (2)

---
 module/plugins/internal/MultiHoster.py | 50 +++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 22 deletions(-)

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 6ec2e4b82..6d10d17d9 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -9,7 +9,7 @@ from module.utils import remove_chars
 class MultiHoster(Hook):
     __name__    = "MultiHoster"
     __type__    = "hook"
-    __version__ = "0.20"
+    __version__ = "0.21"
 
     __description__ = """Generic MultiHoster plugin"""
     __license__     = "GPLv3"
@@ -18,12 +18,18 @@ class MultiHoster(Hook):
 
     interval = 12 * 60 * 60  #: reload hosters every 12h
 
-    HOSTER_REPLACEMENTS = [("1fichier.com", "onefichier.com"), ("2shared.com", "twoshared.com"),
-                           ("4shared.com", "fourshared.com"), ("cloudnator.com", "shragle.com"),
-                           ("easy-share.com", "crocko.com"), ("freakshare.net", "freakshare.com"),
-                           ("hellshare.com", "hellshare.cz"), ("ifile.it", "filecloud.io"),
-                           ("putlocker.com", "firedrive.com"), ("share-rapid.cz", "multishare.cz"),
-                           ("sharerapid.cz", "multishare.cz"), ("ul.to", "uploaded.to"),
+    HOSTER_REPLACEMENTS = [("1fichier.com", "onefichier.com"),
+                           ("2shared.com", "twoshared.com"),
+                           ("4shared.com", "fourshared.com"),
+                           ("cloudnator.com", "shragle.com"),
+                           ("easy-share.com", "crocko.com"),
+                           ("freakshare.net", "freakshare.com"),
+                           ("hellshare.com", "hellshare.cz"),
+                           ("ifile.it", "filecloud.io"),
+                           ("putlocker.com", "firedrive.com"),
+                           ("share-rapid.cz", "multishare.cz"),
+                           ("sharerapid.cz", "multishare.cz"),
+                           ("ul.to", "uploaded.to"),
                            ("uploaded.net", "uploaded.to")]
     HOSTER_EXCLUDED     = []
 
@@ -152,9 +158,9 @@ class MultiHoster(Hook):
         # inject plugin plugin
         self.logDebug("Overwritten Hosters", ", ".join(sorted(self.supported)))
         for hoster in self.supported:
-            dict = self.core.pluginManager.hosterPlugins[hoster]
-            dict['new_module'] = module
-            dict['new_name']   = self.__name__
+            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)))
@@ -169,19 +175,19 @@ class MultiHoster(Hook):
 
             self.logDebug("Regexp", regexp)
 
-            dict = self.core.pluginManager.hosterPlugins[self.__name__]
-            dict['pattern'] = regexp
-            dict['re']      = re.compile(regexp)
+            hdict = self.core.pluginManager.hosterPlugins[self.__name__]
+            hdict['pattern'] = regexp
+            hdict['re']      = re.compile(regexp)
 
 
     def unloadHoster(self, hoster):
-        dict = self.core.pluginManager.hosterPlugins[hoster]
-        if "module" in dict:
-            del dict['module']
+        hdict = self.core.pluginManager.hosterPlugins[hoster]
+        if "module" in hdict:
+            del hdict['module']
 
-        if "new_module" in dict:
-            del dict['new_module']
-            del dict['new_name']
+        if "new_module" in hdict:
+            del hdict['new_module']
+            del hdict['new_name']
 
 
     def unload(self):
@@ -191,9 +197,9 @@ class MultiHoster(Hook):
 
         # reset pattern
         klass = getattr(self.core.pluginManager.getPlugin(self.__name__), self.__name__)
-        dict  = self.core.pluginManager.hosterPlugins[self.__name__]
-        dict['pattern'] = getattr(klass, "__pattern__", r'^unmatchable$')
-        dict['re']      = re.compile(dict['pattern'])
+        hdict  = self.core.pluginManager.hosterPlugins[self.__name__]
+        hdict['pattern'] = getattr(klass, "__pattern__", r'^unmatchable$')
+        hdict['re']      = re.compile(hdict['pattern'])
 
 
     def downloadFailed(self, pyfile):
-- 
cgit v1.2.3


From 0860e09f5ff16ee3f097f6f9d444f277a38abd72 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 17 Dec 2014 23:03:46 +0100
Subject: Extend SimpleHoster in multi-hoster plugins (3)

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 6d10d17d9..0bcb79817 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -9,7 +9,7 @@ from module.utils import remove_chars
 class MultiHoster(Hook):
     __name__    = "MultiHoster"
     __type__    = "hook"
-    __version__ = "0.21"
+    __version__ = "0.22"
 
     __description__ = """Generic MultiHoster plugin"""
     __license__     = "GPLv3"
@@ -18,19 +18,22 @@ class MultiHoster(Hook):
 
     interval = 12 * 60 * 60  #: reload hosters every 12h
 
-    HOSTER_REPLACEMENTS = [("1fichier.com", "onefichier.com"),
-                           ("2shared.com", "twoshared.com"),
-                           ("4shared.com", "fourshared.com"),
-                           ("cloudnator.com", "shragle.com"),
-                           ("easy-share.com", "crocko.com"),
-                           ("freakshare.net", "freakshare.com"),
-                           ("hellshare.com", "hellshare.cz"),
-                           ("ifile.it", "filecloud.io"),
-                           ("putlocker.com", "firedrive.com"),
-                           ("share-rapid.cz", "multishare.cz"),
-                           ("sharerapid.cz", "multishare.cz"),
-                           ("ul.to", "uploaded.to"),
-                           ("uploaded.net", "uploaded.to")]
+    HOSTER_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"    )]
     HOSTER_EXCLUDED     = []
 
 
@@ -133,12 +136,12 @@ class MultiHoster(Hook):
 
 
     def overridePlugins(self):
-        pluginMap    = dict((name.lower(), name) for name in self.core.pluginManager.hosterPlugins.keys())
+        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]
         excludedList = []
 
         for hoster in self.getHosterCached():
-            name = remove_chars(hoster.lower(), "-.")
+            name = remove_chars(hoster, "-.")
 
             if name in accountList:
                 excludedList.append(hoster)
@@ -166,10 +169,12 @@ class MultiHoster(Hook):
             self.logInfo(_("The following hosters were not overwritten - account exists"), ", ".join(sorted(excludedList)))
 
         if self.new_supported:
-            self.logDebug("New Hosters", ", ".join(sorted(self.new_supported)))
+            hosters = sorted(self.new_supported)
+
+            self.logDebug("New Hosters", ", ".join(hosters))
 
             # create new regexp
-            regexp = r'.*(%s).*' % "|".join([x.replace(".", "\.") for x in self.new_supported])
+            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)
 
-- 
cgit v1.2.3


From 4e9c8f7ab1269966a9eac9e1b6363f5458f9f970 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 18 Dec 2014 16:07:21 +0100
Subject: Update checkFile routine in some hoster plugins

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

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 0bcb79817..68550a4dd 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -33,7 +33,7 @@ class MultiHoster(Hook):
                            ("share-rapid.cz" , "multishare.cz" ),
                            ("sharerapid.cz"  , "multishare.cz" ),
                            ("ul.to"          , "uploaded.to"   ),
-                           ("uploaded.net"  , "uploaded.to"    )]
+                           ("uploaded.net"   , "uploaded.to"   )]
     HOSTER_EXCLUDED     = []
 
 
-- 
cgit v1.2.3


From 87203e996fb42c172b15e29f0e394d5b328d9ac2 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 23 Dec 2014 13:20:53 +0100
Subject: New plugin: MultiHoster

---
 module/plugins/internal/MultiHoster.py | 226 ++++++---------------------------
 1 file changed, 36 insertions(+), 190 deletions(-)

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 68550a4dd..4425cfce0 100644
--- a/module/plugins/internal/MultiHoster.py
+++ b/module/plugins/internal/MultiHoster.py
@@ -2,216 +2,62 @@
 
 import re
 
-from module.plugins.Hook import Hook
-from module.utils import remove_chars
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, replace_patterns, set_cookies
 
 
-class MultiHoster(Hook):
+class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
-    __type__    = "hook"
-    __version__ = "0.22"
+    __type__    = "hoster"
+    __version__ = "0.23"
 
-    __description__ = """Generic MultiHoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
-
-
-    interval = 12 * 60 * 60  #: reload hosters every 12h
-
-    HOSTER_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"   )]
-    HOSTER_EXCLUDED     = []
-
-
-    def setup(self):
-        self.hosters       = []
-        self.supported     = []
-        self.new_supported = []
-
-
-    def getConfig(self, option, default=''):
-        """getConfig with default value - sublass may not implements all config options"""
-        try:
-            return self.getConf(option)
-        except KeyError:
-            return default
-
-
-    def getHosterCached(self):
-        if not self.hosters:
-            try:
-                hosterSet = self.toHosterSet(self.getHoster()) - set(self.HOSTER_EXCLUDED)
-            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(','))
-
-                    if configMode == "listed":
-                        hosterSet &= configSet
-                    else:
-                        hosterSet -= configSet
+    __pattern__ = r'^unmatchable$'
 
-            except Exception, e:
-                self.logError(e)
-
-            self.hosters = list(hosterSet)
-
-        return self.hosters
-
-
-    def toHosterSet(self, hosters):
-        hosters = set((str(x).strip().lower() for x in hosters))
-
-        for rep in self.HOSTER_REPLACEMENTS:
-            if rep[0] in hosters:
-                hosters.remove(rep[0])
-                hosters.add(rep[1])
+    __description__ = """Multi hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
-        hosters.discard('')
-        return hosters
 
+    DIRECT_LINK   = True
+    MULTI_HOSTER  = True
+    LOGIN_ACCOUNT = True
+    LOGIN_PREMIUM = False
 
-    def getHoster(self):
-        """Load list of supported hoster
 
-        :return: List of domain names
-        """
-        raise NotImplementedError
+    def setup(self):
+        self.chunkLimit = 1
+        self.multiDL    = self.premium
 
 
-    def coreReady(self):
-        if self.cb:
-            self.core.scheduler.removeJob(self.cb)
+    def prepare(self):
+        self.info      = {}
+        self.link      = ""
+        self.multihost = False
 
-        self.setConfig("activated", True)  #: config not in sync after plugin reload
+        self.req.setOption("timeout", 120)
 
-        cfg_interval = self.getConfig("interval", None)  #: reload interval in hours
-        if cfg_interval is not None:
-            self.interval = cfg_interval * 60 * 60
+        if isinstance(self.COOKIES, list):
+            set_cookies(self.req.cj, self.COOKIES)
 
-        if self.interval:
-            self._periodical()
+        if self.DIRECT_LINK is None:
+            self.directDL = bool(self.account)
         else:
-            self.periodical()
-
-
-    def initPeriodical(self):
-        pass
+            self.directDL = self.DIRECT_LINK
 
+        if (self.__pattern__ != self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
+            or re.match(self.__pattern__, self.pyfile.url) is None):
 
-    def periodical(self):
-        """reload hoster list periodically"""
-        self.logInfo(_("Reloading supported hoster list"))
+            if self.LOGIN_ACCOUNT and not self.account:
+                self.logError(_("Required account not found"))
 
-        old_supported      = self.supported
-        self.supported     = []
-        self.new_supported = []
-        self.hosters       = []
+            elif self.LOGIN_PREMIUM and not self.premium:
+                self.logError(_("Required premium account not found"))
 
-        self.overridePlugins()
-
-        old_supported = [hoster for hoster in old_supported if hoster not in self.supported]
-        if old_supported:
-            self.logDebug("UNLOAD", ", ".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]
-        excludedList = []
-
-        for hoster in self.getHosterCached():
-            name = remove_chars(hoster, "-.")
-
-            if name in accountList:
-                excludedList.append(hoster)
             else:
-                if name in pluginMap:
-                    self.supported.append(pluginMap[name])
-                else:
-                    self.new_supported.append(hoster)
-
-        if not self.supported and not self.new_supported:
-            self.logError(_("No Hoster loaded"))
-            return
-
-        module = self.core.pluginManager.getPlugin(self.__name__)
-        klass  = getattr(module, self.__name__)
-
-        # inject plugin plugin
-        self.logDebug("Overwritten Hosters", ", ".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)))
-
-        if self.new_supported:
-            hosters = sorted(self.new_supported)
+                self.multihost = True
 
-            self.logDebug("New Hosters", ", ".join(hosters))
+        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
 
-            # 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)
-
-            hdict = self.core.pluginManager.hosterPlugins[self.__name__]
-            hdict['pattern'] = regexp
-            hdict['re']      = re.compile(regexp)
-
-
-    def unloadHoster(self, hoster):
-        hdict = self.core.pluginManager.hosterPlugins[hoster]
-        if "module" in hdict:
-            del hdict['module']
-
-        if "new_module" in hdict:
-            del hdict['new_module']
-            del hdict['new_name']
-
-
-    def unload(self):
-        """Remove override for all hosters. Scheduler job is removed by hookmanager"""
-        for hoster in self.supported:
-            self.unloadHoster(hoster)
-
-        # reset pattern
-        klass = getattr(self.core.pluginManager.getPlugin(self.__name__), self.__name__)
-        hdict  = self.core.pluginManager.hosterPlugins[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 "new_name" in hdict and hdict['new_name'] == self.__name__:
-                self.logDebug("Unload MultiHoster", pyfile.pluginname, hdict)
-                self.unloadHoster(pyfile.pluginname)
-                pyfile.setStatus("queued")
+    def handleMulti(self):
+        raise NotImplementedError
-- 
cgit v1.2.3


From a4786e340993bbfc5d2bf971c9bec18863d3dd80 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 23 Dec 2014 19:29:15 +0100
Subject: [MultiHoster] Update

---
 module/plugins/internal/MultiHoster.py | 53 +++++++++++++++-------------------
 1 file changed, 24 insertions(+), 29 deletions(-)

(limited to 'module/plugins/internal/MultiHoster.py')

diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py
index 4425cfce0..e5c28d034 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, replace_patterns, set_cookies
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class MultiHoster(SimpleHoster):
     __name__    = "MultiHoster"
     __type__    = "hoster"
-    __version__ = "0.23"
+    __version__ = "0.24"
 
     __pattern__ = r'^unmatchable$'
 
@@ -18,9 +18,6 @@ class MultiHoster(SimpleHoster):
 
 
     DIRECT_LINK   = True
-    MULTI_HOSTER  = True
-    LOGIN_ACCOUNT = True
-    LOGIN_PREMIUM = False
 
 
     def setup(self):
@@ -28,36 +25,34 @@ class MultiHoster(SimpleHoster):
         self.multiDL    = self.premium
 
 
-    def prepare(self):
-        self.info      = {}
-        self.link      = ""
-        self.multihost = False
+    def process(self, pyfile):
+        self.prepare()
 
-        self.req.setOption("timeout", 120)
+        if self.directDL:
+            self.logDebug("Looking for direct download link...")
+            self.handleDirect()
 
-        if isinstance(self.COOKIES, list):
-            set_cookies(self.req.cj, self.COOKIES)
+        if not self.link and not self.lastDownload:
+            self.preload()
 
-        if self.DIRECT_LINK is None:
-            self.directDL = bool(self.account)
-        else:
-            self.directDL = self.DIRECT_LINK
+            if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()):
+                self.logDebug("Handled as premium download")
+                self.handlePremium()
 
-        if (self.__pattern__ != self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
-            or re.match(self.__pattern__, self.pyfile.url) is None):
+            else:
+                self.logDebug("Handled as free download")
+                self.handleFree()
 
-            if self.LOGIN_ACCOUNT and not self.account:
-                self.logError(_("Required account not found"))
+        self.downloadLink(self.link)
+        self.checkFile()
 
-            elif self.LOGIN_PREMIUM and not self.premium:
-                self.logError(_("Required premium account not found"))
 
-            else:
-                self.multihost = True
+    def handlePremium(self):
+        return self.handleFree()
 
-        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 handleMulti(self):
-        raise NotImplementedError
+    def handleFree(self):
+        if self.premium:
+            raise NotImplementedError
+        else:
+            self.logError(_("Required account not found"))
-- 
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/MultiHoster.py')

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 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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/internal/MultiHoster.py')

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()
 
-- 
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/MultiHoster.py')

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