X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FLocationBox.py;h=29d94f553fef38bd347ad1db29b57edc0ff14f36;hp=13315ffc45aab5a0aac3227121cb3af9aa02a188;hb=ba5fcab217438b995c1f903e0294b71d1411668b;hpb=ec970c4f4534a4ed6f1f4d930bfb8d56bf5531a9

diff --git a/lib/python/Screens/LocationBox.py b/lib/python/Screens/LocationBox.py
index 13315ff..29d94f5 100644
--- a/lib/python/Screens/LocationBox.py
+++ b/lib/python/Screens/LocationBox.py
@@ -163,11 +163,11 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
 		})
 
 		# Run some functions when shown
-		self.onShown.extend([
+		self.onShown.extend((
 			boundFunction(self.setTitle, windowTitle),
 			self.updateTarget,
 			self.showHideRename,
-		])
+		))
 
 		self.onLayoutFinish.append(self.switchToFileListOnStart)
  
@@ -241,7 +241,7 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
 			)
 
 	def createDirCallback(self, res):
-		if res is not None and len(res):
+		if res:
 			path = os.path.join(self["filelist"].current_directory, res)
 			if not pathExists(path):
 				if not createDir(path):
@@ -289,6 +289,11 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
 			else:
 				self["filelist"].refresh()
 				self.removeBookmark(name, True)
+				val = self.realBookmarks and self.realBookmarks.value
+				if val and name in val:
+					val.remove(name)
+					self.realBookmarks.value = val
+					self.realBookmarks.save()
 
 	def up(self):
 		self[self.currList].up()
@@ -326,7 +331,7 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
 
 	def selectConfirmed(self, ret):
 		if ret:
-			ret = ''.join([self.getPreferredFolder(), self.filename])
+			ret = ''.join((self.getPreferredFolder(), self.filename))
 			if self.realBookmarks:
 				if self.autoAdd and not ret in self.bookmarks:
 					self.bookmarks.append(self.getPreferredFolder())
@@ -390,23 +395,28 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
 		# Write Combination of Folder & Filename when Folder is valid
 		currFolder = self.getPreferredFolder()
 		if currFolder is not None:
-			self["target"].setText(''.join([currFolder, self.filename]))
+			self["target"].setText(''.join((currFolder, self.filename)))
 		# Display a Warning otherwise
 		else:
 			self["target"].setText(_("Invalid Location"))
 
 	def showMenu(self):
 		if not self.userMode and self.realBookmarks:
-			menu = []
 			if self.currList == "filelist":
-				menu.append((_("switch to bookmarks"), self.switchToBookList))
-				menu.append((_("add bookmark"), self.addRemoveBookmark))
+				menu = [
+					(_("switch to bookmarks"), self.switchToBookList),
+					(_("add bookmark"), self.addRemoveBookmark)
+				]
 				if self.editDir:
-					menu.append((_("create directory"), self.createDir))
-					menu.append((_("remove directory"), self.removeDir))
+					menu.extend((
+						(_("create directory"), self.createDir),
+						(_("remove directory"), self.removeDir)
+					))
 			else:
-				menu.append((_("switch to filelist"), self.switchToFileList))
-				menu.append((_("remove bookmark"), self.addRemoveBookmark))
+				menu = (
+					(_("switch to filelist"), self.switchToFileList),
+					(_("remove bookmark"), self.addRemoveBookmark)
+				)
 
 			self.session.openWithCallback(
 				self.menuCallback,
@@ -449,7 +459,7 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
 
 	def selectByStart(self):
 		# Don't do anything on initial call
-		if not len(self.quickselect):
+		if not self.quickselect:
 			return
 
 		# Don't select if no dir
@@ -501,3 +511,31 @@ class MovieLocationBox(LocationBox):
 	def __init__(self, session, text, dir, minFree = None):
 		inhibitDirs = ["/bin", "/boot", "/dev", "/etc", "/lib", "/proc", "/sbin", "/sys", "/usr", "/var"]
 		LocationBox.__init__(self, session, text = text, currDir = dir, bookmarks = config.movielist.videodirs, autoAdd = True, editDir = True, inhibitDirs = inhibitDirs, minFree = minFree)
+		self.skinName = "LocationBox"
+
+class TimeshiftLocationBox(LocationBox):
+	def __init__(self, session):
+		inhibitDirs = ["/bin", "/boot", "/dev", "/etc", "/lib", "/proc", "/sbin", "/sys", "/usr", "/var"]
+		LocationBox.__init__(
+				self,
+				session,
+				text = _("Where to save temporary timeshift recordings?"),
+				currDir = config.usage.timeshift_path.value,
+				bookmarks = config.usage.allowed_timeshift_paths,
+				autoAdd = True,
+				editDir = True,
+				inhibitDirs = inhibitDirs,
+				minFree = 1024 # the same requirement is hardcoded in servicedvb.cpp
+		)
+		self.skinName = "LocationBox"
+
+	def cancel(self):
+		config.usage.timeshift_path.cancel()
+		LocationBox.cancel(self)
+
+	def selectConfirmed(self, ret):
+		if ret:
+			config.usage.timeshift_path.value = self.getPreferredFolder()
+			config.usage.timeshift_path.save()
+			LocationBox.selectConfirmed(self, ret)
+