From 1c8d2bc7e185fe241316d24867d580de7d01bbd2 Mon Sep 17 00:00:00 2001 From: "bees.json" <81214296+beesdotjson@users.noreply.github.com> Date: Mon, 22 Mar 2021 23:53:37 -0700 Subject: [PATCH 1/2] fix PixivFavoriteExtractor regex --- gallery_dl/extractor/pixiv.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gallery_dl/extractor/pixiv.py b/gallery_dl/extractor/pixiv.py index db49b9091b..5249b8f1fb 100644 --- a/gallery_dl/extractor/pixiv.py +++ b/gallery_dl/extractor/pixiv.py @@ -254,8 +254,9 @@ class PixivFavoriteExtractor(PixivExtractor): "{user_bookmark[id]} {user_bookmark[account]}") archive_fmt = "f_{user_bookmark[id]}_{id}{num}.{extension}" pattern = (r"(?:https?://)?(?:www\.|touch\.)?pixiv\.net/(?:(?:en/)?" - r"users/(\d+)/(bookmarks/artworks(?:/([^/?#]+))?|following)" - r"|bookmark\.php(?:\?([^#]*))?)") + r"users/(\d+)/(bookmarks/artworks|following)" + r"|bookmark\.php)(?:(?<=bookmarks/artworks)" + r"(?:/([^/?#]+)))?(?:\?([^#]*))?") test = ( ("https://www.pixiv.net/en/users/173530/bookmarks/artworks", { "url": "e717eb511500f2fa3497aaee796a468ecf685cc4", From c3b5fd32fa99e0dab0a81ab902236104aa1191f7 Mon Sep 17 00:00:00 2001 From: "bees.json" <81214296+beesdotjson@users.noreply.github.com> Date: Tue, 23 Mar 2021 15:46:47 -0700 Subject: [PATCH 2/2] do not use lookbehind --- gallery_dl/extractor/pixiv.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gallery_dl/extractor/pixiv.py b/gallery_dl/extractor/pixiv.py index 5249b8f1fb..ebbce6700f 100644 --- a/gallery_dl/extractor/pixiv.py +++ b/gallery_dl/extractor/pixiv.py @@ -254,9 +254,8 @@ class PixivFavoriteExtractor(PixivExtractor): "{user_bookmark[id]} {user_bookmark[account]}") archive_fmt = "f_{user_bookmark[id]}_{id}{num}.{extension}" pattern = (r"(?:https?://)?(?:www\.|touch\.)?pixiv\.net/(?:(?:en/)?" - r"users/(\d+)/(bookmarks/artworks|following)" - r"|bookmark\.php)(?:(?<=bookmarks/artworks)" - r"(?:/([^/?#]+)))?(?:\?([^#]*))?") + r"users/(\d+)/(bookmarks/artworks|following)(?:/([^/?#]+))?" + r"|bookmark\.php)(?:\?([^#]*))?") test = ( ("https://www.pixiv.net/en/users/173530/bookmarks/artworks", { "url": "e717eb511500f2fa3497aaee796a468ecf685cc4",