From 421e31c961ef2e83ab221c9f7445bd3af59ccacd Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Thu, 4 Apr 2013 18:30:02 +0200 Subject: [PATCH] Fix Oglaf --- dosagelib/plugins/o.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dosagelib/plugins/o.py b/dosagelib/plugins/o.py index b9edae68e..299f0b0da 100644 --- a/dosagelib/plugins/o.py +++ b/dosagelib/plugins/o.py @@ -5,7 +5,7 @@ from re import compile from ..scraper import _BasicScraper from ..helpers import indirectStarter -from ..util import tagre +from ..util import tagre, urlopen class OctopusPie(_BasicScraper): @@ -30,9 +30,17 @@ class OddFish(_BasicScraper): class Oglaf(_BasicScraper): url = 'http://oglaf.com/' stripUrl = url + '%s/' - imageSearch = compile(tagre("img", "src", r'(/media-haha/comic/[^"]+)', before="strip")) - prevSearch = compile(tagre("a", "href", r'([^"]+)') + tagre("div", "id", "pvs")) + imageSearch = compile(tagre("img", "src", r'(http://media\.oglaf\.com/comic/[^"]+)', before="strip")) + prevSearch = compile(tagre("a", "href", r'(/[^"]+)') + tagre("div", "id", "pvs?")) help = 'Index format: stripname/nn' + adult = True + + @classmethod + def starter(cls): + # click the "I am 18" button + data = {"over18": " "} + urlopen(cls.url, cls.session, data=data, stream=False, referrer=cls.url) + return cls.url class OkCancel(_BasicScraper):