ShareRapidCom: rewritten most of the plugin

1 files changed, 20 insertions, 57 deletions

diff --git a/module/plugins/hoster/ShareRapidCom.py b/module/plugins/hoster/ShareRapidCom.py
index 42bdaa4e3..82f98d73c 100644
--- a/module/plugins/hoster/ShareRapidCom.py
+++ b/module/plugins/hoster/ShareRapidCom.py
@@ -2,54 +2,32 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from pycurl import HTTPHEADER
-from module.network.RequestFactory import getRequest, getURL
 from module.network.HTTPRequest import BadHeader
-from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo
-from module.common.json_layer import json_loads
-
-
-def checkFile(url):
-    response = getURL("http://share-rapid.com/checkfiles.php", post={"files": url}, decode=True)
-    info = json_loads(response)
-
-    if "error" in info:
-        if info['error'] == False:
-            info['name'] = info['filename']
-            info['status'] = 2
-        elif info['msg'] == "Not found":
-            info['status'] = 1  # offline
-        elif info['msg'] == "Service Unavailable":
-            info['status'] = 6  # temp.offline
-
-    return info
+from module.network.RequestFactory import getRequest
+from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo, replace_patterns
 
 
 def getInfo(urls):
+    h = getRequest()
+    h.c.setopt(HTTPHEADER,
+               ["Accept: text/html",
+                "User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:25.0) Gecko/20100101 Firefox/25.0"])
     for url in urls:
-        info = checkFile(url)
-        if "filename" in info:
-            yield info['name'], info['size'], info['status'], url
-        else:
-            file_info = (url, 0, 3, url)
-            h = getRequest()
-            try:
-                h.c.setopt(HTTPHEADER, ["Accept: text/html"])
-                html = h.load(url, cookies=True, decode=True)
-                file_info = parseFileInfo(ShareRapidCom, url, html)
-            finally:
-                h.close()
-                yield file_info
+        html = h.load(url, decode=True)
+        file_info = parseFileInfo(ShareRapidCom, replace_patterns(url, ShareRapidCom.FILE_URL_REPLACEMENTS), html)
+        yield file_info
 
 
 class ShareRapidCom(SimpleHoster):
     __name__ = "ShareRapidCom"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:www\.)?((share(-?rapid\.(biz|com|cz|info|eu|net|org|pl|sk)|-(central|credit|free|net)\.cz|-ms\.net)|(s-?rapid|rapids)\.(cz|sk))|(e-stahuj|mediatack|premium-rapidshare|rapidshare-premium|qiuck)\.cz|kadzet\.com|stahuj-zdarma\.eu|strelci\.net|universal-share\.com)/stahuj/(\w+)"
-    __version__ = "0.52"
+    __pattern__ = r"http://(?:www\.)?((share(-?rapid\.(biz|com|cz|info|eu|net|org|pl|sk)|-(central|credit|free|net)\.cz|-ms\.net)|(s-?rapid|rapids)\.(cz|sk))|(e-stahuj|mediatack|premium-rapidshare|rapidshare-premium|qiuck)\.cz|kadzet\.com|stahuj-zdarma\.eu|strelci\.net|universal-share\.com)/stahuj/(?P<id>\w+)"
+    __version__ = "0.53"
     __description__ = """Share-rapid.com plugin - premium only"""
-    __author_name__ = ("MikyWoW", "zoidberg")
-    __author_mail__ = ("MikyWoW@seznam.cz", "zoidberg@mujmail.cz")
+    __author_name__ = ("MikyWoW", "zoidberg", "stickell")
+    __author_mail__ = ("MikyWoW@seznam.cz", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
 
     FILE_NAME_PATTERN = r'<h1[^>]*><span[^>]*>(?:<a[^>]*>)?(?P<N>[^<]+)'
     FILE_SIZE_PATTERN = r'<td class="i">Velikost:</td>\s*<td class="h"><strong>\s*(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</strong></td>'
@@ -59,7 +37,7 @@ class ShareRapidCom(SimpleHoster):
     ERR_LOGIN_PATTERN = ur'<div class="error_div"><strong>Stahování je přístupné pouze přihlášeným uživatelům'
     ERR_CREDIT_PATTERN = ur'<div class="error_div"><strong>Stahování zdarma je možné jen přes náš'
 
-    FILE_URL_REPLACEMENTS = [(__pattern__, r'http://share-rapid.com/stahuj/\1')]
+    FILE_URL_REPLACEMENTS = [(__pattern__, r'http://share-rapid.com/stahuj/\g<id>')]
 
     def setup(self):
         self.chunkLimit = 1
@@ -69,35 +47,20 @@ class ShareRapidCom(SimpleHoster):
         if not self.account:
             self.fail("User not logged in")
 
-        self.info = checkFile(pyfile.url)
-        self.logDebug(self.info)
-
-        pyfile.status = self.info['status']
-
-        if pyfile.status == 2:
-            pyfile.name = self.info['name']
-            pyfile.size = self.info['size']
-        elif pyfile.status == 1:
-            self.offline()
-        elif pyfile.status == 6:
-            self.tempOffline()
-        else:
-            self.fail("Unexpected file status")
-
-        url = "http://share-rapid.com/stahuj/%s" % self.info['filepath']
         try:
-            self.html = self.load(url, decode=True)
+            self.html = self.load(pyfile.url, decode=True)
         except BadHeader, e:
             self.account.relogin(self.user)
             self.retry(3, 0, str(e))
 
+        self.getFileInfo()
+
         found = re.search(self.DOWNLOAD_URL_PATTERN, self.html)
-        if found is not None:
+        if found:
             link = found.group(1)
             self.logDebug("Premium link: %s" % link)
 
-            self.check_data = {"size": pyfile.size}
-            self.download(link)
+            self.download(link, disposition=True)
         else:
             if re.search(self.ERR_LOGIN_PATTERN, self.html):
                 self.relogin(self.user)