X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a194b290cad5bfd10126b9a225b08e2c58c5c990..af5dfb0ec911f152f909530cf29c9e2ba74e2c1f:/lib/python/Components/MovieList.py

diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 7ec8a9ff..a921b8df 100644
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -2,6 +2,7 @@ from HTMLComponent import *
 from GUIComponent import *
 from Tools.FuzzyDate import FuzzyTime
 from ServiceReference import ServiceReference
+from Components.MultiContent import MultiContentEntryText, RT_HALIGN_LEFT, RT_HALIGN_RIGHT
 
 from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation
 
@@ -9,49 +10,43 @@ from enigma import eServiceReference, eServiceCenter, \
 	eServiceCenterPtr, iListableServicePtr, \
 	iStaticServiceInformationPtr
 
-RT_HALIGN_LEFT = 0
-RT_HALIGN_RIGHT = 1
-RT_HALIGN_CENTER = 2
-RT_HALIGN_BLOCK = 4
-
-RT_VALIGN_TOP = 0
-RT_VALIGN_CENTER = 8
-RT_VALIGN_BOTTOM = 16
-
-RT_WRAP = 32
-
-
 #
 # | name of movie              |
 #
 def MovieListEntry(serviceref, serviceHandler):
-	res = [ serviceref ]
+	if serviceref.flags & eServiceReference.mustDescent:
+		return None
 
 	info = serviceHandler.info(serviceref)
 	
 	if info is None:
 		# ignore service which refuse to info
-		return
+		return None
 	
 	len = info.getLength(serviceref)
-	if len:
+	if len > 0:
 		len = "%d:%02d" % (len / 60, len % 60)
 	else:
 		len = "?:??"
 	
-	res.append((0, 0, 0, 560, 30, 0, RT_HALIGN_LEFT, info.getName(serviceref)))
-	
-	description = info.getInfoString(serviceref, iServiceInformation.sDescription)
 	begin = info.getInfo(serviceref, iServiceInformation.sTimeCreate)
+	res = [ (serviceref, begin) ]
+
+	res.append(MultiContentEntryText(pos=(0, 0), size=(420, 30), font = 0, flags = RT_HALIGN_LEFT, text = info.getName(serviceref)))
+	service = ServiceReference(info.getInfoString(serviceref, iServiceInformation.sServiceref))
+	if service is not None:
+		res.append(MultiContentEntryText(pos=(420, 0), size=(140, 30), font = 0, flags = RT_HALIGN_RIGHT, text = service.getServiceName()))
 	
+	description = info.getInfoString(serviceref, iServiceInformation.sDescription)
+
 	begin_string = ""
 	if begin > 0:
 		t = FuzzyTime(begin)
 		begin_string = t[0] + ", " + t[1]
 	
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 30, 560, 20, 1, RT_HALIGN_LEFT, description))
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 270, 20, 1, RT_HALIGN_LEFT, begin_string))
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 290, 50, 270, 20, 1, RT_HALIGN_RIGHT, len))
+	res.append(MultiContentEntryText(pos=(0, 30), size=(560, 20), font=1, flags=RT_HALIGN_LEFT, text=description))
+	res.append(MultiContentEntryText(pos=(0, 50), size=(270, 20), font=1, flags=RT_HALIGN_LEFT, text=begin_string))
+	res.append(MultiContentEntryText(pos=(290, 50), size=(270, 20), font=1, flags=RT_HALIGN_RIGHT, text=len))
 	
 	return res
 
@@ -59,11 +54,11 @@ class MovieList(HTMLComponent, GUIComponent):
 	def __init__(self, root):
 		GUIComponent.__init__(self)
 		self.l = eListboxPythonMultiContent()
-		self.load(root)
-		self.l.setList(self.list)
-		self.l.setFont(0, gFont("Regular", 30))
+		if root is not None:
+			self.reload(root)
+		self.l.setFont(0, gFont("Regular", 22))
 		self.l.setFont(1, gFont("Regular", 18))
-
+		
 	def moveToIndex(self, index):
 		self.instance.moveSelectionTo(index)
 
@@ -71,7 +66,8 @@ class MovieList(HTMLComponent, GUIComponent):
 		return self.instance.getCurrentIndex()
 
 	def getCurrent(self):
-		return self.l.getCurrentSelection()
+		l = self.l.getCurrentSelection()
+		return l and l[0]
 	
 	def GUIcreate(self, parent):
 		self.instance = eListbox(parent)
@@ -82,6 +78,19 @@ class MovieList(HTMLComponent, GUIComponent):
 		self.instance.setContent(None)
 		self.instance = None
 
+	def reload(self, root = None):
+		if root is not None:
+			self.load(root)
+		else:
+			self.load(self.root)
+		self.l.setList(self.list)
+
+	def removeService(self, service):
+		for l in self.list[:]:
+			if l[0][0] == service:
+				self.list.remove(l)
+		self.l.setList(self.list)
+
 	def load(self, root):
 		# this lists our root service, then building a 
 		# nice list
@@ -105,20 +114,20 @@ class MovieList(HTMLComponent, GUIComponent):
 		
 		# now process them...
 		for ref in movieList:
-			self.list.append(MovieListEntry(ref, serviceHandler))
-			
+			a = MovieListEntry(ref, serviceHandler)
+			if a is not None:
+				self.list.append(a)
+		
+		self.list.sort(key=lambda x: -x[0][1])
+
 	def moveTo(self, serviceref):
 		found = 0
 		count = 0
 		for x in self.list:
-			if str(ServiceReference(x[0])) == str(ServiceReference(serviceref)):
+			if str(ServiceReference(x[0][0])) == str(ServiceReference(serviceref)):
 				found = count
 			count += 1
 		self.instance.moveSelectionTo(found)
 
-	def reload(self):
-		self.load(self.root)
-		self.l.setList(self.list)
-
 	def moveDown(self):
 		self.instance.moveSelection(self.instance.moveDown)