big speedup of grouping by compiling format

1 files changed, 10 insertions, 2 deletions

diff --git a/plugins/SongStatus.py b/plugins/SongStatus.py
index a03476e..93d8311 100644
--- a/plugins/SongStatus.py
+++ b/plugins/SongStatus.py
@@ -3,6 +3,8 @@ from clMonty import monty
 from clPlugin import *
 from traceback import print_exc
 
+import format
+
 SS_DEFAULT_FORMAT='<font size="4">now $state</font>'\
 '$if($title,<font size="8" color="blue">$title</font>'\
 '<br />by <font size="8" color="green">$artist</font>'\
@@ -13,6 +15,7 @@ class wgSongStatus(QtGui.QWidget):
 	"""Displays the status of the current song, if playing."""
 	" label containing the info"
 	lblInfo=None
+	format=None
 	def __init__(self, parent=None):
 		QtGui.QWidget.__init__(self, parent)
 
@@ -23,6 +26,7 @@ class wgSongStatus(QtGui.QWidget):
 		self.setLayout(layout)
 
 		layout.addWidget(self.lblInfo)
+		self.updateFormat()
 
 		monty.addListener('onSongChange', self.update)
 		monty.addListener('onTimeChange', self.update)
@@ -43,9 +47,12 @@ class wgSongStatus(QtGui.QWidget):
 		except:
 			pass
 		
-		txt=format(settings.get('songstatus.format', SS_DEFAULT_FORMAT), song, values)
-		self.lblInfo.setText(txt)
+		if song:
+			self.lblInfo.setText(self.format(format.params(song, values)))
 		
+	def updateFormat(self):
+		self.format=format.compile(settings.get('songstatus.format', SS_DEFAULT_FORMAT))
+
 	def text(self):
 		return self.lblInfo.text()
 
@@ -68,4 +75,5 @@ class pluginSongStatus(Plugin):
 				['songstatus.format', 'Format', 'Format of the song status. Possible tags: $title, $artist, $album, $track, $time, $length, $state', format]
 			]
 	def afterSaveSettings(self):
+		self.o.updateFormat()
 		self.o.update(None)