andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #1218

Browse Source 
Output the last_modified timestamp from mopidy's track model to mpd clients
in the same format as mpd uses - yyyy-mm-ddTHH:MM:SS

Outputs nothing for Last-Modified if last_modified is None or zero

This commit uses UTC time, adds a 'Z' to end, and updates the test accordingly
This commit is contained in:
Mark Greenwood 2015-07-21 18:20:17 +01:00
parent 38ca65a0b6
commit 6ed9b07aaa
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mopidy/mpd/translator.py
View File

@ -87,10 +87,10 @@ def track_to_mpd_format(track, position=None, stream_title=None):
if track.disc_no:
result.append(('Disc', track.disc_no))
if track.last_modified is not None:
datestring = datetime.datetime.fromtimestamp(
if track.last_modified:
datestring = datetime.datetime.utcfromtimestamp(
track.last_modified // 1000).isoformat()
result.append(('Last-Modified', datestring))
result.append(('Last-Modified', datestring + 'Z'))
if track.musicbrainz_id is not None:
result.append(('MUSICBRAINZ_TRACKID', track.musicbrainz_id))

9
tests/mpd/test_translator.py
View File

@ -1,6 +1,5 @@
from __future__ import absolute_import, unicode_literals
import datetime
import unittest
from mopidy.internal import path
@ -82,12 +81,6 @@ class TrackMpdFormatTest(unittest.TestCase):
def test_track_to_mpd_format_with_last_modified(self):
track = self.track.replace(last_modified=995303899000)
# Due to this being local time-zone dependant, we have
# to calculate what the Last-Modified output will look like
# on the machine where the tests are being run. So this only tests
# that the output is actually there.
datestring = datetime.datetime.fromtimestamp(
track.last_modified // 1000).isoformat()
result = translator.track_to_mpd_format(track)
self.assertIn(('file', 'a uri'), result)
self.assertIn(('Time', 137), result)
@ -101,7 +94,7 @@ class TrackMpdFormatTest(unittest.TestCase):
self.assertIn(('Track', '7/13'), result)
self.assertIn(('Date', '1977-01-01'), result)
self.assertIn(('Disc', 1), result)
self.assertIn(('Last-Modified', datestring), result)
self.assertIn(('Last-Modified', '2001-07-16T17:18:19Z'), result)
self.assertNotIn(('Comment', 'a comment'), result)
self.assertEqual(len(result), 13)