Update addon plugins

31 files changed, 25 insertions, 780 deletions

diff --git a/module/plugins/hooks/AlldebridComHook.py b/module/plugins/hooks/AlldebridComHook.py
deleted file mode 100644
index 402850d87..000000000
--- a/module/plugins/hooks/AlldebridComHook.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class AlldebridComHook(MultiHook):
-    __name__    = "AlldebridComHook"
-    __type__    = "hook"
-    __version__ = "0.17"
-    __status__  = "testing"
-
-    __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__ = """Alldebrid.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Andy Voigt", "spamsales@online.de")]
-
-
-    def get_hosters(self):
-        html = self.load("https://www.alldebrid.com/api.php",
-                         get={'action': "get_host"}).replace("\"", "").strip()
-        return [x.strip() for x in html.split(",") if x.strip()]
diff --git a/module/plugins/hooks/DebridItaliaComHook.py b/module/plugins/hooks/DebridItaliaComHook.py
deleted file mode 100644
index 1b000c665..000000000
--- a/module/plugins/hooks/DebridItaliaComHook.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class DebridItaliaComHook(MultiHook):
-    __name__    = "DebridItaliaComHook"
-    __type__    = "hook"
-    __version__ = "0.13"
-    __status__  = "testing"
-
-    __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__ = """Debriditalia.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell"      , "l.stickell@yahoo.it"),
-                       ("Walter Purcaro", "vuolter@gmail.com"  )]
-
-
-    def get_hosters(self):
-        return self.load("http://debriditalia.com/api.php", get={'hosts': ""}).replace('"', '').split(',')
diff --git a/module/plugins/hooks/EasybytezComHook.py b/module/plugins/hooks/EasybytezComHook.py
deleted file mode 100644
index 6f53619ac..000000000
--- a/module/plugins/hooks/EasybytezComHook.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class EasybytezComHook(MultiHook):
-    __name__    = "EasybytezComHook"
-    __type__    = "hook"
-    __version__ = "0.08"
-    __status__  = "testing"
-
-    __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__ = """EasyBytez.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
-
-
-    def get_hosters(self):
-        user, info = self.account.select()
-
-        html = self.load("http://www.easybytez.com",
-                         req=self.account.get_request(user))
-
-        return re.search(r'</textarea>\s*Supported sites:(.*)', html).group(1).split(',')
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
index 4ec526d35..c752ce6ac 100644
--- a/module/plugins/hooks/ExternalScripts.py
+++ b/module/plugins/hooks/ExternalScripts.py
@@ -94,7 +94,8 @@ class ExternalScripts(Addon):
                 p.communicate()
 
         except Exception, e:
-            self.log_error(_("Runtime error: %s") % script, e or _("Unknown error"))
+            self.log_error(_("Runtime error: %s") % script,
+                           e or _("Unknown error"))
 
 
     def pyload_start(self):
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index 7d3d9237e..19d8bef94 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -4,7 +4,6 @@ from __future__ import with_statement
 
 import os
 import sys
-import traceback
 
 # monkey patch bug in python 2.6 and lower
 # http://bugs.python.org/issue6122 , http://bugs.python.org/issue1236 , http://bugs.python.org/issue1731717
@@ -167,13 +166,9 @@ class ExtractArchive(Addon):
                     self.log_warning(_("No %s installed") % p)
                 else:
                     self.log_warning(_("Could not activate: %s") % p, e)
-                    if self.pyload.debug:
-                        traceback.print_exc()
 
             except Exception, e:
                 self.log_warning(_("Could not activate: %s") % p, e)
-                if self.pyload.debug:
-                    traceback.print_exc()
 
         if self.extractors:
             self.log_debug(*["Found %s %s" % (Extractor.__name__, Extractor.VERSION) for Extractor in self.extractors])
@@ -510,8 +505,6 @@ class ExtractArchive(Addon):
 
         except Exception, e:
             self.log_error(name, _("Unknown error"), e)
-            if self.pyload.debug:
-                traceback.print_exc()
 
         self.manager.dispatchEvent("archive_extract_failed", pyfile, archive)
 
diff --git a/module/plugins/hooks/FastixRuHook.py b/module/plugins/hooks/FastixRuHook.py
deleted file mode 100644
index 3fdb29409..000000000
--- a/module/plugins/hooks/FastixRuHook.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.common.json_layer import json_loads
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class FastixRuHook(MultiHook):
-    __name__    = "FastixRuHook"
-    __type__    = "hook"
-    __version__ = "0.06"
-    __status__  = "testing"
-
-    __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__ = """Fastix.ru hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")]
-
-
-    def get_hosters(self):
-        html = self.load("http://fastix.ru/api_v2",
-                      get={'apikey': "5182964c3f8f9a7f0b00000a_kelmFB4n1IrnCDYuIFn2y",
-                           'sub'   : "allowed_sources"})
-        host_list = json_loads(html)
-        host_list = host_list['allow']
-        return host_list
diff --git a/module/plugins/hooks/FreeWayMeHook.py b/module/plugins/hooks/FreeWayMeHook.py
deleted file mode 100644
index 1380433bf..000000000
--- a/module/plugins/hooks/FreeWayMeHook.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class FreeWayMeHook(MultiHook):
-    __name__    = "FreeWayMeHook"
-    __type__    = "hook"
-    __version__ = "0.18"
-    __status__  = "testing"
-
-    __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__ = """FreeWay.me hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Nicolas Giese", "james@free-way.me")]
-
-
-    def get_hosters(self):
-        user, info = self.account.select()
-        hostis = self.load("http://www.free-way.bz/ajax/jd.php",
-                           get={'id'  : 3,
-                                'user': user,
-                                'pass': info['login']['password']}).replace("\"", "")  #@TODO: Revert to `https` in 0.4.10
-        return [x.strip() for x in hostis.split(",") if x.strip()]
diff --git a/module/plugins/hooks/HighWayMeHook.py b/module/plugins/hooks/HighWayMeHook.py
deleted file mode 100644
index e9e62525d..000000000
--- a/module/plugins/hooks/HighWayMeHook.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.common.json_layer import json_loads
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class HighWayMeHook(MultiHook):
-    __name__    = "HighWayMeHook"
-    __type__    = "hook"
-    __version__ = "0.04"
-    __status__  = "testing"
-
-    __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__ = """High-Way.me hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("EvolutionClip", "evolutionclip@live.de")]
-
-
-    def get_hosters(self):
-        json_data = json_loads(self.load("https://high-way.me/api.php",
-                                           get={'hoster': 1}))
-        return [element['name'] for element in json_data['hoster']]
diff --git a/module/plugins/hooks/IRCInterface.py b/module/plugins/hooks/IRCInterface.py
index 020939805..c84c0439d 100644
--- a/module/plugins/hooks/IRCInterface.py
+++ b/module/plugins/hooks/IRCInterface.py
@@ -18,7 +18,7 @@ from module.utils import formatSize
 class IRCInterface(Thread, Addon):
     __name__    = "IRCInterface"
     __type__    = "hook"
