X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5acb8fc9d204c63e0da84142c570c5ca41424cae..dbe120313d2b4589e3c7ebe49ee98586a2b04e16:/lib/python/Screens/MovieSelection.py?ds=sidebyside

diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index 30f8d408..8e08db88 100644
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -5,11 +5,14 @@ from Components.ActionMap import ActionMap
 from Components.MovieList import MovieList
 from Components.DiskInfo import DiskInfo
 from Components.Label import Label
+from Components.PluginComponent import plugins
+from Plugins.Plugin import PluginDescriptor
 
 from Screens.MessageBox import MessageBox
 from Screens.FixedMenu import FixedMenu
 
 from Tools.Directories import *
+from Tools.BoundFunction import boundFunction
 
 from enigma import eServiceReference, eServiceCenter, eTimer
 
@@ -20,8 +23,14 @@ class ChannelContextMenu(FixedMenu):
 		
 		menu = [(_("back"), self.close), (_("delete..."), self.delete)]
 		
+		for p in plugins.getPlugins(PluginDescriptor.WHERE_MOVIELIST):
+			menu.append((p.description, boundFunction(self.execPlugin, p)))
+		
 		FixedMenu.__init__(self, session, _("Movie Menu"), menu)
 		self.skinName = "Menu"
+	
+	def execPlugin(self, plugin):
+		plugin(session=self.session, service=self.service)
 
 	def delete(self):
 		serviceHandler = eServiceCenter.getInstance()
@@ -52,13 +61,7 @@ class ChannelContextMenu(FixedMenu):
 		if result == False:
 			self.session.openWithCallback(self.close, MessageBox, _("Delete failed!"), MessageBox.TYPE_ERROR)
 		else:
-			list = self.csel["list"]
-			currentIndex = list.getCurrentIndex()
-			list.moveDown()
-			if list.getCurrentIndex() == currentIndex:
-				currentIndex -= 1
-			list.reload()
-			list.moveToIndex(currentIndex)
+			list = self.csel["list"].removeService(self.service)
 			self.close()
  
 class MovieSelection(Screen):
@@ -74,12 +77,13 @@ class MovieSelection(Screen):
 		self["waitingtext"] = Label(_("Please wait... Loading list..."))
 		
 		self["list"] = MovieList(None)
+		self.list = self["list"]
 		self.selectedmovie = selectedmovie
 		
 		#self["okbutton"] = Button("ok", [self.channelSelected])
 		self["freeDiskSpace"] = DiskInfo(resolveFilename(SCOPE_HDD), DiskInfo.FREE, update=False)
 		
-		self["actions"] = ActionMap(["OkCancelActions", "ContextMenuActions"],
+		self["actions"] = ActionMap(["OkCancelActions", "MovieSelectionActions"],
 			{
 				"cancel": self.abort,
 				"ok": self.movieSelected,
@@ -88,8 +92,13 @@ class MovieSelection(Screen):
 		self["actions"].csel = self
 		self.onShown.append(self.go)
 		
+		self.lengthTimer = eTimer()
+		self.lengthTimer.timeout.get().append(self.updateLengthData)
+		
 	def go(self):
-		self.delayTimer.start(0, 1)
+		# ouch. this should redraw our "Please wait..."-text.
+		# this is of course not the right way to do this.
+		self.delayTimer.start(10, 1)
 
 	def updateHDDData(self):
 		self["list"].reload(eServiceReference("2:0:1:0:0:0:0:0:0:0:" + resolveFilename(SCOPE_HDD)))
@@ -98,18 +107,33 @@ class MovieSelection(Screen):
 		self["waitingtext"].instance.hide()
 						
 		self["freeDiskSpace"].update()
+		
+		self.lengthTimer.start(10, 1)
+		self.lengthPosition = 0
+		self.lengthLength = len(self["list"])
+		
+	def updateLengthData(self):
+		self.list.updateLengthOfIndex(self.lengthPosition)
+		self.lengthPosition += 1
+		if self.lengthPosition < self.lengthLength:
+			self.lengthTimer.start(10, 1)
 
 	def moveTo(self):
 		self["list"].moveTo(self.selectedmovie)
 
 	def getCurrent(self):
-		return self["list"].getCurrent()[0]
+		return self["list"].getCurrent()
 
 	def movieSelected(self):
-		self.close(self.getCurrent())
+		self.lengthTimer.stop()
+		current = self.getCurrent()
+		if current is not None:
+			self.close(current)
 
 	def doContext(self):
-		self.session.open(ChannelContextMenu, self, self.getCurrent())
+		current = self.getCurrent()
+		if current is not None:
+			self.session.open(ChannelContextMenu, self, current)
 
 	def abort(self):
 		self.close(None)