Guido Draheim avatar Guido Draheim committed 4f6036d

remove exception - lets it pass test_012343222

Comments (0)

Files changed (2)

src/dvbcronrecording/computer.py

                 # ..move current starttime up
                 if previous.datetimeX > current.datetimeX:
                     if previous.datetimeX >= current.datetimeY:
-                        msg = (u"previous starts after current\nPREV %s\nNEXT %s" 
-                               % (previous, current))
-                        raise Exception(msg)
+                        previous.deleted = True
+                        previous.datetimeY = previous.datetimeX
+                        previous.endtimeMMM = previous.newtimeMMM
+                        previous.extratimeM = 0
+                        previous.message += _(" and deleted as it is moved inside the other recording")
+                        self.logg.debug("   ^%s and deleted as it is moved inside the other recording", previous.item.title)
                     else:
                         current.datetimeX = previous.datetimeX
                         current.newtimeMMM = previous.endtimeMMM

src/dvbcronrecording/dvbcronrecording.de.po

 msgstr " gelöscht denn die Aufnahme ist nun zu kurz"
 
 #
+msgid " and deleted as it is moved inside the other recording"
+msgstr " gelöscht denn Aufnahme liegt nun innerhalb der anderen"
+#
 msgid " previous starts after current"
 msgstr " vorherige Aufnahme startet nach aktueller"
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.