-    __version__ = "0.16"
+    __version__ = "0.17"
     __status__  = "testing"
 
     __config__ = [("host"     , "str" , "IRC-Server Address"                           , "Enter your server here!"),
@@ -105,7 +105,8 @@ class IRCInterface(Thread, Addon):
 
         except IRCError, ex:
             self.sock.send("QUIT :byebye\r\n")
-            traceback.print_exc()
+            if self.pyload.debug:
+                traceback.print_exc()
             self.sock.close()
 
 
diff --git a/module/plugins/hooks/LinksnappyComHook.py b/module/plugins/hooks/LinksnappyComHook.py
deleted file mode 100644
index e46e480d6..000000000
--- a/module/plugins/hooks/LinksnappyComHook.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.common.json_layer import json_loads
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class LinksnappyComHook(MultiHook):
-    __name__    = "LinksnappyComHook"
-    __type__    = "hook"
-    __version__ = "0.05"
-    __status__  = "testing"
-
-    __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__ = """Linksnappy.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
-
-
-    def get_hosters(self):
-        json_data = self.load("http://gen.linksnappy.com/lseAPI.php", get={'act': "FILEHOSTS"})
-        json_data = json_loads(json_data)
-
-        return json_data['return'].keys()
diff --git a/module/plugins/hooks/MegaDebridEuHook.py b/module/plugins/hooks/MegaDebridEuHook.py
deleted file mode 100644
index 04f0be86f..000000000
--- a/module/plugins/hooks/MegaDebridEuHook.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.common.json_layer import json_loads
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class MegaDebridEuHook(MultiHook):
-    __name__    = "MegaDebridEuHook"
-    __type__    = "hook"
-    __version__ = "0.06"
-    __status__  = "testing"
-
-    __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__ = """Mega-debrid.eu hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("D.Ducatel", "dducatel@je-geek.fr")]
-
-
-    def get_hosters(self):
-        reponse   = self.load("http://www.mega-debrid.eu/api.php", get={'action': "getHosters"})
-        json_data = json_loads(reponse)
-
-        if json_data['response_code'] == "ok":
-            host_list = [element[0] for element in json_data['hosters']]
-        else:
-            self.log_error(_("Unable to retrieve hoster list"))
-            host_list = []
-
-        return host_list
diff --git a/module/plugins/hooks/MegaRapidoNetHook.py b/module/plugins/hooks/MegaRapidoNetHook.py
deleted file mode 100644
index 4956427ff..000000000
--- a/module/plugins/hooks/MegaRapidoNetHook.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class MegaRapidoNetHook(MultiHook):
-    __name__    = "MegaRapidoNetHook"
-    __type__    = "hook"
-    __version__ = "0.03"
-    __status__  = "testing"
-
-    __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__ = """MegaRapido.net hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
-
-
-    def get_hosters(self):
-        hosters = {'1fichier'    : [],  # leave it there are so many possible addresses?
-                   '1st-files'   : ['1st-files.com'],
-                   '2shared'     : ['2shared.com'],
-                   '4shared'     : ['4shared.com', '4shared-china.com'],
-                   'asfile'      : ['http://asfile.com/'],
-                   'bitshare'    : ['bitshare.com'],
-                   'brupload'    : ['brupload.net'],
-                   'crocko'      : ['crocko.com', 'easy-share.com'],
-                   'dailymotion' : ['dailymotion.com'],
-                   'depfile'     : ['depfile.com'],
-                   'depositfiles': ['depositfiles.com', 'dfiles.eu'],
-                   'dizzcloud'   : ['dizzcloud.com'],
-                   'dl.dropbox'  : [],
-                   'extabit'     : ['extabit.com'],
-                   'extmatrix'   : ['extmatrix.com'],
-                   'facebook'    : [],
-                   'file4go'     : ['file4go.com'],
-                   'filecloud'   : ['filecloud.io', 'ifile.it', 'mihd.net'],
-                   'filefactory' : ['filefactory.com'],
-                   'fileom'      : ['fileom.com'],
-                   'fileparadox' : ['fileparadox.in'],
-                   'filepost'    : ['filepost.com', 'fp.io'],
-                   'filerio'     : ['filerio.in', 'filerio.com', 'filekeen.com'],
-                   'filesflash'  : ['filesflash.com'],
-                   'firedrive'   : ['firedrive.com', 'putlocker.com'],
-                   'flashx'      : [],
-                   'freakshare'  : ['freakshare.net', 'freakshare.com'],
-                   'gigasize'    : ['gigasize.com'],
-                   'hipfile'     : ['hipfile.com'],
-                   'junocloud'   : ['junocloud.me'],
-                   'letitbit'    : ['letitbit.net', 'shareflare.net'],
-                   'mediafire'   : ['mediafire.com'],
-                   'mega'        : ['mega.co.nz'],
-                   'megashares'  : ['megashares.com'],
-                   'metacafe'    : ['metacafe.com'],
-                   'netload'     : ['netload.in'],
-                   'oboom'       : ['oboom.com'],
-                   'rapidgator'  : ['rapidgator.net'],
-                   'rapidshare'  : ['rapidshare.com'],
-                   'rarefile'    : ['rarefile.net'],
-                   'ryushare'    : ['ryushare.com'],
-                   'sendspace'   : ['sendspace.com'],
-                   'turbobit'    : ['turbobit.net', 'unextfiles.com'],
-                   'uploadable'  : ['uploadable.ch'],
-                   'uploadbaz'   : ['uploadbaz.com'],
-                   'uploaded'    : ['uploaded.to', 'uploaded.net', 'ul.to'],
-                   'uploadhero'  : ['uploadhero.com'],
-                   'uploading'   : ['uploading.com'],
-                   'uptobox'     : ['uptobox.com'],
-                   'xvideos'     : ['xvideos.com'],
-                   'youtube'     : ['youtube.com']}
-
-        hoster_list = []
-
-        for item in hosters.values():
-            hoster_list.extend(item)
-
-        return hoster_list
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py
index a76a578bf..c6405e5a3 100644
--- a/module/plugins/hooks/MergeFiles.py
+++ b/module/plugins/hooks/MergeFiles.py
@@ -4,7 +4,6 @@ from __future__ import with_statement
 
 import os
 import re
-import traceback
 
 from module.plugins.internal.Addon import Addon, threaded
 from module.utils import save_join as fs_join
@@ -13,7 +12,7 @@ from module.utils import save_join as fs_join
 class MergeFiles(Addon):
     __name__    = "MergeFiles"
     __type__    = "hook"
-    __version__ = "0.16"
+    __version__ = "0.17"
     __status__  = "testing"
 
     __config__ = [("activated", "bool", "Activated", True)]
@@ -69,7 +68,7 @@ class MergeFiles(Addon):
                         self.log_debug("Finished merging part", splitted_file)
 
                     except Exception, e:
-                        traceback.print_exc()
+                        self.log_error(e)
 
                     finally:
                         pyfile.setProgress(100)
diff --git a/module/plugins/hooks/MultihostersComHook.py b/module/plugins/hooks/MultihostersComHook.py
deleted file mode 100644
index ec1cf9c85..000000000
--- a/module/plugins/hooks/MultihostersComHook.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.hooks.ZeveraComHook import ZeveraComHook
-
-
-class MultihostersComHook(ZeveraComHook):
-    __name__    = "MultihostersComHook"
-    __type__    = "hook"
-    __version__ = "0.03"
-    __status__  = "testing"
-
-    __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__ = """Multihosters.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("tjeh", "tjeh@gmx.net")]
diff --git a/module/plugins/hooks/MultishareCzHook.py b/module/plugins/hooks/MultishareCzHook.py
deleted file mode 100644
index 30f1e21b5..000000000
--- a/module/plugins/hooks/MultishareCzHook.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class MultishareCzHook(MultiHook):
-    __name__    = "MultishareCzHook"
-    __type__    = "hook"
-    __version__ = "0.08"
-    __status__  = "testing"
-
-    __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__ = """MultiShare.cz hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
-
-
-    HOSTER_PATTERN = r'<img class="logo-shareserveru"[^>]*?alt="(.+?)"></td>\s*<td class="stav">[^>]*?alt="OK"'
-
-
-    def get_hosters(self):
-        html = self.load("http://www.multishare.cz/monitoring/")
-        return re.findall(self.HOSTER_PATTERN, html)
diff --git a/module/plugins/hooks/MyfastfileComHook.py b/module/plugins/hooks/MyfastfileComHook.py
deleted file mode 100644
index 1eedd9238..000000000
--- a/module/plugins/hooks/MyfastfileComHook.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.common.json_layer import json_loads
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class MyfastfileComHook(MultiHook):
-    __name__    = "MyfastfileComHook"
-    __type__    = "hook"
-    __version__ = "0.06"
-    __status__  = "testing"
-
-    __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__ = """Myfastfile.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("stickell", "l.stickell@yahoo.it")]
-
-
-    def get_hosters(self):
-        json_data = self.load("http://myfastfile.com/api.php", get={'hosts': ""})
-        self.log_debug("JSON data", json_data)
-        json_data = json_loads(json_data)
-
-        return json_data['hosts']
diff --git a/module/plugins/hooks/NoPremiumPlHook.py b/module/plugins/hooks/NoPremiumPlHook.py
deleted file mode 100644
index 7dbdf6a68..000000000
--- a/module/plugins/hooks/NoPremiumPlHook.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.common.json_layer import json_loads
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class NoPremiumPlHook(MultiHook):
-    __name__    = "NoPremiumPlHook"
-    __type__    = "hook"
-    __version__ = "0.04"
-    __status__  = "testing"
-
-    __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__ = """NoPremium.pl hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("goddie", "dev@nopremium.pl")]
-
-
-    def get_hosters(self):
-        hostings         = json_loads(self.load("https://www.nopremium.pl/clipboard.php?json=3").strip())
-        hostings_domains = [domain for row in hostings for domain in row['domains'] if row['sdownload'] == "0"]
-
-        self.log_debug(hostings_domains)
-
-        return hostings_domains
diff --git a/module/plugins/hooks/OverLoadMeHook.py b/module/plugins/hooks/OverLoadMeHook.py
deleted file mode 100644
index 5398fc17d..000000000
--- a/module/plugins/hooks/OverLoadMeHook.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class OverLoadMeHook(MultiHook):
-    __name__    = "OverLoadMeHook"
-    __type__    = "hook"
-    __version__ = "0.05"
-    __status__  = "testing"
-
-    __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__ = """Over-Load.me hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("marley", "marley@over-load.me")]
-
-
-    def get_hosters(self):
-        html = self.load("https://api.over-load.me/hoster.php",
-                         get={'auth': "0001-cb1f24dadb3aa487bda5afd3b76298935329be7700cd7-5329be77-00cf-1ca0135f"}).replace("\"", "").strip()
-        return [x.strip() for x in html.split(",") if x.strip()]
diff --git a/module/plugins/hooks/PremiumToHook.py b/module/plugins/hooks/PremiumToHook.py
deleted file mode 100644
index bcd7a7aab..000000000
--- a/module/plugins/hooks/PremiumToHook.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class PremiumToHook(MultiHook):
-    __name__    = "PremiumToHook"
-    __type__    = "hook"
-    __version__ = "0.11"
-    __status__  = "testing"
-
-    __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__ = """Premium.to hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN"   , "RaNaN@pyload.org"   ),
-                       ("zoidberg", "zoidberg@mujmail.cz"),
-                       ("stickell", "l.stickell@yahoo.it")]
-
-
-    def get_hosters(self):
-        user, info = self.account.select()
-        html = self.load("http://premium.to/api/hosters.php",
-                         get={'username': user,
-                              'password': info['login']['password']})
-        return [x.strip() for x in html.replace("\"", "").split(";")]
diff --git a/module/plugins/hooks/PremiumizeMeHook.py b/module/plugins/hooks/PremiumizeMeHook.py
deleted file mode 100644
index 9a9a380af..000000000
--- a/module/plugins/hooks/PremiumizeMeHook.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.common.json_layer import json_loads
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class PremiumizeMeHook(MultiHook):
-    __name__    = "PremiumizeMeHook"
-    __type__    = "hook"
-    __version__ = "0.20"
-    __status__  = "testing"
-
-    __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__ = """Premiumize.me hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
-
-
-    def get_hosters(self):
-        #: Get account data
-        user, info = self.account.select()
-
-        #: Get supported hosters list from premiumize.me using the
-        #: json API v1 (see https://secure.premiumize.me/?show=api)
-        answer = self.load("http://api.premiumize.me/pm-api/v1.php",  #@TODO: Revert to `https` in 0.4.10
-                           get={'method'       : "hosterlist",
-                                'params[login]': user,
-                                'params[pass]' : info['login']['password']})
-        data = json_loads(answer)
-
-        #: If account is not valid thera are no hosters available
-        if data['status'] != 200:
-            return []
-
-        #: Extract hosters from json file
-        return data['result']['hosterlist']
diff --git a/module/plugins/hooks/PutdriveComHook.py b/module/plugins/hooks/PutdriveComHook.py
deleted file mode 100644
index d206aaf88..000000000
--- a/module/plugins/hooks/PutdriveComHook.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.hooks.ZeveraComHook import ZeveraComHook
-
-
-class PutdriveComHook(ZeveraComHook):
-    __name__    = "PutdriveComHook"
-    __type__    = "hook"
-    __version__ = "0.02"
-    __status__  = "testing"
-
-    __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__ = """Putdrive.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
diff --git a/module/plugins/hooks/RPNetBizHook.py b/module/plugins/hooks/RPNetBizHook.py
deleted file mode 100644
index 5d26b7f09..000000000
--- a/module/plugins/hooks/RPNetBizHook.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.common.json_layer import json_loads
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class RPNetBizHook(MultiHook):
-    __name__    = "RPNetBizHook"
-    __type__    = "hook"
-    __version__ = "0.16"
-    __status__  = "testing"
-
-    __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__ = """RPNet.biz hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Dman", "dmanugm@gmail.com")]
-
-
-    def get_hosters(self):
-        #: Get account data
-        user, info = self.account.select()
-
-        res = self.load("https://premium.rpnet.biz/client_api.php",
-                        get={'username': user,
-                             'password': info['login']['password'],
-                             'action'  : "showHosterList"})
-        hoster_list = json_loads(res)
-
-        #: If account is not valid thera are no hosters available
-        if 'error' in hoster_list:
-            return []
-
-        #: Extract hosters from json file
-        return hoster_list['hosters']
diff --git a/module/plugins/hooks/RapideoPlHook.py b/module/plugins/hooks/RapideoPlHook.py
deleted file mode 100644
index 130f73851..000000000
--- a/module/plugins/hooks/RapideoPlHook.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.common.json_layer import json_loads
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class RapideoPlHook(MultiHook):
-    __name__    = "RapideoPlHook"
-    __type__    = "hook"
-    __version__ = "0.04"
-    __status__  = "testing"
-
-    __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__ = """Rapideo.pl hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("goddie", "dev@rapideo.pl")]
-
-
-    def get_hosters(self):
-        hostings         = json_loads(self.load("https://www.rapideo.pl/clipboard.php?json=3").strip())
-        hostings_domains = [domain for row in hostings for domain in row['domains'] if row['sdownload'] == "0"]
-
-        self.log_debug(hostings_domains)
-
-        return hostings_domains
diff --git a/module/plugins/hooks/RealdebridComHook.py b/module/plugins/hooks/RealdebridComHook.py
deleted file mode 100644
index 01b9d165e..000000000
--- a/module/plugins/hooks/RealdebridComHook.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class RealdebridComHook(MultiHook):
-    __name__    = "RealdebridComHook"
-    __type__    = "hook"
-    __version__ = "0.47"
-    __status__  = "testing"
-
-    __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__ = """Real-Debrid.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
-
-
-    def get_hosters(self):
-        html = self.load("https://real-debrid.com/api/hosters.php").replace("\"", "").strip()
-        return [x.strip() for x in html.split(",") if x.strip()]
diff --git a/module/plugins/hooks/RehostToHook.py b/module/plugins/hooks/RehostToHook.py
deleted file mode 100644
index 7bb27e820..000000000
--- a/module/plugins/hooks/RehostToHook.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class RehostToHook(MultiHook):
-    __name__    = "RehostToHook"
-    __type__    = "hook"
-    __version__ = "0.51"
-    __status__  = "testing"
-
-    __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__ = """Rehost.to hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
-
-
-    def get_hosters(self):
-        user, info = self.account.select()
-        html = self.load("http://rehost.to/api.php",
-                           get={'cmd'     : "get_supported_och_dl",
-                                'long_ses': self.account.get_data(user)['session']})
-        return [x.strip() for x in html.replace("\"", "").split(",")]
diff --git a/module/plugins/hooks/SimplyPremiumComHook.py b/module/plugins/hooks/SimplyPremiumComHook.py
deleted file mode 100644
index 6fbd75c8a..000000000
--- a/module/plugins/hooks/SimplyPremiumComHook.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.common.json_layer import json_loads
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class SimplyPremiumComHook(MultiHook):
-    __name__    = "SimplyPremiumComHook"
-    __type__    = "hook"
-    __version__ = "0.06"
-    __status__  = "testing"
-
-    __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__ = """Simply-Premium.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("EvolutionClip", "evolutionclip@live.de")]
-
-
-    def get_hosters(self):
-        json_data = self.load("http://www.simply-premium.com/api/hosts.php", get={'format': "json", 'online': 1})
-        json_data = json_loads(json_data)
-
-        host_list = [element['regex'] for element in json_data['result']]
-
-        return host_list
diff --git a/module/plugins/hooks/SimplydebridComHook.py b/module/plugins/hooks/SimplydebridComHook.py
deleted file mode 100644
index 0da7ec719..000000000
--- a/module/plugins/hooks/SimplydebridComHook.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class SimplydebridComHook(MultiHook):
-    __name__    = "SimplydebridComHook"
-    __type__    = "hook"
-    __version__ = "0.05"
-    __status__  = "testing"
-
-    __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__ = """Simply-Debrid.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
-
-
-    def get_hosters(self):
-        html = self.load("http://simply-debrid.com/api.php", get={'list': 1})
-        return [x.strip() for x in html.rstrip(';').replace("\"", "").split(";")]
diff --git a/module/plugins/hooks/SmoozedComHook.py b/module/plugins/hooks/SmoozedComHook.py
deleted file mode 100644
index b9825b223..000000000
--- a/module/plugins/hooks/SmoozedComHook.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class SmoozedComHook(MultiHook):
-    __name__    = "SmoozedComHook"
-    __type__    = "hook"
-    __version__ = "0.04"
-    __status__  = "testing"
-
-    __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__ = """Smoozed.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("", "")]
-
-
-    def get_hosters(self):
-        user, info = self.account.select()
-        return self.account.get_data(user)['hosters']
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index fb9e28b5d..ec262e672 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -7,7 +7,6 @@ import os
 import re
 import sys
 import time
