Merge branch 'bug_274_disable_fast_winding_for_non_ts' into experimental

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 1f65038cd73dca936b2ceeffa6ea13b46f0a60b5..f670417a5eddca05f8322c01b3b60c88bb372141 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -1,25 +1,23 @@
-import time
-#from time import datetime
-from Tools import Directories, Notifications, ASCIItranslit
-
-from Components.config import config
-import timer
-import xml.etree.cElementTree
-

 from enigma import eEPGCache, getBestPlayableServiceReference, \
        eServiceReference, iRecordableService, quitMainloop
 
 from enigma import eEPGCache, getBestPlayableServiceReference, \
        eServiceReference, iRecordableService, quitMainloop
 

-from Screens.MessageBox import MessageBox
+from Components.config import config
+from Components.UsageConfig import defaultMoviePath

 from Components.TimerSanityCheck import TimerSanityCheck
 from Components.TimerSanityCheck import TimerSanityCheck

-import NavigationInstance

 
 

+from Screens.MessageBox import MessageBox

 import Screens.Standby
 import Screens.Standby

-
-from time import localtime
-
+from Tools import Directories, Notifications, ASCIItranslit

 from Tools.XMLTools import stringToXML
 from Tools.XMLTools import stringToXML

+
+import timer
+import xml.etree.cElementTree
+import NavigationInstance

 from ServiceReference import ServiceReference
 
 from ServiceReference import ServiceReference
 

+from time import localtime, strftime, ctime, time
+from bisect import insort
+

 # ok, for descriptions etc we have:
 # service reference  (to get the service name)
 # name               (title)
 # ok, for descriptions etc we have:
 # service reference  (to get the service name)
 # name               (title)


@@ -65,8 +63,8 @@ class RecordTimerEntry(timer.TimerEntry, object):
                        recordings = NavigationInstance.instance.getRecordings()
                        if not recordings: # no more recordings exist
                                rec_time = NavigationInstance.instance.RecordTimer.getNextRecordingTime()
                        recordings = NavigationInstance.instance.getRecordings()
                        if not recordings: # no more recordings exist
                                rec_time = NavigationInstance.instance.RecordTimer.getNextRecordingTime()

-                               if rec_time > 0 and (rec_time - time.time()) < 360:
-                                       print "another recording starts in", rec_time - time.time(), "seconds... do not shutdown yet"
+                               if rec_time > 0 and (rec_time - time()) < 360:
+                                       print "another recording starts in", rec_time - time(), "seconds... do not shutdown yet"

                                else:
                                        print "no starting records in the next 360 seconds... immediate shutdown"
                                        RecordTimerEntry.shutdown() # immediate shutdown
                                else:
                                        print "no starting records in the next 360 seconds... immediate shutdown"
                                        RecordTimerEntry.shutdown() # immediate shutdown


@@ -96,8 +94,8 @@ class RecordTimerEntry(timer.TimerEntry, object):
                timer.TimerEntry.__init__(self, int(begin), int(end))
 
                if checkOldTimers == True:
                timer.TimerEntry.__init__(self, int(begin), int(end))
 
                if checkOldTimers == True:

-                       if self.begin < time.time() - 1209600:
-                               self.begin = int(time.time())
+                       if self.begin < time() - 1209600:
+                               self.begin = int(time())

                
                if self.end < self.begin:
                        self.end = self.begin
                
                if self.end < self.begin:
                        self.end = self.begin


@@ -125,12 +123,12 @@ class RecordTimerEntry(timer.TimerEntry, object):
                self.resetState()
        
        def log(self, code, msg):
                self.resetState()
        
        def log(self, code, msg):

-               self.log_entries.append((int(time.time()), code, msg))
+               self.log_entries.append((int(time()), code, msg))

                print "[TIMER]", msg
 
        def calculateFilename(self):
                service_name = self.service_ref.getServiceName()
                print "[TIMER]", msg
 
        def calculateFilename(self):
                service_name = self.service_ref.getServiceName()

-               begin_date = time.strftime("%Y%m%d %H%M", time.localtime(self.begin))
+               begin_date = strftime("%Y%m%d %H%M", localtime(self.begin))

                
                print "begin_date: ", begin_date
                print "service_name: ", service_name
                
                print "begin_date: ", begin_date
                print "service_name: ", service_name


@@ -144,11 +142,13 @@ class RecordTimerEntry(timer.TimerEntry, object):
                if config.recording.ascii_filenames.value:
                        filename = ASCIItranslit.legacyEncode(filename)
 
                if config.recording.ascii_filenames.value:
                        filename = ASCIItranslit.legacyEncode(filename)
 

-               if self.dirname and not Directories.fileExists(self.dirname, 'w'):
-                       self.dirnameHadToFallback = True
-                       self.Filename = Directories.getRecordingFilename(filename, None)
+               if not self.dirname or not Directories.fileExists(self.dirname, 'w'):
+                       if self.dirname:
+                               self.dirnameHadToFallback = True
+                       dirname = defaultMoviePath()

                else:
                else:

