summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Stefano <l.stickell@yahoo.it> 2014-03-19 14:45:22 +0100
committerGravatar Stefano <l.stickell@yahoo.it> 2014-04-21 17:06:16 +0200
commit724fee6bc3ec7cab1a0ad0216fd485c061bed602 (patch)
tree13ee9c0880b4b9ac082681411b445931a1d4dae3
parentMerge pull request #546 from CrazYoshi/patch-1 (diff)
downloadpyload-724fee6bc3ec7cab1a0ad0216fd485c061bed602.tar.xz
Zippyshare: Fixed #545
Thanks @gaberad (cherry picked from commit 900994bdb2062f547baa7be7c5dc5f93e1927111)
-rw-r--r--pyload/plugins/hoster/ZippyshareCom.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pyload/plugins/hoster/ZippyshareCom.py b/pyload/plugins/hoster/ZippyshareCom.py
index 2df59c58f..221db7104 100644
--- a/pyload/plugins/hoster/ZippyshareCom.py
+++ b/pyload/plugins/hoster/ZippyshareCom.py
@@ -17,7 +17,7 @@ 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.44"
+ __version__ = "0.45"
__description__ = """Zippyshare.com Download Hoster"""
__author_name__ = ("spoob", "zoidberg", "stickell")
__author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
@@ -82,7 +82,8 @@ class ZippyshareCom(SimpleHoster):
js = re.sub(regex + r" = ([^;]+);", '', js)
js = re.sub(regex, omg, js)
js = re.sub(r"document.getElementById\(\\*'dlbutton\\*'\).href\s*= ", '', js)
- js = re.sub(r"function som(e|d)Function\(\) {", '', js)
+ js = re.sub(r"(function som(e|d)Function\(\) {)|(var som(e|d)function = function\(\) {)",
+ '', js, flags=re.I)
url = self.js.eval(js)
elif found and re.search(r"document.getElementById\(\\*'dlbutton\\*'\).href = \"", self.html):
js = "\n".join(found.groups())