[oe1] Simplify (#2646)

pull/8/head
Philipp Hagemeister 11 years ago
parent e9a6fd6a68
commit b17418313f

@ -1,8 +1,8 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
import calendar import calendar
import datetime import datetime
import json
import re import re
from .common import InfoExtractor from .common import InfoExtractor
@ -12,15 +12,17 @@ from .common import InfoExtractor
class OE1IE(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): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
show_id = mobj.group('id') show_id = mobj.group('id')
data = json.loads(self._download_webpage(
data = self._download_json(
'http://oe1.orf.at/programm/%s/konsole' % show_id, 'http://oe1.orf.at/programm/%s/konsole' % show_id,
show_id show_id
)) )
timestamp = datetime.datetime.strptime('%s %s' % ( timestamp = datetime.datetime.strptime('%s %s' % (
data['item']['day_label'], data['item']['day_label'],
@ -33,6 +35,6 @@ class OE1IE(InfoExtractor):
'title': data['item']['title'], 'title': data['item']['title'],
'url': data['item']['url_stream'], 'url': data['item']['url_stream'],
'ext': 'mp3', 'ext': 'mp3',
'description': data['item']['info'], 'description': data['item'].get('info'),
'timestamp': unix_timestamp 'timestamp': unix_timestamp
} }

Loading…
Cancel
Save