summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorGravatar spoob <spoob@gmx.de> 2009-12-20 23:45:18 +0100
committerGravatar spoob <spoob@gmx.de> 2009-12-20 23:45:18 +0100
commit91b1ff7e83a4576ade65792b9c402e2f970c5ef5 (patch)
tree3b30bce862ba1f0adfaf89d456edba6987ad623e /module
parentcli + web fixes (diff)
downloadpyload-91b1ff7e83a4576ade65792b9c402e2f970c5ef5.tar.xz
fixed zippyshare
Diffstat (limited to 'module')
-rw-r--r--module/plugins/LinkList.py10
-rw-r--r--module/plugins/ZippyshareCom.py13
2 files changed, 10 insertions, 13 deletions
diff --git a/module/plugins/LinkList.py b/module/plugins/LinkList.py
index 92508ce29..fc737e8c5 100644
--- a/module/plugins/LinkList.py
+++ b/module/plugins/LinkList.py
@@ -29,11 +29,11 @@ class LinkList(Plugin):
if link != "\n":
tmpLinks.append(link.replace("\n", ""))
txt.close()
-
- if not self.parent.core.config['general']['debug_mode']:
- txt = open(linkList, 'w')
- txt.write("")
- txt.close()
+#~
+ #~ if not self.parent.core.config['general']['debug_mode']:
+ #~ txt = open(linkList, 'w')
+ #~ txt.write("")
+ #~ txt.close()
#@TODO: maybe delete read txt file?
self.links = tmpLinks
diff --git a/module/plugins/ZippyshareCom.py b/module/plugins/ZippyshareCom.py
index 0c638087b..bec7f8c65 100644
--- a/module/plugins/ZippyshareCom.py
+++ b/module/plugins/ZippyshareCom.py
@@ -30,14 +30,11 @@ class ZippyshareCom(Plugin):
def get_file_url(self):
""" returns the absolute downloadable filepath
"""
- if self.html == None:
- self.download_html()
- if not self.want_reconnect:
- file_url = urllib.unquote(re.search("var \w* = 'fck(.*)';", self.html).group(1))
- return file_url
- else:
- return False
-
+ file_url_pattern = r"var \w* = '(http%.*?)';"
+ file_url_search = re.search(file_url_pattern, self.html).group(1)
+ file_url = urllib.unquote(file_url_search.replace("nnn", "aaa").replace("unlg", "v").replace("serwus", "zippyshare"))
+ return file_url
+
def get_file_name(self):
if self.html == None:
self.download_html()