diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-09-15 12:14:59 +0200 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-09-15 12:14:59 +0200 |
| commit | e69ae5b9e74910541e75eea4c8dfc13066f28f65 (patch) | |
| tree | 853d4e9e03ed89964233d0b8dd285660f476e636 | |
| parent | 92790f4e542fc3d5f4cc02a647a2695d9175d464 (diff) | |
| download | youtube-dl-e69ae5b9e74910541e75eea4c8dfc13066f28f65.tar.gz youtube-dl-e69ae5b9e74910541e75eea4c8dfc13066f28f65.tar.xz youtube-dl-e69ae5b9e74910541e75eea4c8dfc13066f28f65.zip | |
[youtube] support youtube.googleapis.com/v/* urls (fixes #1425)
| -rw-r--r-- | test/test_all_urls.py | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/test/test_all_urls.py b/test/test_all_urls.py index 99fc7bd28..ff1c86efe 100644 --- a/test/test_all_urls.py +++ b/test/test_all_urls.py @@ -36,6 +36,7 @@ class TestAllURLsMatching(unittest.TestCase): self.assertFalse(YoutubeIE.suitable(u'https://www.youtube.com/watch?v=AV6J6_AeFEQ&playnext=1&list=PL4023E734DA416012')) #668 self.assertMatch('http://youtu.be/BaW_jenozKc', ['youtube']) self.assertMatch('http://www.youtube.com/v/BaW_jenozKc', ['youtube']) + self.assertMatch('https://youtube.googleapis.com/v/BaW_jenozKc', ['youtube']) def test_youtube_channel_matching(self): assertChannel = lambda url: self.assertMatch(url, ['youtube:channel']) diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index f49665925..e4a2e22bc 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -139,7 +139,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor): ( (?:https?://)? # http(s):// (optional) (?:(?:(?:(?:\w+\.)?youtube(?:-nocookie)?\.com/| - tube\.majestyc\.net/) # the various hostnames, with wildcard subdomains + tube\.majestyc\.net/| + youtube\.googleapis\.com/) # the various hostnames, with wildcard subdomains (?:.*?\#/)? # handle anchor (#/) redirect urls (?: # the various things that can precede the ID: (?:(?:v|embed|e)/) # v/ or embed/ or e/ |