fix automatic scan for DVB-T

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index eb9de6fbf790e0829bc86dca0ce6d95e637f79b9..dfddb73cc9cdf357780efeee58c65d669576151f 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -109,7 +109,7 @@ class RecordTimerEntry(timer.TimerEntry):
                                        f.write(self.description + "\n")
                                        f.write(str(self.begin) + "\n")
                                        f.close()
-                               except:
+                               except IOError:
                                        self.log(4, "failed to write meta information")
                                return True
 
@@ -343,24 +343,29 @@ class RecordTimer(timer.Timer):
                
        def isInTimer(self, eventid, begin, duration, service):
                time_match = 0
+               chktime = None
+               chktimecmp = None
+               chktimecmp_end = None
+               end = begin + duration
                for x in self.timer_list:
                        if str(x.service_ref) == str(service):
                                #if x.eit is not None and x.repeated == 0:
                                #       if x.eit == eventid:
                                #               return duration
                                if x.repeated != 0:
-                                       chktime = localtime(begin)
+                                       if chktime is None:
+                                               chktime = localtime(begin)
+                                               chktimecmp = chktime.tm_wday * 1440 + chktime.tm_hour * 60 + chktime.tm_min
+                                               chktimecmp_end = chktimecmp + (duration / 60)
                                        time = localtime(x.begin)
-                                       chktimecmp = chktime.tm_wday * 1440 + chktime.tm_hour * 60 + chktime.tm_min
                                        for y in range(7):
                                                if x.repeated & (2 ** y):
                                                        timecmp = y * 1440 + time.tm_hour * 60 + time.tm_min
                                                        if timecmp <= chktimecmp < (timecmp + ((x.end - x.begin) / 60)):
                                                                time_match = ((timecmp + ((x.end - x.begin) / 60)) - chktimecmp) * 60
-                                                       elif chktimecmp <= timecmp < (chktimecmp + (duration / 60)):
-                                                               time_match = ((chktimecmp + (duration / 60)) - timecmp) * 60
+                                                       elif chktimecmp <= timecmp < chktimecmp_end:
+                                                               time_match = (chktimecmp_end - timecmp) * 60
                                else: #if x.eit is None:
-                                       end = begin + duration
                                        if begin <= x.begin <= end:
                                                diff = end - x.begin
                                                if time_match < diff: