Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/OCR.py
	module/plugins/accounts/BayfilesCom.py
	module/plugins/accounts/CatShareNet.py
	module/plugins/accounts/DebridItaliaCom.py
	module/plugins/accounts/FourSharedCom.py
	module/plugins/accounts/FshareVn.py
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/accounts/LomafileCom.py
	module/plugins/accounts/RapiduNet.py
	module/plugins/accounts/RyushareCom.py
	module/plugins/accounts/ShareonlineBiz.py
	module/plugins/addon/Checksum.py
	module/plugins/addon/ExternalScripts.py
	module/plugins/addon/ExtractArchive.py
	module/plugins/addon/MergeFiles.py
	module/plugins/addon/RestartSlow.py
	module/plugins/addon/SkipRev.py
	module/plugins/addon/UnSkipOnFail.py
	module/plugins/addon/UpdateManager.py
	module/plugins/addon/WindowsPhoneToastNotify.py
	module/plugins/container/CCF.py
	module/plugins/container/LinkList.py
	module/plugins/container/RSDF.py
	module/plugins/crypter/BitshareCom.py
	module/plugins/crypter/CrockoCom.py
	module/plugins/crypter/DataHu.py
	module/plugins/crypter/DepositfilesCom.py
	module/plugins/crypter/Dereferer.py
	module/plugins/crypter/DevhostStFolder.py
	module/plugins/crypter/DlProtectCom.py
	module/plugins/crypter/DontKnowMe.py
	module/plugins/crypter/EasybytezCom.py
	module/plugins/crypter/FilecloudIo.py
	module/plugins/crypter/FilecryptCc.py
	module/plugins/crypter/FilefactoryCom.py
	module/plugins/crypter/FilerNet.py
	module/plugins/crypter/FilestubeCom.py
	module/plugins/crypter/FiletramCom.py
	module/plugins/crypter/FreakhareCom.py
	module/plugins/crypter/FreetexthostCom.py
	module/plugins/crypter/FshareVn.py
	module/plugins/crypter/ImgurComAlbum.py
	module/plugins/crypter/JunocloudMe.py
	module/plugins/crypter/LinkSaveIn.py
	module/plugins/crypter/MegaRapidCz.py
	module/plugins/crypter/MultiUpOrg.py
	module/plugins/crypter/NetfolderIn.py
	module/plugins/crypter/NosvideoCom.py
	module/plugins/crypter/OneKhDe.py
	module/plugins/crypter/PastebinCom.py
	module/plugins/crypter/RapidfileshareNet.py
	module/plugins/crypter/RelinkUs.py
	module/plugins/crypter/TnyCz.py
	module/plugins/crypter/TurbobitNet.py
	module/plugins/crypter/TusfilesNet.py
	module/plugins/crypter/UploadableCh.py
	module/plugins/crypter/UploadedTo.py
	module/plugins/crypter/XFileSharingPro.py
	module/plugins/hooks/AlldebridCom.py
	module/plugins/hooks/BypassCaptcha.py
	module/plugins/hooks/Captcha9Kw.py
	module/plugins/hooks/CaptchaBrotherhood.py
	module/plugins/hooks/ClickAndLoad.py
	module/plugins/hooks/DeathByCaptcha.py
	module/plugins/hooks/DebridItaliaCom.py
	module/plugins/hooks/EasybytezCom.py
	module/plugins/hooks/ExpertDecoders.py
	module/plugins/hooks/FastixRu.py
	module/plugins/hooks/FreeWayMe.py
	module/plugins/hooks/ImageTyperz.py
	module/plugins/hooks/LinkdecrypterCom.py
	module/plugins/hooks/LinksnappyCom.py
	module/plugins/hooks/MegaDebridEu.py
	module/plugins/hooks/MultishareCz.py
	module/plugins/hooks/MyfastfileCom.py
	module/plugins/hooks/OverLoadMe.py
	module/plugins/hooks/PremiumTo.py
	module/plugins/hooks/PremiumizeMe.py
	module/plugins/hooks/RPNetBiz.py
	module/plugins/hooks/RealdebridCom.py
	module/plugins/hooks/RehostTo.py
	module/plugins/hooks/SimplyPremiumCom.py
	module/plugins/hooks/SimplydebridCom.py
	module/plugins/hooks/UnrestrictLi.py
	module/plugins/hooks/XFileSharingPro.py
	module/plugins/hooks/ZeveraCom.py
	module/plugins/hoster/AlldebridCom.py
	module/plugins/hoster/BayfilesCom.py
	module/plugins/hoster/DebridItaliaCom.py
	module/plugins/hoster/DepositfilesCom.py
	module/plugins/hoster/DodanePl.py
	module/plugins/hoster/ExtabitCom.py
	module/plugins/hoster/FastixRu.py
	module/plugins/hoster/FastshareCz.py
	module/plugins/hoster/FileParadoxIn.py
	module/plugins/hoster/FileSharkPl.py
	module/plugins/hoster/FilerNet.py
	module/plugins/hoster/FileserveCom.py
	module/plugins/hoster/FreakshareCom.py
	module/plugins/hoster/FreeWayMe.py
	module/plugins/hoster/GigapetaCom.py
	module/plugins/hoster/IfileIt.py
	module/plugins/hoster/Keep2ShareCc.py
	module/plugins/hoster/LetitbitNet.py
	module/plugins/hoster/LinksnappyCom.py
	module/plugins/hoster/LomafileCom.py
	module/plugins/hoster/MegaCoNz.py
	module/plugins/hoster/MegaDebridEu.py
	module/plugins/hoster/MegaRapidCz.py
	module/plugins/hoster/MyfastfileCom.py
	module/plugins/hoster/OverLoadMe.py
	module/plugins/hoster/PremiumTo.py
	module/plugins/hoster/PremiumizeMe.py
	module/plugins/hoster/RPNetBiz.py
	module/plugins/hoster/RapidgatorNet.py
	module/plugins/hoster/RealdebridCom.py
	module/plugins/hoster/RehostTo.py
	module/plugins/hoster/RyushareCom.py
	module/plugins/hoster/SendmywayCom.py
	module/plugins/hoster/ShareonlineBiz.py
	module/plugins/hoster/SimplyPremiumCom.py
	module/plugins/hoster/SimplydebridCom.py
	module/plugins/hoster/TusfilesNet.py
	module/plugins/hoster/UnibytesCom.py
	module/plugins/hoster/UnrestrictLi.py
	module/plugins/hoster/UploadedTo.py
	module/plugins/hoster/WebshareCz.py
	module/plugins/hoster/XFileSharingPro.py
	module/plugins/hoster/YoutubeCom.py
	module/plugins/hoster/ZeveraCom.py
	module/plugins/hoster/ZippyshareCom.py
	module/plugins/internal/AbstractExtractor.py
	module/plugins/internal/BasePlugin.py
	module/plugins/internal/CaptchaService.py
	module/plugins/internal/DeadCrypter.py
	module/plugins/internal/DeadHoster.py
	module/plugins/internal/MultiHoster.py
	module/plugins/internal/SimpleCrypter.py
	module/plugins/internal/SimpleHoster.py
	module/plugins/internal/UnRar.py
	module/plugins/internal/UnZip.py
	module/plugins/internal/XFSCrypter.py
	module/plugins/internal/XFSHoster.py

