X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/63fd3a60724b9c03a70ce847955f2aa9facb423f..7721d73af13f07f4b53d20707fc9cbeb5a172e72:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index aa48415a..602828a6 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -1,11 +1,12 @@
 import time
 import codecs
 #from time import datetime
-from Tools import Directories
+from Tools import Directories, Notifications
 
 import timer
 import xml.dom.minidom
 
+from Screens.MessageBox import MessageBox
 import NavigationInstance
 
 from Tools.XMLTools import elementsWithTag
@@ -63,12 +64,14 @@ class RecordTimerEntry(timer.TimerEntry):
 			if self.record_service == None:
 				print "timer record failed."
 			else:	
-				self.record_service.prepare(self.Filename + ".ts")
+				if self.record_service.prepare(self.Filename + ".ts"):
+					# error. 
+					Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nReason: unknown."))
+
 				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."
@@ -80,26 +83,41 @@ class RecordTimerEntry(timer.TimerEntry):
 			self.record_service = None
 			print "Timer successfully ended"
 
+	def failureCB(self, answer):
+		if answer == True:
+			print "kill user to record"
+		else:
+			print "user killed record"
 
 def createTimer(xml):
 	begin = int(xml.getAttribute("begin"))
 	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")
-	return RecordTimerEntry(begin, end, serviceref, epgdata, description)
+	entry = RecordTimerEntry(begin, end, serviceref, epgdata, description)
+	entry.repeated = int(repeated)
+	return entry
 
 class RecordTimer(timer.Timer):
 	def __init__(self):
 		timer.Timer.__init__(self)
 		
-		self.Filename = Directories.resolveFilename(Directories.SCOPE_USERETC, "timers.xml")
+		self.Filename = Directories.resolveFilename(Directories.SCOPE_CONFIG, "timers.xml")
 		
 		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):
 		# TODO: PATH!
@@ -126,6 +144,7 @@ class RecordTimer(timer.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)
@@ -138,21 +157,36 @@ class RecordTimer(timer.Timer):
 		file.close()
 	
 	def record(self, entry):
+		print "[Timer] Record " + str(entry)
 		entry.Timer = self
 		self.addTimerEntry(entry)
 
 	def removeEntry(self, entry):
+		print "[Timer] Remove " + str(entry)
+		
+		entry.repeated = False
+
+		entry.repeated = False
+
 		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.calcNextActivation()
 			print "timer did not yet start - removing"
+
+			# the timer was aborted, and removed.
+			return
 		else:
 			print "timer did already end - doing nothing."
 		
+		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)