Fix previous merge commit

3 files changed, 0 insertions, 177 deletions

diff --git a/module/plugins/hoster/DevhostSt.py b/module/plugins/hoster/DevhostSt.py
deleted file mode 100644
index 088ace93a..000000000
--- a/module/plugins/hoster/DevhostSt.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Test links:
-# http://d-h.st/mM8
-
-import re
-
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-
-
-class DevhostSt(SimpleHoster):
-    __name__ = "Devhost"
-    __type__ = "hoster"
-    __version__ = "0.01"
-
-    __pattern__ = r'http://(?:www\.)?d-h\.st/\w+'
-
-    __description__ = """d-h.st hoster plugin"""
-    __author_name__ = "zapp-brannigan"
-    __author_mail__ = "fuerst.reinje@web.de"
-
-
-    FILE_NAME_PATTERN = r'>Filename:</span> <div title="(?P<N>.+?)"'
-    FILE_SIZE_PATTERN = r'>Size:</span> (?P<S>[\d.]+) (?P<U>\w+)'
-
-    OFFLINE_PATTERN = r'>File Not Found<'
-    LINK_PATTERN = r'id="downloadfile" href="(.+?)"'
-
-
-    def setup(self):
-        self.multiDL = True
-        self.chunkLimit = 1
-
-
-    def handleFree(self):
-        m = re.search(self.LINK_PATTERN, self.html)
-        if m is None:
-            self.parseError("Download link not found")
-
-        dl_url = m.group(1)
-        self.logDebug("Download URL = " + dl_url)
-        self.download(dl_url, disposition=True)
-
-        check = self.checkDownload({'is_html': re.compile("html")})
-        if check == "is_html":
-            self.parseError("Downloaded file is an html file")
-
-
-getInfo = create_getInfo(DevhostSt)
diff --git a/module/plugins/hoster/DropboxCom.py b/module/plugins/hoster/DropboxCom.py
deleted file mode 100644
index ab63fc801..000000000
--- a/module/plugins/hoster/DropboxCom.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-
-
-class DropboxCom(SimpleHoster):
-    __name__ = "DropboxCom"
-    __type__ = "hoster"
-    __version__ = "0.01"
-
-    __pattern__ = r'https?://(?:www\.)?dropbox\.com/.+'
-
-    __description__ = """Dropbox.com hoster plugin"""
-    __author_name__ = "zapp-brannigan"
-    __author_mail__ = "fuerst.reinje@web.de"
-
-
-    FILE_NAME_PATTERN = r'<title>Dropbox - (?P<N>.+?)<'
-    FILE_SIZE_PATTERN = r'&nbsp;&middot;&nbsp; (?P<S>[\d,]+) (?P<U>\w+)'
-
-    OFFLINE_PATTERN = r'<title>Dropbox - (404|Shared link error)<'
-
-    SH_COOKIES = [(".dropbox.com", "lang", "en")]
-
-
-    def setup(self):
-        self.multiDL = True
-        self.chunkLimit = 1
-        self.resumeDownload = True
-
-
-    def handleFree(self):
-        self.download(self.pyfile.url, get={'dl': "1"})
-
-        check = self.checkDownload({'is_html': re.compile("html")})
-        if check == "is_html":
-            self.parseError("Downloaded file is an html file")
-
-
-getInfo = create_getInfo(DropboxCom)
diff --git a/module/plugins/hoster/KingfilesNet.py b/module/plugins/hoster/KingfilesNet.py
deleted file mode 100644
index e8aefa53b..000000000
--- a/module/plugins/hoster/KingfilesNet.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from module.plugins.internal.CaptchaService import SolveMedia
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-
-
-class KingfilesNet(SimpleHoster):
-    __name__ = "KingfilesNet"
-    __type__ = "hoster"
-    __version__ = "0.01"
-
-    __pattern__ = r'http://(?:www\.)?kingfiles\.net/(?P<ID>\w{12})'
-
-    __description__ = """Kingfiles.net hoster plugin"""
-    __author_name__ = ("zapp-brannigan", "Walter Purcaro")
-    __author_mail__ = ("fuerst.reinje@web.de", "vuolter@gmail.com")
-
-
-    FILE_NAME_PATTERN = r'name="fname" value="(?P<N>.+?)">'
-    FILE_SIZE_PATTERN = r'>Size: .+?">(?P<S>[\d.]+) (?P<U>\w+)'
-
-    OFFLINE_PATTERN = r'>(File Not Found</b><br><br>|File Not Found</h2>)'
-
-    RAND_ID_PATTERN = r'type=\"hidden\" name=\"rand\" value=\"(.+)\">'
-
-    LINK_PATTERN = r'var download_url = \'(.+)\';'
-
-
-    def setup(self):
-        self.multiDL = True
-        self.resumeDownload = True
-
-
-    def handleFree(self):
-        # Click the free user button
-        post_data = {'op': "download1",
-                     'usr_login': "",
-                     'id': file_info['ID'],
-                     'fname': self.pyfile.name,
-                     'referer': "",
-                     'method_free': "+"}
-        b = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True)
-
-        solvemedia = SolveMedia(self)
-
-        captcha_key = solvemedia.detect_key()
-        if captcha_key is None:
-            self.parseError("SolveMedia key not found")
-
-        self.logDebug("captcha_key", captcha_key)
-        captcha_challenge, captcha_response = solvemedia.challenge(captcha_key)
-
-        # Make the downloadlink appear and load the file
-        m = re.search(self.RAND_ID_PATTERN, b)
-        if m is None:
-            self.parseError("Random key not found")
-
-        rand = m.group(1)
-        self.logDebug("rand", rand)
-
-        post_data = {'op': "download2",
-                     'id': file_id,
-                     'rand': rand,
-                     'referer': self.pyfile.url,
-                     'method_free': "+",
-                     'method_premium': "",
-                     'adcopy_response': captcha_response,
-                     'adcopy_challenge': captcha_challenge,
-                     'down_direct': "1"}
-        c = self.load(self.pyfile.url, post=post_data, cookies=True, decode=True)
-
-        m = re.search(self.LINK_PATTERN, c)
-        if m is None:
-            self.parseError("Download url not found")
-
-        dl_url = m.group(1)
-        self.download(dl_url, cookies=True, disposition=True)
-
-        check = self.checkDownload({'is_html': re.compile("<html>")})
-        if check == "is_html":
-            self.parseError("Downloaded file is an html file")
-
-
-getInfo = create_getInfo(KingfilesNet)