From c798257f00a61ecb73b1c904e35240d25f2510a0 Mon Sep 17 00:00:00 2001 From: Trygve Aaberge Date: Tue, 5 Aug 2014 18:34:08 +0200 Subject: [PATCH 1/7] mpd: Test that "list album foo" responds correctly Previously, test_list_album_with_artist_name would only test that the command didn't fail. Now it also checks that the response is correct. That is, that the response contains albums. This makes the test detect the error reported in #817. (cherry picked from commit 9771eda23068f4581a30059ac597f1360d349dcd) --- tests/mpd/protocol/test_music_db.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/mpd/protocol/test_music_db.py b/tests/mpd/protocol/test_music_db.py index 55ab75c5..e6712fef 100644 --- a/tests/mpd/protocol/test_music_db.py +++ b/tests/mpd/protocol/test_music_db.py @@ -880,7 +880,11 @@ class MusicDatabaseListTest(protocol.BaseTestCase): self.assertInResponse('OK') def test_list_album_with_artist_name(self): + self.backend.library.dummy_find_exact_result = SearchResult( + tracks=[Track(album=Album(name='foo'))]) + self.sendRequest('list "album" "anartist"') + self.assertInResponse('Album: foo') self.assertInResponse('OK') def test_list_album_with_artist_name_without_filter_value(self): From 210e1705e74cd571e7cf396785ae8cebf24c1957 Mon Sep 17 00:00:00 2001 From: Trygve Aaberge Date: Tue, 5 Aug 2014 18:46:16 +0200 Subject: [PATCH 2/7] mpd: Fix list commands with 3 arguments (fixes #817) List commands with 3 arguments should return albums, not artists. (cherry picked from commit ec413126f1670ccf4f5853e6ee375239cdb374e6) --- mopidy/mpd/protocol/music_db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mopidy/mpd/protocol/music_db.py b/mopidy/mpd/protocol/music_db.py index acddf1f4..a5757915 100644 --- a/mopidy/mpd/protocol/music_db.py +++ b/mopidy/mpd/protocol/music_db.py @@ -257,7 +257,7 @@ def list_(context, *args): if len(parameters) == 1: if field != 'album': raise exceptions.MpdArgError('should be "Album" for 3 arguments') - return _list_artist(context, {'artist': parameters}) + return _list_album(context, {'artist': parameters}) try: query = _query_from_mpd_search_parameters(parameters, _LIST_MAPPING) From 73982f0455f2c0d93fe860122f0230fc87cbbb9c Mon Sep 17 00:00:00 2001 From: Trygve Aaberge Date: Tue, 5 Aug 2014 19:44:50 +0200 Subject: [PATCH 3/7] docs: Add the mpd list command fix to the changelog (cherry picked from commit 92fa75325d968bb271b8601447080c29bccbde5f) Conflicts: docs/changelog.rst --- docs/changelog.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 25655c98..8938b849 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,16 @@ Changelog This changelog is used to track all major changes to Mopidy. +v0.19.4 (UNRELEASED) +==================== + +Bug fix release. + + - MPD frontend: Make the ``list`` command return albums when sending 3 + arguments. This was incorrectly returning artists after the MPD command + changes in 0.19.0. (Fixes: :issue:`817`) + + v0.19.3 (2014-08-03) ==================== From 19f96f7944f2f19a7b5c7b1eeaaf8c24d52d06e4 Mon Sep 17 00:00:00 2001 From: Trygve Aaberge Date: Tue, 5 Aug 2014 19:50:06 +0200 Subject: [PATCH 4/7] docs: Fix formatting (cherry picked from commit 26cfd24e113801b23a00bfb5d6706ee66e643e5b) --- docs/changelog.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 8938b849..c0d48ec4 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -10,9 +10,9 @@ v0.19.4 (UNRELEASED) Bug fix release. - - MPD frontend: Make the ``list`` command return albums when sending 3 - arguments. This was incorrectly returning artists after the MPD command - changes in 0.19.0. (Fixes: :issue:`817`) +- MPD frontend: Make the ``list`` command return albums when sending 3 + arguments. This was incorrectly returning artists after the MPD command + changes in 0.19.0. (Fixes: :issue:`817`) v0.19.3 (2014-08-03) From 9b7bcd37b3d00134d22382b2a75881cb55cf7d37 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 5 Aug 2014 23:58:03 +0200 Subject: [PATCH 5/7] docs: Add note Debian package distro support (fixes #820) --- docs/installation/debian.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/installation/debian.rst b/docs/installation/debian.rst index 26864986..f34eb255 100644 --- a/docs/installation/debian.rst +++ b/docs/installation/debian.rst @@ -14,6 +14,22 @@ instructions should work for you as well. If you're setting up a Raspberry Pi from scratch, we have a guide for installing Debian/Raspbian and Mopidy. See :ref:`raspberrypi-installation`. +.. note:: + + The packages should work with: + + - Debian stable and testing, + - Raspbian stable and testing, + - Ubuntu 14.04 LTS and later. + + Some of the packages, including the core "mopidy" packages, does *not* work + on Ubuntu 12.04 LTS. + + This is just what we currently support, not a promise to continue to + support the same in the future. We *will* drop support for older + distributions when supporting those stops us from moving forward with the + project. + #. Add the archive's GPG key:: wget -q -O - https://apt.mopidy.com/mopidy.gpg | sudo apt-key add - From bac3bfb7a2e47634334c2adb8350e5005bccecf7 Mon Sep 17 00:00:00 2001 From: Trygve Aaberge Date: Mon, 11 Aug 2014 01:31:25 +0200 Subject: [PATCH 6/7] log: Don't disable loggers when loading fileConfig The default when loading config for logging from a file is to disable existing loggers. Since some loggers are created before logging is set up, these loggers were disabled if logging/config_file is set. (cherry picked from commit cb0387c46d7c65d141355ce716764f7b05ef3f3f) Conflicts: docs/changelog.rst --- docs/changelog.rst | 3 +++ mopidy/utils/log.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index c0d48ec4..eddf10b7 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -14,6 +14,9 @@ Bug fix release. arguments. This was incorrectly returning artists after the MPD command changes in 0.19.0. (Fixes: :issue:`817`) +- Logging: Fix that some loggers would be disabled if logging/config_file was + set. + v0.19.3 (2014-08-03) ==================== diff --git a/mopidy/utils/log.py b/mopidy/utils/log.py index 5d6d3635..c461b434 100644 --- a/mopidy/utils/log.py +++ b/mopidy/utils/log.py @@ -47,7 +47,8 @@ def setup_logging(config, verbosity_level, save_debug_log): if config['logging']['config_file']: # Logging config from file must be read before other handlers are # added. If not, the other handlers will have no effect. - logging.config.fileConfig(config['logging']['config_file']) + logging.config.fileConfig(config['logging']['config_file'], + disable_existing_loggers=False) setup_console_logging(config, verbosity_level) if save_debug_log: From 44c79515207aace013cae24d18509c17893609ca Mon Sep 17 00:00:00 2001 From: Trygve Aaberge Date: Mon, 11 Aug 2014 12:48:56 +0200 Subject: [PATCH 7/7] docs: Use :confval:-syntax, add fixes for logging issue (cherry picked from commit 524043f6b7ee4c3120d6e7e00bad154e4ad82668) Conflicts: docs/changelog.rst --- docs/changelog.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index eddf10b7..8409054a 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -14,8 +14,8 @@ Bug fix release. arguments. This was incorrectly returning artists after the MPD command changes in 0.19.0. (Fixes: :issue:`817`) -- Logging: Fix that some loggers would be disabled if logging/config_file was - set. +- Logging: Fix that some loggers would be disabled if + :confval:`logging/config_file` was set. (Fixes: :issue:`740`) v0.19.3 (2014-08-03)