-                       self.Filename = Directories.getRecordingFilename(filename, self.dirname)
+                       dirname = self.dirname
+               self.Filename = Directories.getRecordingFilename(filename, dirname)

                self.log(0, "Filename calculated as: '%s'" % self.Filename)
                #begin_date + " - " + service_name + description)
 
                self.log(0, "Filename calculated as: '%s'" % self.Filename)
                #begin_date + " - " + service_name + description)
 


@@ -186,10 +186,16 @@ class RecordTimerEntry(timer.TimerEntry, object):
 
                        prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id, self.name.replace("\n", ""), self.description.replace("\n", ""), ' '.join(self.tags))
                        if prep_res:
 
                        prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id, self.name.replace("\n", ""), self.description.replace("\n", ""), ' '.join(self.tags))
                        if prep_res:

-                               if prep_res == 255:
+                               if prep_res == -255:

                                        self.log(4, "failed to write meta information")
                                else:
                                        self.log(2, "'prepare' failed: error %d" % prep_res)
                                        self.log(4, "failed to write meta information")
                                else:
                                        self.log(2, "'prepare' failed: error %d" % prep_res)

+
+                               # we must calc nur start time before stopRecordService call because in Screens/Standby.py TryQuitMainloop tries to get
+                               # the next start time in evEnd event handler...
+                               self.do_backoff()
+                               self.start_prepare = time() + self.backoff
+

                                NavigationInstance.instance.stopRecordService(self.record_service)
                                self.record_service = None
                                return False
                                NavigationInstance.instance.stopRecordService(self.record_service)
                                self.record_service = None
                                return False


@@ -207,29 +213,37 @@ class RecordTimerEntry(timer.TimerEntry, object):
        def activate(self):
                next_state = self.state + 1
                self.log(5, "activating state %d" % next_state)
        def activate(self):
                next_state = self.state + 1
                self.log(5, "activating state %d" % next_state)

-               
+

                if next_state == self.StatePrepared:
                        if self.tryPrepare():
                                self.log(6, "prepare ok, waiting for begin")
                if next_state == self.StatePrepared:
                        if self.tryPrepare():
                                self.log(6, "prepare ok, waiting for begin")

+                               # create file to "reserve" the filename
+                               # because another recording at the same time on another service can try to record the same event
+                               # i.e. cable / sat.. then the second recording needs an own extension... when we create the file
+                               # here than calculateFilename is happy
+                               if not self.justplay:
+                                       open(self.Filename + ".ts", "w").close() 

                                # fine. it worked, resources are allocated.
                                self.next_activation = self.begin
                                self.backoff = 0
                                return True
                                # fine. it worked, resources are allocated.
                                self.next_activation = self.begin
                                self.backoff = 0
                                return True

-                       
+

                        self.log(7, "prepare failed")
                        if self.first_try_prepare:
                                self.first_try_prepare = False
                        self.log(7, "prepare failed")
                        if self.first_try_prepare:
                                self.first_try_prepare = False

-                               if not config.recording.asktozap.value:
-                                       self.log(8, "asking user to zap away")
-                                       Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"), timeout=20)
-                               else: # zap without asking
-                                       self.log(9, "zap without asking")
-                                       Notifications.AddNotification(MessageBox, _("In order to record a timer, the TV was switched to the recording service!\n"), type=MessageBox.TYPE_INFO, timeout=20)
-                                       self.failureCB(True)
-
-                       self.do_backoff()
-                       # retry
-                       self.start_prepare = time.time() + self.backoff
+                               cur_ref = NavigationInstance.instance.getCurrentlyPlayingServiceReference()
+                               if cur_ref and not cur_ref.getPath():
+                                       if not config.recording.asktozap.value:
+                                               self.log(8, "asking user to zap away")
+                                               Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"), timeout=20)
+                                       else: # zap without asking
+                                               self.log(9, "zap without asking")
+                                               Notifications.AddNotification(MessageBox, _("In order to record a timer, the TV was switched to the recording service!\n"), type=MessageBox.TYPE_INFO, timeout=20)
+                                               self.failureCB(True)
+                               elif cur_ref:
+                                       self.log(8, "currently running service is not a live service.. so stop it makes no sense")
+                               else:
+                                       self.log(8, "currently no service running... so we dont need to stop it")

                        return False
                elif next_state == self.StateRunning:
                        # if this timer has been cancelled, just go to "end" state.
                        return False
                elif next_state == self.StateRunning:
                        # if this timer has been cancelled, just go to "end" state.


@@ -255,7 +269,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
                                        self.log(13, "start record returned %d" % record_res)
                                        self.do_backoff()
                                        # retry
                                        self.log(13, "start record returned %d" % record_res)
                                        self.do_backoff()
                                        # retry

-                                       self.begin = time.time() + self.backoff
+                                       self.begin = time() + self.backoff

                                        return False
 
                                return True
                                        return False
 
                                return True


@@ -284,7 +298,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
                if not self.autoincrease:
                        return False
                if entry is None:
                if not self.autoincrease:
                        return False
                if entry is None:

-                       new_end =  int(time.time()) + self.autoincreasetime
+                       new_end =  int(time()) + self.autoincreasetime

                else:
                        new_end = entry.begin -30
 
                else:
                        new_end = entry.begin -30
 


@@ -297,7 +311,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
                        del simulTimerList
                        new_end -= 30                           # 30 Sekunden Prepare-Zeit lassen
                del dummyentry
                        del simulTimerList
                        new_end -= 30                           # 30 Sekunden Prepare-Zeit lassen
                del dummyentry

-               if new_end <= time.time():
+               if new_end <= time():

                        return False
                self.end = new_end
                return True
                        return False
                self.end = new_end
                return True


@@ -335,7 +349,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
                self.backoff = 0
                
                if int(old_prepare) != int(self.start_prepare):
                self.backoff = 0
                
                if int(old_prepare) != int(self.start_prepare):

-                       self.log(15, "record time changed, start prepare is now: %s" % time.ctime(self.start_prepare))
+                       self.log(15, "record time changed, start prepare is now: %s" % ctime(self.start_prepare))

 
        def gotRecordEvent(self, record, event):
                # TODO: this is not working (never true), please fix. (comparing two swig wrapped ePtrs)
 
        def gotRecordEvent(self, record, event):
                # TODO: this is not working (never true), please fix. (comparing two swig wrapped ePtrs)


@@ -427,7 +441,36 @@ class RecordTimer(timer.Timer):
                        self.loadTimer()
                except IOError:
                        print "unable to load timers from file!"
                        self.loadTimer()
                except IOError:
                        print "unable to load timers from file!"

-                       
+
+       def doActivate(self, w):
+               # when activating a timer which has already passed,
+               # simply abort the timer. don't run trough all the stages.
+               if w.shouldSkip():
+                       w.state = RecordTimerEntry.StateEnded
+               else:
+                       # when active returns true, this means "accepted".
+                       # otherwise, the current state is kept.
+                       # the timer entry itself will fix up the delay then.
+                       if w.activate():
+                               w.state += 1
+
+               self.timer_list.remove(w)
+
+               # did this timer reached the last state?
+               if w.state < RecordTimerEntry.StateEnded:
+                       # no, sort it into active list
+                       insort(self.timer_list, w)
+               else:
+                       # yes. Process repeated, and re-add.
+                       if w.repeated:
+                               w.processRepeated()
+                               w.state = RecordTimerEntry.StateWaiting
+                               self.addTimerEntry(w)
+                       else:
+                               insort(self.processed_timers, w)
+               
+               self.stateChanged(w)
+

        def isRecording(self):
                isRunning = False
                for timer in self.timer_list:
        def isRecording(self):
                isRunning = False
                for timer in self.timer_list:


@@ -559,7 +602,7 @@ class RecordTimer(timer.Timer):
                file.close()
 
        def getNextZapTime(self):
                file.close()
 
        def getNextZapTime(self):

-               now = time.time()
+               now = time()

                for timer in self.timer_list:
                        if not timer.justplay or timer.begin < now:
                                continue
                for timer in self.timer_list:
                        if not timer.justplay or timer.begin < now:
                                continue


@@ -567,15 +610,16 @@ class RecordTimer(timer.Timer):
                return -1
 
        def getNextRecordingTime(self):
                return -1
 
        def getNextRecordingTime(self):

-               now = time.time()
+               now = time()

                for timer in self.timer_list:
                for timer in self.timer_list:

-                       if timer.justplay or timer.begin < now:
+                       next_act = timer.getNextActivation()
+                       if timer.justplay or next_act < now:

                                continue
                                continue

-                       return timer.begin
+                       return next_act

                return -1
 
        def isNextRecordAfterEventActionAuto(self):
                return -1
 
        def isNextRecordAfterEventActionAuto(self):

-               now = time.time()
+               now = time()

                t = None
                for timer in self.timer_list:
                        if timer.justplay or timer.begin < now:
                t = None
                for timer in self.timer_list:
                        if timer.justplay or timer.begin < now:


@@ -649,7 +693,7 @@ class RecordTimer(timer.Timer):
                                                chktimecmp_end = chktimecmp + (duration / 60)
                                        time = localtime(x.begin)
                                        for y in (0, 1, 2, 3, 4, 5, 6):
                                                chktimecmp_end = chktimecmp + (duration / 60)
                                        time = localtime(x.begin)
                                        for y in (0, 1, 2, 3, 4, 5, 6):

-                                               if x.repeated & (2 ** y) and (x.begin <= begin or begin <= x.begin <= end):
+                                               if x.repeated & (1 << y) and (x.begin <= begin or begin <= x.begin <= end):

                                                        timecmp = y * 1440 + time.tm_hour * 60 + time.tm_min
                                                        if timecmp <= chktimecmp < (timecmp + ((x.end - x.begin) / 60)):
                                                                time_match = ((timecmp + ((x.end - x.begin) / 60)) - chktimecmp) * 60
                                                        timecmp = y * 1440 + time.tm_hour * 60 + time.tm_min
                                                        if timecmp <= chktimecmp < (timecmp + ((x.end - x.begin) / 60)):
                                                                time_match = ((timecmp + ((x.end - x.begin) / 60)) - chktimecmp) * 60