From 04038a2cf0c4c2d9cc9a0c8e8bf9beb6426afae8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 10 Jul 2014 03:02:26 +0200 Subject: Use parseError instead PluginParseError + unified all download pattern attributes as LINK_PATTERN + removed some old patterns (not used anymore) + other code cosmetics --- module/plugins/hoster/RemixshareCom.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'module/plugins/hoster/RemixshareCom.py') diff --git a/module/plugins/hoster/RemixshareCom.py b/module/plugins/hoster/RemixshareCom.py index dedb3b8e1..a0f67e0b2 100644 --- a/module/plugins/hoster/RemixshareCom.py +++ b/module/plugins/hoster/RemixshareCom.py @@ -1,11 +1,13 @@ # -*- coding: utf-8 -*- -#Testlink: -#http://remixshare.com/download/p946u -# + +# Test link: +# http://remixshare.com/download/p946u + +# Note: # The remixshare.com website is very very slow, so # if your download not starts because of pycurl timeouts: # Adjust timeouts in /usr/share/pyload/module/network/HTTPRequest.py -# + import re @@ -24,9 +26,9 @@ class RemixshareCom(SimpleHoster): FILE_INFO_PATTERN = r'title=\'.+?\'>(?P.+?) \((?P\d+) (?P\w+)\)<' OFFLINE_PATTERN = r'

Ooops!<' - WAIT_PATTERN = r'var XYZ = "(\d+)"' - FILE_URL_PATTERN = r'(http://remixshare.com/downloadfinal/.+?)"' - FILE_TOKEN_PATTERN = r'var acc = (\d+)' + LINK_PATTERN = r'(http://remixshare\.com/downloadfinal/.+?)"' + TOKEN_PATTERN = r'var acc = (\d+)' + WAIT_PATTERN = r'var XYZ = r"(\d+)"' def setup(self): @@ -34,12 +36,12 @@ class RemixshareCom(SimpleHoster): self.chunkLimit = 1 def handleFree(self): - b = re.search(self.FILE_URL_PATTERN, self.html) + b = re.search(self.LINK_PATTERN, self.html) if not b: - self.fail("Can not parse download url") - c = re.search(self.FILE_TOKEN_PATTERN, self.html) + self.parseError("Cannot parse download url") + c = re.search(self.TOKEN_PATTERN, self.html) if not c: - self.fail("Can not parse file token") + self.parseError("Cannot parse file token") dl_url = b.group(1) + c.group(1) #Check if we have to wait @@ -49,7 +51,7 @@ class RemixshareCom(SimpleHoster): self.wait(seconds.group(1)) # Finally start downloading... - self.logDebug("Download-URL: " + dl_url) + self.logDebug("Download URL = r" + dl_url) self.download(dl_url, disposition=True) -- cgit v1.2.3