From: Felix Domke <tmbinc@elitedvb.net>
Date: Sat, 25 Oct 2008 10:01:49 +0000 (+0000)
Subject: remove duplicate code, add 'quit and delete movie'-option (experts only), move import... 
X-Git-Tag: 2.6.0~704
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/df0caf48b4590bbb469ec065ac08284903292394

remove duplicate code, add 'quit and delete movie'-option (experts only), move imports inside functions
---

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index a6b2516e..0d33217d 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -5,13 +5,6 @@ from Screen import Screen
 profile("LOAD:enigma")
 from enigma import iPlayableService
 
-profile("LOAD:ChannelSelectionRadio")
-from Screens.ChannelSelection import ChannelSelectionRadio
-profile("LOAD:MovieSelection")
-from Screens.MovieSelection import MovieSelection
-profile("LOAD:ChoiceBox")
-from Screens.ChoiceBox import ChoiceBox
-
 profile("LOAD:InfoBarGenerics")
 from Screens.InfoBarGenerics import InfoBarShowHide, \
 	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \
@@ -111,12 +104,14 @@ class InfoBar(InfoBarBase, InfoBarShowHide,
 			self.showRadioChannelList(True)
 		else:
 			self.rds_display.hide() # in InfoBarRdsDecoder
+			from Screens.ChannelSelection import ChannelSelectionRadio
 			self.session.openWithCallback(self.ChannelSelectionRadioClosed, ChannelSelectionRadio, self)
 
 	def ChannelSelectionRadioClosed(self, *arg):
 		self.rds_display.show()  # in InfoBarRdsDecoder
 
 	def showMovies(self):
+		from Screens.MovieSelection import MovieSelection
 		self.session.openWithCallback(self.movieSelected, MovieSelection)
 
 	def movieSelected(self, service):
@@ -157,29 +152,60 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
 	def __onClose(self):
 		self.session.nav.playService(self.lastservice)
 
-	def leavePlayer(self):
+	def handleLeave(self, how):
 		self.is_closing = True
-
-		if config.usage.on_movie_stop.value == "ask":
+		if how == "ask":
 			list = []
 			list.append((_("Yes"), "quit"))
 			if config.usage.setup_level.index >= 2: # expert+
 				list.append((_("Yes, returning to movie list"), "movielist"))
+			if config.usage.setup_level.index >= 2: # expert+
+				list.append((_("Yes, and delete this movie"), "quitanddelete"))
 			list.append((_("No"), "continue"))
 			if config.usage.setup_level.index >= 2: # expert+
 				list.append((_("No, but restart from begin"), "restart"))
+
+			from Screens.ChoiceBox import ChoiceBox
 			self.session.openWithCallback(self.leavePlayerConfirmed, ChoiceBox, title=_("Stop playing this movie?"), list = list)
 		else:
-			self.leavePlayerConfirmed([True, config.usage.on_movie_stop.value])
+			self.leavePlayerConfirmed([True, how])
+
+	def leavePlayer(self):
+		self.handleLeave(config.usage.on_movie_stop.value)
+
+	def deleteConfirmed(self, answer):
+		if answer:
+			self.leavePlayerConfirmed((True, "quitanddeleteconfirmed"))
 
 	def leavePlayerConfirmed(self, answer):
 		answer = answer and answer[1]
-		if answer == "quit":
+
+		if answer in ["quitanddelete", "quitanddeleteconfirmed"]:
+			ref = self.session.nav.getCurrentlyPlayingServiceReference()
+			from enigma import eServiceCenter
+			serviceHandler = eServiceCenter.getInstance()
+			info = serviceHandler.info(ref)
+			name = info and info.getName(ref) or _("this recording")
+
+		if answer == "quitanddelete":
+			from Screens.MessageBox import MessageBox
+			self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Do you really want to delete %s?") % name)
+			return
+
+		if answer == "quitanddeleteconfirmed":
+			offline = serviceHandler.offlineOperations(ref)
+			if offline.deleteFromDisk(0):
+				from Screens.MessageBox import MessageBox
+				self.session.openWithCallback(self.close, MessageBox, _("You cannot delete this!"), MessageBox.TYPE_ERROR)
+				return
+
+		if answer in ["quit", "quitanddeleteconfirmed"]:
 			config.movielist.last_videodir.cancel()
 			self.close()
 		elif answer == "movielist":
 			ref = self.session.nav.getCurrentlyPlayingServiceReference()
 			self.returning = True
+			from Screens.MovieSelection import MovieSelection
 			self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
 			self.session.nav.stopService()
 		elif answer == "restart":
@@ -190,21 +216,11 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
 			return
 		if not playing :
 			return
-		self.is_closing = True
-		if config.usage.on_movie_eof.value == "ask":
-			list = []
-			list.append((_("Yes"), "quit"))
-			if config.usage.setup_level.index >= 2: # expert+
-				list.append((_("Yes, returning to movie list"), "movielist"))
-			list.append((_("No"), "continue"))
-			if config.usage.setup_level.index >= 2: # expert+
-				list.append((_("No, but restart from begin"), "restart"))
-			self.session.openWithCallback(self.leavePlayerConfirmed, ChoiceBox, title=_("Stop playing this movie?"), list = list)
-		else:
-			self.leavePlayerConfirmed([True, config.usage.on_movie_eof.value])
+		self.handleLeave(config.usage.on_movie_eof.value)
 
 	def showMovies(self):
 		ref = self.session.nav.getCurrentlyPlayingServiceReference()
+		from Screens.MovieSelection import MovieSelection
 		self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
 
 	def movieSelected(self, service):