X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FTimerEdit.py;h=8f742b8ccb3a8998daf91b9c3c61dfff3ac4df43;hb=61111fab026bb61d70ffcf74c36e51da56aa7ad2;hp=cdff4c5ba36f22fe803727d93a966694adb48e86;hpb=c46312d7f5ce4113ece4c33595b7192eccadcb1d;p=vuplus_dvbapp

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index cdff4c5..8f742b8 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
@@ -12,6 +13,7 @@ from ServiceReference import ServiceReference
 from TimerEntry import TimerEntry, TimerLog
 from Tools.BoundFunction import boundFunction
 from time import time
+from timer import TimerEntry as RealTimerEntry
 
 class TimerEditList(Screen):
 	EMPTY = 0
@@ -87,7 +89,9 @@ class TimerEditList(Screen):
 				if not timersanitycheck.check():
 					t.disable()
 					print "Sanity check failed"
-					self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, timersanitycheck.getSimulTimerList())
+					simulTimerList = timersanitycheck.getSimulTimerList()
+					if simulTimerList is not None:
+						self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, simulTimerList)
 				else:
 					print "Sanity check passed"
 					if timersanitycheck.doubleCheck():
@@ -171,14 +175,20 @@ 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)
+		#helper function to move finished timers to end of list
+		def eol_compare(x, y):
+			if x[0].state != y[0].state and x[0].state == RealTimerEntry.StateEnded or y[0].state == RealTimerEntry.StateEnded:
+				return cmp(x[0].state, y[0].state)
+			return cmp(x[0].begin, x[1].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])
+		if config.usage.timerlist_finished_timer_position.index: #end of list
+			list.sort(cmp = eol_compare)
+		else:
+			list.sort(key = lambda x: x[0].begin)
 
 	def showLog(self):
 		cur=self["timerlist"].getCurrent()
@@ -246,7 +256,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)
@@ -273,7 +283,7 @@ class TimerEditList(Screen):
 					else:
 						success = True
 			else:
-				succsess = True
+				success = True
 			if success:
 				print "Sanity check passed"
 				self.session.nav.RecordTimer.timeChanged(entry)