[WIP] Pass unverified state further, improve logging for such cases.

Author: leper

whipper/command/cd.py

@@ -231,6 +231,9 @@ class Rip(_CD):
     skipped_tracks = []
     # this holds tracks that fail to rip -
     # currently only used when the --keep-going option is used
+    unverified_tracks = []
+    # this holds tracks that failed to verify -
+    # currently only used when the --keep-unverified option is used
     description = """
 Rips a CD.
 
@@ -500,12 +503,12 @@ def _ripIfNotRipped(number):
                                     number, tries)
                     if self.options.keep_unverified and not number == 0:
                         logger.warning("track %d failed to rip. keeping unverified file.", number)
-                        logger.debug("adding %s to skipped_tracks",
+                        logger.debug("adding %s to unverified_tracks",
                                      trackResult)
-                        self.skipped_tracks.append(trackResult)
-                        logger.debug("skipped_tracks = %s",
-                                     self.skipped_tracks)
-                        trackResult.skipped = True
+                        self.unverified_tracks.append(trackResult)
+                        logger.debug("unverified_tracks = %s",
+                                     self.unverified_tracks)
+                        trackResult.unverified = True
                     elif self.options.keep_going:
                         logger.warning("track %d failed to rip.", number)
                         logger.debug("adding %s to skipped_tracks",
@@ -518,7 +521,7 @@ def _ripIfNotRipped(number):
                         raise RuntimeError("track can't be ripped. "
                                            "Rip attempts number is equal "
                                            "to {}".format(self.options.max_retries))
-                if trackResult in self.skipped_tracks:
+                if trackResult in (self.skipped_tracks or self.unverified_tracks):
                     print("Skipping CRC comparison for track %d "
                           "due to rip failure" % number)
                 else:
@@ -586,6 +589,8 @@ def _ripIfNotRipped(number):
         logger.debug('writing m3u file for %r', discName)
         self.program.write_m3u(discName)
 
+        if len(self.unverified_tracks) > 0:
+            self.program.unverified_tracks = self.unverified_tracks
         if len(self.skipped_tracks) > 0:
             logger.warning("the generated cue sheet references %d track(s) "
                            "which failed to rip so the associated file(s) "
@@ -601,6 +606,7 @@ def _ripIfNotRipped(number):
 
         self.program.writeLog(discName, self.logger)
 
+        # TODO: Return non-zero in case of unverified tracks?
         if len(self.skipped_tracks) > 0:
             logger.warning('%d tracks have been skipped from this rip attempt',
                            len(self.skipped_tracks))

whipper/common/program.py

@@ -60,6 +60,7 @@ class Program:
     outdir = None
     result = None
     skipped_tracks = None
+    unverified_tracks = None
 
     def __init__(self, config, record=False):
         """

whipper/result/logger.py

@@ -16,6 +16,7 @@ class WhipperLogger(result.Logger):
     _inARDatabase = 0
     _errors = False
     _skippedTracks = False
+    _unverifiedTracks = False
 
     def log(self, ripResult, epoch=time.time()):
         """Return logfile as string."""
@@ -142,6 +143,8 @@ def logRip(self, ripResult, epoch):
             message = "There were errors"
         elif self._skippedTracks:
             message = "Some tracks were not ripped (skipped)"
+        elif self._unverifiedTracks:
+            message = "Some tracks could not be verified (but were kept)"
         else:
             message = "No errors occurred"
         data["Health status"] = message
@@ -250,6 +253,10 @@ def trackLog(self, trackResult):
         if trackResult.skipped:
             track["Status"] = "Track not ripped (skipped)"
             self._skippedTracks = True
+        # Check if the track has failed verification, but has been kept
+        elif trackResult.unverified:
+            track["Status"] = "Copy NOT OK (unverified file kept)"
+            self._unverifiedTracks = True
         # Check if Test & Copy CRCs are equal
         elif trackResult.testcrc == trackResult.copycrc:
             track["Status"] = "Copy OK"

whipper/result/result.py

@@ -39,6 +39,7 @@ class TrackResult:
     AR = None
     classVersion = 3
     skipped = False
+    unverified = False
 
     def __init__(self):
         """