diff options
| author | Philipp Hagemeister <[email protected]> | 2014-09-29 12:45:18 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <[email protected]> | 2014-09-29 12:45:18 +0200 |
| commit | 99b67fecc5ab6c57eada1e1678034dd71c57e338 (patch) | |
| tree | fe07d9a8e723af6c20d18232c398d5f7da96a02c | |
| parent | 89294b5f50462ede8ba83463ff262eb2c5219e1b (diff) | |
| download | youtube-dl-99b67fecc5ab6c57eada1e1678034dd71c57e338.tar.gz youtube-dl-99b67fecc5ab6c57eada1e1678034dd71c57e338.zip | |
[arte] Fix upload date extraction
| -rw-r--r-- | test/test_utils.py | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/arte.py | 6 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index 6419b3ca9..97551ce9c 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -138,6 +138,7 @@ class TestUtil(unittest.TestCase): self.assertEqual(unified_strdate('Dec 14, 2012'), '20121214') self.assertEqual(unified_strdate('2012/10/11 01:56:38 +0000'), '20121011') self.assertEqual(unified_strdate('1968-12-10'), '19681210') + self.assertEqual(unified_strdate('28/01/2014 21:00:00 +0100'), '20140128') def test_find_xpath_attr(self): testxml = '''<root> diff --git a/youtube_dl/extractor/arte.py b/youtube_dl/extractor/arte.py index 957d35979..c3d02f85e 100644 --- a/youtube_dl/extractor/arte.py +++ b/youtube_dl/extractor/arte.py @@ -86,11 +86,15 @@ class ArteTVPlus7IE(InfoExtractor): info = self._download_json(json_url, video_id) player_info = info['videoJsonPlayer'] + upload_date_str = player_info.get('shootingDate') + if not upload_date_str: + upload_date_str = player_info.get('VDA', '').split(' ')[0] + info_dict = { 'id': player_info['VID'], 'title': player_info['VTI'], 'description': player_info.get('VDE'), - 'upload_date': unified_strdate(player_info.get('VDA', '').split(' ')[0]), + 'upload_date': unified_strdate(upload_date_str), 'thumbnail': player_info.get('programImage') or player_info.get('VTU', {}).get('IUR'), } diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 950cd1a7a..f05747097 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -890,6 +890,7 @@ def unified_strdate(date_str): '%d/%m/%Y', '%d/%m/%y', '%Y/%m/%d %H:%M:%S', + '%d/%m/%Y %H:%M:%S', '%Y-%m-%d %H:%M:%S', '%d.%m.%Y %H:%M', '%d.%m.%Y %H.%M', |