the record.png blinks now whenever a timerentry in the recordingtimer is running

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 286d523b2969c250acc34e25f833761f68bafd9f..134079586df374d7a0881d5839550e549eb986f5 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -1,7 +1,9 @@
 import time
 import codecs
 import time
 import codecs

+#from time import datetime
+from Tools import Directories

 
 

-from timer import *
+import timer

 import xml.dom.minidom
 
 import NavigationInstance
 import xml.dom.minidom
 
 import NavigationInstance


@@ -9,20 +11,40 @@ import NavigationInstance
 from Tools.XMLTools import elementsWithTag
 from ServiceReference import ServiceReference
 
 from Tools.XMLTools import elementsWithTag
 from ServiceReference import ServiceReference
 

-class RecordTimerEntry(TimerEntry):
+class RecordTimerEntry(timer.TimerEntry):

        def __init__(self, begin, end, serviceref, epg, description):
        def __init__(self, begin, end, serviceref, epg, description):

-               TimerEntry.__init__(self, int(begin), int(end))
+               timer.TimerEntry.__init__(self, int(begin), int(end))

                
                assert isinstance(serviceref, ServiceReference)
                
                self.service_ref = serviceref
                
                
                assert isinstance(serviceref, ServiceReference)
                
                self.service_ref = serviceref
                

-               print self.service_ref.getServiceName()
-               self.epg_data = epg
+               if epg is not None:
+                       self.epg_data = ""
+                       #str(epg.m_event_name)
+               else:
+                       self.epg_data = ""
+               
+               self.dontSave = False

                self.description = description
                self.timer = None
                self.record_service = None
                
                self.description = description
                self.timer = None
                self.record_service = None
                

+       def calculateFilename(self):
+               service_name = self.service_ref.getServiceName()
+#              begin_date = datetime.fromtimestamp(begin).strf...
+               begin_date = ""
+               if self.epg_data is not None:
+                       description = " - " + self.epg_data
+               else:
+                       description = ""
+               
+               print "begin_date: " + str(begin_date)
+               print "service_name: " + str(service_name)
+               print "description: " + str(description)
+               self.Filename = Directories.getRecordingFilename(service_name)
+               #begin_date + " - " + service_name + description)
+               

                # build filename from epg
                
                # pff das geht noch nicht...
                # build filename from epg
                
                # pff das geht noch nicht...


@@ -32,14 +54,21 @@ class RecordTimerEntry(TimerEntry):
 #                      self.Filename = "record_" + str(epg.m_event_name) + ".ts"
 #              
 #              print "------------ record filename: %s" % (self.Filename)
 #                      self.Filename = "record_" + str(epg.m_event_name) + ".ts"
 #              
 #              print "------------ record filename: %s" % (self.Filename)

-               
+       
+       

        def activate(self, event):
                if event == self.EventPrepare:
        def activate(self, event):
                if event == self.EventPrepare:

+                       self.calculateFilename()

                        self.record_service = NavigationInstance.instance.recordService(self.service_ref)
                        if self.record_service == None:
                                print "timer record failed."
                        else:   
                        self.record_service = NavigationInstance.instance.recordService(self.service_ref)
                        if self.record_service == None:
                                print "timer record failed."
                        else:   

-                               self.record_service.prepare()
+                               self.record_service.prepare(self.Filename + ".ts")
+                               f = open(self.Filename + ".ts.meta", "w")
+                               f.write(str(self.service_ref) + "\n")
+                               f.write(self.epg_data + "\n")
+                               del f
+                               

                elif self.record_service == None:
                        if event != self.EventAbort:
                                print "timer record start failed, can't finish recording."
                elif self.record_service == None:
                        if event != self.EventAbort:
                                print "timer record start failed, can't finish recording."


@@ -57,23 +86,32 @@ def createTimer(xml):
        end = int(xml.getAttribute("end"))
        serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
        description = xml.getAttribute("description")
        end = int(xml.getAttribute("end"))
        serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
        description = xml.getAttribute("description")

+       repeated = xml.getAttribute("repeated")

        epgdata = xml.getAttribute("epgdata")
        #filename = xml.getAttribute("filename")
        epgdata = xml.getAttribute("epgdata")
        #filename = xml.getAttribute("filename")

-       return RecordTimerEntry(begin, end, serviceref, epgdata, description)
+       entry = RecordTimerEntry(begin, end, serviceref, epgdata, description)
+       entry.repeated = int(repeated)
+       return entry

 
 

