extractors/*/youtube: Also allow mobile URIs

1 year ago · 6a232bfab9
parent e043265b23
commit 6a232bfab9
2 changed files with 19 additions and 3 deletions
--- a/server/entertainment_decider/extractors/collection/youtube.py
+++ b/server/entertainment_decider/extractors/collection/youtube.py
@ -22,9 +22,21 @@ DataType: TypeAlias = Dict


 class YouTubeCollectionExtractor(CollectionExtractor[DataType]):
-
    __uri_regex = re.compile(
-        r"^https?://(www\.)?youtube\.com/(channel/|playlist\?list=)(?P<id>[^/&?]+)"
+        r"""^
+        https?://
+            ((
+                www
+                |
+                m
+            )\.)?youtube\.com/(
+                channel/
+                |
+                playlist\?list=
+            )
+            (?P<id>[^/&?]+)
+        """,
+        re.VERBOSE,
    )

    @classmethod
--- a/server/entertainment_decider/extractors/media/youtube.py
+++ b/server/entertainment_decider/extractors/media/youtube.py
@ -65,7 +65,11 @@ class YoutubeMediaExtractor(MediaExtractor[YoutubeVideoData]):
    __uri_regex = re.compile(
        r"""^
        https?://(
-            (www\.)?youtube(-nocookie)?\.com/(
+            ((
+                www
+                |
+                m
+            )\.)?youtube(-nocookie)?\.com/(
                watch\?v=
                |
                embed/