summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhilipp Hagemeister <[email protected]>2014-03-28 23:22:43 +0100
committerPhilipp Hagemeister <[email protected]>2014-03-28 23:23:58 +0100
commitb17418313f15f030dcc938f5618cdccf55752e39 (patch)
treeaaec0a0168209e5e20568c2f7ac1d89dbed1c367
parente9a6fd6a68024b7835d4ee664c921ef3f3591594 (diff)
downloadyoutube-dl-b17418313f15f030dcc938f5618cdccf55752e39.tar.gz
youtube-dl-b17418313f15f030dcc938f5618cdccf55752e39.zip
[oe1] Simplify (#2646)
-rw-r--r--youtube_dl/extractor/oe1.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/youtube_dl/extractor/oe1.py b/youtube_dl/extractor/oe1.py
index f327e9e08..38971ab4d 100644
--- a/youtube_dl/extractor/oe1.py
+++ b/youtube_dl/extractor/oe1.py
@@ -1,8 +1,8 @@
# coding: utf-8
from __future__ import unicode_literals
+
import calendar
import datetime
-import json
import re
from .common import InfoExtractor
@@ -12,15 +12,17 @@ from .common import InfoExtractor
class OE1IE(InfoExtractor):
- _VALID_URL = r'http://oe1\.orf\.at/programm/(?P<id>\d+)'
+ IE_DESC = 'oe1.orf.at'
+ _VALID_URL = r'http://oe1\.orf\.at/programm/(?P<id>[0-9]+)'
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
show_id = mobj.group('id')
- data = json.loads(self._download_webpage(
+
+ data = self._download_json(
'http://oe1.orf.at/programm/%s/konsole' % show_id,
show_id
- ))
+ )
timestamp = datetime.datetime.strptime('%s %s' % (
data['item']['day_label'],
@@ -33,6 +35,6 @@ class OE1IE(InfoExtractor):
'title': data['item']['title'],
'url': data['item']['url_stream'],
'ext': 'mp3',
- 'description': data['item']['info'],
+ 'description': data['item'].get('info'),
'timestamp': unix_timestamp
}