* 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.
This commit is contained in:
Thomas Vander Stichele
2011-01-02 17:14:26 +00:00
parent 1ca176a91a
commit 08fc4f67a6
4 changed files with 113 additions and 9 deletions

View File

@@ -137,10 +137,16 @@ See http://sourceforge.net/tracker/?func=detail&aid=604751&group_id=2171&atid=1
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
itable = prog.getTable(runner, ittoc.getCDDBDiscId(), device)