X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fc75f85617502afc5fe3175d530f4eb938c421ad..f460ed50d836d20f79ea3665b15f15b0da4cbab9:/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py?ds=sidebyside

diff --git a/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py b/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py
index 53c9ab66..424641c9 100644
--- a/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py
+++ b/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py
@@ -36,6 +36,19 @@ def removeAlternative(service1, service2):
 		del alternatives[service1]
 	if len(alternatives[service2]) == 0:
 		del alternatives[service2]
+		
+def loadAlternatives():
+	doc = xml.dom.minidom.parse(resolveFilename(SCOPE_CONFIG, "alternatives.xml"))
+	
+	root = doc.childNodes[0]
+	for service in elementsWithTag(root.childNodes, 'service'):
+		newService = str(service.getAttribute('ref'))
+		for alternative in elementsWithTag(service.childNodes, 'alternative'):
+			newAlternative = str(alternative.getAttribute('ref'))
+			addAlternative(newService, newAlternative)
+
+def sortKey(x):
+	return str.lower(ServiceReference(x).getServiceName().strip())
 			
 class AlternativeZapping(Screen):
 	skin = """
@@ -67,7 +80,10 @@ class AlternativeZapping(Screen):
 		self.serviceslist = []
 		self.alternativeslist = []
 		
-		self.loadAlternatives()
+		try:
+			self.loadAlternatives()
+		except:
+			pass
 		self["serviceslist"] = MenuList(self.serviceslist)
 		self["alternativeslist"] = MenuList(self.alternativeslist)
 
@@ -164,17 +180,27 @@ class AlternativeZapping(Screen):
 	
 	def updateServices(self):
 		self.serviceslist = []
-		
-		for x in self.alternatives.keys():
+		keys = self.alternatives.keys()
+		keys.sort(key = sortKey)
+		for x in keys:
 			self.serviceslist.append((ServiceReference(x).getServiceName(), x))
 			
-		self["serviceslist"].l.setList(self.serviceslist)
+		self["serviceslist"].setList(self.serviceslist)
 		if len(self.serviceslist) > 0:
 			self.yellow.setText(_("Add alternative"))
 			self.red.setText(_("Remove service"))
 		else:
 			self.yellow.setText("")
 			self.red.setText("")
+	
+	def selectService(self, ref):
+		count = 0
+		for x in self["serviceslist"].list:
+			if x[1] == ref:
+				self["serviceslist"].instance.moveSelectionTo(count)
+				return
+			count += 1
+			
 			
 	def updateAlternatives(self):
 		self.alternativeslist = []
@@ -185,17 +211,18 @@ class AlternativeZapping(Screen):
 			for x in alternativelist:
 				self.alternativeslist.append((ServiceReference(x).getServiceName(), x))
 			
-		self["alternativeslist"].l.setList(self.alternativeslist)
+		self["alternativeslist"].setList(self.alternativeslist)
 			
 	def greenKey(self):
 		self.session.openWithCallback(self.finishedChannelSelection, SimpleChannelSelection, _("Select reference service"))
 
 	def finishedChannelSelection(self, args):
-		if not self.alternatives.has_key(str(ServiceReference(args))):
-			self.alternatives[str(ServiceReference(args))] = []
-		print "alternatives:", self.alternatives
+		serviceString = str(ServiceReference(args))
+		if not self.alternatives.has_key(serviceString):
+			self.alternatives[serviceString] = []
 		self.updateServices()
 		self.updateAlternatives()
+		self.selectService(serviceString)
 
 	def yellowKey(self):
 		if len(self.serviceslist) > 0:
@@ -218,6 +245,10 @@ def playService(self, ref):
 
 def autostart(reason):
 	if reason == 0:
+		try:
+			loadAlternatives()
+		except:
+			pass
 		NavigationInstance.instance.playService = type(NavigationInstance.instance.playService)(playService, NavigationInstance, Navigation)
 
 def AlternativeZappingSetup(session):