From 4404e34a798dab4a489a461ab7564cac0ef24738 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 10 Jun 2011 19:55:59 +0200
Subject: [PATCH] Test and implement mpris.Seek()

---
 mopidy/frontends/mpris.py                     | 12 +--
 .../frontends/mpris/player_interface_test.py  | 79 +++++++++++++++++++
 2 files changed, 83 insertions(+), 8 deletions(-)

diff --git a/mopidy/frontends/mpris.py b/mopidy/frontends/mpris.py
index d1107020..50e4e49a 100644
--- a/mopidy/frontends/mpris.py
+++ b/mopidy/frontends/mpris.py
@@ -273,14 +273,10 @@ class MprisObject(dbus.service.Object):
     @dbus.service.method(dbus_interface=PLAYER_IFACE)
     def Seek(self, offset):
         logger.debug(u'%s.Seek called', PLAYER_IFACE)
-        # TODO Pseudo code:
-        # new_position = playback.time_position + offset
-        # if new_position > playback.current_track.length:
-        #     playback.next()
-        #     return
-        # if new_position < 0: new_position = 0
-        # playback.seek(new_position)
-        pass
+        offset_in_milliseconds = offset // 1000
+        current_position = self.backend.playback.time_position.get()
+        new_position = current_position + offset_in_milliseconds
+        self.backend.playback.seek(new_position)
 
     @dbus.service.method(dbus_interface=PLAYER_IFACE)
     def SetPosition(self, track_id, position):
diff --git a/tests/frontends/mpris/player_interface_test.py b/tests/frontends/mpris/player_interface_test.py
index d8514abd..ef84ce3c 100644
--- a/tests/frontends/mpris/player_interface_test.py
+++ b/tests/frontends/mpris/player_interface_test.py
@@ -232,3 +232,82 @@ class PlayerInterfaceTest(unittest.TestCase):
         self.assertEquals(self.backend.playback.state.get(), STOPPED)
         self.mpris.Play()
         self.assertEquals(self.backend.playback.state.get(), STOPPED)
+
+    def test_seek_seeks_given_microseconds_forward_in_the_current_track(self):
+        self.backend.current_playlist.append([Track(uri='a', length=40000)])
+        self.backend.playback.play()
+
+        before_seek = self.backend.playback.time_position.get()
+        self.assert_(before_seek >= 0)
+
+        milliseconds_to_seek = 10000
+        microseconds_to_seek = milliseconds_to_seek * 1000
+
+        self.mpris.Seek(microseconds_to_seek)
+
+        self.assertEquals(self.backend.playback.state.get(), PLAYING)
+
+        after_seek = self.backend.playback.time_position.get()
+        self.assert_(after_seek >= (before_seek + milliseconds_to_seek))
+
+    def test_seek_seeks_given_microseconds_backward_if_negative(self):
+        self.backend.current_playlist.append([Track(uri='a', length=40000)])
+        self.backend.playback.play()
+        self.backend.playback.seek(20000)
+
+        before_seek = self.backend.playback.time_position.get()
+        self.assert_(before_seek >= 20000)
+
+        milliseconds_to_seek = -10000
+        microseconds_to_seek = milliseconds_to_seek * 1000
+
+        self.mpris.Seek(microseconds_to_seek)
+
+        self.assertEquals(self.backend.playback.state.get(), PLAYING)
+
+        after_seek = self.backend.playback.time_position.get()
+        self.assert_(after_seek >= (before_seek + milliseconds_to_seek))
+        self.assert_(after_seek < before_seek)
+
+    def test_seek_seeks_to_start_of_track_if_new_position_is_negative(self):
+        self.backend.current_playlist.append([Track(uri='a', length=40000)])
+        self.backend.playback.play()
+        self.backend.playback.seek(20000)
+
+        before_seek = self.backend.playback.time_position.get()
+        self.assert_(before_seek >= 20000)
+
+        milliseconds_to_seek = -30000
+        microseconds_to_seek = milliseconds_to_seek * 1000
+
+        self.mpris.Seek(microseconds_to_seek)
+
+        self.assertEquals(self.backend.playback.state.get(), PLAYING)
+
+        after_seek = self.backend.playback.time_position.get()
+        self.assert_(after_seek >= (before_seek + milliseconds_to_seek))
+        self.assert_(after_seek < before_seek)
+        self.assert_(after_seek >= 0)
+
+    def test_seek_skips_to_next_track_if_new_position_larger_than_track_length(self):
+        self.backend.current_playlist.append([Track(uri='a', length=40000),
+            Track(uri='b')])
+        self.backend.playback.play()
+        self.backend.playback.seek(20000)
+
+        before_seek = self.backend.playback.time_position.get()
+        self.assert_(before_seek >= 20000)
+        self.assertEquals(self.backend.playback.state.get(), PLAYING)
+        self.assertEquals(self.backend.playback.current_track.get().uri, 'a')
+
+        milliseconds_to_seek = 50000
+        microseconds_to_seek = milliseconds_to_seek * 1000
+
+        self.mpris.Seek(microseconds_to_seek)
+
+        self.assertEquals(self.backend.playback.state.get(), PLAYING)
+        self.assertEquals(self.backend.playback.current_track.get().uri, 'b')
+
+        after_seek = self.backend.playback.time_position.get()
+        self.assert_(after_seek >= 0)
+        self.assert_(after_seek < before_seek)