diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-07-12 13:11:11 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-07-12 13:11:11 +0200 |
| commit | fc638ded28b7b222203fba9907b6bf7f828d1b7b (patch) | |
| tree | 7bc4f95042c9f4a036901837e74248b257506675 /pyload/plugins/hoster/ZippyshareCom.py | |
| parent | added legacy file to fix older plugins (diff) | |
| parent | Merge pull request #193 from vuolter/plugin/UnrestrictLi (diff) | |
| download | pyload-fc638ded28b7b222203fba9907b6bf7f828d1b7b.tar.xz | |
Merge remote-tracking branch 'origin/stable'
Conflicts:
module/plugins/accounts/Premium4Me.py
pyload/plugins/addons/Premium4Me.py
pyload/plugins/crypter/NCryptIn.py
pyload/plugins/hooks/Captcha9kw.py
pyload/plugins/hoster/Premium4Me.py
pyload/plugins/hoster/Xdcc.py
pyload/plugins/hoster/XvidstageCom.py
Diffstat (limited to 'pyload/plugins/hoster/ZippyshareCom.py')
| -rw-r--r-- | pyload/plugins/hoster/ZippyshareCom.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pyload/plugins/hoster/ZippyshareCom.py b/pyload/plugins/hoster/ZippyshareCom.py index 84974e7ba..756a92ef3 100644 --- a/pyload/plugins/hoster/ZippyshareCom.py +++ b/pyload/plugins/hoster/ZippyshareCom.py @@ -10,10 +10,10 @@ class ZippyshareCom(SimpleHoster): __name__ = "ZippyshareCom" __type__ = "hoster" __pattern__ = r"(?P<HOST>http://www\d{0,2}\.zippyshare.com)/v(?:/|iew.jsp.*key=)(?P<KEY>\d+)" - __version__ = "0.37" + __version__ = "0.38" __description__ = """Zippyshare.com Download Hoster""" - __author_name__ = ("spoob", "zoidberg") - __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz") + __author_name__ = ("spoob", "zoidberg", "stickell") + __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it") __config__ = [("swfdump_path", "string", "Path to swfdump", "")] FILE_NAME_PATTERN = r'>Name:</font>\s*<font [^>]*>(?P<N>[^<]+)</font><br />' @@ -62,7 +62,12 @@ class ZippyshareCom(SimpleHoster): found = re.search(self.DOWNLOAD_URL_PATTERN, self.html, re.S) if found: #Method #1: JS eval - url = self.js.eval("\n".join(found.groups())) + js = "\n".join(found.groups()) + regex = r"document.getElementById\(\\*'dlbutton\\*'\).omg" + omg = re.search(regex + r" = ([^;]+);", js).group(1) + js = re.sub(regex + r" = ([^;]+);", '', js) + js = re.sub(regex, omg, js) + url = self.js.eval(js) else: #Method #2: SWF eval seed_search = re.search(self.SEED_PATTERN, self.html) |