diff options
Diffstat (limited to 'gallery_dl/extractor/tapas.py')
| -rw-r--r-- | gallery_dl/extractor/tapas.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/gallery_dl/extractor/tapas.py b/gallery_dl/extractor/tapas.py index 35a346d..d823f6a 100644 --- a/gallery_dl/extractor/tapas.py +++ b/gallery_dl/extractor/tapas.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2021-2023 Mike Fährmann +# Copyright 2021-2025 Mike Fährmann # # 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 @@ -67,7 +67,7 @@ class TapasExtractor(Extractor): def request_api(self, url, params=None): headers = {"Accept": "application/json, text/javascript, */*;"} - return self.request(url, params=params, headers=headers).json()["data"] + return self.request_json(url, params=params, headers=headers)["data"] class TapasEpisodeExtractor(TapasExtractor): @@ -79,14 +79,13 @@ class TapasEpisodeExtractor(TapasExtractor): self.login() episode_id = self.groups[0] - url = "{}/episode/{}".format(self.root, episode_id) + url = f"{self.root}/episode/{episode_id}" data = self.request_api(url) episode = data["episode"] if not episode.get("free") and not episode.get("unlocked"): raise exception.AuthorizationError( - "{}: Episode '{}' not unlocked".format( - episode_id, episode["title"])) + f"{episode_id}: Episode '{episode['title']}' not unlocked") html = data["html"] episode["series"] = self._extract_series(html) @@ -106,11 +105,11 @@ class TapasEpisodeExtractor(TapasExtractor): yield Message.Url, url, text.nameext_from_url(url, episode) def _extract_series(self, html): - series_id = text.rextract(html, 'data-series-id="', '"')[0] + series_id = text.rextr(html, 'data-series-id="', '"') try: return self._cache[series_id] except KeyError: - url = "{}/series/{}".format(self.root, series_id) + url = f"{self.root}/series/{series_id}" series = self._cache[series_id] = self.request_api(url) return series @@ -123,12 +122,12 @@ class TapasSeriesExtractor(TapasExtractor): def items(self): self.login() - url = "{}/series/{}".format(self.root, self.groups[0]) + url = f"{self.root}/series/{self.groups[0]}" series_id, _, episode_id = text.extr( self.request(url).text, 'content="tapastic://series/', '"', ).partition("/episodes/") - url = "{}/series/{}/episodes".format(self.root, series_id) + url = f"{self.root}/series/{series_id}/episodes" params = { "eid" : episode_id, "page" : 1, @@ -157,7 +156,7 @@ class TapasCreatorExtractor(TapasExtractor): def items(self): self.login() - url = "{}/{}/series".format(self.root, self.groups[0]) + url = f"{self.root}/{self.groups[0]}/series" page = self.request(url).text page = text.extr(page, '<ul class="content-list-wrap', "</ul>") |