From 962286d391ff1375f2b95bb37f99bbc9286d7b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damjan=20Ko=C5=A1ir?= Date: Thu, 14 May 2015 23:06:12 +1200 Subject: [PATCH] fixed OctopusPie --- dosagelib/plugins/o.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dosagelib/plugins/o.py b/dosagelib/plugins/o.py index 7f10f5e13..799cb2f6c 100644 --- a/dosagelib/plugins/o.py +++ b/dosagelib/plugins/o.py @@ -8,16 +8,13 @@ from ..helpers import indirectStarter from ..util import tagre -class OctopusPie(_BasicScraper): +class OctopusPie(_ParserScraper): url = 'http://www.octopuspie.com/' rurl = escape(url) - starter = indirectStarter(url, - compile(tagre("a", "href", r'(%s[^"]+)' % rurl) + - tagre("img", "src", r'%sjunk/latest\.png' % rurl))) stripUrl = url + '%s/' firstStripUrl = stripUrl % '2007-05-14/001-pea-wiggle' - imageSearch = compile(tagre("img", "src", r'(%sstrippy/[^"]+)' % rurl)) - prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl, after="prev")) + imageSearch = '//img[@title]' + prevSearch = '//a[@rel="prev"]' help = 'Index format: yyyy-mm-dd/nnn-strip-name'