Merge branch 'bug_236_recordpath'

10 files changed, 232 insertions, 23 deletions

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index 3dde7e22..f8edba11 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -6,6 +6,7 @@ from Components.Label import Label
 from Components.EpgList import EPGList, EPG_TYPE_SINGLE, EPG_TYPE_SIMILAR, EPG_TYPE_MULTI
 from Components.ActionMap import ActionMap
 from Components.TimerSanityCheck import TimerSanityCheck
+from Components.UsageConfig import preferredTimerPath
 from Components.Sources.ServiceEvent import ServiceEvent
 from Components.Sources.Event import Event
 from Screens.TimerEdit import TimerSanityConflict
@@ -235,7 +236,7 @@ class EPGSelection(Screen):
 				self.session.openWithCallback(cb_func, MessageBox, _("Do you really want to delete %s?") % event.getEventName())
 				break
 		else:
-			newEntry = RecordTimerEntry(serviceref, checkOldTimers = True, *parseEvent(event))
+			newEntry = RecordTimerEntry(serviceref, checkOldTimers = True, dirname = preferredTimerPath(), *parseEvent(event))
 			self.session.openWithCallback(self.finishedAdd, TimerEntry, newEntry)
 
 	def finishedAdd(self, answer):
diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py
index c1ffb585..cced3ceb 100644
--- a/lib/python/Screens/EventView.py
+++ b/lib/python/Screens/EventView.py
@@ -6,6 +6,7 @@ from Components.Button import Button
 from Components.Label import Label
 from Components.ScrollLabel import ScrollLabel
 from Components.TimerList import TimerList
+from Components.UsageConfig import preferredTimerPath
 from enigma import eEPGCache, eTimer, eServiceReference
 from RecordTimer import RecordTimerEntry, parseEvent, AFTEREVENT
 from TimerEntry import TimerEntry
@@ -85,7 +86,7 @@ class EventViewBase:
 				self.session.openWithCallback(cb_func, MessageBox, _("Do you really want to delete %s?") % event.getEventName())
 				break
 		else:
-			newEntry = RecordTimerEntry(self.currentService, checkOldTimers = True, *parseEvent(self.event))
+			newEntry = RecordTimerEntry(self.currentService, checkOldTimers = True, dirname = preferredTimerPath(), *parseEvent(self.event))
 			self.session.openWithCallback(self.finishedAdd, TimerEntry, newEntry)
 
 	def finishedAdd(self, answer):
diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 59cc21d3..a15c7ac1 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -212,7 +212,6 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
 					return
 
 		if answer in ("quit", "quitanddeleteconfirmed"):
-			config.movielist.last_videodir.cancel()
 			self.close()
 		elif answer == "movielist":
 			ref = self.session.nav.getCurrentlyPlayingServiceReference()
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 8f9b670e..a3e56a40 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -10,6 +10,7 @@ from Components.ServiceEventTracker import ServiceEventTracker
 from Components.Sources.Boolean import Boolean
 from Components.config import config, ConfigBoolean, ConfigClock
 from Components.SystemInfo import SystemInfo
+from Components.UsageConfig import preferredInstantRecordPath, defaultMoviePath
 from EpgSelection import EPGSelection
 from Plugins.Plugin import PluginDescriptor
 
@@ -28,7 +29,7 @@ from Screens.TimeDateInput import TimeDateInput
 from ServiceReference import ServiceReference
 
 from Tools import Notifications
-from Tools.Directories import SCOPE_HDD, resolveFilename, fileExists
+from Tools.Directories import fileExists
 
 from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \
 	iPlayableService, eServiceReference, eEPGCache
@@ -1474,7 +1475,7 @@ class InfoBarInstantRecord:
 		if isinstance(serviceref, eServiceReference):
 			serviceref = ServiceReference(serviceref)
 
-		recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname = config.movielist.last_videodir.value)
+		recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname = preferredInstantRecordPath())
 		recording.dontSave = True
 		
 		if event is None or limitEvent == False:
@@ -1575,9 +1576,9 @@ class InfoBarInstantRecord:
 			self.session.nav.RecordTimer.timeChanged(entry)
 
 	def instantRecord(self):
