Merge lp:~markjtully/ubuntu-app-review-board/unity-scopes-music-extras-oneiric into lp:~app-review-board/ubuntu-app-review-board/unity-scopes-music-extras-oneiric

[Allison Randal]

[Allison Randal (allison)]

review: Approve

[lp:~markjtully/ubuntu-app-review-board/unity-scopes-music-extras-oneiric]

16. By Allison Randal on 2012-03-31

Merging fixes for gmusicbrowser from markjtully

=== modified file 'scopes/gmusicbrowser/unity-scope-gmusicbrowser'
--- scopes/gmusicbrowser/unity-scope-gmusicbrowser	2012-03-23 05:14:53 +0000
+++ scopes/gmusicbrowser/unity-scope-gmusicbrowser	2012-03-31 01:44:19 +0000
@@ -59,18 +59,20 @@
 			fields = song.split("\t")
 			track = {}
 			track[0] = fields[30]						#title
-			track[1] = fields[20] + "/" + fields[10]	# Location
+			track[1] = fields[20] + "/" + fields[10]			# Location
 			track[2] = fields[4] 						# Artist
 			track[3] = fields[2] 						# Album Name
 			track[4] = "audio/mp3"						# mimetype
 			track[5] = fields[3]						# Album Artist
 			track[6] = fields[12]						# Genre
 			if len(fields) < 34:
-				track[7] = "0"
+				track[7] = 0
 			else:
-				track[7] = str(fields[33])[0:4]						# Year
-				if track[7] == "0Non":
-					track[7] = "0"
+				track[7] = str(fields[33])[0:4]				# Year
+				try:
+					track[7] = int(track[7])
+				except:
+					track[7] = 0
 			track[8] = 0 if fields[31] is None else fields[31]
 			tracks.append(track)
 		
@@ -205,21 +207,21 @@
 							continue
 						else:
 							model.append (uri,			# uri
-								albumart,				# string formatted GIcon
-								SONGS,					# numeric group id
-								mimetype,				# mimetype
-								title,					# display name
-								artist + "\n" + album,	# comment
-								uri)					# dnduri
+								albumart,			# string formatted GIcon
+								SONGS,				# numeric group id
+								mimetype,			# mimetype
+								title,				# display name
+								artist + "\n" + album,		# comment
+								uri)				# dnduri
 							
 							if album not in albums:
 								model.append (albumuri,		# uri
-									albumart,				# string formatted GIcon
-									ALBUMS,					# numeric group id
-									mimetype,				# mimetype
-									album,					# display name
+									albumart,		# string formatted GIcon
+									ALBUMS,			# numeric group id
+									mimetype,		# mimetype
+									album,			# display name
 									artist + "\n" + album,	# comment
-									uri)					# dnduri
+									uri)			# dnduri
 								if album != None:
 									albums.append(album)
 	              
@@ -227,12 +229,8 @@
 						self.i = self.i + 1
 
 	def activate_uri(self, scope, uri):
-		print uri
 		import subprocess
-		albumtracks = []
-		albumtracks.append("gmusicbrowser")
-		albumtracks.append("-play")
-		albumtracks.append("-playlist")
+		command = ["gmusicbrowser", "-playlist"]
 		# If uri starts with album:// then we need to play all the songs on it
 		if uri.startswith("album://"):
 			trackdetails = []
@@ -246,12 +244,11 @@
 					trackdetails.append(trackdetail)
 			trackdetails.sort(key=lambda track: int(track[1]))
 			for track in trackdetails:
-				albumtracks.append(track[0])
-			print albumtracks
-			subprocess.Popen(albumtracks)
+				command.append(track[0])
+			subprocess.Popen(command)
 		else:
-			albumtracks.append("file://" + uri)
-			subprocess.Popen(albumtracks)
+			command.append(uri)
+			subprocess.Popen(command)
 		return Unity.ActivationResponse (handled = Unity.HandledType.HIDE_DASH, goto_uri = '')
 
 if __name__ == "__main__":