Browse Source

[youtube_truncated_url] Add support for truncated watch URLs with annotations (#3178)

Philipp Hagemeister 11 years ago
parent
commit
c4808c6009
1 changed files with 9 additions and 1 deletions
  1. 9 1
      youtube_dl/extractor/youtube.py

+ 9 - 1
youtube_dl/extractor/youtube.py

@@ -1825,10 +1825,18 @@ class YoutubeTruncatedURLIE(InfoExtractor):
     IE_NAME = 'youtube:truncated_url'
     IE_DESC = False  # Do not list
     _VALID_URL = r'''(?x)
-        (?:https?://)?[^/]+/watch\?(?:feature=[a-z_]+)?$|
+        (?:https?://)?[^/]+/watch\?(?:
+            feature=[a-z_]+|
+            annotation_id=annotation_[^&]+
+        )?$|
         (?:https?://)?(?:www\.)?youtube\.com/attribution_link\?a=[^&]+$
     '''
 
+    _TESTS = [{
+        'url': 'http://www.youtube.com/watch?annotation_id=annotation_3951667041',
+        'only_matching': True,
+    }]
+
     def _real_extract(self, url):
         raise ExtractorError(
             u'Did you forget to quote the URL? Remember that & is a meta '