X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d5e22a275d2ecdf3205bfefa927be6e125ac27b8..348578ef7c073083779ddbb25c9e1c69d8405f46:/lib/python/Components/MovieList.py

diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 4144353e..2e010ab6 100644
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -1,14 +1,13 @@
 from HTMLComponent import *
 from GUIComponent import *
+from Tools.FuzzyDate import FuzzyTime
 
-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,17 +26,31 @@ 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)
+	if len:
+		len = "%d:%02d" % (len / 60, len % 60)
+	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, "1232MB"))
+	
+	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((0, 30, 200, 20, 1, RT_HALIGN_LEFT, description))
+	res.append((0, 50, 200, 20, 1, RT_HALIGN_LEFT, begin_string))
+	res.append((200, 50, 200, 20, 1, RT_HALIGN_RIGHT, len))
 	
 	return res
 
@@ -67,19 +80,18 @@ 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 = [ ]
 		while 1:
-			s = eServiceReference()
-			if list.getNext(s):
-				del s
+			s = list.getNext()
+			if not s.valid():
 				del list
 				break
 			movieList.append(s)
@@ -87,3 +99,7 @@ class MovieList(HTMLComponent, GUIComponent):
 		# now process them...
 		for ref in movieList:
 			self.list.append(MovieListEntry(ref, serviceHandler))
+
+	def reload(self):
+		self.load(self.root)
+		self.l.setList(self.list)