X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/223c807af74a9a402fa5a649c3e7acafb8caa8e3..a9f9792e9d271864182d32bfff58795690084cab:/lib/python/Screens/TimerEdit.py

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index b64fb116..73733913 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -6,7 +6,7 @@ from Components.Label import Label
 from Components.Button import Button
 from Components.TextInput import TextInput
 from TimerEntry import TimerEntry
-from RecordTimer import RecordTimerEntry
+from RecordTimer import RecordTimerEntry, parseEvent
 from time import *
 from ServiceReference import ServiceReference
 from Components.config import *
@@ -16,27 +16,33 @@ class TimerEditList(Screen):
 		Screen.__init__(self, session)
 		
 		list = [ ]
-		for timer in session.nav.RecordTimer.timer_list:
-			list.append(TimerEntryComponent(timer, 0))
-		
-		for timer in session.nav.RecordTimer.processed_timers:
-			list.append(TimerEntryComponent(timer, 1))
-		
+		self.list = list
+		self.fillTimerList()
+
 		self["timerlist"] = TimerList(list)
 		
-		self["key_red"] = Button("Delete")
-		self["key_green"] = Button("Add")
+		self["key_red"] = Button(_("Delete"))
+		self["key_green"] = Button(_("Add"))
 		self["key_yellow"] = Button("")
 		self["key_blue"] = Button("")
 
 		self["actions"] = ActionMap(["OkCancelActions", "ShortcutActions"], 
 			{
 				"ok": self.openEdit,
-				"cancel": self.close,
+				"cancel": self.leave,
 				"red": self.removeTimer,
 				"green": self.addCurrentTimer
 			})
 
+	def fillTimerList(self):
+		del self.list[:]
+		
+		for timer in self.session.nav.RecordTimer.timer_list:
+			self.list.append(TimerEntryComponent(timer, 0))
+		
+		for timer in self.session.nav.RecordTimer.processed_timers:
+			self.list.append(TimerEntryComponent(timer, 1))
+
 	def openEdit(self):
 		self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timerlist"].getCurrent()[0])
 		#self.session.open(TimerEdit, self["timerlist"].getCurrent()[0])
@@ -44,36 +50,26 @@ class TimerEditList(Screen):
 	def removeTimer(self):
 		# FIXME doesn't work...
 		self.session.nav.RecordTimer.removeEntry(self["timerlist"].getCurrent()[0])
+		self.fillTimerList()
+		self["timerlist"].invalidate()
 	
 	def addCurrentTimer(self):
-		begin = time()
-		end = time() + 60
-		
-		epg = None
-		try:
-			service = self.session.nav.getCurrentService()
+		event = None
+		service = self.session.nav.getCurrentService()
+		if service is not None:
 			info = service.info()
-			ev = info.getEvent(0)
-			epg = ev
-		except:
-			pass
-		
-		if (epg == None):
-			description = "unknown event"
-		else:
-			description = ev.getEventName()
-			# FIXME we need a timestamp here:
-			begin = ev.getBeginTime()
-			
-			print begin
-			print ev.getDuration()
-			end = begin + ev.getDuration()
-
+			if info is not None:
+				event = info.getEvent(0)
 
 		# FIXME only works if already playing a service
 		serviceref = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference())
 		
-		self.addTimer(RecordTimerEntry(begin, end, serviceref, epg, description))
+		if event is None:	
+			data = (int(time()), int(time() + 60), "unknown event", "", None)
+		else:
+			data = parseEvent(event)
+
+		self.addTimer(RecordTimerEntry(serviceref, *data))
 		
 	def addTimer(self, timer):
 		self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)
@@ -81,11 +77,18 @@ class TimerEditList(Screen):
 	def finishedEdit(self, answer):
 		if (answer[0]):
 			print "Edited timer"
+			self.session.nav.RecordTimer.timeChanged(answer[1])
+			self.fillTimerList()
 		else:
 			print "Timeredit aborted"
-
+			
 	def finishedAdd(self, answer):
 		if (answer[0]):
 			self.session.nav.RecordTimer.record(answer[1])
+			self.fillTimerList()
 		else:
-			print "Timeredit aborted"		
\ No newline at end of file
+			print "Timeredit aborted"		
+
+	def leave(self):
+		self.session.nav.RecordTimer.saveTimer()
+		self.close()