- add description for timer entries

diff --git a/Navigation.py b/Navigation.py
index 57c1283..5fe2651 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -71,10 +71,10 @@ class Navigation:
        def pause(self, p):
                return self.pnav.pause(p)
        
-       def recordWithTimer(self, begin, end, ref, epg):
+       def recordWithTimer(self, begin, end, ref, epg, description):
                if isinstance(ref, eServiceReference):
                        ref = ServiceReference.ServiceReference(ref)
-               entry = RecordTimer.RecordTimerEntry(begin, end, ref, epg)
+               entry = RecordTimer.RecordTimerEntry(begin, end, ref, epg, description)
                self.RecordTimer.record(entry)
                return entry
        

diff --git a/RecordTimer.py b/RecordTimer.py
index 0d3d53d..37208dd 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -10,7 +10,7 @@ from Tools.XMLTools import elementsWithTag
 from ServiceReference import ServiceReference
 
 class RecordTimerEntry(TimerEntry):
-       def __init__(self, begin, end, serviceref, epg):
+       def __init__(self, begin, end, serviceref, epg, description):
                TimerEntry.__init__(self, int(begin), int(end))
                
                assert isinstance(serviceref, ServiceReference)
@@ -19,6 +19,7 @@ class RecordTimerEntry(TimerEntry):
                
                print self.service_ref.getServiceName()
                self.epg_data = epg
+               self.description = description
                self.timer = None
                self.record_service = None
                
@@ -55,9 +56,10 @@ def createTimer(xml):
        begin = int(xml.getAttribute("begin"))
        end = int(xml.getAttribute("end"))
        serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
+       description = xml.getAttribute("description")
        epgdata = xml.getAttribute("epgdata")
        #filename = xml.getAttribute("filename")
-       return RecordTimerEntry(begin, end, serviceref, epgdata)
+       return RecordTimerEntry(begin, end, serviceref, epgdata, description)
 
 class RecordTimer(Timer):
        def __init__(self):
@@ -93,6 +95,7 @@ class RecordTimer(Timer):
                        t.setAttribute("end", str(timer.end))
                        t.setAttribute("serviceref", str(timer.service_ref))
                        #t.setAttribute("epgdata", timer.)
+                       t.setAttribute("description", timer.description)
                        root_element.appendChild(t)
                        t = doc.createTextNode("\n")
                        root_element.appendChild(t)

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index d868fd8..5112a00 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -93,7 +93,6 @@ class InfoBar(Screen):
                                        ev = eServiceEventPtr()
                                        if info.getEvent(ev, 0) == 0:
                                                epg = ev
-
-                       self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg)
-                       print "got entry: %s" % (str(self.recording))
+                       # fix me, description. 
+                       self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")