From 0fa78b8e3943d871b517ba7e5cbc514b67230839 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 18 Dec 2015 01:37:04 +0100
Subject: [PATCH] gst1: Fix datetime tag conversion

---
 mopidy/audio/tags.py     | 3 +--
 tests/audio/test_tags.py | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/mopidy/audio/tags.py b/mopidy/audio/tags.py
index c5376906..85b56d4f 100644
--- a/mopidy/audio/tags.py
+++ b/mopidy/audio/tags.py
@@ -101,8 +101,7 @@ def convert_tags_to_track(tags):
     album_kwargs['num_discs'] = tags.get(Gst.TAG_ALBUM_VOLUME_COUNT, [None])[0]
     album_kwargs['musicbrainz_id'] = tags.get('musicbrainz-albumid', [None])[0]
 
-    if tags.get(Gst.TAG_DATE) and tags.get(Gst.TAG_DATE)[0]:
-        track_kwargs['date'] = tags[Gst.TAG_DATE][0].isoformat()
+    track_kwargs['date'] = tags.get(Gst.TAG_DATE, [None])[0]
 
     # Clear out any empty values we found
     track_kwargs = {k: v for k, v in track_kwargs.items() if v}
diff --git a/tests/audio/test_tags.py b/tests/audio/test_tags.py
index 19a2a804..8a1116be 100644
--- a/tests/audio/test_tags.py
+++ b/tests/audio/test_tags.py
@@ -41,13 +41,13 @@ class TestConvertTaglist(object):
 
     def test_date_time_tag(self):
         taglist = self.make_taglist(Gst.TAG_DATE_TIME, [
-            Gst.DateTime.new_from_iso8601_string(b'2014-01-07')
+            Gst.DateTime.new_from_iso8601_string(b'2014-01-07 14:13:12')
         ])
 
         result = tags.convert_taglist(taglist)
 
         assert isinstance(result[Gst.TAG_DATE_TIME][0], compat.text_type)
-        assert result[Gst.TAG_DATE_TIME][0] == '2014-01-07'
+        assert result[Gst.TAG_DATE_TIME][0] == '2014-01-07T14:13:12Z'
 
     def test_string_tag(self):
         taglist = self.make_taglist(Gst.TAG_ARTIST, [b'ABBA', b'ACDC'])
@@ -84,7 +84,7 @@ class TagsToTrackTest(unittest.TestCase):
             'track-count': [2],
             'album-disc-number': [2],
             'album-disc-count': [3],
-            'date': [datetime.date(2006, 1, 1,)],
+            'date': ['2006-01-01'],
             'container-format': ['ID3 tag'],
             'genre': ['genre'],
             'comment': ['comment'],
@@ -172,7 +172,7 @@ class TagsToTrackTest(unittest.TestCase):
         self.check(self.track.replace(date=None))
 
     def test_multiple_track_date(self):
-        self.tags['date'].append(datetime.date(2030, 1, 1))
+        self.tags['date'].append('2030-01-01')
         self.check(self.track)
 
     def test_missing_track_comment(self):