From 73e1af7aba7b2153f88cf4dedf101fa16c4a6fc8 Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Thu, 6 Feb 2014 19:57:56 +0100 Subject: [PATCH] Fixed FredoAndPidjin --- doc/changelog.txt | 3 +++ dosagelib/plugins/f.py | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/changelog.txt b/doc/changelog.txt index fea1d4f0b..ac97a76ec 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -3,6 +3,9 @@ Dosage 2.13 (released xx.xx.2014) Features: - comics: Added OhJoySexToy, TheGentlemansArmchair. +Fixes: +- comics: Fixed FredoAndPidjin. + Dosage 2.12 (released 24.1.2014) diff --git a/dosagelib/plugins/f.py b/dosagelib/plugins/f.py index 69242eaec..f6b1e32b1 100755 --- a/dosagelib/plugins/f.py +++ b/dosagelib/plugins/f.py @@ -164,8 +164,11 @@ class FredoAndPidjin(_BasicScraper): url = 'http://www.pidjin.net/' stripUrl = url + '%s/' firstStripUrl = stripUrl % '2006/02/19/goofy-monday' - help = 'Index format: yyyy/mm/dd/name' - imageSearch = compile(tagre('img', 'src', '(http://cdn\.pidjin\.net/wp-content/uploads/\d+/\d+/[^"]+\.[a-z]+)')) + help = 'Index format: yyyy/mm/dd/number-index' + imageSearch = ( + compile(tagre('img', 'src', '(http://cdn\.pidjin\.net/wp-content/uploads/\d+/\d+/\d+[^"]+\.[a-z]+)')), + compile(tagre('img', 'src', '(http://cdn\.pidjin\.net/wp-content/uploads/old/[^"]+\.[a-z]+)')), + ) multipleImagesPerStrip = True prevSearch = compile(tagre('a', 'href', '([^"]+)')+"Prev") starter = indirectStarter(url,