X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=cf900170c8ac65929a7e41836de789bc39f16d44;hp=6ae4d719136c229612008eb84b5c23ebe597b856;hb=ebdbedb7b01c55a06c9fd548cc776354ced3b4cf;hpb=8c87d0c9772738df1005bd81a749d3fd6174c4cc

diff --git a/RecordTimer.py b/RecordTimer.py
index 6ae4d71..cf90017 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -393,8 +393,22 @@ class RecordTimer(timer.Timer):
 	
 	def loadTimer(self):
 		# TODO: PATH!
-		doc = xml.dom.minidom.parse(self.Filename)
-		
+		try:
+			doc = xml.dom.minidom.parse(self.Filename)
+		except xml.parsers.expat.ExpatError:
+			from Tools.Notifications import AddPopup
+			from Screens.MessageBox import MessageBox
+
+			AddPopup(_("The timer file (timers.xml) is corrupt and could not be loaded."), type = MessageBox.TYPE_ERROR, timeout = 0, id = "TimerLoadFailed")
+
+			print "timers.xml failed to load!"
+			try:
+				import os
+				os.rename(self.Filename, self.Filename + "_old")
+			except IOError:
+				print "renaming broken timer failed"
+			return
+
 		root = doc.childNodes[0]
 		for timer in elementsWithTag(root.childNodes, "timer"):
 			self.record(createTimer(timer))
@@ -482,27 +496,19 @@ class RecordTimer(timer.Timer):
 		file.close()
 
 	def getNextZapTime(self):
-		llen = len(self.timer_list)
-		idx = 0
 		now = time.time()
-		while idx < llen:
-			timer = self.timer_list[idx]
+		for timer in self.timer_list:
 			if not timer.justplay or timer.begin < now:
-				idx += 1
-			else:
-				return timer.begin
+				continue
+			return timer.begin
 		return -1
 
 	def getNextRecordingTime(self):
-		llen = len(self.timer_list)
-		idx = 0
 		now = time.time()
-		while idx < llen:
-			timer = self.timer_list[idx]
+		for timer in self.timer_list:
 			if timer.justplay or timer.begin < now:
-				idx += 1
-			else:
-				return timer.begin
+				continue
+			return timer.begin
 		return -1
 
 	def record(self, entry):
@@ -510,9 +516,9 @@ class RecordTimer(timer.Timer):
 		print "[Timer] Record " + str(entry)
 		entry.Timer = self
 		self.addTimerEntry(entry)
+		self.saveTimer()
 		
 	def isInTimer(self, eventid, begin, duration, service):
-		print "isInTimer"
 		time_match = 0
 		chktime = None
 		chktimecmp = None
@@ -592,6 +598,7 @@ class RecordTimer(timer.Timer):
 		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)
+		self.saveTimer()
 
 	def shutdown(self):
 		self.saveTimer()