From: Tobias Bell <tobias.bell@gmail.com>
Date: Sat, 17 May 2014 17:04:02 +0000 (+0200)
Subject: [gameone] Added timestamp extraction
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=305d0683628d26c8e9ba04c77c4b3c7283106f80;p=youtube-dl

[gameone] Added timestamp extraction
---

diff --git a/youtube_dl/extractor/gameone.py b/youtube_dl/extractor/gameone.py
index 3b3870878..008eb90a5 100644
--- a/youtube_dl/extractor/gameone.py
+++ b/youtube_dl/extractor/gameone.py
@@ -2,10 +2,12 @@
 from __future__ import unicode_literals
 
 import re
-import xml.etree.ElementTree as ET
 
 from .common import InfoExtractor
-from ..utils import xpath_with_ns
+from ..utils import (
+    xpath_with_ns,
+    parse_iso8601
+)
 
 NAMESPACE_MAP = {
     'media': 'http://search.yahoo.com/mrss/',
@@ -15,6 +17,8 @@ NAMESPACE_MAP = {
 # Credits go to XBox-Maniac http://board.jdownloader.org/showpost.php?p=185835&postcount=31 
 RAW_MP4_URL = 'http://cdn.riptide-mtvn.com/'
 
+PUB_DATE_FORMAT = '%Y-%m-%d %H:%M:%S %z'
+
 class GameOneIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?gameone\.de/tv/(?P<id>\d+)'
     _TEST = {
@@ -27,7 +31,9 @@ class GameOneIE(InfoExtractor):
             'duration': 1238,
             'thumbnail': 'http://s3.gameone.de/gameone/assets/video_metas/teaser_images/000/643/636/big/640x360.jpg',
             'description': 'FIFA-Pressepokal 2014, Star Citizen, Kingdom Come: Deliverance, Project Cars, Schöner Trants Nerdquiz Folge 2 Runde 1',
-            'age_limit': 16
+            'age_limit': 16,
+            'upload_date': '20140513',
+            'timestamp': 1399980122,
         }
     }
 
@@ -44,6 +50,7 @@ class GameOneIE(InfoExtractor):
         mrss = self._download_xml(mrss_url, video_id, 'Downloading mrss')
         title = mrss.find('.//item/title').text
         thumbnail = mrss.find('.//item/image').get('url')
+        timestamp = parse_iso8601(mrss.find('.//pubDate').text, delimiter=' ')
         content = mrss.find(xpath_with_ns('.//media:content', NAMESPACE_MAP))
         content_url = content.get('url')
 
@@ -68,4 +75,5 @@ class GameOneIE(InfoExtractor):
             'formats': formats,
             'description': description,
             'age_limit': age_limit,
+            'timestamp': timestamp,
         }
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 1036ea9bd..3e7947f5d 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -765,7 +765,7 @@ class YoutubeDLHandler(compat_urllib_request.HTTPHandler):
     https_response = http_response
 
 
-def parse_iso8601(date_str):
+def parse_iso8601(date_str, delimiter='T'):
     """ Return a UNIX timestamp from the given date """
 
     if date_str is None:
@@ -785,8 +785,8 @@ def parse_iso8601(date_str):
             timezone = datetime.timedelta(
                 hours=sign * int(m.group('hours')),
                 minutes=sign * int(m.group('minutes')))
-
-    dt = datetime.datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S') - timezone
+    date_format =  '%Y-%m-%d{0}%H:%M:%S'.format(delimiter)
+    dt = datetime.datetime.strptime(date_str, date_format) - timezone
     return calendar.timegm(dt.timetuple())