From b702ecebf037390f5dee7a72228bc23aa67212e7 Mon Sep 17 00:00:00 2001
From: anovicecodemonkey <anovicecodemonkey13435@mailinator.com>
Date: Wed, 28 May 2014 22:17:13 +0930
Subject: [PATCH] [UstreamIE] added support for "/embed/recorded/" style URLs
(Fixes #2990)
---
youtube_dl/extractor/ustream.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/extractor/ustream.py b/youtube_dl/extractor/ustream.py
index e4bb3b9490..eb2944573d 100644
--- a/youtube_dl/extractor/ustream.py
+++ b/youtube_dl/extractor/ustream.py
@@ -11,7 +11,7 @@ from ..utils import (
class UstreamIE(InfoExtractor):
- _VALID_URL = r'https?://www\.ustream\.tv/(?P<type>recorded|embed)/(?P<videoID>\d+)'
+ _VALID_URL = r'https?://www\.ustream\.tv/(?P<type>recorded|embed|embed/recorded)/(?P<videoID>\d+)'
IE_NAME = 'ustream'
_TEST = {
'url': 'http://www.ustream.tv/recorded/20274954',
@@ -25,6 +25,13 @@ class UstreamIE(InfoExtractor):
def _real_extract(self, url):
m = re.match(self._VALID_URL, url)
+ video_id = m.group('videoID')
+
+ if m.group('type') == 'embed/recorded': # some sites use this embed format (see: http://github.com/rg3/youtube-dl/issues/2990)
+ video_id = m.group('videoID')
+ webpage = self._download_webpage(url, video_id, note="Downloading embedded Ustream page")
+ desktop_url = 'http://www.ustream.tv/recorded/' + video_id
+ return self.url_result(desktop_url, 'Ustream')
if m.group('type') == 'embed':
video_id = m.group('videoID')
webpage = self._download_webpage(url, video_id)
@@ -32,8 +39,6 @@ class UstreamIE(InfoExtractor):
desktop_url = 'http://www.ustream.tv/recorded/' + desktop_video_id
return self.url_result(desktop_url, 'Ustream')
- video_id = m.group('videoID')
-
video_url = 'http://tcdn.ustream.tv/video/%s' % video_id
webpage = self._download_webpage(url, video_id)