From 85550a37c4b462013a07b422d172c8582464b12a Mon Sep 17 00:00:00 2001 From: Delphox Date: Thu, 25 Apr 2024 13:19:40 -0300 Subject: [PATCH 1/4] [twitter] support fixvx urls --- gallery_dl/extractor/twitter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py index e5799e22..688478cd 100644 --- a/gallery_dl/extractor/twitter.py +++ b/gallery_dl/extractor/twitter.py @@ -16,7 +16,7 @@ import json import re BASE_PATTERN = (r"(?:https?://)?(?:www\.|mobile\.)?" - r"(?:(?:[fv]x)?twitter|(?:fixup)?x)\.com") + r"(?:(?:[fv]x)?twitter|(?:fix(?:up|v))?x)\.com") class TwitterExtractor(Extractor): From 6969963125b55d5e530fe72236bf5363088cd3d3 Mon Sep 17 00:00:00 2001 From: Delphox Date: Thu, 25 Apr 2024 13:25:39 -0300 Subject: [PATCH 2/4] [furaffinity] support fxfuraffinity and fxraffinity urls --- gallery_dl/extractor/furaffinity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gallery_dl/extractor/furaffinity.py b/gallery_dl/extractor/furaffinity.py index 56721d0f..83181822 100644 --- a/gallery_dl/extractor/furaffinity.py +++ b/gallery_dl/extractor/furaffinity.py @@ -11,7 +11,7 @@ from .common import Extractor, Message from .. import text, util -BASE_PATTERN = r"(?:https?://)?(?:www\.|sfw\.)?furaffinity\.net" +BASE_PATTERN = r"(?:https?://)?(?:www\.|sfw\.)?f(?:[xu]|xfu)raffinity\.net" class FuraffinityExtractor(Extractor): From 1886721d8206c45eaf20637a512903b0586c5169 Mon Sep 17 00:00:00 2001 From: Delphox Date: Thu, 25 Apr 2024 13:28:30 -0300 Subject: [PATCH 3/4] update tests --- test/results/furaffinity.py | 12 ++++++++++++ test/results/twitter.py | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/test/results/furaffinity.py b/test/results/furaffinity.py index 187029bb..6d3e47c7 100644 --- a/test/results/furaffinity.py +++ b/test/results/furaffinity.py @@ -121,6 +121,18 @@ __tests__ = ( "#class" : furaffinity.FuraffinityPostExtractor, }, +{ + "#url" : "https://fxfuraffinity.net/view/21835115/", + "#category": ("", "furaffinity", "post"), + "#class" : furaffinity.FuraffinityPostExtractor, +}, + +{ + "#url" : "https://fxraffinity.net/view/21835115/", + "#category": ("", "furaffinity", "post"), + "#class" : furaffinity.FuraffinityPostExtractor, +}, + { "#url" : "https://sfw.furaffinity.net/view/21835115/", "#category": ("", "furaffinity", "post"), diff --git a/test/results/twitter.py b/test/results/twitter.py index ac119a33..9cba93b0 100644 --- a/test/results/twitter.py +++ b/test/results/twitter.py @@ -60,6 +60,12 @@ __tests__ = ( "#class" : twitter.TwitterUserExtractor, }, +{ + "#url" : "https://fixvx.com/supernaturepics", + "#category": ("", "twitter", "user"), + "#class" : twitter.TwitterUserExtractor, +}, + { "#url" : "https://x.com/supernaturepics", "#category": ("", "twitter", "user"), From 5aefa9465c3261f156022245c5cd2dced2a8c361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Thu, 25 Apr 2024 21:58:34 +0200 Subject: [PATCH 4/4] [furaffinity] simplify pattern, match original domain first --- gallery_dl/extractor/furaffinity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gallery_dl/extractor/furaffinity.py b/gallery_dl/extractor/furaffinity.py index 83181822..d7238719 100644 --- a/gallery_dl/extractor/furaffinity.py +++ b/gallery_dl/extractor/furaffinity.py @@ -11,7 +11,7 @@ from .common import Extractor, Message from .. import text, util -BASE_PATTERN = r"(?:https?://)?(?:www\.|sfw\.)?f(?:[xu]|xfu)raffinity\.net" +BASE_PATTERN = r"(?:https?://)?(?:www\.|sfw\.)?f(?:u|x|xfu)raffinity\.net" class FuraffinityExtractor(Extractor):