Changeset 420 for trunk/morituri/rip/cd.py

Timestamp:

02-01-11 18:14:26 (2 years ago)

Author:

thomas

Message:

• morituri/common/program.py:
• morituri/image/table.py:
• morituri/rip/cd.py: Get CDDB disc id. Use it to print info when not found on MusicBrainz?.

File:

• trunk/morituri/rip/cd.py (modified) (1 diff)

trunk/morituri/rip/cd.py

@@ -138 +138 @@
         prog.metadata = prog.getMusicBrainz(ittoc, mbdiscid)
 
-        # stop if the cd is unknown and we don't want to continue
-        if not prog.metadata and not self.options.unknown:
-            prog.ejectDevice(device)
-            return -1
+        if not prog.metadata:
+            # fall back to FreeDB for lookup
+            cddbid = ittoc.getCDDBValues()
+            cddbmd = prog.getCDDB(cddbid)
+            if cddbmd:
+                print 'FreeDB identifies disc as %s' % cddbmd
+
+            if not self.options.unknown:
+                prog.ejectDevice(device)
+                return -1
 
         # now, read the complete index table, which is slower