[RyushareCom] Update

3 files changed, 5 insertions, 94 deletions

diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py
index ca476366b..8c56ff20f 100644
--- a/module/plugins/accounts/RyushareCom.py
+++ b/module/plugins/accounts/RyushareCom.py
@@ -6,20 +6,11 @@ from module.plugins.internal.XFSAccount import XFSAccount
 class RyushareCom(XFSAccount):
     __name__    = "RyushareCom"
     __type__    = "account"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __description__ = """Ryushare.com account plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
-                       ("trance4us", None)]
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "ryushare.com"
-
-
-    def login(self, user, data, req):
-        req.lastURL = "http://ryushare.com/login.python"
-        html = req.load("http://ryushare.com/login.python",
-                        post={"login": user, "password": data['password'], "op": "login"})
-        if 'Incorrect Login or Password' in html or '>Error<' in html:
-            self.wrongPassword()
diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py
index 73cb0b0eb..0745a6c7e 100644
--- a/module/plugins/hooks/XFileSharingPro.py
+++ b/module/plugins/hooks/XFileSharingPro.py
@@ -8,7 +8,7 @@ from module.plugins.Hook import Hook
 class XFileSharingPro(Hook):
     __name__    = "XFileSharingPro"
     __type__    = "hook"
-    __version__ = "0.29"
+    __version__ = "0.30"
 
     __config__ = [("activated"       , "bool", "Activated"                     , True ),
                   ("use_hoster_list" , "bool", "Load listed hosters only"      , False),
@@ -30,8 +30,8 @@ class XFileSharingPro(Hook):
 
     HOSTER_BUILTIN  = [#WORKING HOSTERS:
                        "180upload.com", "backin.net", "eyesfile.ca", "file4safe.com", "fileband.com", "filedwon.com",
-                       "fileparadox.in", "filevice.com", "hostingbulk.com", "linestorage.com", "ravishare.com", "salefiles.com",
-                       "sendmyway.com", "sharesix.com", "thefile.me", "verzend.be", "xvidstage.com",
+                       "fileparadox.in", "filevice.com", "hostingbulk.com", "linestorage.com", "ravishare.com", "ryushare.com",
+                       "salefiles.com", "sendmyway.com", "sharesix.com", "thefile.me", "verzend.be", "xvidstage.com",
                        #NOT TESTED:
                        "101shared.com", "4upfiles.com", "filemaze.ws", "filenuke.com", "linkzhost.com", "mightyupload.com",
                        "rockdizfile.com", "sharebeast.com", "sharerepo.com", "shareswift.com", "uploadbaz.com", "uploadc.com",
diff --git a/module/plugins/hoster/RyushareCom.py b/module/plugins/hoster/RyushareCom.py
deleted file mode 100644
index 0964c51fc..000000000
--- a/module/plugins/hoster/RyushareCom.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Test links:
-# http://ryushare.com/cl0jy8ric2js/random.bin
-
-import re
-
-from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
-from module.plugins.internal.CaptchaService import SolveMedia
-
-
-class RyushareCom(XFSHoster):
-    __name__    = "RyushareCom"
-    __type__    = "hoster"
-    __version__ = "0.20"
-
-    __pattern__ = r'http://(?:www\.)?ryushare\.com/\w+'
-
-    __description__ = """Ryushare.com hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
-                       ("stickell", "l.stickell@yahoo.it"),
-                       ("quareevo", "quareevo@arcor.de")]
-
-
-    HOSTER_DOMAIN = "ryushare.com"
-
-    WAIT_PATTERN = r'You have to wait ((?P<H>\d+) hour[s]?, )?((?P<M>\d+) minute[s], )?(?P<S>\d+) second[s]'
-
-    LINK_PATTERN = r'<a href="([^"]+)">Click here to download<'
-
-
-    def getDownloadLink(self):
-        retry = False
-        self.html = self.load(self.pyfile.url)
-        action, inputs = self.parseHtmlForm(input_names={"op": re.compile("^download")})
-        if "method_premium" in inputs:
-            del inputs['method_premium']
-
-        self.html = self.load(self.pyfile.url, post=inputs)
-        action, inputs = self.parseHtmlForm('F1')
-
-        self.setWait(65)
-        # Wait 1 hour
-        if "You have reached the download-limit" in self.html:
-            self.setWait(1 * 60 * 60, True)
-            retry = True
-
-        m = re.search(self.WAIT_PATTERN, self.html)
-        if m:
-            wait = m.groupdict(0)
-            waittime = int(wait['H']) * 60 * 60 + int(wait['M']) * 60 + int(wait['S'])
-            self.setWait(waittime, True)
-            retry = True
-
-        self.wait()
-        if retry:
-            self.retry()
-
-        for _i in xrange(5):
-            solvemedia = SolveMedia(self)
-            challenge, response = solvemedia.challenge()
-
-            inputs['adcopy_challenge'] = challenge
-            inputs['adcopy_response'] = response
-
-            self.html = self.load(self.pyfile.url, post=inputs)
-            if "WRONG CAPTCHA" in self.html:
-                self.invalidCaptcha()
-            else:
-                self.correctCaptcha()
-                break
-        else:
-            self.fail(_("You have entered 5 invalid captcha codes"))
-
-        if "Click here to download" in self.html:
-            return re.search(r'<a href="([^"]+)">Click here to download</a>', self.html).group(1)
-
-
-getInfo = create_getInfo(RyushareCom)