Fixed broken plugins after dbd7a02ab03dcc97a6d0eb0c6fcc95a75a63cc6d

1 files changed, 0 insertions, 75 deletions

diff --git a/pyload/plugins/hoster/LuckyShareNet.py b/pyload/plugins/hoster/LuckyShareNet.py
index 5f6b26493..08e44d9f6 100644
--- a/pyload/plugins/hoster/LuckyShareNet.py
+++ b/pyload/plugins/hoster/LuckyShareNet.py
@@ -1,77 +1,3 @@
-<<<<<<< HEAD:pyload/plugins/hoster/LuckyShareNet.py
-# -*- coding: utf-8 -*-
-
-import re
-from module.lib.bottle import json_loads
-
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-from module.plugins.ReCaptcha import ReCaptcha
-
-
-class LuckyShareNet(SimpleHoster):
-    __name__ = "LuckyShareNet"
-    __type__ = "hoster"
-    __pattern__ = r"https?://(www\.)?luckyshare.net/(?P<ID>\d{10,})"
-    __version__ = "0.02"
-    __description__ = """LuckyShare.net Download Hoster"""
-    __author_name__ = ("stickell")
-    __author_mail__ = ("l.stickell@yahoo.it")
-
-    FILE_INFO_PATTERN = r"<h1 class='file_name'>(?P<N>\S+)</h1>\s*<span class='file_size'>Filesize: (?P<S>[\d.]+)(?P<U>\w+)</span>"
-    FILE_OFFLINE_PATTERN = 'There is no such file available'
-    RECAPTCHA_KEY = '6LdivsgSAAAAANWh-d7rPE1mus4yVWuSQIJKIYNw'
-
-    def parseJson(self, rep):
-        if 'AJAX Error' in rep:
-            html = self.load(self.pyfile.url, decode=True)
-            m = re.search(r"waitingtime = (\d+);", html)
-            if m:
-                waittime = int(m.group(1))
-                self.logDebug('You have to wait %d seconds between free downloads' % waittime)
-                self.retry(wait_time=waittime)
-            else:
-                self.parseError('Unable to detect wait time between free downloads')
-        elif 'Hash expired' in rep:
-            self.retry(reason='Hash expired')
-        return json_loads(rep)
-
-    # TODO: There should be a filesize limit for free downloads
-    # TODO: Some files could not be downloaded in free mode
-    def handleFree(self):
-        file_id = re.search(self.__pattern__, self.pyfile.url).group('ID')
-        self.logDebug('File ID: ' + file_id)
-        rep = self.load(r"http://luckyshare.net/download/request/type/time/file/" + file_id, decode=True)
-        self.logDebug('JSON: ' + rep)
-        json = self.parseJson(rep)
-
-        self.setWait(int(json['time']))
-        self.wait()
-
-        recaptcha = ReCaptcha(self)
-        for i in xrange(5):
-            challenge, response = recaptcha.challenge(self.RECAPTCHA_KEY)
-            rep = self.load(r"http://luckyshare.net/download/verify/challenge/%s/response/%s/hash/%s" %
-                            (challenge, response, json['hash']), decode=True)
-            self.logDebug('JSON: ' + rep)
-            if 'link' in rep:
-                json.update(self.parseJson(rep))
-                self.correctCaptcha()
-                break
-            elif 'Verification failed' in rep:
-                self.logInfo('Wrong captcha')
-                self.invalidCaptcha()
-            else:
-                self.parseError('Unable to get downlaod link')
-
-        if not json['link']:
-            self.fail("No Download url retrieved/all captcha attempts failed")
-
-        self.logDebug('Direct URL: ' + json['link'])
-        self.download(json['link'])
-
-
-getInfo = create_getInfo(LuckyShareNet)
-=======
 # -*- coding: utf-8 -*-
 
 import re
@@ -144,4 +70,3 @@ class LuckyShareNet(SimpleHoster):
 
 
 getInfo = create_getInfo(LuckyShareNet)
->>>>>>> dd30ed8... Using CaptchaService to make them works on 0.5:module/plugins/hoster/LuckyShareNet.py