-import traceback
 
 from module.plugins.internal.Addon import Expose, Addon, threaded
 from module.plugins.internal.Plugin import exists
@@ -269,8 +268,6 @@ class UpdateManager(Addon):
 
             except Exception, e:
                 self.log_error(_("Error updating plugin: [%s] %s") % (type, name), e)
-                if self.pyload.debug:
-                    traceback.print_exc()
 
         if updated:
             self.log_info(_("*** Plugins updated ***"))
@@ -337,8 +334,6 @@ class UpdateManager(Addon):
 
                     except OSError, e:
                         self.log_warning(_("Error removing: %s") % filename, e)
-                        if self.pyload.debug:
-                            traceback.print_exc()
 
                     else:
                         id = (type, name)
diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py
index 9b9c7f0ad..70bafba67 100644
--- a/module/plugins/hooks/XFileSharingPro.py
+++ b/module/plugins/hooks/XFileSharingPro.py
@@ -8,7 +8,7 @@ from module.plugins.internal.Hook import Hook
 class XFileSharingPro(Hook):
     __name__    = "XFileSharingPro"
     __type__    = "hook"
-    __version__ = "0.42"
+    __version__ = "0.43"
     __status__  = "testing"
 
     __config__ = [("activated"       , "bool", "Activated"                     , True ),
@@ -28,22 +28,22 @@ class XFileSharingPro(Hook):
                   'crypter': (r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:user|folder)s?/\w+',
                               r'https?://(?:[^/]+\.)?(?P<DOMAIN>%s)/(?:user|folder)s?/\w+')}
 
