summaryrefslogtreecommitdiffstats
path: root/Plugins
diff options
context:
space:
mode:
Diffstat (limited to 'Plugins')
-rw-r--r--Plugins/LixIn.py37
-rw-r--r--Plugins/ZippyshareCom.py9
2 files changed, 43 insertions, 3 deletions
diff --git a/Plugins/LixIn.py b/Plugins/LixIn.py
new file mode 100644
index 000000000..409c72f6d
--- /dev/null
+++ b/Plugins/LixIn.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.unescape import unescape
+from Plugin import Plugin
+
+class LixIn(Plugin):
+
+ def __init__(self, parent):
+ Plugin.__init__(self, parent)
+ props = {}
+ props['name'] = "LixIn"
+ props['type'] = "container"
+ props['pattern'] = r"http://(www.)?lix.in/"
+ props['version'] = "0.1"
+ props['description'] = """Lix.in Container Plugin"""
+ props['author_name'] = ("spoob")
+ props['author_mail'] = ("spoob@pyload.org")
+ self.props = props
+ self.parent = parent
+ self.html = None
+
+ def file_exists(self):
+ """ returns True or False
+ """
+ return True
+
+ def proceed(self, url, location):
+ url = self.parent.url
+ self.html = self.req.load(url)
+ new_link = ""
+ if not re.search("captcha_img.php", self.html):
+ new_link = re.search(r".*<iframe name=\"ifram\" src=\"(.*)\" marginwidth=\"0\".*", self.req.load(url, post={"submit" : "continue"})).group(1)
+
+ self.links = [new_link]
diff --git a/Plugins/ZippyshareCom.py b/Plugins/ZippyshareCom.py
index 4e69a5155..d61841ab0 100644
--- a/Plugins/ZippyshareCom.py
+++ b/Plugins/ZippyshareCom.py
@@ -26,7 +26,7 @@ class ZippyshareCom(Plugin):
def download_html(self):
url = self.parent.url
- self.html = self.req.load(url)
+ self.html = self.req.load(url, cookies=True)
self.time_plus_wait = time() + 12
def get_file_url(self):
@@ -35,7 +35,7 @@ class ZippyshareCom(Plugin):
if self.html == None:
self.download_html()
if not self.want_reconnect:
- file_url = urllib.unquote(re.search("var comeonguys = 'fck(.*)';", self.html).group(1))
+ file_url = urllib.unquote(re.search("var \w* = 'fck(.*)';", self.html).group(1))
return file_url
else:
return False
@@ -45,7 +45,6 @@ class ZippyshareCom(Plugin):
self.download_html()
if not self.want_reconnect:
file_name = re.search("<strong>Name: </strong>(.*)</font><br />", self.html).group(1)
- print "zippy",file_name
return file_name
else:
return self.parent.url
@@ -59,3 +58,7 @@ class ZippyshareCom(Plugin):
return False
else:
return True
+
+ def proceed(self, url, location):
+
+ self.req.download(url, location, cookies=True)