From d2861d029f637b6a423854d0b192dfd55abd0975 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Tue, 3 Dec 2019 19:50:41 +0100 Subject: [PATCH] Fix "Extra Fabulous Comics" (fixes #129) --- dosagelib/plugins/common.py | 1 + dosagelib/plugins/e.py | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dosagelib/plugins/common.py b/dosagelib/plugins/common.py index 009d8945c..0f152441c 100644 --- a/dosagelib/plugins/common.py +++ b/dosagelib/plugins/common.py @@ -20,6 +20,7 @@ WP_LATEST_SEARCH = '//a[%s]' % xpath_class('comic-nav-last') class _WordPressScraper(_ParserScraper): imageSearch = '//div[@id="comic"]//img' prevSearch = '//a[%s]' % xpath_class('comic-nav-previous') + nextSearch = '//a[%s]' % xpath_class('comic-nav-next') class _WPNavi(_WordPressScraper): diff --git a/dosagelib/plugins/e.py b/dosagelib/plugins/e.py index edc7e1852..bb8059946 100644 --- a/dosagelib/plugins/e.py +++ b/dosagelib/plugins/e.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam -# Copyright (C) 2015-2018 Tobias Gruetzmacher +# Copyright (C) 2015-2019 Tobias Gruetzmacher from __future__ import absolute_import, division, print_function import os from re import compile, escape, IGNORECASE -from ..helpers import indirectStarter, xpath_class +from ..helpers import bounceStarter, indirectStarter, xpath_class from ..scraper import _BasicScraper, _ParserScraper from ..util import tagre from .common import _ComicControlScraper, _WordPressScraper, _WPNavi, WP_LATEST_SEARCH @@ -160,10 +160,9 @@ class ExploitationNow(_WPNavi): class ExtraFabulousComics(_WordPressScraper): - url = 'http://extrafabulouscomics.com/comic/buttfly/' - firstStripUrl = url - latestSearch = '//a[%s]' % xpath_class('navi-last') - starter = indirectStarter + url = 'https://extrafabulouscomics.com/' + firstStripUrl = url + 'comic/buttfly/' + starter = bounceStarter multipleImagesPerStrip = True def namer(self, image_url, page_url):