Notifications.AddNotification(Screens.Standby.TryQuitMainloop, 1, onSessionOpenCallback=RecordTimerEntry.stopTryQuitMainloop)
#################################################################
- 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.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)
+ self.Filename = Directories.getRecordingFilename(filename, self.dirname)
self.log(0, "Filename calculated as: '%s'" % self.Filename)
#begin_date + " - " + service_name + description)
eit = long(xml.getAttribute("eit"))
else:
eit = None
-
+ if xml.hasAttribute("location") and xml.getAttribute("location") != "None":
+ location = str(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')