New upstream version 1.17.0.upstream/1.17.0

1 files changed, 6 insertions, 2 deletions

diff --git a/gallery_dl/extractor/mangadex.py b/gallery_dl/extractor/mangadex.py
index d59e5bb..6a88d58 100644
--- a/gallery_dl/extractor/mangadex.py
+++ b/gallery_dl/extractor/mangadex.py
@@ -17,6 +17,7 @@ class MangadexExtractor(Extractor):
     """Base class for mangadex extractors"""
     category = "mangadex"
     root = "https://mangadex.org"
+    api_root = "https://api.mangadex.org"
 
     # mangadex-to-iso639-1 codes
     iso639_map = {
@@ -28,7 +29,10 @@ class MangadexExtractor(Extractor):
 
     def __init__(self, match):
         Extractor.__init__(self, match)
-        self.api_root = self.config("api-server") or "https://mangadex.org/api"
+
+        server = self.config("api-server")
+        if server is not None:
+            self.api_root = server.rstrip("/")
 
     def chapter_data(self, chapter_id):
         """Request API results for 'chapter_id'"""
@@ -177,7 +181,7 @@ class MangadexMangaExtractor(MangadexExtractor):
 
     def chapters(self):
         """Return a sorted list of chapter-metadata dicts"""
-        manga = self.manga_data(self.manga_id)
+        manga = self.manga_data(int(self.manga_id))
         results = []
 
         for cdata in self.manga_chapters(self.manga_id):