Merge lp:~laszlok/zeitgeist-datasources/trunk into lp:zeitgeist-datasources/0.8

[Laszlo Pandy]

[Seif Lotfy (seif)]

review: Approve

=== modified file 'rhythmbox/__init__.py'
--- rhythmbox/__init__.py	2009-11-27 08:49:31 +0000
+++ rhythmbox/__init__.py	2010-01-21 04:29:09 +0000
@@ -19,6 +19,7 @@
 
 import rb
 import rhythmdb
+import gobject
 import time
 
 from zeitgeist.client import ZeitgeistDBusInterface
@@ -42,7 +43,13 @@
             shell_player.connect("playing-changed", self.playing_changed)
             shell_player.connect("playing-source-changed", self.playing_source_changed)
             shell_player.connect("playing-song-changed", self.playing_song_changed)
+
+            backend_player = shell_player.get_property("player")
+            backend_player.connect("eos", self.on_backend_eos)
+    
+            self.__manual_switch = True
             self.__current_song = None
+            self._shell = shell
         
     @staticmethod
     def get_song_info(db, entry):
@@ -56,37 +63,77 @@
         return song
         
         
+    def on_backend_eos(self, backend_player, stream_data, eos_early):
+        print "got eos signal"
+        # EOS signal means that the song changed because the song is over.
+        # ie. the user did not explicitly change the song.
+        self.__manual_switch = False
+        
     def playing_changed(self, shell, state):
         """ using this signal to trigger play/pause switches"""
-        print ("got playing_changed signal", shell, state)
+        pass
         
     def playing_source_changed(self, shell, source):
         """ use this signal to trigger changes between local music, radio, online music etc."""
-        print ("got playing_source_changed signal", shell, source)
+        pass
         
     def playing_song_changed(self, shell, entry):
         print ("got playing_song_changed signal", shell, entry)
-        db = shell.get_property("db")
+        if self.__current_song is not None:
+            self.send_to_zeitgeist_async(self.__current_song, Interpretation.CLOSE_EVENT)
+
         if entry is not None:
-            self.__current_song = entry
-            song = self.get_song_info(db, entry)
-            subject = Subject.new_for_values(
-                uri=song["location"],
-                interpretation=unicode(Interpretation.MUSIC),
-                manifestation=unicode(Manifestation.FILE),
-                #~ origin="", #TBD
-                mimetype=song["mimetype"],
-                text=" - ".join([song["title"], song["artist"], song["album"]])
-            )            
-            event = Event.new_for_values(
-                timestamp=int(time.time()*1000),
-                interpretation=unicode(Interpretation.VISIT_EVENT),
-                manifestation=unicode(Manifestation.USER_ACTIVITY),
-                actor="application://rhythmbox.desktop",
-                subjects=[subject,]
-            )
-            print event
-            IFACE.InsertEvents([event,])
+	        self.send_to_zeitgeist_async(entry, Interpretation.OPEN_EVENT)
+
+        self.__current_song = entry
+        gobject.idle_add(self.reset_manual_switch)
+        
+    def reset_manual_switch(self):
+        print "manual_switch reset to True"
+        """
+        After the eos signal has fired, and after the zeitgeist events have
+        been sent asynchronously, reset the manual_switch variable.
+        """
+        self.__manual_switch = True
+        
+    def send_to_zeitgeist_async(self, entry, event_type):
+        """ 
+        We do async here because the "eos" signal is fired
+        *after* the "playing-song-changed" signal.
+        We don't know if the song change was manual or automatic
+        until we get get the eos signal. If the mainloop goes to
+        idle, it means there are no more signals scheduled, so we
+        will have already received the eos if it was coming.   
+        """
+        gobject.idle_add(self.send_to_zeitgeist, entry, event_type)
+        
+    def send_to_zeitgeist(self, entry, event_type):
+        db = self._shell.get_property("db")
+        song = self.get_song_info(db, entry)
+        
+        if self.__manual_switch:
+            manifest = Manifestation.USER_ACTIVITY
+        else:
+            manifest = Manifestation.SCHEDULED_ACTIVITY
+        
+        subject = Subject.new_for_values(
+            uri=song["location"],
+            interpretation=unicode(Interpretation.MUSIC),
+            manifestation=unicode(Manifestation.FILE),
+            #~ origin="", #TBD
+            mimetype=song["mimetype"],
+            text=" - ".join([song["title"], song["artist"], song["album"]])
+        )            
+        event = Event.new_for_values(
+            timestamp=int(time.time()*1000),
+            interpretation=unicode(event_type),
+            manifestation=unicode(manifest),
+            actor="application://rhythmbox.desktop",
+            subjects=[subject,]
+        )
+        print event
+        IFACE.InsertEvents([event,])
         
     def deactivate(self, shell):
         print "UNLOADING Zeitgeist plugin ......."
+