-		dir = config.movielist.last_videodir.value
-		if not fileExists(dir, 'w'):
-			dir = resolveFilename(SCOPE_HDD)
+		dir = preferredInstantRecordPath()
+		if not dir or not fileExists(dir, 'w'):
+			dir = defaultMoviePath()
 		try:
 			stat = os_stat(dir)
 		except:
diff --git a/lib/python/Screens/LocationBox.py b/lib/python/Screens/LocationBox.py
index 61d7105d..29d94f55 100644
--- a/lib/python/Screens/LocationBox.py
+++ b/lib/python/Screens/LocationBox.py
@@ -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()
diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am
index 44994b86..585983c2 100755
--- a/lib/python/Screens/Makefile.am
+++ b/lib/python/Screens/Makefile.am
@@ -14,5 +14,5 @@ install_PYTHON = \
 	SubtitleDisplay.py SubservicesQuickzap.py ParentalControlSetup.py NumericalTextInputHelpDialog.py \
 	SleepTimerEdit.py Ipkg.py RdsDisplay.py Globals.py DefaultWizard.py \
 	SessionGlobals.py LocationBox.py WizardLanguage.py TaskView.py Rc.py VirtualKeyBoard.py \
-	TextBox.py FactoryReset.py
+	TextBox.py FactoryReset.py RecordPaths.py
 
diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index 174a4f07..0468f8a0 100644
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -7,8 +7,9 @@ from Components.DiskInfo import DiskInfo
 from Components.Pixmap import Pixmap
 from Components.Label import Label
 from Components.PluginComponent import plugins
-from Components.config import config, ConfigSubsection, ConfigText, ConfigInteger, ConfigLocations
+from Components.config import config, ConfigSubsection, ConfigText, ConfigInteger, ConfigLocations, ConfigSet
 from Components.Sources.ServiceEvent import ServiceEvent
+from Components.UsageConfig import defaultMoviePath
 
 from Plugins.Plugin import PluginDescriptor
 
@@ -31,6 +32,7 @@ config.movielist.last_timer_videodir = ConfigText(default=resolveFilename(SCOPE_
 config.movielist.videodirs = ConfigLocations(default=[resolveFilename(SCOPE_HDD)])
 config.movielist.first_tags = ConfigText(default="")
 config.movielist.second_tags = ConfigText(default="")
+config.movielist.last_selected_tags = ConfigSet([], default=[])
 
 
 def setPreferredTagEditor(te):
@@ -168,7 +170,10 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 		HelpableScreen.__init__(self)
 
 		self.tags = [ ]
-		self.selected_tags = None
+		if selectedmovie:
+			self.selected_tags = config.movielist.last_selected_tags.value
+		else:
+			self.selected_tags = None
 		self.selected_tags_ele = None
 
 		self.movemode = False
@@ -183,8 +188,8 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 		self["DescriptionBorder"] = Pixmap()
 		self["DescriptionBorder"].hide()
 
-		if not pathExists(config.movielist.last_videodir.value):
-			config.movielist.last_videodir.value = resolveFilename(SCOPE_HDD)
+		if not fileExists(config.movielist.last_videodir.value):
+			config.movielist.last_videodir.value = defaultMoviePath()
 			config.movielist.last_videodir.save()
 		self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + config.movielist.last_videodir.value)
 
@@ -292,6 +297,7 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 		self.close(None)
 
 	def saveconfig(self):
+		config.movielist.last_selected_tags.value = self.selected_tags
 		config.movielist.moviesort.save()
 		config.movielist.listtype.save()
 		config.movielist.description.save()
@@ -339,8 +345,8 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 		self["list"].setSortType(type)
 
 	def reloadList(self, sel = None, home = False):
-		if not pathExists(config.movielist.last_videodir.value):
-			path = resolveFilename(SCOPE_HDD)
+		if not fileExists(config.movielist.last_videodir.value):
+			path = defaultMoviePath()
 			config.movielist.last_videodir.value = path
 			config.movielist.last_videodir.save()
 			self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + path)
