X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4cc1f7a05166715c19c965e3bbbe74a43835a754..dbe120313d2b4589e3c7ebe49ee98586a2b04e16:/lib/python/Screens/MovieSelection.py

diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index e9dc5b38..8e08db88 100644
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -4,11 +4,17 @@ from Components.ServiceList import ServiceList
 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 enigma import eServiceReference, eServiceCenter
+from Tools.Directories import *
+from Tools.BoundFunction import boundFunction
+
+from enigma import eServiceReference, eServiceCenter, eTimer
 
 class ChannelContextMenu(FixedMenu):
 	def __init__(self, session, csel, service):
@@ -17,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()
@@ -32,7 +44,7 @@ class ChannelContextMenu(FixedMenu):
 		if result == True:
 			self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Do you really want to delete this recording?"))
 		else:
-			self.session.openWithCallback(self.close, MessageBox, _("You cannot delete this!"))
+			self.session.openWithCallback(self.close, MessageBox, _("You cannot delete this!"), MessageBox.TYPE_ERROR)
 
 	def deleteConfirmed(self, confirmed):
 		if not confirmed:
@@ -47,45 +59,81 @@ class ChannelContextMenu(FixedMenu):
 				result = True
 		
 		if result == False:
-			self.session.openWithCallback(self.close, MessageBox, _("Delete failed!"))
+			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):
-	def __init__(self, session):
+	def __init__(self, session, selectedmovie = None):
 		Screen.__init__(self, session)
 		
 		self.movemode = False
 		self.bouquet_mark_edit = False
 		
-		self["list"] = MovieList(eServiceReference("2:0:1:0:0:0:0:0:0:0:/hdd/movies/"))
+		self.delayTimer = eTimer()
+		self.delayTimer.timeout.get().append(self.updateHDDData)
+		
+		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("/hdd/movies", DiskInfo.FREE)
+		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,
 				"contextMenu": self.doContext,
 			})
 		self["actions"].csel = self
+		self.onShown.append(self.go)
+		
+		self.lengthTimer = eTimer()
+		self.lengthTimer.timeout.get().append(self.updateLengthData)
+		
+	def go(self):
+		# 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)))
+		if (self.selectedmovie is not None):
+			self.moveTo()
+		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)