summaryrefslogtreecommitdiffstats
path: root/Plugins
diff options
context:
space:
mode:
authorGravatar spoob <spoob@gmx.de> 2009-06-23 23:11:17 +0200
committerGravatar spoob <spoob@gmx.de> 2009-06-23 23:11:17 +0200
commita531493acbaa0cb94d60e7ae353a8bf4a92da900 (patch)
tree862e1b6d603e162d462811c3dc76bc1aba3f987b /Plugins
parentcli able to delete links in queue (diff)
downloadpyload-a531493acbaa0cb94d60e7ae353a8bf4a92da900.tar.xz
fixed 4chan user wish
Diffstat (limited to 'Plugins')
-rw-r--r--Plugins/FourChan.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/Plugins/FourChan.py b/Plugins/FourChan.py
index 020270e9b..840274457 100644
--- a/Plugins/FourChan.py
+++ b/Plugins/FourChan.py
@@ -12,14 +12,13 @@ class FourChan(Plugin):
props = {}
props['name'] = "FourChan"
props['type'] = "container"
- props['pattern'] = r"http://(www\.)?(img\.)?(zip\.)?4chan.org/\w+/res/"
+ props['pattern'] = r"http://(www\.)?(img\.)?(zip\.)?4chan.org/\w+/(res/|imgboard\.html)"
props['version'] = "0.1"
props['description'] = """4chan.org Thread Download Plugin"""
props['author_name'] = ("Spoob")
props['author_mail'] = ("Spoob@pyload.org")
self.props = props
self.parent = parent
- print True
self.html = None
def file_exists(self):
@@ -30,4 +29,13 @@ class FourChan(Plugin):
def proceed(self, url, location):
url = self.parent.url
html = self.req.load(url)
- self.links = re.findall('File : <a href="(http://(?:img\.)?(?:zip\.)?4chan\.org/\w{,3}/src/\d*\..{3})"', html)
+ link_pattern = ""
+ temp_links = []
+ if "imagebord.html" in url:
+ link_pattern = '[<a href="(res/\d*\.html)">Reply</a>]'
+ temp_links = re.findall(link_pattern, html)
+ for link in re.findall(link_pattern, html):
+ temp_links.append(link)
+ else:
+ temp_links = re.findall('File : <a href="(http://(?:img\.)?(?:zip\.)?4chan\.org/\w{,3}/src/\d*\..{3})"', html)
+ self.links = temp_links