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

diff --git a/RecordTimer.py b/RecordTimer.py
index 62fa6370..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,6 +83,11 @@ 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"))
@@ -97,7 +105,7 @@ 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()
@@ -155,6 +163,10 @@ class RecordTimer(timer.Timer):
 
 	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."
@@ -162,14 +174,13 @@ class RecordTimer(timer.Timer):
 			self.timeChanged(entry)
 		elif entry.state != timer.TimerEntry.StateEnded:
 			entry.activate(timer.TimerEntry.EventAbort)
-			try: # FIXME: is needed, because after loading the timers, every timer (even already ended ones)
-				 # have the state EventWaiting..
-				self.timer_list.remove(entry)
-			except:
-				pass
-				
+			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."