timer: add name/description, factor out "parse from epg event", fix some cases where demux was not available at that time, add timeshift framework, fix movielist (not all movies are great!)

1 files changed, 6 insertions, 15 deletions

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index db8be2e1..4d288b00 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -5,7 +5,7 @@ from Components.ActionMap import ActionMap
 from Screens.EventView import EventView
 from enigma import eServiceReference, eServiceEventPtr
 from Screens.FixedMenu import FixedMenu
-from RecordTimer import RecordTimerEntry
+from RecordTimer import RecordTimerEntry, parseEvent
 from TimerEdit import TimerEditList
 from TimerEntry import TimerEntry
 from ServiceReference import ServiceReference
@@ -49,24 +49,15 @@ class EPGSelection(Screen):
 		self.session.open(EventView, event, self.currentService, self.eventViewCallback)
 	
 	def timerAdd(self):
-		epg = self["list"].getCurrent()
+		event = self["list"].getCurrent()
+		
+		if event is None:
+			return
 		
-		if (epg == None):
-			description = "unknown event"
-		else:
-			description = epg.getEventName()
-			# FIXME we need a timestamp here:
-			begin = epg.getBeginTime()
-			
-			print begin
-			print epg.getDuration()
-			end = begin + epg.getDuration()
-
-
 		# FIXME only works if already playing a service
 		serviceref = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference())
 		
-		newEntry = RecordTimerEntry(begin, end, serviceref, epg, description)
+		newEntry = RecordTimerEntry(serviceref, *parseEvent(event))
 		self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
 	
 	def timerEditFinished(self, answer):