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

Merge pull request #907 from adamcik/feature/mpd-remove-comments

Browse Source 
Feature/mpd remove comments
This commit is contained in:
Stein Magnus Jodal 2014-12-14 18:08:29 +01:00
commit 84897dde05
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mopidy/mpd/dispatcher.py
View File

@ -196,17 +196,12 @@ class MpdDispatcher(object):
def _format_lines(self, line): def _format_lines(self, line):
if isinstance(line, dict): if isinstance(line, dict):
return [self._escape_newlines('%s: %s' % (key, value)) return ['%s: %s' % (key, value) for (key, value) in line.items()]
for (key, value)
in line.items()]
if isinstance(line, tuple): if isinstance(line, tuple):
(key, value) = line (key, value) = line
return [self._escape_newlines('%s: %s' % (key, value))] return ['%s: %s' % (key, value)]
return [line] return [line]
def _escape_newlines(self, text):
return text.replace('\n', '\\n')
class MpdContext(object): class MpdContext(object):
""" """

3
mopidy/mpd/translator.py
View File

@ -81,9 +81,6 @@ def track_to_mpd_format(track, position=None):
if track.disc_no: if track.disc_no:
result.append(('Disc', track.disc_no)) result.append(('Disc', track.disc_no))
if track.comment:
result.append(('Comment', track.comment))
if track.musicbrainz_id is not None: if track.musicbrainz_id is not None:
result.append(('MUSICBRAINZ_TRACKID', track.musicbrainz_id)) result.append(('MUSICBRAINZ_TRACKID', track.musicbrainz_id))
return result return result

4
tests/mpd/test_translator.py
View File

@ -73,10 +73,10 @@ class TrackMpdFormatTest(unittest.TestCase):
self.assertIn(('Track', '7/13'), result) self.assertIn(('Track', '7/13'), result)
self.assertIn(('Date', datetime.date(1977, 1, 1)), result) self.assertIn(('Date', datetime.date(1977, 1, 1)), result)
self.assertIn(('Disc', '1'), result) self.assertIn(('Disc', '1'), result)
self.assertIn(('Comment', 'a comment'), result)
self.assertIn(('Pos', 9), result) self.assertIn(('Pos', 9), result)
self.assertIn(('Id', 122), result) self.assertIn(('Id', 122), result)
self.assertEqual(len(result), 15) self.assertNotIn(('Comment', 'a comment'), result)
self.assertEqual(len(result), 14)
def test_track_to_mpd_format_musicbrainz_trackid(self): def test_track_to_mpd_format_musicbrainz_trackid(self):
track = self.track.copy(musicbrainz_id='foo') track = self.track.copy(musicbrainz_id='foo')