aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-03-24 17:12:15 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-03-24 17:12:15 +0100
commit6949d81095b1f42f276f52df547a50ec50c37dd6 (patch)
tree829fbbf7575e8f74863e95e28503d6ee07330d25
parentf847ca02d3816ff1dfc76147d0e4caca430d6c3a (diff)
downloadyoutube-dl-6949d81095b1f42f276f52df547a50ec50c37dd6.tar.xz
[byutv] Add support (Fixes #2612)
-rw-r--r--youtube_dl/extractor/__init__.py1
-rw-r--r--youtube_dl/extractor/byutv.py50
-rw-r--r--youtube_dl/extractor/ooyala.py2
3 files changed, 52 insertions, 1 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 245860140..a7a339e7d 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -25,6 +25,7 @@ from .bloomberg import BloombergIE
from .br import BRIE
from .breakcom import BreakIE
from .brightcove import BrightcoveIE
+from .byutv import BYUtvIE
from .c56 import C56IE
from .canal13cl import Canal13clIE
from .canalplus import CanalplusIE
diff --git a/youtube_dl/extractor/byutv.py b/youtube_dl/extractor/byutv.py
new file mode 100644
index 000000000..91c6398f5
--- /dev/null
+++ b/youtube_dl/extractor/byutv.py
@@ -0,0 +1,50 @@
+from __future__ import unicode_literals
+
+import json
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+ ExtractorError,
+)
+
+
+class BYUtvIE(InfoExtractor):
+ _VALID_URL = r'^https?://(?:www\.)?byutv.org/watch/[0-9a-f-]+/(?P<video_id>[^/?#]+)'
+ _TEST = {
+ 'url': 'http://www.byutv.org/watch/44e80f7b-e3ba-43ba-8c51-b1fd96c94a79/granite-flats-talking',
+ 'info_dict': {
+ 'id': 'granite-flats-talking',
+ 'ext': 'mp4',
+ 'description': 'md5:1a7ae3e153359b7cc355ef3963441e5f',
+ 'title': 'Talking',
+ 'thumbnail': 're:^https?://.*promo.*'
+ },
+ 'params': {
+ 'skip_download': True,
+ }
+ }
+
+ def _real_extract(self, url):
+ mobj = re.match(self._VALID_URL, url)
+ video_id = mobj.group('video_id')
+
+ webpage = self._download_webpage(url, video_id)
+ episode_code = self._search_regex(
+ r'(?s)episode:(.*?\}),\s*\n', webpage, 'episode information')
+ episode_json = re.sub(
+ r'(\n\s+)([a-zA-Z]+):\s+\'(.*?)\'', r'\1"\2": "\3"', episode_code)
+ ep = json.loads(episode_json)
+
+ if ep['providerType'] == 'Ooyala':
+ return {
+ '_type': 'url_transparent',
+ 'ie_key': 'Ooyala',
+ 'url': 'ooyala:%s' % ep['providerId'],
+ 'id': video_id,
+ 'title': ep['title'],
+ 'description': ep.get('description'),
+ 'thumbnail': ep.get('imageThumbnail'),
+ }
+ else:
+ raise ExtractorError('Unsupported provider %s' % ep['provider'])
diff --git a/youtube_dl/extractor/ooyala.py b/youtube_dl/extractor/ooyala.py
index e20327791..13f12824c 100644
--- a/youtube_dl/extractor/ooyala.py
+++ b/youtube_dl/extractor/ooyala.py
@@ -7,7 +7,7 @@ from ..utils import unescapeHTML
class OoyalaIE(InfoExtractor):
- _VALID_URL = r'https?://.+?\.ooyala\.com/.*?(?:embedCode|ec)=(?P<id>.+?)(&|$)'
+ _VALID_URL = r'(?:ooyala:|https?://.+?\.ooyala\.com/.*?(?:embedCode|ec)=)(?P<id>.+?)(&|$)'
_TEST = {
# From http://it.slashdot.org/story/13/04/25/178216/recovering-data-from-broken-hard-drives-and-ssds-video