Merge lp:~gregory-lachowski/screenlets/nowplaying-exaile into lp:screenlets

[Grzegorz Lachowski]

Unmerged revisions

462. By gregorl <gregorl@chii> on 2010-08-16

Exaile API for NowPlaying screenlet fix

=== modified file 'src/lib/plugins/Exaile.py'
--- src/lib/plugins/Exaile.py	2008-05-26 13:00:37 +0000
+++ src/lib/plugins/Exaile.py	2010-08-16 21:33:45 +0000
@@ -14,20 +14,15 @@
 import gobject
 from GenericPlayer import GenericAPI
 
-#EXAILE = {'DBUS_NAME':'org.exaile.DBusInterface','DBUS_OBJECT':'/DBusInterfaceObject', \
-#			'DBUS_TITLE':'get_title()','DBUS_ALBUM':'get_album()', \
-#			'DBUS_ARTIST':'get_artist()','DBUS_ART':'get_cover_path()',\
-#			'DBUS_PLAYING':'query()','PLAY_WORD':'playing'}
-
 class ExaileAPI(GenericAPI):
 	__name__ = 'Exaile API'
 	__version__ = '0.0'
 	__author__ = 'vrunner'
 	__desc__ = 'API to the Exaile Music Player'
 
-	ns = "org.exaile.DBusInterface"
-	iroot = "/DBusInterfaceObject"
-	iface = "org.exaile.DBusInterface"
+	ns = "org.exaile.Exaile"
+	iroot = "/org/exaile/Exaile"
+	iface = "org.exaile.Exaile"
 
 	playerAPI = None
 
@@ -51,29 +46,39 @@
 		self.playerAPI = dbus.Interface(proxy_obj, self.iface)
 
 	def get_title(self):
-		return self.playerAPI.get_title()
+		return self.playerAPI.GetTrackAttr('title')
 	
 	def get_album(self):
-		return self.playerAPI.get_album()
+		return self.playerAPI.GetTrackAttr('album')
 
 	def get_artist(self):
-		return self.playerAPI.get_artist()
+		return self.playerAPI.GetTrackAttr('artist')
 
 	def get_cover_path(self):
-		return self.playerAPI.get_cover_path()
+		coverart = ""
+		coverFilePath = os.path.join(os.environ["HOME"], '.exaileCover.bmp')
+		coverData = self.playerAPI.GetCoverData()
+		if len(coverData):
+		    with open(coverFilePath,'w') as coverFile:
+			for data in coverData:
+			    coverFile.write(str(data))
+		    coverart = coverFilePath
+		else:
+		    coverart = ""
+
+		return coverart
 
 	def is_playing(self):
-		if self.now_playing() == "": return False
-		else: return True
+		return self.playerAPI.IsPlaying()
 
 	def play_pause(self):
-		self.playerAPI.play()
+		self.playerAPI.PlayPause()
 
 	def next(self):
-		self.playerAPI.next_track()
+		self.playerAPI.Next()
 
 	def previous(self):
-		self.playerAPI.prev_track()
+		self.playerAPI.Prev()
 
 	def register_change_callback(self, fn):
 		self.callback_fn = fn
@@ -102,6 +107,5 @@
 			self.callback_fn()
 			pass
 
-
 	def now_playing(self):
-		return self.get_artist()+self.get_title()
+		return self.get_artist() + self.get_title()