From 6996f5c118bd26d43c6b94d539ed59342f787c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Mon, 9 Jul 2018 15:22:17 +0200
Subject: [PATCH] [mangahere] fix and improve chapter extraction

---
 CHANGELOG.md                      |  5 ++++-
 gallery_dl/extractor/mangahere.py | 10 +++-------
 gallery_dl/extractor/xvideos.py   |  2 +-
 gallery_dl/version.py             |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c729eaaf..66dd27de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,15 @@
 # Changelog
 
+## Unreleased
+- Fixed chapter extraction on `mangahere`
+
 ## 1.4.2 - 2018-07-06
 - Added image-pool extractors for `safebooru` and `rule34`
 - Added option for extended tag information on `booru` sites ([#92](https://github.com/mikf/gallery-dl/issues/92))
 - Added support for DeviantArt's new URL format
 - Added support for `mangapark` mirrors
 - Changed `imagefap` extractors to use HTTPS
-- Fixed download-skips for files without known extension
+- Fixed crash when skipping downloads for files without known extension
 
 ## 1.4.1 - 2018-06-22
 - Added an `ugoira` post-processor to convert  `pixiv` animations to WebM
diff --git a/gallery_dl/extractor/mangahere.py b/gallery_dl/extractor/mangahere.py
index 8cfe373b..ff4fb315 100644
--- a/gallery_dl/extractor/mangahere.py
+++ b/gallery_dl/extractor/mangahere.py
@@ -111,13 +111,9 @@ class MangahereChapterExtractor(MangahereBase, ChapterExtractor):
         """Yield all image-urls for this chapter"""
         pnum = 1
         while True:
-            url, pos = text.extract(page, '<img src="', '"')
-            yield url, None
-            _  , pos = text.extract(page, '<img src="', '"', pos)
-            _  , pos = text.extract(page, '<img src="', '"', pos)
-            url, pos = text.extract(page, '<img src="', '"', pos)
-            yield url, None
-
+            for url in text.extract_iter(page, '<img src="', '"'):
+                if "/store/manga/" in url:
+                    yield url, None
             pnum += 2
             page = self.request(self.url_fmt.format(self.part, pnum)).text
 
diff --git a/gallery_dl/extractor/xvideos.py b/gallery_dl/extractor/xvideos.py
index c38fe200..5dccea08 100644
--- a/gallery_dl/extractor/xvideos.py
+++ b/gallery_dl/extractor/xvideos.py
@@ -36,7 +36,7 @@ class XvideosGalleryExtractor(XvideosExtractor):
         (("https://www.xvideos.com/profiles"
           "/pervertedcouple/photos/751031/random_stuff"), {
             "url": "4f0d992e5dc39def2c3ac8e099d17bf09e76e3c7",
-            "keyword": "750d462802d56eead0fe06c4f453419396d2f944",
+            "keyword": "8d637b372c6231cc4ada92dd5918db5fdbd06520",
         }),
         ("https://www.xvideos.com/profiles/pervertedcouple/photos/751032/", {
             "exception": exception.NotFoundError,
diff --git a/gallery_dl/version.py b/gallery_dl/version.py
index 5fe53bca..765ee123 100644
--- a/gallery_dl/version.py
+++ b/gallery_dl/version.py
@@ -6,4 +6,4 @@
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 
-__version__ = "1.4.2"
+__version__ = "1.4.3-dev"