Commits

Guido Draheim committed 6b19574

swap around

Comments (0)

Files changed (2)

src/dvbcronrecording/computer.py

                         previous = current
                         continue
                     else:
-                        msg = (u"previous starts after current\nPREV %s\nNEXT %s" 
-                               % (previous, current))
-                        raise Exception(msg)                        
+                        # we would actually need to swap it around
+                        # the previous gets a start time after current.
+                        previous.message += _(" previous moved after next recording - swapped around,")
+                        previous.datetimeX = current.datetimeY
+                        previous.newtimeMMM = current.endtimeMMM + current.extratimeM
+                        # we try to keep the computation correct by letting
+                        # the previous item to stay.
+                        previous = previous
+                        continue 
+                        # msg = (u"previous starts after current\nPREV %s\nNEXT %s" 
+                        #        % (previous, current))
+                        # raise Exception(msg)                        
                 # move previous endtime down
                 if overlapM <= previous.extratimeM:
                     previous.extratimeM -= overlapM

src/dvbcronrecording/dvbcronrecording.de.po

 msgid " deleted as moved inside"
 msgstr " gelöscht da nun innerhalb"
 
-msgid "  set start time to previous start %s,"
+msgid " set start time to previous start %s,"
 msgstr " Startzeit gesetzt auf vorige Startzeit %s,"
+
+msgid " previous moved after next recording - swapped around,"
+msgstr " vorige verschoben hinter nächste Aufname - vertauscht,"