Fix extract_video_id_from_youtube_url to handle shorts

README.md

@@ -1867,7 +1867,7 @@ parse_youtube_url('https://www.youtube.com/taranisnews')
 
 #### extract_video_id_from_youtube_url
 
-Return a video id from the given Youtube url or `None` if we could not find one.
+Return a video id from the given Youtube url or `None` if we could not find one. Note that this will also work with Youtube shorts.
 
 ```python
 from ural.youtube import extract_video_id_from_youtube_url

test/youtube_test.py

@@ -270,7 +270,9 @@ def test_parse_youtube_url(self):
 
     def test_extract_video_id_from_youtube_url(self):
         for url, result, _ in PARSE_TESTS:
-            extract_result = result.id if isinstance(result, YoutubeVideo) else None
+            extract_result = (
+                result.id if isinstance(result, (YoutubeVideo, YoutubeShort)) else None
+            )
 
             assert extract_video_id_from_youtube_url(url) == extract_result
 

ural/utils.py

@@ -216,4 +216,3 @@ def get_query_argument(url, key):
             return q[1]
 
     return None
-

ural/youtube.py

@@ -401,7 +401,7 @@ def parse_youtube_url(url, fix_common_mistakes=True):
 def extract_video_id_from_youtube_url(url):
     parsed = parse_youtube_url(url)
 
-    if parsed is None or not isinstance(parsed, YoutubeVideo):
+    if parsed is None or not isinstance(parsed, (YoutubeVideo, YoutubeShort)):
         return
 
     return parsed.id
@@ -433,7 +433,6 @@ def normalize_youtube_url(url):
         return YOUTUBE_CHANNEL_NAME_URL_TEMPLATE % parsed.name
 
     if isinstance(parsed, YoutubeShort):
-        if parsed.id is not None:
-            return YOUTUBE_SHORT_URL_TEMPLATE % parsed.id
+        return YOUTUBE_SHORT_URL_TEMPLATE % parsed.id
 
     raise TypeError("normalize_youtube_url: impossible path reached")