Merge pull request #109 from sindrig/1.4.5

1.4.5

Author: sindrig

README.rst

@@ -45,9 +45,9 @@ DBus integration
 
 1. Run `make install_dbus`
 2. Make sure you have python-gobject2 installed
-3. Symlink gobject (and possibly glib) to your virtualenv (that is, if you're not installing globally!)
+3. Symlink gi (and possibly glib) to your virtualenv (that is, if you're not installing globally!)
 
-  * ln -s /usr/lib/python3.5/site-packages/gobject/ $VIRTUAL_ENV/lib/python3.5/site-packages/gobject
+  * ln -s /usr/lib/python3.5/site-packages/gi/ $VIRTUAL_ENV/lib/python3.5/site-packages/gi
   * ln -s /usr/lib/python3.5/site-packages/glib/ $VIRTUAL_ENV/lib/python3.5/site-packages/glib
 
 4. The service will be available at "/com/spoppy" (f.x. :code:`qdbus com.spoppy /com/spoppy com.spoppy.PlayPause`)

spoppy/__init__.py

@@ -10,7 +10,7 @@
 
 
 def get_version():
-    return '1.4.4'
+    return '1.4.5'
 
 if click:
     @click.command()

spoppy/dbus_listener.py

@@ -24,9 +24,9 @@
     )
 
 try:
-    import gobject
+    from gi.repository import GObject
 except ImportError:
-    gobject = None
+    GObject = None
     logger.warning(
         'gobject not installed, you won\'t be able to control the '
         'player via DBus'
@@ -39,7 +39,7 @@ def __init__(self, lifecycle):
             self.lifecycle = lifecycle
 
         def run(self):
-            gobject.threads_init()
+            GObject.threads_init()
             dbus.mainloop.glib.threads_init()
             dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
             bus_name = dbus.service.BusName(
@@ -50,7 +50,7 @@ def run(self):
                 bus_name, "/com/spoppy"
             )
 
-            self._loop = gobject.MainLoop()
+            self._loop = GObject.MainLoop()
             self._loop.run()
 
         def stop(self):
@@ -104,7 +104,7 @@ class DBusListener(threading.Thread):
     def __init__(self, lifecycle, stop_event, *args):
         self.lifecycle = lifecycle
         self.stop_event = stop_event
-        self.should_run = dbus and gobject
+        self.should_run = dbus and GObject
         if not self.should_run:
             logger.warning(
                 'DBusListener thread aborting because of missing dependencies'

spoppy/menus.py

@@ -1,5 +1,4 @@
 import logging
-import random
 import threading
 import webbrowser
 from collections import namedtuple
@@ -876,6 +875,8 @@ class RadioSelected(TrackSearchResults):
     radio_name = ''
 
     def get_header(self):
+        if not self.search.results.total:
+            return 'Song cannot be played in radio, sorry!'
         return 'Radio list "%s" generated:' % self.get_mock_playlist_name()
 
     def get_mock_playlist_name(self):

spoppy/navigation.py

@@ -62,12 +62,10 @@ def navigate_to(self, going):
         self.session.process_events()
         going.initialize()
         while self.navigating:
-            logger.debug('clearing screen...')
             click.clear()
             self.print_header()
             self.print_menu(going.get_ui())
             response = going.get_response()
-            logger.debug('Got response %s' % response)
             if callable(response):
                 response = response()
                 logger.debug('Got response %s after evaluation' % response)

spoppy/players.py

@@ -494,6 +494,8 @@ def add_to_queue(self, item):
             self.song_order.append(len(self.song_order))
             # Add the song to the current song list
             self.song_list.append(item)
+            if not self.current_track:
+                self.play_current_song(start_playing=False)
         elif hasattr(item, 'tracks'):
             for track in item.tracks:
                 if track.availability != spotify.TrackAvailability.UNAVAILABLE:
@@ -586,7 +588,7 @@ def on_end_of_track(self, session=None):
         self.end_of_track.set()
         thread.interrupt_main()
 
-    def play_current_song(self):
+    def play_current_song(self, start_playing=True):
         '''
         Plays the current song
         :returns: None
@@ -606,7 +608,8 @@ def play_current_song(self):
         )
 
         self.player.load(self.current_track)
-        self.play_pause()
+        if start_playing:
+            self.play_pause()
 
         self.seconds_played = 0
 

spoppy/radio.py

@@ -73,6 +73,7 @@ def get_empty_results(self):
         return RadioResults([])
 
     def handle_results(self, response_data):
+        logger.debug('Got %d songs', len(response_data))
         item_results = self.manipulate_items([
             self.item_cls(self.session, item['uri'])
             for item in response_data

spoppy/search.py

@@ -32,15 +32,15 @@ class Search(threading.Thread):
     ENDPOINTS = {
         # Each entry is a tuple, (HTTP_ENDPOINT, CLS)
         'tracks': (
-            '/v1/search?query={query}&offset=0&limit=20&type=track',
+            u'/v1/search?query={query}&offset=0&limit=20&type=track',
             Track
         ),
         'albums': (
-            '/v1/search?query={query}&offset=0&limit=20&type=album',
+            u'/v1/search?query={query}&offset=0&limit=20&type=album',
             Album
         ),
         'artists': (
-            '/v1/search?query={query}&offset=0&limit=20&type=artist',
+            u'/v1/search?query={query}&offset=0&limit=20&type=artist',
             None
         ),
     }

tests/test_players.py

@@ -264,14 +264,18 @@ def test_toggle_repeat(self):
             sorted(seen_repeat_flags)
         )
 
-    def test_add_track_to_queue(self):
+    @patch('spoppy.players.Player.play_current_song')
+    def test_add_track_to_queue(self, patched_play_current_song):
         track = MagicMock(spec=spotify.Track)
         self.player.playlist = 'foo'
+        self.assertIsNone(self.player.current_track)
         self.assertIsNone(self.player.add_to_queue(track))
         self.assertIn(track, self.player.song_list)
         self.assertIsNone(self.player.playlist)
+        patched_play_current_song.assert_called_once_with(start_playing=False)
 
-    def test_add_playlist_to_queue(self):
+    @patch('spoppy.players.Player.play_current_song')
+    def test_add_playlist_to_queue(self, patched_play_current_song):
         tracks = [
             MagicMock(spec=spotify.Track),
             MagicMock(spec=spotify.Track),
@@ -286,6 +290,8 @@ def test_add_playlist_to_queue(self):
         for track in tracks:
             self.assertIn(track, self.player.song_list)
         self.assertIsNone(self.player.playlist)
+        self.assertEqual(patched_play_current_song.call_count, 3)
+        patched_play_current_song.assert_called_with(start_playing=False)
 
     @patch('spoppy.players.Player.next_song')
     @patch('spoppy.players.Player.play_current_song')