@@ -370,7 +376,7 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 
 	def gotFilename(self, res):
 		if res is not None and res is not config.movielist.last_videodir.value:
-			if pathExists(res):
+			if fileExists(res):
 				config.movielist.last_videodir.value = res
 				config.movielist.last_videodir.save()
 				self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + res)
@@ -392,7 +398,7 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 	def showTagsN(self, tagele):
 		if not self.tags:
 			self.showTagWarning()
-		elif not tagele or self.selected_tags_ele == tagele or not tagele.value in self.tags:
+		elif not tagele or (self.selected_tags and tagele.value in self.selected_tags) or not tagele.value in self.tags:
 			self.showTagsMenu(tagele)
 		else:
 			self.selected_tags_ele = tagele
diff --git a/lib/python/Screens/RecordPaths.py b/lib/python/Screens/RecordPaths.py
new file mode 100644
index 00000000..c833266f
--- /dev/null
+++ b/lib/python/Screens/RecordPaths.py
@@ -0,0 +1,194 @@
+from Screens.Screen import Screen
+from Screens.LocationBox import MovieLocationBox, TimeshiftLocationBox
+from Screens.MessageBox import MessageBox
+from Components.Label import Label
+from Components.config import config, ConfigSelection, getConfigListEntry, configfile
+from Components.ConfigList import ConfigListScreen
+from Components.ActionMap import ActionMap
+from Tools.Directories import fileExists
+
+
+class RecordPathsSettings(Screen,ConfigListScreen):
+	skin = """
+		<screen name="RecordPathsSettings" position="160,150" size="450,200" title="Recording paths">
+			<ePixmap pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" alphatest="on" />
+			<ePixmap pixmap="skin_default/buttons/green.png" position="300,0" size="140,40" alphatest="on" />
+			<widget source="key_red" render="Label" position="10,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
+			<widget source="key_green" render="Label" position="300,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+			<widget name="config" position="10,44" size="430,146" />
+		</screen>"""
+
+	def __init__(self, session):
+		from Components.Sources.StaticText import StaticText
+		Screen.__init__(self, session)
+		self["key_red"] = StaticText(_("Cancel"))
+		self["key_green"] = StaticText(_("Save"))
+
+		ConfigListScreen.__init__(self, [])
+		self.initConfigList()
+
+		self["setupActions"] = ActionMap(["SetupActions", "ColorActions"],
+		{
+		    "green": self.save,
+		    "red": self.cancel,
+		    "cancel": self.cancel,
+		    "ok": self.ok,
+		}, -2)
+
+	def checkReadWriteDir(self, configele):
+		print "checkReadWrite: ", configele.value
+		if configele.value in [x[0] for x in self.styles] or fileExists(configele.value, "w"):
+			configele.last_value = configele.value
+			return True
+		else:
+			dir = configele.value
+			configele.value = configele.last_value
+			self.session.open(
+				MessageBox,
+				_("The directory %s is not writable.\nMake sure you select a writable directory instead.")%dir,
+				type = MessageBox.TYPE_ERROR
+				)
+			return False
+
+	def initConfigList(self):
+		self.styles = [ ("<default>", _("<Default movie location>")), ("<current>", _("<Current movielist location>")), ("<timer>", _("<Last timer location>")) ]
+		styles_keys = [x[0] for x in self.styles]
+		tmp = config.movielist.videodirs.value
+		default = config.usage.default_path.value
+		if default not in tmp:
+			tmp = tmp[:]
+			tmp.append(default)
+		print "DefaultPath: ", default, tmp
+		self.default_dirname = ConfigSelection(default = default, choices = tmp)
+		tmp = config.movielist.videodirs.value
+		default = config.usage.timer_path.value
+		if default not in tmp and default not in styles_keys:
+			tmp = tmp[:]
+			tmp.append(default)
+		print "TimerPath: ", default, tmp
+		self.timer_dirname = ConfigSelection(default = default, choices = self.styles+tmp)
+		tmp = config.movielist.videodirs.value
+		default = config.usage.instantrec_path.value
+		if default not in tmp and default not in styles_keys:
+			tmp = tmp[:]
+			tmp.append(default)
+		print "InstantrecPath: ", default, tmp
+		self.instantrec_dirname = ConfigSelection(default = default, choices = self.styles+tmp)
+		default = config.usage.timeshift_path.value
+		tmp = config.usage.allowed_timeshift_paths.value
+		if default not in tmp:
+			tmp = tmp[:]
+			tmp.append(default)
+		print "TimeshiftPath: ", default, tmp
+		self.timeshift_dirname = ConfigSelection(default = default, choices = tmp)
+		self.default_dirname.addNotifier(self.checkReadWriteDir, initial_call=False, immediate_feedback=False)
+		self.timer_dirname.addNotifier(self.checkReadWriteDir, initial_call=False, immediate_feedback=False)
+		self.instantrec_dirname.addNotifier(self.checkReadWriteDir, initial_call=False, immediate_feedback=False)
+		self.timeshift_dirname.addNotifier(self.checkReadWriteDir, initial_call=False, immediate_feedback=False)
+
+		self.list = []
+		if config.usage.setup_level.index >= 2:
+			self.default_entry = getConfigListEntry(_("Default movie location"), self.default_dirname)
+			self.list.append(self.default_entry)
+			self.timer_entry = getConfigListEntry(_("Timer record location"), self.timer_dirname)
+			self.list.append(self.timer_entry)
+			self.instantrec_entry = getConfigListEntry(_("Instant record location"), self.instantrec_dirname)
+			self.list.append(self.instantrec_entry)
+		else:
+			self.default_entry = getConfigListEntry(_("Movie location"), self.default_dirname)
+			self.list.append(self.default_entry)
+		self.timeshift_entry = getConfigListEntry(_("Timeshift location"), self.timeshift_dirname)
+		self.list.append(self.timeshift_entry)
+		self["config"].setList(self.list)
+
+	def ok(self):
+		currentry = self["config"].getCurrent()
+		self.lastvideodirs = config.movielist.videodirs.value
+		self.lasttimeshiftdirs = config.usage.allowed_timeshift_paths.value
+		if config.usage.setup_level.index >= 2:
+			txt = _("Default movie location")
+		else:
+			txt = _("Movie location")
+		if currentry == self.default_entry:
+			self.entrydirname = self.default_dirname
+			self.session.openWithCallback(
+				self.dirnameSelected,
+				MovieLocationBox,
+				txt,
+				self.default_dirname.value
+			)
+		elif currentry == self.timer_entry:
+			self.entrydirname = self.timer_dirname
+			self.session.openWithCallback(
+				self.dirnameSelected,
+				MovieLocationBox,
+				_("Initial location in new timers"),
+				self.timer_dirname.value
+			)
+		elif currentry == self.instantrec_entry:
+			self.entrydirname = self.instantrec_dirname
+			self.session.openWithCallback(
+				self.dirnameSelected,
+				MovieLocationBox,
+				_("Location for instant recordings"),
+				self.instantrec_dirname.value
+			)
+		elif currentry == self.timeshift_entry:
+			self.entrydirname = self.timeshift_dirname
+			config.usage.timeshift_path.value = self.timeshift_dirname.value
+			self.session.openWithCallback(
+				self.dirnameSelected,
+				TimeshiftLocationBox
+			)
+
+	def dirnameSelected(self, res):
+		if res is not None:
+			self.entrydirname.value = res
+			if config.movielist.videodirs.value != self.lastvideodirs:
+				styles_keys = [x[0] for x in self.styles]
+				tmp = config.movielist.videodirs.value
+				default = self.default_dirname.value
+				if default not in tmp:
+					tmp = tmp[:]
+					tmp.append(default)
+				self.default_dirname.setChoices(tmp, default=default)
+				tmp = config.movielist.videodirs.value
+				default = self.timer_dirname.value
+				if default not in tmp and default not in styles_keys:
+					tmp = tmp[:]
+					tmp.append(default)
+				self.timer_dirname.setChoices(self.styles+tmp, default=default)
+				tmp = config.movielist.videodirs.value
+				default = self.instantrec_dirname.value
+				if default not in tmp and default not in styles_keys:
+					tmp = tmp[:]
+					tmp.append(default)
+				self.instantrec_dirname.setChoices(self.styles+tmp, default=default)
+				self.entrydirname.value = res
+			if config.usage.allowed_timeshift_paths.value != self.lasttimeshiftdirs:
+				tmp = config.usage.allowed_timeshift_paths.value
+				default = self.instantrec_dirname.value
+				if default not in tmp:
+					tmp = tmp[:]
+					tmp.append(default)
+				self.timeshift_dirname.setChoices(tmp, default=default)
+				self.entrydirname.value = res
+			if self.entrydirname.last_value != res:
+				self.checkReadWriteDir(self.entrydirname)
+
+	def save(self):
+		currentry = self["config"].getCurrent()
+		if self.checkReadWriteDir(currentry[1]):
+			config.usage.default_path.value = self.default_dirname.value
+			config.usage.timer_path.value = self.timer_dirname.value
+			config.usage.instantrec_path.value = self.instantrec_dirname.value 
+			config.usage.timeshift_path.value = self.timeshift_dirname.value
+			config.usage.default_path.save()
+			config.usage.timer_path.save()
+			config.usage.instantrec_path.save()
+			config.usage.timeshift_path.save()
+			self.close()
+
+	def cancel(self):
+		self.close()
+
diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index caaf8c95..54354987 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -4,6 +4,7 @@ from Components.config import config
 from Components.MenuList import MenuList
 from Components.TimerList import TimerList
 from Components.TimerSanityCheck import TimerSanityCheck
