some work on the timer sanity check (overlapping timers solver)

2 files changed, 85 insertions, 13 deletions

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index ee2920a0..965c35b6 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -1,5 +1,7 @@
 from Screen import Screen
 from Components.TimerList import TimerList, TimerEntryComponent
+from Components.ConfigList import ConfigList
+from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.TimeInput import TimeInput
 from Components.Label import Label
@@ -138,7 +140,8 @@ class TimerEditList(Screen):
 		
 		if answer[0]:
 			print "Edited timer"
-			if not TimerSanityCheck(self.session.nav.RecordTimer.timer_list, answer[1]).check():
+			timersanitycheck = TimerSanityCheck(self.session.nav.RecordTimer.timer_list, answer[1])
+			if not timersanitycheck.check():
 				print "Sanity check failed"
 			else:
 				print "Sanity check passed"
@@ -150,16 +153,21 @@ class TimerEditList(Screen):
 	def finishedAdd(self, answer):
 		print "finished add"
 		if answer[0]:
-			if not TimerSanityCheck(self.session.nav.RecordTimer.timer_list, answer[1]).check():
+			timersanitycheck = TimerSanityCheck(self.session.nav.RecordTimer.timer_list, answer[1])
+			if not timersanitycheck.check():
 				print "Sanity check failed"
+				self.session.openWithCallback(self.finishSanityCorrection, TimerSanityConflict, timersanitycheck.getSimulTimerList())
 			else:
 				print "Sanity check passed"
-			entry = answer[1]
-			self.session.nav.RecordTimer.record(entry)
-			self.fillTimerList()
+				entry = answer[1]
+				self.session.nav.RecordTimer.record(entry)
+				self.fillTimerList()
 		else:
 			print "Timeredit aborted"		
 
+	def finishSanityCorrection(self, answer):
+		self.finishedAdd(answer)
+
 	def leave(self):
 		self.session.nav.RecordTimer.saveTimer()
 		self.session.nav.RecordTimer.on_state_change.remove(self.onStateChange)
@@ -167,3 +175,67 @@ class TimerEditList(Screen):
 
 	def onStateChange(self, entry):
 		self.refill()
+		
+class TimerSanityConflict(Screen):
+	def __init__(self, session, timer):
+		Screen.__init__(self, session)
+		self.timer = timer
+		print timer
+			
+		self["timer1"] = TimerList(self.getTimerList(timer[0]))
+		if len(timer) > 1:
+			self["timer2"] = TimerList(self.getTimerList(timer[1]))
+		else:
+			self["timer2"] = Button("No conflict")
+		
+		self.list = []
+		count = 0
+		for x in timer:
+			if count != 0:
+				self.list.append((_("Conflicting timer") + " " + str(count), x))
+			count += 1
+
+		self["list"] = MenuList(self.list)
+		
+		self["key_red"] = Button("Edit")
+		self["key_green"] = Button("Disable")
+		self["key_yellow"] = Button("Edit")
+		self["key_blue"] = Button("Disable")
+
+		self["actions"] = ActionMap(["OkCancelActions", "DirectionActions", "ShortcutActions", "TimerEditActions"], 
+			{
+				"ok": self.close,
+				#"cancel": self.leave,
+				"red": self.editTimer1,
+				"green": self.disableTimer1,
+#				"yellow": self.editTimer2,
+#				"blue": self.disableTimer2,
+				#"log": self.showLog,
+				#"left": self.left,
+				#"right": self.right,
+				"up": self.up,
+				"down": self.down
+			}, -1)
+
+	def getTimerList(self, timer):
+		return [TimerEntryComponent(timer, processed=False)]
+
+	def editTimer1(self):
+		self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timer1"].getCurrent()[0])
+
+	def disableTimer1(self):
+		self.timer[0].disabled = True
+		self.finishedEdit((True, self.timer[0]))
+
+	def finishedEdit(self, answer):
+		self.close((True, self.timer[0]))
+
+	def up(self):
+		self["list"].instance.moveSelection(self["list"].instance.moveUp)
+		self["timer2"].l.setList(self.getTimerList(self["list"].getCurrent()[1]))
+		
+	def down(self):
+		self["list"].instance.moveSelection(self["list"].instance.moveDown)
+		self["timer2"].l.setList(self.getTimerList(self["list"].getCurrent()[1]))
+			
+		
\ No newline at end of file
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 752ace42..fef525f0 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -2,7 +2,7 @@ from Screen import Screen
 import ChannelSelection
 from ServiceReference import ServiceReference
 from Components.config import *
-from Components.ActionMap import NumberActionMap
+from Components.ActionMap import ActionMap, NumberActionMap
 from Components.ConfigList import ConfigList
 from Components.MenuList import MenuList
 from Components.Button import Button
@@ -49,7 +49,7 @@ class TimerEntry(Screen):
 
 		self.list = []
 		self["config"] = ConfigList(self.list)
-		self.createSetup()
+		self.createSetup("config")
 
 	def createConfig(self):
 			config.timerentry = ConfigSubsection()
@@ -135,7 +135,7 @@ class TimerEntry(Screen):
 				except:
 					pass
 
-	def createSetup(self):
+	def createSetup(self, widget):
 		self.list = []
 		self.list.append(getConfigListEntry(_("Name"), config.timerentry.name))
 		self.list.append(getConfigListEntry(_("Description"), config.timerentry.description))
@@ -180,15 +180,15 @@ class TimerEntry(Screen):
 		self.channelEntry = getConfigListEntry(_("Channel"), config.timerentry.service)
 		self.list.append(self.channelEntry)
 
-		self["config"].list = self.list
-		self["config"].l.setList(self.list)
+		self[widget].list = self.list
+		self[widget].l.setList(self.list)
 
 	def newConfig(self):
 		print self["config"].getCurrent()
 		if self["config"].getCurrent() == self.timerTypeEntry:
-			self.createSetup()
+			self.createSetup("config")
 		if self["config"].getCurrent() == self.frequencyEntry:
-			self.createSetup()
+			self.createSetup("config")
 
 	def keyLeft(self):
 		if self["config"].getCurrent() == self.channelEntry:
@@ -282,7 +282,7 @@ class TimerEntry(Screen):
 
 	def keyCancel(self):
 		self.close((False,))
-
+		
 class TimerLog(Screen):
 	def __init__(self, session, timer):
 		Screen.__init__(self, session)