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

embed error messages in StopExtraction exceptions

Browse Source
This commit is contained in:
Mike Fährmann
2019-10-28 16:06:36 +01:00
parent d5e3910270
commit 4409d00141
16 changed files with 45 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gallery_dl/extractor/pixiv.py
View File

@@ -335,11 +335,9 @@ class PixivSearchExtractor(PixivExtractor):
def get_metadata(self, user=None):
query = text.parse_query(self.query)
if "word" in query:
self.word = text.unescape(query["word"])
else:
self.log.error("missing search term")
raise exception.StopExtraction()
if "word" not in query:
raise exception.StopExtraction("Missing search term")
self.word = query["word"]
sort = query.get("order", "date_d")
sort_map = {
@@ -504,8 +502,7 @@ class PixivAppAPI():
return response.json()
if response.status_code == 404:
raise exception.NotFoundError()
self.log.error("API request failed: %s", response.text)
raise exception.StopExtraction()
raise exception.StopExtraction("API request failed: %s", response.text)
def _pagination(self, endpoint, params):
while True: