From 332d9e393b4c043eb8dc6d9f570f08d2999f4f66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Sat, 28 Nov 2015 00:31:04 +0100
Subject: [PATCH] [mangahere] support sub-chapters (e.g. ch4.5)

---
 gallery_dl/extractor/mangahere.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gallery_dl/extractor/mangahere.py b/gallery_dl/extractor/mangahere.py
index 884e3bf8..d4885dd5 100644
--- a/gallery_dl/extractor/mangahere.py
+++ b/gallery_dl/extractor/mangahere.py
@@ -8,7 +8,7 @@
 
 """Extract manga pages from http://www.mangahere.co/"""
 
-from .common import AsynchronousExtractor, Message
+from .common import Extractor, AsynchronousExtractor, Message
 from .. import text
 import re
 
@@ -43,23 +43,22 @@ class MangaHereMangaExtractor(Extractor):
 class MangaHereChapterExtractor(AsynchronousExtractor):
 
     category = "mangahere"
-    directory_fmt = ["{category}", "{manga}", "c{chapter:>03}"]
-    filename_fmt = "{manga}_c{chapter:>03}_{page:>03}.{extension}"
-    pattern = [r"(?:https?://)?(?:www\.)?mangahere\.co/manga/([^/]+(?:/v0*(\d+))?/c0*(\d+))"]
+    directory_fmt = ["{category}", "{manga}", "c{chapter:>03}{chapter-minor}"]
+    filename_fmt = "{manga}_c{chapter:>03}{chapter-minor}_{page:>03}.{extension}"
+    pattern = [(r"(?:https?://)?(?:www\.)?mangahere\.co/manga/"
+                r"([^/]+(?:/v0*(\d+))?/c0*(\d+)(\.\d+)?)")]
     url_fmt = "http://www.mangahere.co/manga/{}/{}.html"
 
     def __init__(self, match):
         AsynchronousExtractor.__init__(self)
-        self.part = match.group(1)
-        self.volume = match.group(2)
-        self.chapter = match.group(3)
+        self.part, self.volume, self.chapter, self.chminor = match.groups()
 
     def items(self):
         page = self.request(self.url_fmt.format(self.part, 1)).text
         data = self.get_job_metadata(page)
         yield Message.Version, 1
         yield Message.Directory, data.copy()
-        for i, url in zip(range(int(data["count"])), (self.get_image_urls(page))):
+        for i, url in zip(range(int(data["count"])), self.get_image_urls(page)):
             data["page"] = i+1
             text.nameext_from_url(url, data)
             yield Message.Url, url, data.copy()
@@ -71,13 +70,14 @@ class MangaHereChapterExtractor(AsynchronousExtractor):
         _    , pos = text.extract(page, '<select class="wid60"', '', pos)
         _    , pos = text.extract(page, '</select>', '', pos)
         count, pos = text.extract(page, '>', '<', pos-30)
-        manga = re.match(r"(.+) \d+ - Read .+ Chapter \d+ Online", manga).group(1)
+        manga = re.match(r"(.+) \d+(\.\d+)? - Read .+ Chapter \d+(\.\d+)? Online", manga).group(1)
         return {
             "category": self.category,
             "manga": text.unescape(manga),
             # "title": TODO,
             "volume": self.volume or "",
             "chapter": self.chapter,
+            "chapter-minor": self.chminor or "",
             "chapter-id": chid,
             "count": count,
             "lang": "en",