RecordTimerEntry.receiveRecordEvents = False
@staticmethod
- def TryQuitMainloop():
+ def TryQuitMainloop(default_yes = True):
if not RecordTimerEntry.receiveRecordEvents:
print "RecordTimer.TryQuitMainloop"
NavigationInstance.instance.record_event.append(RecordTimerEntry.staticGotRecordEvent)
# other timers start in a few seconds
RecordTimerEntry.staticGotRecordEvent(None, iRecordableService.evEnd)
# send normal notification for the case the user leave the standby now..
- Notifications.AddNotification(Screens.Standby.TryQuitMainloop, 1, onSessionOpenCallback=RecordTimerEntry.stopTryQuitMainloop)
+ Notifications.AddNotification(Screens.Standby.TryQuitMainloop, 1, onSessionOpenCallback=RecordTimerEntry.stopTryQuitMainloop, default_yes = default_yes)
#################################################################
- def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False, afterEvent = AFTEREVENT.NONE, checkOldTimers = False):
+ def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False, afterEvent = AFTEREVENT.NONE, checkOldTimers = False, dirname = None):
timer.TimerEntry.__init__(self, int(begin), int(end))
if checkOldTimers == True:
self.start_prepare = 0
self.justplay = justplay
self.afterEvent = afterEvent
+ self.dirname = dirname
+ self.dirnameHadToFallback = False
self.log_entries = []
self.resetState()
def log(self, code, msg):
self.log_entries.append((int(time.time()), code, msg))
print "[TIMER]", msg
-
- def resetState(self):
- self.state = self.StateWaiting
- self.cancelled = False
- self.first_try_prepare = True
- self.timeChanged()
-
+
def calculateFilename(self):
service_name = self.service_ref.getServiceName()
begin_date = time.strftime("%Y%m%d %H%M", time.localtime(self.begin))
if self.name:
filename += " - " + self.name
- self.Filename = Directories.getRecordingFilename(filename)
+ if self.dirname and not Directories.pathExists(self.dirname):
+ self.dirnameHadToFallback = True
+ self.Filename = Directories.getRecordingFilename(filename, None)
+ else:
+ self.Filename = Directories.getRecordingFilename(filename, self.dirname)
self.log(0, "Filename calculated as: '%s'" % self.Filename)
#begin_date + " - " + service_name + description)
if self.afterEvent == AFTEREVENT.STANDBY:
if not Screens.Standby.inStandby: # not already in standby
Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A finished record timer wants to set your\nDreambox to standby. Do that now?"), timeout = 20)
- if self.afterEvent == AFTEREVENT.DEEPSTANDBY:
+ elif self.afterEvent == AFTEREVENT.DEEPSTANDBY:
if not Screens.Standby.inTryQuitMainloop: # not a shutdown messagebox is open
- if Screens.Standby.inStandby: # not in standby
+ if Screens.Standby.inStandby: # in standby
RecordTimerEntry.TryQuitMainloop() # start shutdown handling without screen
else:
Notifications.AddNotificationWithCallback(self.sendTryQuitMainloopNotification, MessageBox, _("A finished record timer wants to shut down\nyour Dreambox. Shutdown now?"), timeout = 20)
# that in our state, with also keeping the possibility to re-try.
# TODO: this has to be done.
elif event == iRecordableService.evStart:
+ text = _("A record has been started:\n%s") % self.name
+ if self.dirnameHadToFallback:
+ text = '\n'.join([text, _("Please note that the previously selected media could not be accessed and therefore the default directory is being used instead.")])
+
# maybe this should be configurable?
- Notifications.AddPopup(text = _("A record has been started:\n%s") % self.name, type = MessageBox.TYPE_INFO, timeout = 3)
+ Notifications.AddPopup(text = text, type = MessageBox.TYPE_INFO, timeout = 3)
# we have record_service as property to automatically subscribe to record service events
def setRecordService(self, service):
eit = long(xml.getAttribute("eit"))
else:
eit = None
-
+ if xml.hasAttribute("location") and xml.getAttribute("location") != "None":
+ location = xml.getAttribute("location").encode("utf-8")
+ else:
+ location = None
+
name = xml.getAttribute("name").encode("utf-8")
#filename = xml.getAttribute("filename").encode("utf-8")
- entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled, justplay, afterevent)
+ entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled, justplay, afterevent, dirname = location)
entry.repeated = int(repeated)
for l in elementsWithTag(xml.childNodes, "log"):
list.append(' afterevent="' + str(stringToXML({ AFTEREVENT.NONE: "nothing", AFTEREVENT.STANDBY: "standby", AFTEREVENT.DEEPSTANDBY: "deepstandby" }[timer.afterEvent])) + '"')
if timer.eit is not None:
list.append(' eit="' + str(timer.eit) + '"')
+ if timer.dirname is not None:
+ list.append(' location="' + str(stringToXML(timer.dirname)) + '"')
list.append(' disabled="' + str(int(timer.disabled)) + '"')
list.append(' justplay="' + str(int(timer.justplay)) + '"')
list.append('>\n')