+from Components.UsageConfig import preferredTimerPath
 from RecordTimer import RecordTimerEntry, parseEvent, AFTEREVENT
 from Screen import Screen
 from Screens.ChoiceBox import ChoiceBox
@@ -243,7 +244,7 @@ class TimerEditList(Screen):
 		else:
 			data = parseEvent(event, description = False)
 
-		self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True, dirname = config.movielist.last_timer_videodir.value, *data))
+		self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True, dirname = preferredTimerPath(), *data))
 		
 	def addTimer(self, timer):
 		self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index c6b0db8f..b231b568 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -9,11 +9,11 @@ from Components.Button import Button
 from Components.Label import Label
 from Components.Pixmap import Pixmap
 from Components.SystemInfo import SystemInfo
+from Components.UsageConfig import defaultMoviePath
 from Screens.MovieSelection import getPreferredTagEditor
 from Screens.LocationBox import MovieLocationBox
 from Screens.ChoiceBox import ChoiceBox
 from RecordTimer import AFTEREVENT
-from Tools.Directories import resolveFilename, SCOPE_HDD
 from enigma import eEPGCache
 from time import localtime, mktime, time, strftime
 from datetime import datetime
@@ -111,7 +111,7 @@ class TimerEntry(Screen, ConfigListScreen):
 			self.timerentry_starttime = ConfigClock(default = self.timer.begin)
 			self.timerentry_endtime = ConfigClock(default = self.timer.end)
 
-			default = self.timer.dirname or resolveFilename(SCOPE_HDD)
+			default = self.timer.dirname or defaultMoviePath()
 			tmp = config.movielist.videodirs.value
 			if default not in tmp:
 				tmp.append(default)
@@ -278,9 +278,10 @@ class TimerEntry(Screen, ConfigListScreen):
 		self.timer.service_ref = self.timerentry_service_ref
 		self.timer.tags = self.timerentry_tags
 
-		self.timer.dirname = self.timerentry_dirname.value
-		config.movielist.last_timer_videodir.value = self.timer.dirname
-		config.movielist.last_timer_videodir.save()
+		if self.timer.dirname or self.timerentry_dirname.value != defaultMoviePath():
+			self.timer.dirname = self.timerentry_dirname.value
+			config.movielist.last_timer_videodir.value = self.timer.dirname
+			config.movielist.last_timer_videodir.save()
 
 		if self.timerentry_type.value == "once":
 			self.timer.begin, self.timer.end = self.getBeginEnd()