-    HOSTER_BUILTIN  = [#WORKING HOSTERS:
-                       "ani-stream.com", "backin.net", "cloudsix.me", "eyesfile.ca",
-                       "file4safe.com", "fileband.com", "filedwon.com", "fileparadox.in",
-                       "filevice.com", "hostingbulk.com", "junkyvideo.com", "ravishare.com",
-                       "ryushare.com", "salefiles.com", "sendmyway.com", "sharebeast.com",
-                       "sharesix.com", "thefile.me", "verzend.be", "worldbytez.com",
-                       "xvidstage.com",
-                       #: NOT TESTED:
-                       "101shared.com", "4upfiles.com", "filemaze.ws", "filenuke.com",
-                       "linkzhost.com", "mightyupload.com", "rockdizfile.com", "sharerepo.com",
-                       "shareswift.com", "uploadbaz.com", "uploadc.com", "vidbull.com",
-                       "zalaa.com", "zomgupload.com",
-                       #: NOT WORKING:
-                       "amonshare.com", "banicrazy.info", "boosterking.com", "host4desi.com",
-                       "laoupload.com", "rd-fs.com"]
-    CRYPTER_BUILTIN = ["junocloud.me", "rapidfileshare.net"]
+    BUILTIN_HOSTERS  = [#WORKING HOSTERS:
+                        "ani-stream.com", "backin.net", "cloudsix.me", "eyesfile.ca",
+                        "file4safe.com", "fileband.com", "filedwon.com", "fileparadox.in",
+                        "filevice.com", "hostingbulk.com", "junkyvideo.com", "ravishare.com",
+                        "ryushare.com", "salefiles.com", "sendmyway.com", "sharebeast.com",
+                        "sharesix.com", "thefile.me", "verzend.be", "worldbytez.com",
+                        "xvidstage.com",
+                        #: NOT TESTED:
+                        "101shared.com", "4upfiles.com", "filemaze.ws", "filenuke.com",
+                        "linkzhost.com", "mightyupload.com", "rockdizfile.com", "sharerepo.com",
+                        "shareswift.com", "uploadbaz.com", "uploadc.com", "vidbull.com",
+                        "zalaa.com", "zomgupload.com",
+                        #: NOT WORKING:
+                        "amonshare.com", "banicrazy.info", "boosterking.com", "host4desi.com",
+                        "laoupload.com", "rd-fs.com"]
+    BUILTIN_CRYPTERS = ["junocloud.me", "rapidfileshare.net"]
 
 
     # def plugin_config_changed(self, plugin, name, value):
