From ca04d3ca48b3670089b00b6764922aba8f0e621d Mon Sep 17 00:00:00 2001 From: Jaisen Mathai Date: Tue, 12 Apr 2016 01:40:48 -0700 Subject: [PATCH] gh-32 Add `Creation Date (und-US)` to list of exif fields to read to support older versions of exiftool --- elodie/media/video.py | 2 +- elodie/tests/media/video_test.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/elodie/media/video.py b/elodie/media/video.py index 72abeef..d5652d4 100644 --- a/elodie/media/video.py +++ b/elodie/media/video.py @@ -97,7 +97,7 @@ class Video(Media): # If the time is not found in EXIF we update EXIF seconds_since_epoch = min(os.path.getmtime(source), os.path.getctime(source)) # noqa exif_data = self.get_exif() - for key in ['Creation Date', 'Media Create Date']: + for key in ['Creation Date', 'Creation Date \(und-US\)', 'Media Create Date']: # noqa date = re.search('%s +: +([0-9: ]+)' % key, exif_data) if(date is not None): date_string = date.group(1) diff --git a/elodie/tests/media/video_test.py b/elodie/tests/media/video_test.py index 118c58d..4b1d5e1 100644 --- a/elodie/tests/media/video_test.py +++ b/elodie/tests/media/video_test.py @@ -52,7 +52,6 @@ def test_get_coordinate_longitude(): assert coordinate == -119.9558, coordinate def test_get_date_taken(): - raise SkipTest('gh-32 this test fails on travisci') video = Video(helper.get_file('video.mov')) date_taken = video.get_date_taken()