Merge branch 'develop' of http://github.com/mopidy/mopidy into develop

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)
 ==================

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-')}

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):

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)

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():

tests/data/scanner/advanced/song1.mp3

@@ -1 +0,0 @@
-../sample.mp3

tests/data/scanner/advanced/song2.mp3

@@ -1 +0,0 @@
-../sample.mp3

tests/data/scanner/advanced/song3.mp3

@@ -1 +0,0 @@
-../sample.mp3

tests/data/scanner/advanced/subdir1/song4.mp3

@@ -1 +0,0 @@
-../../sample.mp3

tests/data/scanner/advanced/subdir1/song5.mp3

@@ -1 +0,0 @@
-../../sample.mp3

tests/data/scanner/advanced/subdir1/subsubdir/song8.mp3

@@ -1 +0,0 @@
-../../../sample.mp3

tests/data/scanner/advanced/subdir1/subsubdir/song9.mp3

@@ -1 +0,0 @@
-../../../sample.mp3

tests/data/scanner/advanced/subdir2/song6.mp3

@@ -1 +0,0 @@
-../../sample.mp3

tests/data/scanner/advanced/subdir2/song7.mp3

@@ -1 +0,0 @@
-../../sample.mp3

tests/data/scanner/simple/song1.mp3

@@ -1 +0,0 @@
-../sample.mp3

tests/data/song1.flac

@@ -1 +0,0 @@
-blank.flac

tests/data/song1.mp3

@@ -1 +0,0 @@
-blank.mp3

tests/data/song1.ogg

@@ -1 +0,0 @@
-blank.ogg

tests/data/song1.wav

@@ -1 +0,0 @@
-blank.wav

tests/data/song2.flac

@@ -1 +0,0 @@
-blank.flac

tests/data/song2.mp3

@@ -1 +0,0 @@
-blank.mp3

tests/data/song2.ogg

@@ -1 +0,0 @@
-blank.ogg

tests/data/song2.wav

@@ -1 +0,0 @@
-blank.wav

tests/data/song3.flac

@@ -1 +0,0 @@
-blank.flac

tests/data/song3.mp3

@@ -1 +0,0 @@
-blank.mp3

tests/data/song3.ogg

@@ -1 +0,0 @@
-blank.ogg

tests/data/song3.wav

@@ -1 +0,0 @@
-blank.wav