Merge branch 'zac9/patch-2'

This commit is contained in:
Tobias Gruetzmacher 2014-12-10 00:03:08 +01:00
commit 5af4f45505

View file

@ -120,6 +120,17 @@ class OneQuestion(_BasicScraper):
help = 'Index format: n (unpadded)'
class Optipess(_BasicScraper):
description = u'a word you.d maybe end up with if you combined the two words "optimism" and "pessimism"'
url = 'http://www.optipess.com/'
stripUrl = url + '%s'
firstStripUrl = url + '2008/12/01/jason-friend-of-the-butterflies/'
imageSearch = compile(tagre("img", "src", r'(%scomics/[x|\d]+[^"]+\.[^"]+)' % url))
prevSearch = compile(tagre("a", "href", r'([^"]+)', after="navi navi-prev"))
textSearch = compile(tagre("img", "alt", r'([^"]+)', before=url))
help = 'Index format: yyyy/mm/dd/stripname'
class OrnerBoy(_BasicScraper):
url = 'http://www.orneryboy.com/'
rurl = escape(url)