From 08a8d5c43be271a41af74ce0c7df9d871cf2b532 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <thomas@adamcik.no>
Date: Sun, 14 Dec 2014 14:16:37 +0100
Subject: [PATCH 1/2] mpd: Remove "Comment" tag type from translator output.

Newer versions of the protocol have removed this tag, so we should as well.
This also works around the issue of #881 which was breaking things with
newlines in comment fields.

The readcomments command seems to replace this, but it seems to only care about
specific extra tagtypes, not the general comment tag we normally collect when
scanning things.
---
 mopidy/mpd/translator.py     | 3 ---
 tests/mpd/test_translator.py | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mopidy/mpd/translator.py b/mopidy/mpd/translator.py
index ec3a270b..23fb2874 100644
--- a/mopidy/mpd/translator.py
+++ b/mopidy/mpd/translator.py
@@ -81,9 +81,6 @@ def track_to_mpd_format(track, position=None):
     if track.disc_no:
         result.append(('Disc', track.disc_no))
 
-    if track.comment:
-        result.append(('Comment', track.comment))
-
     if track.musicbrainz_id is not None:
         result.append(('MUSICBRAINZ_TRACKID', track.musicbrainz_id))
     return result
diff --git a/tests/mpd/test_translator.py b/tests/mpd/test_translator.py
index b38a93e8..82e60d93 100644
--- a/tests/mpd/test_translator.py
+++ b/tests/mpd/test_translator.py
@@ -73,10 +73,10 @@ class TrackMpdFormatTest(unittest.TestCase):
         self.assertIn(('Track', '7/13'), result)
         self.assertIn(('Date', datetime.date(1977, 1, 1)), result)
         self.assertIn(('Disc', '1'), result)
-        self.assertIn(('Comment', 'a comment'), result)
         self.assertIn(('Pos', 9), 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):
         track = self.track.copy(musicbrainz_id='foo')

From 541412dbfc33d80727db5dbba067fdcc9d922470 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <thomas@adamcik.no>
Date: Sun, 14 Dec 2014 14:35:13 +0100
Subject: [PATCH 2/2] mpd: Remove newline escaping code.

This was added for #881, where the correct fix turned out to be to remove
comments from the responses. We should still add some sanity checks for
verifying that our responses at the very least only contain printable chars.
---
 mopidy/mpd/dispatcher.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/mopidy/mpd/dispatcher.py b/mopidy/mpd/dispatcher.py
index 8167a774..5d9cecd9 100644
--- a/mopidy/mpd/dispatcher.py
+++ b/mopidy/mpd/dispatcher.py
@@ -196,17 +196,12 @@ class MpdDispatcher(object):
 
     def _format_lines(self, line):
         if isinstance(line, dict):
-            return [self._escape_newlines('%s: %s' % (key, value))
-                    for (key, value)
-                    in line.items()]
+            return ['%s: %s' % (key, value) for (key, value) in line.items()]
         if isinstance(line, tuple):
             (key, value) = line
-            return [self._escape_newlines('%s: %s' % (key, value))]
+            return ['%s: %s' % (key, value)]
         return [line]
 
-    def _escape_newlines(self, text):
-        return text.replace('\n', '\\n')
-
 
 class MpdContext(object):
     """