From e36cfb73ffa28e30fdedff2e654b742001cd67ae Mon Sep 17 00:00:00 2001 From: Luca Russo Date: Thu, 28 Nov 2024 10:55:43 +0100 Subject: [PATCH 1/2] added more tests --- gallery_dl/extractor/facebook.py | 2 +- test/results/facebook.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gallery_dl/extractor/facebook.py b/gallery_dl/extractor/facebook.py index a8b5690f..701bec5e 100644 --- a/gallery_dl/extractor/facebook.py +++ b/gallery_dl/extractor/facebook.py @@ -406,7 +406,7 @@ class FacebookProfileExtractor(FacebookExtractor): BASE_PATTERN + r"/(?!media/|photo/|photo.php|watch/)" r"(?:profile\.php\?id=|people/[^/?#]+/)?" - r"([^/?&#]+)(?:/photos|/videos|/posts)?/?(?:$|\?|#)" + r"([^/?&#]+)(?:/photos|/photos_by|/videos|/posts)?/?(?:$|\?|#)" ) example = "https://www.facebook.com/USERNAME" diff --git a/test/results/facebook.py b/test/results/facebook.py index aef09d1c..7b34a248 100644 --- a/test/results/facebook.py +++ b/test/results/facebook.py @@ -23,6 +23,18 @@ __tests__ = ( "#class" : facebook.FacebookProfileExtractor, }, +{ + "#url" : "https://www.facebook.com/facebook/photos_by", + "#category": ("", "facebook", "profile"), + "#class" : facebook.FacebookProfileExtractor, +}, + +{ + "#url" : "https://www.facebook.com/people/facebook/100064860875397/?sk=photos", + "#category": ("", "facebook", "profile"), + "#class" : facebook.FacebookProfileExtractor, +}, + { "#url" : "https://www.facebook.com/profile.php?id=100064860875397", "#category": ("", "facebook", "profile"), From 0e1d93dca31d74c27ac09d42c01e561bb5a92316 Mon Sep 17 00:00:00 2001 From: Luca Russo Date: Thu, 28 Nov 2024 11:02:50 +0100 Subject: [PATCH 2/2] update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mike Fährmann --- gallery_dl/extractor/facebook.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gallery_dl/extractor/facebook.py b/gallery_dl/extractor/facebook.py index 701bec5e..04acfc52 100644 --- a/gallery_dl/extractor/facebook.py +++ b/gallery_dl/extractor/facebook.py @@ -406,7 +406,7 @@ class FacebookProfileExtractor(FacebookExtractor): BASE_PATTERN + r"/(?!media/|photo/|photo.php|watch/)" r"(?:profile\.php\?id=|people/[^/?#]+/)?" - r"([^/?&#]+)(?:/photos|/photos_by|/videos|/posts)?/?(?:$|\?|#)" + r"([^/?&#]+)(?:/photos(?:_by)?|/videos|/posts)?/?(?:$|\?|#)" ) example = "https://www.facebook.com/USERNAME"