Fix previous merge

3 files changed, 0 insertions, 289 deletions

diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
deleted file mode 100644
index 0acad3dba..000000000
--- a/module/plugins/hoster/XFileSharingPro.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
-
-
-class XFileSharingPro(XFSHoster):
-    __name__    = "XFileSharingPro"
-    __type__    = "hoster"
-    __version__ = "0.43"
-
-    __pattern__ = r'^unmatchable$'
-
-    __description__ = """XFileSharingPro dummy hoster plugin for hook"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    URL_REPLACEMENTS = [("/embed-", "/")]
-
-
-    def _log(self, type, args):
-        msg = " | ".join([str(a).strip() for a in args if a])
-        logger = getattr(self.log, type)
-        logger("%s: %s: %s" % (self.__name__, self.HOSTER_NAME, msg or _("%s MARK" % type.upper())))
-
-
-    def init(self):
-        super(XFileSharingPro, self).init()
-
-        self.__pattern__ = self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
-
-        self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group(1).lower()
-        self.HOSTER_NAME = "".join([str.capitalize() for str in self.HOSTER_DOMAIN.split('.')])
-
-        account = self.core.accountManager.getAccountPlugin(self.HOSTER_NAME)
-
-        if account and account.canUse():
-            self.account = account
-        elif self.account:
-            self.account.HOSTER_DOMAIN = self.HOSTER_DOMAIN
-        else:
-            return
-
-        self.user, data = self.account.selectAccount()
-        self.req = self.account.getAccountRequest(self.user)
-        self.premium = self.account.isPremium(self.user)
-
-
-    def setup(self):
-        self.chunkLimit = 1
-        self.resumeDownload = self.premium
-        self.multiDL = True
-
-
-getInfo = create_getInfo(XFileSharingPro)
diff --git a/module/plugins/hoster/ZShareNet.py b/module/plugins/hoster/ZShareNet.py
deleted file mode 100644
index dc96facbe..000000000
--- a/module/plugins/hoster/ZShareNet.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
-
-
-class ZShareNet(DeadHoster):
-    __name__    = "ZShareNet"
-    __type__    = "hoster"
-    __version__ = "0.21"
-
-    __pattern__ = r'https?://(?:ww[2w]\.)?zshares?\.net/.+'
-
-    __description__ = """ZShare.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("espes", None),
-                       ("Cptn Sandwich", None)]
-
-
-getInfo = create_getInfo(ZShareNet)
diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
deleted file mode 100644
index 7009e6986..000000000
--- a/module/plugins/internal/CaptchaService.py
+++ /dev/null
@@ -1,213 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from random import random
-
-
-class CaptchaService:
-    __name__    = "CaptchaService"
-    __version__ = "0.15"
-
-    __description__ = """Base captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
-
-
-    KEY_PATTERN = None
-
-    key = None  #: last key detected
-
-
-    def __init__(self, plugin):
-        self.plugin = plugin
-
-
-    def detect_key(self, html=None):
-        if not html:
-            if hasattr(self.plugin, "html") and self.plugin.html:
-                html = self.plugin.html
-            else:
-                errmsg = _("%s html not found") % self.__name__
-                self.plugin.fail(errmsg)  #@TODO: replace all plugin.fail(errmsg) with plugin.error(errmsg) in 0.4.10
-                raise TypeError(errmsg)
-
-        m = re.search(self.KEY_PATTERN, html)
-        if m:
-            self.key = m.group("KEY")
-            self.plugin.logDebug("%s key: %s" % (self.__name__, self.key))
-            return self.key
-        else:
-            self.plugin.logDebug("%s key not found" % self.__name__)
-            return None
-
-
-    def challenge(self, key=None):
-        raise NotImplementedError
-
-
-    def result(self, server, challenge):
-        raise NotImplementedError
-
-
-class ReCaptcha(CaptchaService):
-    __name__    = "ReCaptcha"
-    __version__ = "0.08"
-
-    __description__ = """ReCaptcha captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
-
-
-    KEY_PATTERN = r'recaptcha(/api|\.net)/(challenge|noscript)\?k=(?P<KEY>[\w-]+)'
-    KEY_AJAX_PATTERN = r'Recaptcha\.create\s*\(\s*["\'](?P<KEY>[\w-]+)'
-
-
-    def detect_key(self, html=None):
-        if not html:
-            if hasattr(self.plugin, "html") and self.plugin.html:
-                html = self.plugin.html
-            else:
-                errmsg = _("ReCaptcha html not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
-
-        m = re.search(self.KEY_PATTERN, html) or re.search(self.KEY_AJAX_PATTERN, html)
-        if m:
-            self.key = m.group("KEY")
-            self.plugin.logDebug("ReCaptcha key: %s" % self.key)
-            return self.key
-        else:
-            self.plugin.logDebug("ReCaptcha key not found")
-            return None
-
-
-    def challenge(self, key=None):
-        if not key:
-            if self.detect_key():
-                key = self.key
-            else:
-                errmsg = _("ReCaptcha key not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
-
-        js = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={'k': key})
-        try:
-            challenge = re.search("challenge : '(.+?)',", js).group(1)
-            server = re.search("server : '(.+?)',", js).group(1)
-        except:
-            self.plugin.error("ReCaptcha challenge pattern not found")
-
-        result = self.result(server, challenge)
-
-        self.plugin.logDebug("ReCaptcha result: %s" % result, "challenge: %s" % challenge)
-
-        return challenge, result
-
-
-    def result(self, server, challenge):
-        return self.plugin.decryptCaptcha("%simage" % server, get={'c': challenge},
-                                          cookies=True, forceUser=True, imgtype="jpg")
-
-
-class AdsCaptcha(CaptchaService):
-    __name__    = "AdsCaptcha"
-    __version__ = "0.05"
-
-    __description__ = """AdsCaptcha captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
-
-
-    ID_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*CaptchaId=(?P<ID>\d+)'
-    KEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*PublicKey=(?P<KEY>[\w-]+)'
-
-
-    def detect_key(self, html=None):
-        if not html:
-            if hasattr(self.plugin, "html") and self.plugin.html:
-                html = self.plugin.html
-            else:
-                errmsg = _("AdsCaptcha html not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
-
-        m = re.search(self.ID_PATTERN, html)
-        n = re.search(self.KEY_PATTERN, html)
-        if m and n:
-            self.key = (m.group("ID"), m.group("KEY"))
-            self.plugin.logDebug("AdsCaptcha id|key: %s | %s" % self.key)
-            return self.key
-        else:
-            self.plugin.logDebug("AdsCaptcha id or key not found")
-            return None
-
-
-    def challenge(self, key=None):  #: key is a tuple(CaptchaId, PublicKey)
-        if not key:
-            if self.detect_key():
-                key = self.key
-            else:
-                errmsg = _("AdsCaptcha key not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
-
-        CaptchaId, PublicKey = key
-
-        js = self.plugin.req.load("http://api.adscaptcha.com/Get.aspx", get={'CaptchaId': CaptchaId, 'PublicKey': PublicKey})
-        try:
-            challenge = re.search("challenge: '(.+?)',", js).group(1)
-            server = re.search("server: '(.+?)',", js).group(1)
-        except:
-            self.plugin.error("AdsCaptcha challenge pattern not found")
-
-        result = self.result(server, challenge)
-
-        self.plugin.logDebug("AdsCaptcha result: %s" % result, "challenge: %s" % challenge)
-
-        return challenge, result
-
-
-    def result(self, server, challenge):
-        return self.plugin.decryptCaptcha("%sChallenge.aspx" % server, get={'cid': challenge, 'dummy': random()},
-                                          cookies=True, imgtype="jpg")
-
-
-class SolveMedia(CaptchaService):
-    __name__    = "SolveMedia"
-    __version__ = "0.06"
-
-    __description__ = """SolveMedia captcha service plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("pyLoad Team", "admin@pyload.org")]
-
-
-    KEY_PATTERN = r'api\.solvemedia\.com/papi/challenge\.(no)?script\?k=(?P<KEY>.+?)["\']'
-
-
-    def challenge(self, key=None):
-        if not key:
-            if self.detect_key():
-                key = self.key
-            else:
-                errmsg = _("SolveMedia key not found")
-                self.plugin.fail(errmsg)
-                raise TypeError(errmsg)
-
-        html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript", get={'k': key})
-        try:
-            challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="([^"]+)">',
-                                  html).group(1)
-            server = "http://api.solvemedia.com/papi/media"
-        except:
-            self.plugin.error("SolveMedia challenge pattern not found")
-
-        result = self.result(server, challenge)
-
-        self.plugin.logDebug("SolveMedia result: %s" % result, "challenge: %s" % challenge)
-
-        return challenge, result
-
-
-    def result(self, server, challenge):
-        return self.plugin.decryptCaptcha(server, get={'c': challenge}, imgtype="gif")