move code into util.py

gallery_dl/extractor/batoto.py

@@ -9,7 +9,7 @@
 """Extract manga chapters from https://bato.to/"""
 
 from .common import Extractor, AsynchronousExtractor, Message
-from .. import text, iso639_1, config, exception
+from .. import text, util, config, exception
 from ..cache import cache
 import re
 
@@ -160,7 +160,7 @@ class BatotoChapterExtractor(BatotoExtractor, AsynchronousExtractor):
             "chapter": match.group(3),
             "title": match.group(5) or "",
             "group": group,
-            "lang": iso639_1.language_to_code(lang),
+            "lang": util.language_to_code(lang),
             "language": lang,
             "count": count,
         }

gallery_dl/extractor/exhentai.py

@@ -9,7 +9,7 @@
 """Extract images from galleries at https://exhentai.org/"""
 
 from .common import Extractor, Message
-from .. import config, text, iso639_1, exception
+from .. import config, text, util, exception
 from ..cache import cache
 import time
 import random
@@ -103,7 +103,7 @@ class ExhentaiGalleryExtractor(Extractor):
             ("size-units", '', '<'),
             ("count"     , '>Length:</td><td class="gdt2">', ' '),
         ), values=data)
-        data["lang"] = iso639_1.language_to_code(data["language"])
+        data["lang"] = util.language_to_code(data["language"])
         data["title"] = text.unescape(data["title"])
         data["title_jp"] = text.unescape(data["title_jp"])
         return data

gallery_dl/extractor/foolslide.py

@@ -9,7 +9,7 @@
 """Base classes for extractors for FoolSlide based sites"""
 
 from .common import Extractor, Message
-from .. import text, iso639_1
+from .. import text, util
 import json
 
 
@@ -73,7 +73,7 @@ class FoolslideChapterExtractor(Extractor):
 
         self.data["manga"] = text.unescape(manga)
         self.data["title"] = title
-        self.data["language"] = iso639_1.code_to_language(self.data["lang"])
+        self.data["language"] = util.code_to_language(self.data["lang"])
         self.data["chapter_string"] = chapter
         return self.data
 

gallery_dl/extractor/hitomi.py

@@ -9,7 +9,7 @@
 """Extract images from https://hitomi.la/"""
 
 from .common import Extractor, Message
-from .. import text, iso639_1
+from .. import text, util
 import string
 
 
@@ -68,7 +68,7 @@ class HitomiGalleryExtractor(Extractor):
             "artist": string.capwords(artist),
             "group": string.capwords(group),
             "type": gtype.strip().capitalize(),
-            "lang": iso639_1.language_to_code(lang),
+            "lang": util.language_to_code(lang),
             "language": lang,
             "series": string.capwords(series),
         }

gallery_dl/extractor/imagehosts.py

@@ -120,9 +120,6 @@ class FapatImageExtractor(ImgytImageExtractor):
     https = False
 
 
-
-
-
 class ChronosImageExtractor(ImagehostImageExtractor):
     """Extractor for single images from chronos.to"""
     category = "chronos"
@@ -292,7 +289,7 @@ class ImgtrexImageExtractor(ImagehostImageExtractor):
     """Extractor for single images from imgtrex.com"""
     category = "imgtrex"
     pattern = [r"(?:https?://)?((?:www\.)?imgtrex\.com/([^/]+))"]
-    test = [("http://imgtrex.com/im0ypxq0rke4/test-テスト-&<a>.png", {
+    test = [("http://imgtrex.com/im0ypxq0rke4/test-&<a>.png", {
         "url": "c000618bddda42bd599a590b7972c7396d19d8fe",
         "keyword": "58905795a9cd3f17d5ff024fc4d63645795ba23c",
         "content": "0c8768055e4e20e7c7259608b67799171b691140",

gallery_dl/extractor/luscious.py

@@ -9,7 +9,7 @@
 """Extract images from https://luscious.net/"""
 
 from .common import Extractor, Message
-from .. import text, iso639_1
+from .. import text, util
 import re
 
 
@@ -61,7 +61,7 @@ class LusciousAlbumExtractor(Extractor):
             ("section" , '>', '<'),
             ("language", '<p>Language:', ' '),
         ), values={"gallery-id": self.gid})[0]
-        data["lang"] = iso639_1.language_to_code(data["language"])
+        data["lang"] = util.language_to_code(data["language"])
         data["artist"] = text.extract(data["tags"], "rtist: ", ",")[0] or ""
         self.section = data["com"]
         del data["com"]