From ffd30abcb3631b70037158b734d5dc9460729cf4 Mon Sep 17 00:00:00 2001 From: Balgden Date: Mon, 3 Apr 2023 13:30:27 +0000 Subject: [PATCH 1/3] [hotleak] Fix downloading of creators whose name starts with a category name E.g. `hot4lexi` would start downloading the `hot` section by mistake This happened because the regex had a negative lookahead for the category names, but didn't ensure that they where followed by either end-of-string or a slash. --- gallery_dl/extractor/hotleak.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gallery_dl/extractor/hotleak.py b/gallery_dl/extractor/hotleak.py index 7c656be0..2c72e0bb 100644 --- a/gallery_dl/extractor/hotleak.py +++ b/gallery_dl/extractor/hotleak.py @@ -58,7 +58,7 @@ def decode_video_url(url): class HotleakPostExtractor(HotleakExtractor): """Extractor for individual posts on hotleak""" subcategory = "post" - pattern = (BASE_PATTERN + r"/(?!hot|creators|videos|photos)" + pattern = (BASE_PATTERN + r"/(?!(?:hot|creators|videos|photos)(?:$|/))" r"([^/]+)/(photo|video)/(\d+)") test = ( ("https://hotleak.vip/kaiyakawaii/photo/1617145", { @@ -117,7 +117,7 @@ class HotleakPostExtractor(HotleakExtractor): class HotleakCreatorExtractor(HotleakExtractor): """Extractor for all posts from a hotleak creator""" subcategory = "creator" - pattern = BASE_PATTERN + r"/(?!hot|creators|videos|photos)([^/?#]+)/?$" + pattern = BASE_PATTERN + r"/(?!(?:hot|creators|videos|photos)(?:$|/))([^/?#]+)/?$" test = ( ("https://hotleak.vip/kaiyakawaii", { "range": "1-200", From bbc5977121f6d95433f68341cbdf5f110a8cd510 Mon Sep 17 00:00:00 2001 From: Balgden Date: Mon, 3 Apr 2023 13:38:42 +0000 Subject: [PATCH 2/3] Fix line length --- gallery_dl/extractor/hotleak.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gallery_dl/extractor/hotleak.py b/gallery_dl/extractor/hotleak.py index 2c72e0bb..6599c53f 100644 --- a/gallery_dl/extractor/hotleak.py +++ b/gallery_dl/extractor/hotleak.py @@ -117,7 +117,8 @@ class HotleakPostExtractor(HotleakExtractor): class HotleakCreatorExtractor(HotleakExtractor): """Extractor for all posts from a hotleak creator""" subcategory = "creator" - pattern = BASE_PATTERN + r"/(?!(?:hot|creators|videos|photos)(?:$|/))([^/?#]+)/?$" + pattern = (BASE_PATTERN + r"/(?!(?:hot|creators|videos|photos)(?:$|/))" + r"([^/?#]+)/?$") test = ( ("https://hotleak.vip/kaiyakawaii", { "range": "1-200", From 4b141cce66e4749ad5657dcf49a52e448dab9d51 Mon Sep 17 00:00:00 2001 From: Balgden Date: Mon, 3 Apr 2023 13:44:14 +0000 Subject: [PATCH 3/3] Fix indentation --- gallery_dl/extractor/hotleak.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gallery_dl/extractor/hotleak.py b/gallery_dl/extractor/hotleak.py index 6599c53f..30158b43 100644 --- a/gallery_dl/extractor/hotleak.py +++ b/gallery_dl/extractor/hotleak.py @@ -118,7 +118,7 @@ class HotleakCreatorExtractor(HotleakExtractor): """Extractor for all posts from a hotleak creator""" subcategory = "creator" pattern = (BASE_PATTERN + r"/(?!(?:hot|creators|videos|photos)(?:$|/))" - r"([^/?#]+)/?$") + r"([^/?#]+)/?$") test = ( ("https://hotleak.vip/kaiyakawaii", { "range": "1-200",