-class RecordTimer(Timer):
+class RecordTimer(timer.Timer):

        def __init__(self):
        def __init__(self):

-               Timer.__init__(self)
+               timer.Timer.__init__(self)

                
                

-               self.Filename = "timers.xml"
+               self.Filename = Directories.resolveFilename(Directories.SCOPE_USERETC, "timers.xml")

                
                try:
                        self.loadTimer()
                except:
                        print "unable to load timers from file!"
                
                try:
                        self.loadTimer()
                except:
                        print "unable to load timers from file!"

+                       
+       def isRecording(self):
+               isRunning = False
+               for timer in self.timer_list:
+                       if timer.isRunning():
+                               isRunning = True
+               return isRunning

        
        def loadTimer(self):
        
        def loadTimer(self):

-               

                # TODO: PATH!
                doc = xml.dom.minidom.parse(self.Filename)
                
                # TODO: PATH!
                doc = xml.dom.minidom.parse(self.Filename)
                


@@ -88,39 +126,53 @@ class RecordTimer(Timer):
                root_element.appendChild(doc.createTextNode("\n"))
                
                for timer in self.timer_list + self.processed_timers:
                root_element.appendChild(doc.createTextNode("\n"))
                
                for timer in self.timer_list + self.processed_timers:

+                       # some timers (instant records) don't want to be saved.
+                       # skip them
+                       if timer.dontSave:
+                               continue

                        t = doc.createTextNode("\t")
                        root_element.appendChild(t)
                        t = doc.createElement('timer')
                        t.setAttribute("begin", str(timer.begin))
                        t.setAttribute("end", str(timer.end))
                        t.setAttribute("serviceref", str(timer.service_ref))
                        t = doc.createTextNode("\t")
                        root_element.appendChild(t)
                        t = doc.createElement('timer')
                        t.setAttribute("begin", str(timer.begin))
                        t.setAttribute("end", str(timer.end))
                        t.setAttribute("serviceref", str(timer.service_ref))

+                       t.setAttribute("repeated", str(timer.repeated))                 

                        #t.setAttribute("epgdata", timer.)
                        t.setAttribute("description", timer.description)
                        root_element.appendChild(t)
                        t = doc.createTextNode("\n")
                        root_element.appendChild(t)
                        #t.setAttribute("epgdata", timer.)
                        t.setAttribute("description", timer.description)
                        root_element.appendChild(t)
                        t = doc.createTextNode("\n")
                        root_element.appendChild(t)

-               
+

                file = open(self.Filename, "w")
                doc.writexml(codecs.getwriter('UTF-8')(file))
                file = open(self.Filename, "w")
                doc.writexml(codecs.getwriter('UTF-8')(file))

+               file.write("\n")

                file.close()
        
        def record(self, entry):
                file.close()
        
        def record(self, entry):

+               print "[Timer] Record " + str(entry)

                entry.Timer = self
                self.addTimerEntry(entry)
 
        def removeEntry(self, entry):
                entry.Timer = self
                self.addTimerEntry(entry)
 
        def removeEntry(self, entry):

-               if entry.state == TimerEntry.StateRunning:
-                       entry.End = time.time()
-                       print "aborting timer"
-               elif entry.state != TimerEntry.StateEnded:
-                       entry.activate(TimerEntry.EventAbort)
+               print "[Timer] Remove " + str(entry)
+
+               if entry.state == timer.TimerEntry.StateRunning:
+                       print "remove running timer."
+                       entry.end = time.time()
+                       self.timeChanged(entry)
+               elif entry.state != timer.TimerEntry.StateEnded:
+                       entry.activate(timer.TimerEntry.EventAbort)

                        self.timer_list.remove(entry)
                        self.timer_list.remove(entry)

+                       self.calcNextActivation()

                        print "timer did not yet start - removing"
                else:
                        print "timer did already end - doing nothing."
                        print "timer did not yet start - removing"
                else:
                        print "timer did already end - doing nothing."

-
-               self.calcNextActivation()
-
+               
+               print "state: ", entry.state
+               print "in processed: ", entry in self.processed_timers
+               print "in running: ", entry in self.timer_list
+               # now the timer should be in the processed_timers list. remove it from there.
+               self.processed_timers.remove(entry)

 
        def shutdown(self):
                self.saveTimer()
 
        def shutdown(self):
                self.saveTimer()