X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/32e138da53cdc01960e274fc5f242805198f8aea..e90006f23e9a87b65a3fbb8b5abf5f6b4432817c:/lib/python/Screens/TimerEdit.py

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 8cda8ca4..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
@@ -95,10 +96,11 @@ class TimerEditList(Screen):
 			else:
 				if t.isRunning():
 					if t.repeated:
-						list = []
-						list.append((_("Stop current event but not coming events"), "stoponlycurrent"))
-						list.append((_("Stop current event and disable coming events"), "stopall"))
-						list.append((_("Don't stop current event but disable coming events"), "stoponlycoming"))
+						list = (
+							(_("Stop current event but not coming events"), "stoponlycurrent"),
+							(_("Stop current event and disable coming events"), "stopall"),
+							(_("Don't stop current event but disable coming events"), "stoponlycoming")
+						)
 						self.session.openWithCallback(boundFunction(self.runningEventCallback, t), ChoiceBox, title=_("Repeating event currently recording... What do you want to do?"), list = list)
 				else:
 					t.disable()
@@ -170,14 +172,11 @@ class TimerEditList(Screen):
 			self.key_blue_choice = self.EMPTY
 
 	def fillTimerList(self):
-		del self.list[:]
-		
-		for timer in self.session.nav.RecordTimer.timer_list:
-			self.list.append((timer, False))
-		
-		for timer in self.session.nav.RecordTimer.processed_timers:
-			self.list.append((timer, True))
-		self.list.sort(cmp = lambda x, y: x[0].begin < y[0].begin)
+		list = self.list
+		del list[:]
+		list.extend([(timer, False) for timer in self.session.nav.RecordTimer.timer_list])
+		list.extend([(timer, True) for timer in self.session.nav.RecordTimer.processed_timers])
+		list.sort(cmp = lambda x, y: x[0].begin < y[0].begin)
 
 	def showLog(self):
 		cur=self["timerlist"].getCurrent()
@@ -245,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)
@@ -258,20 +257,25 @@ class TimerEditList(Screen):
 			print "Edited timer"
 			entry = answer[1]
 			timersanitycheck = TimerSanityCheck(self.session.nav.RecordTimer.timer_list, entry)
+			success = False
 			if not timersanitycheck.check():
 				simulTimerList = timersanitycheck.getSimulTimerList()
-				if (len(simulTimerList) == 2) and (simulTimerList[1].dontSave) and (simulTimerList[1].autoincrease):
-					simulTimerList[1].end = entry.begin - 30
-					self.session.nav.RecordTimer.timeChanged(simulTimerList[1])
-					self.session.nav.RecordTimer.timeChanged(entry)
-				else:
-					print "Sanity check failed"
-					self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, timersanitycheck.getSimulTimerList())
+				if simulTimerList is not None:
+					for x in simulTimerList:
+						if x.setAutoincreaseEnd(entry):
+							self.session.nav.RecordTimer.timeChanged(x)
+					if not timersanitycheck.check():
+						simulTimerList = timersanitycheck.getSimulTimerList()
+						if simulTimerList is not None:
+							self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, timersanitycheck.getSimulTimerList())
+					else:
+						success = True
 			else:
+				success = True
+			if success:
 				print "Sanity check passed"
-#				if not timersanitycheck.doubleCheck():
 				self.session.nav.RecordTimer.timeChanged(entry)
-					
+			
 			self.fillTimerList()
 			self.updateState()
 		else:
@@ -283,11 +287,11 @@ class TimerEditList(Screen):
 			entry = answer[1]
 			simulTimerList = self.session.nav.RecordTimer.record(entry)
 			if simulTimerList is not None:
-				if (len(simulTimerList) == 2) and (simulTimerList[1].dontSave) and (simulTimerList[1].autoincrease):
-					simulTimerList[1].end = entry.begin - 30
-					self.session.nav.RecordTimer.timeChanged(simulTimerList[1])
-					self.session.nav.RecordTimer.record(entry)
-				else:
+				for x in simulTimerList:
+					if x.setAutoincreaseEnd(entry):
+						self.session.nav.RecordTimer.timeChanged(x)
+				simulTimerList = self.session.nav.RecordTimer.record(entry)
+				if simulTimerList is not None:
 					self.session.openWithCallback(self.finishSanityCorrection, TimerSanityConflict, simulTimerList)
 			self.fillTimerList()
 			self.updateState()
@@ -403,7 +407,7 @@ class TimerSanityConflict(Screen):
 				self["actions"].actions.update({"green":self.toggleTimer1})
 				self["key_green"].setText(_("Enable"))
 				self.key_green_choice = self.ENABLE
-			elif self.timer[0].isRunning() and not timer[0].repeated and self.key_green_choice != self.EMPTY:
+			elif self.timer[0].isRunning() and not self.timer[0].repeated and self.key_green_choice != self.EMPTY:
 				self.removeAction("green")
 				self["key_green"].setText(" ")
 				self.key_green_choice = self.EMPTY
@@ -423,7 +427,7 @@ class TimerSanityConflict(Screen):
 					self["actions"].actions.update({"blue":self.toggleTimer2})
 					self["key_blue"].setText(_("Enable"))
 					self.key_blue_choice = self.ENABLE
-				elif self.timer[x].isRunning() and not timer[x].repeated and self.key_blue_choice != self.EMPTY:
+				elif self.timer[x].isRunning() and not self.timer[x].repeated and self.key_blue_choice != self.EMPTY:
 					self.removeAction("blue")
 					self["key_blue"].setText(" ")
 					self.key_blue_choice = self.EMPTY