X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FMovieList.py;h=7ec8a9ff3ae9fd91709f22926fb45d0c3d1ae899;hb=a194b290cad5bfd10126b9a225b08e2c58c5c990;hp=5b07791fbdff22927138515683d3c2b3c2d75acf;hpb=2dc9b0cb83069aaed4dbb3f45b3d15835568d0d9;p=vuplus_dvbapp

diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 5b07791..7ec8a9f 100644
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -1,14 +1,14 @@
 from HTMLComponent import *
 from GUIComponent import *
+from Tools.FuzzyDate import FuzzyTime
+from ServiceReference import ServiceReference
 
-from enigma import eListboxPythonMultiContent, eListbox, gFont
+from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation
 
 from enigma import eServiceReference, eServiceCenter, \
 	eServiceCenterPtr, iListableServicePtr, \
 	iStaticServiceInformationPtr
 
-
-
 RT_HALIGN_LEFT = 0
 RT_HALIGN_RIGHT = 1
 RT_HALIGN_CENTER = 2
@@ -27,11 +27,10 @@ RT_WRAP = 32
 def MovieListEntry(serviceref, serviceHandler):
 	res = [ serviceref ]
 
-	info = iStaticServiceInformationPtr()
-
-	if serviceHandler.info(serviceref, info):
+	info = serviceHandler.info(serviceref)
+	
+	if info is None:
 		# ignore service which refuse to info
-		del info
 		return
 	
 	len = info.getLength(serviceref)
@@ -40,10 +39,19 @@ def MovieListEntry(serviceref, serviceHandler):
 	else:
 		len = "?:??"
 	
-	res.append((0, 0, 400, 30, 0, RT_HALIGN_LEFT, info.getName(serviceref)))
-	res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, "Toller Film"))
-	res.append((0, 50, 200, 20, 1, RT_HALIGN_LEFT, "Aufgenommen: irgendwann"))
-	res.append((200, 50, 200, 20, 1, RT_HALIGN_RIGHT, 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)
+	
+	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))
 	
 	return res
 
@@ -53,9 +61,15 @@ class MovieList(HTMLComponent, GUIComponent):
 		self.l = eListboxPythonMultiContent()
 		self.load(root)
 		self.l.setList(self.list)
-		self.l.setFont(0, gFont("Arial", 30))
-		self.l.setFont(1, gFont("Arial", 18))
-	
+		self.l.setFont(0, gFont("Regular", 30))
+		self.l.setFont(1, gFont("Regular", 18))
+
+	def moveToIndex(self, index):
+		self.instance.moveSelectionTo(index)
+
+	def getCurrentIndex(self):
+		return self.instance.getCurrentIndex()
+
 	def getCurrent(self):
 		return self.l.getCurrentSelection()
 	
@@ -73,12 +87,12 @@ class MovieList(HTMLComponent, GUIComponent):
 		# nice list
 		
 		self.list = [ ]
+		self.root = root
 		
-		serviceHandler = eServiceCenterPtr()
-		eServiceCenter.getInstance(serviceHandler)
-		list = iListableServicePtr()
+		serviceHandler = eServiceCenter.getInstance()
+		list = serviceHandler.list(root)
 		
-		if serviceHandler.list(root, list):
+		if list is None:
 			raise "listing of movies failed"
 
 		movieList = [ ]
@@ -92,3 +106,19 @@ class MovieList(HTMLComponent, GUIComponent):
 		# now process them...
 		for ref in movieList:
 			self.list.append(MovieListEntry(ref, serviceHandler))
+			
+	def moveTo(self, serviceref):
+		found = 0
+		count = 0
+		for x in self.list:
+			if str(ServiceReference(x[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)