more hoster disabled

2 files changed, 10 insertions, 74 deletions

diff --git a/module/plugins/hoster/FilejungleCom.py b/module/plugins/hoster/FilejungleCom.py
index b880086a6..7aa7eca37 100644
--- a/module/plugins/hoster/FilejungleCom.py
+++ b/module/plugins/hoster/FilejungleCom.py
@@ -21,11 +21,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 from module.network.RequestFactory import getURL
 from module.plugins.ReCaptcha import ReCaptcha
 
+def getInfo(urls):
+    yield [(url, 0, 1, url) for url in urls]
+
 class FilejungleCom(SimpleHoster):
     __name__ = "FilejungleCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:www\.)?filejungle\.com/f/([^/]+).*"
-    __version__ = "0.23"
+    __version__ = "0.24"
     __description__ = """Filejungle.com plugin - free only"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
@@ -36,50 +39,5 @@ class FilejungleCom(SimpleHoster):
     WAIT_TIME_PATTERN = r'<h1>Please wait for (\d+) seconds to download the next file\.</h1>'
 
     def handleFree(self):       
-        file_id = re.search(self.__pattern__, self.pyfile.url).group(1)
-        url = "http://www.filejungle.com/f/%s" % file_id 
-        self.logDebug("File ID: %s" % file_id)        
-           
-        # Get captcha
-        found = re.search(self.RECAPTCHA_KEY_PATTERN, self.html) 
-        if not found: self.fail("Captcha key not found")
-        captcha_key = found.group(1)
-        
-        json_response = self.load(self.pyfile.url, post = {"checkDownload" :	"check"}, decode = True)
-        self.logDebug(json_response)     
-        if r'"success":"showCaptcha"' in json_response:
-            recaptcha = ReCaptcha(self)
-            for i in range(5):
-                captcha_challenge, captcha_response = recaptcha.challenge(captcha_key)
-                self.logDebug("RECAPTCHA: %s : %s : %s" % (captcha_key, captcha_challenge, captcha_response))
-
-                json_response = self.load("http://www.filejungle.com/checkReCaptcha.php", post = {
-                    "recaptcha_challenge_field" : captcha_challenge, 	
-                    "recaptcha_response_field" : captcha_response,	
-                    "recaptcha_shortencode_field" :	file_id 
-                    }, decode = True)
-                self.logDebug(json_response)  
-                if r'{"success":1}' in json_response:
-                    self.correctCaptcha() 
-                    break
-                else:
-                    self.invalidCaptcha()
-            else: self.fail("Invalid captcha")
-        elif r'"fail":"timeLimit"' in json_response:
-            self.html = self.load(url, post = {"checkDownload" :	"showError", "errorType" :	"timeLimit"})
-            found = re.search(self.WAIT_TIME_PATTERN, self.html)
-            self.retry(5, int(found.group(1)) if found else 1200, "Time limit reached")
-        else:
-            self.fail("Unknown server response")
-      
-        json_response = self.load(url, post = {"downloadLink" :	"wait"}, decode = True)
-        self.logDebug(json_response[:30])   
-        found = re.search(r'"waitTime":(\d+)', json_response)
-        if not found: self.fail("Cannot get wait time")
-        self.setWait(int(found.group(1)))
-        self.wait()
-        
-        response = self.load(url, post = {"downloadLink" :	"show"})     
-        self.download(url, post = {"download" :	"normal"})
+        self.fail("Hoster not longer available")
         
-getInfo = create_getInfo(FilejungleCom)
\ No newline at end of file
diff --git a/module/plugins/hoster/UploadStationCom.py b/module/plugins/hoster/UploadStationCom.py
index f89ef3ad1..fea5f4245 100644
--- a/module/plugins/hoster/UploadStationCom.py
+++ b/module/plugins/hoster/UploadStationCom.py
@@ -8,37 +8,13 @@ from module.plugins.ReCaptcha import ReCaptcha
 import re

 

 def getInfo(urls):

-    result = []

-    

-    for url in urls:

-        

-        # Get file info html

-        html = getURL(url) 

-        if re.search(UploadStationCom.FILE_OFFLINE_PATTERN, html):

-            result.append((url, 0, 1, url))

-            continue

-        

-        # Name

-        name = re.search(UploadStationCom.FILE_TITLE_PATTERN, html).group(1)

-        

-        # Size

-        m = re.search(UploadStationCom.FILE_SIZE_PATTERN, html)

-        value = float(m.group(1))

-        units = m.group(2)

-        pow = {'KB' : 1, 'MB' : 2, 'GB' : 3}[units] 

-        size = int(value*1024**pow)

-    

-        # Return info

-        result.append((name, size, 2, url))

-        

-    yield result

-

+    yield [(url, 0, 1, url) for url in urls]

 

 class UploadStationCom(Hoster):

     __name__ = "UploadStationCom"

     __type__ = "hoster"

     __pattern__ = r"http://(www\.)?uploadstation\.com/file/(?P<id>[A-Za-z0-9]+)"

-    __version__ = "0.31"

+    __version__ = "0.33"

     __description__ = """UploadStation.Com File Download Hoster"""

     __author_name__ = ("fragonib")

     __author_mail__ = ("fragonib[AT]yahoo[DOT]es")

@@ -61,6 +37,8 @@ class UploadStationCom(Hoster):
 

     def process(self, pyfile):

         

+	self.fail("Hoster not longer available")

+        

         # Get URL

         self.html = self.load(self.pyfile.url, ref=False, decode=True)

 

@@ -160,4 +138,4 @@ class UploadStationCom(Hoster):
             self.logDebug("Failed, you need to wait %d seconds for another download." % wait)

             self.setWait(wait + 3, True)

             self.wait()

-            self.retry()
\ No newline at end of file
+            self.retry()