1 files changed, 12 insertions, 47 deletions

diff --git a/module/plugins/hooks/LinkdecrypterCom.py b/module/plugins/hooks/LinkdecrypterCom.py
index fff596386..f85a598bc 100644
--- a/module/plugins/hooks/LinkdecrypterCom.py
+++ b/module/plugins/hooks/LinkdecrypterCom.py
@@ -2,59 +2,24 @@
 
 import re
 
-from pyload.network.RequestFactory import getURL
-from pyload.plugin.Addon import Addon
-from pyload.utils import remove_chars
+from module.plugins.internal.MultiHook import MultiHook
 
 
-class LinkdecrypterCom(Addon):
+class LinkdecrypterCom(MultiHook):
     __name__    = "LinkdecrypterCom"
     __type__    = "hook"
-    __version__ = "0.21"
+    __version__ = "1.02"
+
+    __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__ = """Linkdecrypter.com hook plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
-
-
-    def activate(self):
-        try:
-            self.loadPatterns()
-        except Exception, e:
-            self.logError(e)
-
-
-    def loadPatterns(self):
-        html = getURL("http://linkdecrypter.com/")
-
-        m = re.search(r'<title>', html)
-        if m is None:
-            self.logError(_("Linkdecrypter site is down"))
-            return
-
-        m = re.search(r'<b>Supported\(\d+\)</b>: <i>([^+<]*)', html)
-        if m is None:
-            self.logError(_("Crypter list not found"))
-            return
-
-        builtin = [name.lower() for name in self.core.pluginManager.crypterPlugins.keys()]
-        builtin.append("downloadserienjunkiesorg")
-
-        crypter_pattern = re.compile("(\w[\w.-]+)")
-        online = []
-        for crypter in m.group(1).split(', '):
-            m = re.match(crypter_pattern, crypter)
-            if m and remove_chars(m.group(1), "-.") not in builtin:
-                online.append(m.group(1).replace(".", "\\."))
-
-        if not online:
-            self.logError(_("Crypter list is empty"))
-            return
-
-        regexp = r'https?://([^.]+\.)*?(%s)/.*' % '|'.join(online)
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
-        dict = self.core.pluginManager.crypterPlugins[self.__name__]
-        dict['pattern'] = regexp
-        dict['re'] = re.compile(regexp)
 
-        self.logDebug("Loaded pattern: %s" % regexp)
+    def getCrypters(self):
+        return re.search(r'>Supported\(\d+\)</b>: <i>(.[\w.\-, ]+)',
+                         self.getURL("http://linkdecrypter.com/").replace("(g)", "")).group(1).split(', ')