From d6281b5685a005c2f24e045b1b4daaec4600ec58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 8 Mar 2025 15:54:46 +0100 Subject: [PATCH] [tenor] relax '/view/' URL pattern (#6075) --- gallery_dl/extractor/tenor.py | 2 +- test/results/tenor.py | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gallery_dl/extractor/tenor.py b/gallery_dl/extractor/tenor.py index 978cbc44..7273eacf 100644 --- a/gallery_dl/extractor/tenor.py +++ b/gallery_dl/extractor/tenor.py @@ -108,7 +108,7 @@ class TenorExtractor(Extractor): class TenorImageExtractor(TenorExtractor): subcategory = "image" - pattern = BASE_PATTERN + r"view/(?:[\w-]*-)?(\d+)" + pattern = BASE_PATTERN + r"view/(?:[^/?#]*-)?(\d+)" example = "https://tenor.com/view/SLUG-1234567890" def gifs(self): diff --git a/test/results/tenor.py b/test/results/tenor.py index e0bd1703..61865271 100644 --- a/test/results/tenor.py +++ b/test/results/tenor.py @@ -68,6 +68,15 @@ __tests__ = ( "#urls" : "https://media.tenor.com/dlGgz3LRXEMAAAAx/moving.webp", }, +{ + "#url" : "https://tenor.com/view/vtuber-hololive-%E3%83%9B%E3%83%AD%E3%83%A9%E3%82%A4%E3%83%96-hologra-%E3%83%9B%E3%83%AD%E3%81%90%E3%82%89-gif-26058046", + "#comment": "non-ASCII characters in URL", + "#class" : tenor.TenorImageExtractor, + "#urls" : "https://media1.tenor.com/m/jHugoUKy-T0AAAAC/vtuber-hololive.gif", + + "id": "10122861201914526013", +}, + { "#url" : "https://tenor.com/ja/view/moving-gif-8525772382434057283", "#class": tenor.TenorImageExtractor,