aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-10-04 00:58:35 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-10-04 00:58:35 +0200
commitabefd1f7c4c309aa7d9fec478fc437a7a1d2eb99 (patch)
treea6c341357fd529756f3c08dcdf769705f22548dd
parentc21315f273c7f2877dfbd43fe3b56d636091e1c0 (diff)
parentadfeafe9e19d3240bb07ad6ca97f01aed86c0615 (diff)
Merge remote-tracking branch 'rzhxeo/rtl_upload_date'
-rw-r--r--youtube_dl/extractor/rtlnow.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/youtube_dl/extractor/rtlnow.py b/youtube_dl/extractor/rtlnow.py
index 32541077f..a156666f9 100644
--- a/youtube_dl/extractor/rtlnow.py
+++ b/youtube_dl/extractor/rtlnow.py
@@ -98,14 +98,17 @@ class RTLnowIE(InfoExtractor):
webpage, u'playerdata_url')
playerdata = self._download_webpage(playerdata_url, video_id)
- mobj = re.search(r'<title><!\[CDATA\[(?P<description>.+?)\s+- (?:Sendung )?vom (?P<upload_date_d>[0-9]{2})\.(?P<upload_date_m>[0-9]{2})\.(?:(?P<upload_date_Y>[0-9]{4})|(?P<upload_date_y>[0-9]{2})) [0-9]{2}:[0-9]{2} Uhr\]\]></title>', playerdata)
+ mobj = re.search(r'<title><!\[CDATA\[(?P<description>.+?)(?:\s+- (?:Sendung )?vom (?P<upload_date_d>[0-9]{2})\.(?P<upload_date_m>[0-9]{2})\.(?:(?P<upload_date_Y>[0-9]{4})|(?P<upload_date_y>[0-9]{2})) [0-9]{2}:[0-9]{2} Uhr)?\]\]></title>', playerdata)
if mobj:
video_description = mobj.group(u'description')
if mobj.group('upload_date_Y'):
video_upload_date = mobj.group('upload_date_Y')
- else:
+ elif mobj.group('upload_date_y'):
video_upload_date = u'20' + mobj.group('upload_date_y')
- video_upload_date += mobj.group('upload_date_m')+mobj.group('upload_date_d')
+ else:
+ video_upload_date = None
+ if video_upload_date:
+ video_upload_date += mobj.group('upload_date_m')+mobj.group('upload_date_d')
else:
video_description = None
video_upload_date = None