github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[hitomi] fix some keywords

Browse Source
This commit is contained in:
Mike Fährmann
2016-09-23 08:21:49 +02:00
parent 9d107b8e1b
commit 3f985d5342
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gallery_dl/extractor/hitomi.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2015 Mike Fährmann # Copyright 2015,2016 Mike Fährmann
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as # it under the terms of the GNU General Public License version 2 as
@@ -19,7 +19,7 @@ class HitomiGalleryExtractor(Extractor):
directory_fmt = ["{category}", "{gallery-id} {title}"] directory_fmt = ["{category}", "{gallery-id} {title}"]
filename_fmt = "{category}_{gallery-id}_{num:>03}_{name}.{extension}" filename_fmt = "{category}_{gallery-id}_{num:>03}_{name}.{extension}"
pattern = [r"(?:https?://)?hitomi\.la/(?:galleries|reader)/(\d+)\.html"] pattern = [r"(?:https?://)?hitomi\.la/(?:galleries|reader)/(\d+)\.html"]
test = [("http://hitomi.la/galleries/867789.html", { test = [("https://hitomi.la/galleries/867789.html", {
"url": "23fd59894c3db65aec826aa5efb85f96d2384883", "url": "23fd59894c3db65aec826aa5efb85f96d2384883",
"keyword": "80395a06b6ba24842c15121d142830bb467ae68b", "keyword": "80395a06b6ba24842c15121d142830bb467ae68b",
})] })]
@@ -63,10 +63,10 @@ class HitomiGalleryExtractor(Extractor):
return { return {
"category": self.category, "category": self.category,
"gallery-id": self.gid, "gallery-id": self.gid,
"title": title, "title": " ".join(title.split()),
"artist": string.capwords(artist), "artist": string.capwords(artist),
"group": string.capwords(group), "group": string.capwords(group),
"type": gtype[1:-1].capitalize(), "type": gtype.strip().capitalize(),
"lang": iso639_1.language_to_code(lang), "lang": iso639_1.language_to_code(lang),
"language": lang, "language": lang,
"series": string.capwords(series), "series": string.capwords(series),
@@ -75,10 +75,9 @@ class HitomiGalleryExtractor(Extractor):
@staticmethod @staticmethod
def get_image_urls(page): def get_image_urls(page):
"""Extract and return a list of all image-urls""" """Extract and return a list of all image-urls"""
pos = 0 return [
images = list() "https://g.hitomi.la/galleries/" + urlpart
while True: for urlpart in text.extract_iter(
urlpart, pos = text.extract(page, "'//tn.hitomi.la/smalltn/", ".jpg',", pos) page, "'//tn.hitomi.la/smalltn/", ".jpg',"
if not urlpart: )
return images ]
images.append("https://g.hitomi.la/galleries/" + urlpart)