@@ -73,7 +73,7 @@ class XFileSharingPro(Hook):
                 plugin_set = set(plugins.replace(' ', '').replace('\\', '').replace('|', ',').replace(';', ',').lower().split(','))
 
                 if use_builtin_list:
-                    plugin_set |= set(x.lower() for x in getattr(self, "%s_BUILTIN" % type.upper()))
+                    plugin_set |= set(x.lower() for x in getattr(self, "BUILTIN_%sS" % type.upper()))
 
                 plugin_set -= set(('', u''))
 
diff --git a/module/plugins/hooks/ZeveraComHook.py b/module/plugins/hooks/ZeveraComHook.py
deleted file mode 100644
index 395c67802..000000000
--- a/module/plugins/hooks/ZeveraComHook.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.MultiHook import MultiHook
-
-
-class ZeveraComHook(MultiHook):
-    __name__    = "ZeveraComHook"
-    __type__    = "hook"
-    __version__ = "0.06"
-    __status__  = "testing"
-
-    __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__ = """Zevera.com hook plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg"      , "zoidberg@mujmail.cz"),
-                       ("Walter Purcaro", "vuolter@gmail.com"  )]
-
-
-    def get_hosters(self):
-        html = self.account.api_response(pyreq.getHTTPRequest(timeout=120), cmd="gethosters")
-        return [x.strip() for x in html.split(",")]