* morituri/test/test_common_program.py:

* morituri/common/program.py:
	  Extract a common method to get textual representation of
	  AccurateRip results, and test it.
	* morituri/rip/cd.py:
	* morituri/rip/image.py:
	  Use the method.

morituri/rip/cd.py

@@ -276,32 +276,9 @@ class Rip(logcommand.LogCommand):
                     responses[0].cddbDiscId
 
            
-        # FIXME: put accuraterip verification into a separate task/function
-        # and apply here
         prog.verifyImage(runner, responses)
 
-        # loop over tracks
-        for trackResult in prog.result.tracks:
-
-            status = 'rip NOT accurate'
-
-            if trackResult.accurip:
-                    status = 'rip accurate    '
-
-            c = "(not found)"
-            ar = "(not in database)"
-            if trackResult.ARDBMaxConfidence:
-                c = "(max confidence %3d)" % trackResult.ARDBMaxConfidence
-                if trackResult.ARDBConfidence is not None:
-                    if trackResult.ARDBConfidence \
-                            < trackResult.ARDBMaxConfidence:
-                        c = "(confidence %3d of %3d)" % (
-                            trackResult.ARDBConfidence,
-                            trackResult.ARDBMaxConfidence)
-
-                ar = ", AR [%08x]" % trackResult.ARDBCRC
-                print "Track %2d: %s %s [%08x]%s" % (
-                    i + 1, status, c, trackResult.ARCRC, ar)
+        print "\n".join(prog.getAccurateRipResults()) + "\n"
 
         # write log file
         logger = result.getLogger()

morituri/rip/image.py

@@ -22,6 +22,7 @@
 
 from morituri.common import logcommand, task, checksum, accurip, program
 from morituri.image import image, cue
+from morituri.result import result
 from morituri.program import cdrdao, cdparanoia
 
 
@@ -40,12 +41,18 @@ class Verify(logcommand.LogCommand):
             url = cueImage.table.getAccurateRipURL()
             responses = cache.retrieve(url)
 
-            return
-            
-            # FIXME: finish implementation
+            # FIXME: this feels like we're poking at internals.
             prog.cuePath = arg
+            prog.result = result.RipResult()
+            for track in cueImage.table.tracks:
+                tr = result.TrackResult()
+                tr.number = track.number
+                prog.result.tracks.append(tr)
+
             prog.verifyImage(runner, responses) 
 
+            print "\n".join(prog.getAccurateRipResults()) + "\n"
+
 class Image(logcommand.LogCommand):
     summary = "handle images"