From c25be987a3a8d536b8323455828b83f66870d81d Mon Sep 17 00:00:00 2001 From: godofdream Date: Mon, 6 Aug 2012 17:48:55 +0200 Subject: update Freakshare, IcyFiles, Zippyshare, C1neon, FshareVn-Ac, Filefactory-Ac Added BypassCaptcha - closed #647, #615, #639, #644, #562, #586, #642 --- module/plugins/hoster/FreakshareCom.py | 10 +++++++--- module/plugins/hoster/IcyFilesCom.py | 4 ++-- module/plugins/hoster/ZippyshareCom.py | 29 +++++++++++++++++++++++++---- 3 files changed, 34 insertions(+), 9 deletions(-) (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/FreakshareCom.py b/module/plugins/hoster/FreakshareCom.py index 29a0bda8f..56e02cbdc 100644 --- a/module/plugins/hoster/FreakshareCom.py +++ b/module/plugins/hoster/FreakshareCom.py @@ -9,7 +9,7 @@ class FreakshareCom(Hoster): __name__ = "FreakshareCom" __type__ = "hoster" __pattern__ = r"http://(?:www\.)?freakshare\.(net|com)/files/\S*?/" - __version__ = "0.36" + __version__ = "0.37" __description__ = """Freakshare.com Download Hoster""" __author_name__ = ("sitacuisses","spoob","mkaay", "Toilal") __author_mail__ = ("sitacuisses@yahoo.de","spoob@pyload.org","mkaay@mkaay.de", "toilal.dev@gmail.com") @@ -39,7 +39,8 @@ class FreakshareCom(Hoster): check = self.checkDownload({"bad": "bad try", "paralell": "> Sorry, you cant download more then 1 files at time. <", - "empty": "Warning: Unknown: Filename cannot be empty"}) + "empty": "Warning: Unknown: Filename cannot be empty", + "wrong_captcha": "Wrong Captcha!"}) if check == "bad": self.fail("Bad Try.") @@ -48,7 +49,10 @@ class FreakshareCom(Hoster): self.wait() self.retry() if check == "empty": - self.fail("File not downloadable") + self.fail("File not downloadable") + if check == "wrong_captcha": + self.invalidCaptcha() + self.retry() def prepare(self): pyfile = self.pyfile diff --git a/module/plugins/hoster/IcyFilesCom.py b/module/plugins/hoster/IcyFilesCom.py index 73dd5f7c9..09458732e 100644 --- a/module/plugins/hoster/IcyFilesCom.py +++ b/module/plugins/hoster/IcyFilesCom.py @@ -33,7 +33,7 @@ def getInfo(urls): size = re.search(IcyFilesCom.SIZE_PATTERN, html) if name is not None: name = name.group(1) - size = (size.group(1) * 1000000) + size = (int(size.group(1)) * 1000000) result.append((name, size, 2, url)) yield result @@ -42,7 +42,7 @@ class IcyFilesCom(Hoster): __name__ = "IcyFilesCom" __type__ = "hoster" __pattern__ = r"http://(?:www\.)?icyfiles\.com/.*" - __version__ = "0.02" + __version__ = "0.03" __description__ = """IcyFiles.com plugin - free only""" __author_name__ = ("godofdream") __author_mail__ = ("soilfiction@gmail.com") diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py index 0dde85e2c..001e2b296 100644 --- a/module/plugins/hoster/ZippyshareCom.py +++ b/module/plugins/hoster/ZippyshareCom.py @@ -10,7 +10,7 @@ class ZippyshareCom(SimpleHoster): __name__ = "ZippyshareCom" __type__ = "hoster" __pattern__ = r"(?Phttp://www\d{0,2}\.zippyshare.com)/v(?:/|iew.jsp.*key=)(?P\d+)" - __version__ = "0.33" + __version__ = "0.35" __description__ = """Zippyshare.com Download Hoster""" __author_name__ = ("spoob", "zoidberg") __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz") @@ -100,8 +100,29 @@ class ZippyshareCom(SimpleHoster): try: swf_data = self.load(swf_url) os.write(fd, swf_data) - - p = subprocess.Popen(['swfdump', '-a', fpath], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + # used for detecting if swfdump is instelled + def is_exe(ppath): + return os.path.isfile(ppath) and os.access(ppath, os.X_OK) + + program = 'swfdump' + swfdump = None + ppath, pname = os.path.split(program) + if ppath: + if is_exe(program): + swfdump = program + else: + for ppath in os.environ["PATH"].split(os.pathsep): + exe_file = os.path.join(ppath, program) + if is_exe(exe_file): + swfdump = exe_file + if swfdump is None: + self.fail("swfdump missing - install swftools") + # ok swfdump is installed move on... + + + + p = subprocess.Popen([swfdump, '-a', fpath], stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, err = p.communicate() if err: @@ -151,4 +172,4 @@ class ZippyshareCom(SimpleHoster): return url -getInfo = create_getInfo(ZippyshareCom) \ No newline at end of file +getInfo = create_getInfo(ZippyshareCom) -- cgit v1.2.3