diff --git a/docs/changes.rst b/docs/changes.rst index dbdc9d3b..fe7b9927 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -40,6 +40,9 @@ No description yet. - Better error messages on wrong login or network problems. Thanks to Antoine Pierlot-Garcin for patches to Mopidy and Pyspotify. (Fixes: :issue:`77`) + - Reduce log level for trivial log messages from warning to info. (Fixes: + :issue:`71`) + - Local backend: - Fix crash in :command:`mopidy-scan` if a track has no artist name. Thanks @@ -66,6 +69,11 @@ No description yet. - Fix crash on ``--list-settings`` on clean installation. Thanks to Martins Grunskis for the bug report and patch. (Fixes: :issue:`63`) +- Packaging: + + - Replace test data symlinks with real files to avoid symlink issues when + installing with pip. (Fixes: :issue:`68`) + 0.3.1 (2010-01-22) ================== diff --git a/docs/conf.py b/docs/conf.py index 4587c16d..7ae3c126 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -202,4 +202,4 @@ latex_documents = [ needs_sphinx = '1.0' -extlinks = {'issue': ('http://github.com/mopidy/mopidy/issues#issue/%s', 'GH-')} +extlinks = {'issue': ('http://github.com/mopidy/mopidy/issues/%s', 'GH-')} diff --git a/mopidy/backends/spotify/playback.py b/mopidy/backends/spotify/playback.py index b02c2d9f..3721fe9c 100644 --- a/mopidy/backends/spotify/playback.py +++ b/mopidy/backends/spotify/playback.py @@ -23,7 +23,7 @@ class SpotifyPlaybackProvider(BasePlaybackProvider): self.backend.output.play_uri('appsrc://') return True except SpotifyError as e: - logger.warning('Play %s failed: %s', track.uri, e) + logger.info('Playback of %s failed: %s', track.uri, e) return False def resume(self): diff --git a/mopidy/backends/spotify/translator.py b/mopidy/backends/spotify/translator.py index 64422485..dca2b285 100644 --- a/mopidy/backends/spotify/translator.py +++ b/mopidy/backends/spotify/translator.py @@ -62,5 +62,5 @@ class SpotifyTranslator(object): if str(Link.from_track(t, 0))], ) except SpotifyError, e: - logger.warning(u'Failed translating Spotify playlist ' + logger.info(u'Failed translating Spotify playlist ' '(probably a playlist folder boundary): %s', e) diff --git a/mopidy/core.py b/mopidy/core.py index 093f783d..f1a9dc36 100644 --- a/mopidy/core.py +++ b/mopidy/core.py @@ -23,9 +23,11 @@ def main(): setup_backend() setup_frontends() try: - time.sleep(10000*24*60*60) + while ActorRegistry.get_all(): + time.sleep(1) + logger.info(u'No actors left. Exiting...') except KeyboardInterrupt: - logger.info(u'Exiting...') + logger.info(u'User interrupt. Exiting...') ActorRegistry.stop_all() def parse_options(): diff --git a/tests/data/scanner/advanced/song1.mp3 b/tests/data/scanner/advanced/song1.mp3 deleted file mode 120000 index 6896a7a2..00000000 --- a/tests/data/scanner/advanced/song1.mp3 +++ /dev/null @@ -1 +0,0 @@ -../sample.mp3 \ No newline at end of file diff --git a/tests/data/scanner/advanced/song1.mp3 b/tests/data/scanner/advanced/song1.mp3 new file mode 100644 index 00000000..ad5aa37a Binary files /dev/null and b/tests/data/scanner/advanced/song1.mp3 differ diff --git a/tests/data/scanner/advanced/song2.mp3 b/tests/data/scanner/advanced/song2.mp3 deleted file mode 120000 index 6896a7a2..00000000 --- a/tests/data/scanner/advanced/song2.mp3 +++ /dev/null @@ -1 +0,0 @@ -../sample.mp3 \ No newline at end of file diff --git a/tests/data/scanner/advanced/song2.mp3 b/tests/data/scanner/advanced/song2.mp3 new file mode 100644 index 00000000..ad5aa37a Binary files /dev/null and b/tests/data/scanner/advanced/song2.mp3 differ diff --git a/tests/data/scanner/advanced/song3.mp3 b/tests/data/scanner/advanced/song3.mp3 deleted file mode 120000 index 6896a7a2..00000000 --- a/tests/data/scanner/advanced/song3.mp3 +++ /dev/null @@ -1 +0,0 @@ -../sample.mp3 \ No newline at end of file diff --git a/tests/data/scanner/advanced/song3.mp3 b/tests/data/scanner/advanced/song3.mp3 new file mode 100644 index 00000000..ad5aa37a Binary files /dev/null and b/tests/data/scanner/advanced/song3.mp3 differ diff --git a/tests/data/scanner/advanced/subdir1/song4.mp3 b/tests/data/scanner/advanced/subdir1/song4.mp3 deleted file mode 120000 index 45812ac5..00000000 --- a/tests/data/scanner/advanced/subdir1/song4.mp3 +++ /dev/null @@ -1 +0,0 @@ -../../sample.mp3 \ No newline at end of file diff --git a/tests/data/scanner/advanced/subdir1/song4.mp3 b/tests/data/scanner/advanced/subdir1/song4.mp3 new file mode 100644 index 00000000..ad5aa37a Binary files /dev/null and b/tests/data/scanner/advanced/subdir1/song4.mp3 differ diff --git a/tests/data/scanner/advanced/subdir1/song5.mp3 b/tests/data/scanner/advanced/subdir1/song5.mp3 deleted file mode 120000 index 45812ac5..00000000 --- a/tests/data/scanner/advanced/subdir1/song5.mp3 +++ /dev/null @@ -1 +0,0 @@ -../../sample.mp3 \ No newline at end of file diff --git a/tests/data/scanner/advanced/subdir1/song5.mp3 b/tests/data/scanner/advanced/subdir1/song5.mp3 new file mode 100644 index 00000000..ad5aa37a Binary files /dev/null and b/tests/data/scanner/advanced/subdir1/song5.mp3 differ diff --git a/tests/data/scanner/advanced/subdir1/subsubdir/song8.mp3 b/tests/data/scanner/advanced/subdir1/subsubdir/song8.mp3 deleted file mode 120000 index e84bdc24..00000000 --- a/tests/data/scanner/advanced/subdir1/subsubdir/song8.mp3 +++ /dev/null @@ -1 +0,0 @@ -../../../sample.mp3 \ No newline at end of file diff --git a/tests/data/scanner/advanced/subdir1/subsubdir/song8.mp3 b/tests/data/scanner/advanced/subdir1/subsubdir/song8.mp3 new file mode 100644 index 00000000..ad5aa37a Binary files /dev/null and b/tests/data/scanner/advanced/subdir1/subsubdir/song8.mp3 differ diff --git a/tests/data/scanner/advanced/subdir1/subsubdir/song9.mp3 b/tests/data/scanner/advanced/subdir1/subsubdir/song9.mp3 deleted file mode 120000 index e84bdc24..00000000 --- a/tests/data/scanner/advanced/subdir1/subsubdir/song9.mp3 +++ /dev/null @@ -1 +0,0 @@ -../../../sample.mp3 \ No newline at end of file diff --git a/tests/data/scanner/advanced/subdir1/subsubdir/song9.mp3 b/tests/data/scanner/advanced/subdir1/subsubdir/song9.mp3 new file mode 100644 index 00000000..ad5aa37a Binary files /dev/null and b/tests/data/scanner/advanced/subdir1/subsubdir/song9.mp3 differ diff --git a/tests/data/scanner/advanced/subdir2/song6.mp3 b/tests/data/scanner/advanced/subdir2/song6.mp3 deleted file mode 120000 index 45812ac5..00000000 --- a/tests/data/scanner/advanced/subdir2/song6.mp3 +++ /dev/null @@ -1 +0,0 @@ -../../sample.mp3 \ No newline at end of file diff --git a/tests/data/scanner/advanced/subdir2/song6.mp3 b/tests/data/scanner/advanced/subdir2/song6.mp3 new file mode 100644 index 00000000..ad5aa37a Binary files /dev/null and b/tests/data/scanner/advanced/subdir2/song6.mp3 differ diff --git a/tests/data/scanner/advanced/subdir2/song7.mp3 b/tests/data/scanner/advanced/subdir2/song7.mp3 deleted file mode 120000 index 45812ac5..00000000 --- a/tests/data/scanner/advanced/subdir2/song7.mp3 +++ /dev/null @@ -1 +0,0 @@ -../../sample.mp3 \ No newline at end of file diff --git a/tests/data/scanner/advanced/subdir2/song7.mp3 b/tests/data/scanner/advanced/subdir2/song7.mp3 new file mode 100644 index 00000000..ad5aa37a Binary files /dev/null and b/tests/data/scanner/advanced/subdir2/song7.mp3 differ diff --git a/tests/data/scanner/simple/song1.mp3 b/tests/data/scanner/simple/song1.mp3 deleted file mode 120000 index 6896a7a2..00000000 --- a/tests/data/scanner/simple/song1.mp3 +++ /dev/null @@ -1 +0,0 @@ -../sample.mp3 \ No newline at end of file diff --git a/tests/data/scanner/simple/song1.mp3 b/tests/data/scanner/simple/song1.mp3 new file mode 100644 index 00000000..ad5aa37a Binary files /dev/null and b/tests/data/scanner/simple/song1.mp3 differ diff --git a/tests/data/song1.flac b/tests/data/song1.flac deleted file mode 120000 index e5e7c129..00000000 --- a/tests/data/song1.flac +++ /dev/null @@ -1 +0,0 @@ -blank.flac \ No newline at end of file diff --git a/tests/data/song1.flac b/tests/data/song1.flac new file mode 100644 index 00000000..ae18d36f Binary files /dev/null and b/tests/data/song1.flac differ diff --git a/tests/data/song1.mp3 b/tests/data/song1.mp3 deleted file mode 120000 index 03cdf66f..00000000 --- a/tests/data/song1.mp3 +++ /dev/null @@ -1 +0,0 @@ -blank.mp3 \ No newline at end of file diff --git a/tests/data/song1.mp3 b/tests/data/song1.mp3 new file mode 100644 index 00000000..ef159a70 Binary files /dev/null and b/tests/data/song1.mp3 differ diff --git a/tests/data/song1.ogg b/tests/data/song1.ogg deleted file mode 120000 index 33e773e1..00000000 --- a/tests/data/song1.ogg +++ /dev/null @@ -1 +0,0 @@ -blank.ogg \ No newline at end of file diff --git a/tests/data/song1.ogg b/tests/data/song1.ogg new file mode 100644 index 00000000..e67e428b Binary files /dev/null and b/tests/data/song1.ogg differ diff --git a/tests/data/song1.wav b/tests/data/song1.wav deleted file mode 120000 index 72a38fad..00000000 --- a/tests/data/song1.wav +++ /dev/null @@ -1 +0,0 @@ -blank.wav \ No newline at end of file diff --git a/tests/data/song1.wav b/tests/data/song1.wav new file mode 100644 index 00000000..0041c7ba Binary files /dev/null and b/tests/data/song1.wav differ diff --git a/tests/data/song2.flac b/tests/data/song2.flac deleted file mode 120000 index e5e7c129..00000000 --- a/tests/data/song2.flac +++ /dev/null @@ -1 +0,0 @@ -blank.flac \ No newline at end of file diff --git a/tests/data/song2.flac b/tests/data/song2.flac new file mode 100644 index 00000000..ae18d36f Binary files /dev/null and b/tests/data/song2.flac differ diff --git a/tests/data/song2.mp3 b/tests/data/song2.mp3 deleted file mode 120000 index 03cdf66f..00000000 --- a/tests/data/song2.mp3 +++ /dev/null @@ -1 +0,0 @@ -blank.mp3 \ No newline at end of file diff --git a/tests/data/song2.mp3 b/tests/data/song2.mp3 new file mode 100644 index 00000000..ef159a70 Binary files /dev/null and b/tests/data/song2.mp3 differ diff --git a/tests/data/song2.ogg b/tests/data/song2.ogg deleted file mode 120000 index 33e773e1..00000000 --- a/tests/data/song2.ogg +++ /dev/null @@ -1 +0,0 @@ -blank.ogg \ No newline at end of file diff --git a/tests/data/song2.ogg b/tests/data/song2.ogg new file mode 100644 index 00000000..e67e428b Binary files /dev/null and b/tests/data/song2.ogg differ diff --git a/tests/data/song2.wav b/tests/data/song2.wav deleted file mode 120000 index 72a38fad..00000000 --- a/tests/data/song2.wav +++ /dev/null @@ -1 +0,0 @@ -blank.wav \ No newline at end of file diff --git a/tests/data/song2.wav b/tests/data/song2.wav new file mode 100644 index 00000000..0041c7ba Binary files /dev/null and b/tests/data/song2.wav differ diff --git a/tests/data/song3.flac b/tests/data/song3.flac deleted file mode 120000 index e5e7c129..00000000 --- a/tests/data/song3.flac +++ /dev/null @@ -1 +0,0 @@ -blank.flac \ No newline at end of file diff --git a/tests/data/song3.flac b/tests/data/song3.flac new file mode 100644 index 00000000..ae18d36f Binary files /dev/null and b/tests/data/song3.flac differ diff --git a/tests/data/song3.mp3 b/tests/data/song3.mp3 deleted file mode 120000 index 03cdf66f..00000000 --- a/tests/data/song3.mp3 +++ /dev/null @@ -1 +0,0 @@ -blank.mp3 \ No newline at end of file diff --git a/tests/data/song3.mp3 b/tests/data/song3.mp3 new file mode 100644 index 00000000..ef159a70 Binary files /dev/null and b/tests/data/song3.mp3 differ diff --git a/tests/data/song3.ogg b/tests/data/song3.ogg deleted file mode 120000 index 33e773e1..00000000 --- a/tests/data/song3.ogg +++ /dev/null @@ -1 +0,0 @@ -blank.ogg \ No newline at end of file diff --git a/tests/data/song3.ogg b/tests/data/song3.ogg new file mode 100644 index 00000000..e67e428b Binary files /dev/null and b/tests/data/song3.ogg differ diff --git a/tests/data/song3.wav b/tests/data/song3.wav deleted file mode 120000 index 72a38fad..00000000 --- a/tests/data/song3.wav +++ /dev/null @@ -1 +0,0 @@ -blank.wav \ No newline at end of file diff --git a/tests/data/song3.wav b/tests/data/song3.wav new file mode 100644 index 00000000..0041c7ba Binary files /dev/null and b/tests/data/song3.wav differ