From 252a2e814156e53833eb3dcd00d6cfce317c06dd Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Sat, 21 Sep 2019 21:35:17 +0200 Subject: [PATCH 1/2] Use ittoc only for CDDB and MusicBrainz lookups The data from itable may be more accurate, because ittoc comes from getFastToc(). Signed-off-by: Andreas Oberritter --- whipper/command/cd.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/whipper/command/cd.py b/whipper/command/cd.py index 1c0130d..ab10771 100644 --- a/whipper/command/cd.py +++ b/whipper/command/cd.py @@ -443,17 +443,17 @@ Log files will log the path to tracks relative to this directory. logger.debug('HTOA peak %r is equal to the SILENT ' 'threshold, disregarding', trackResult.peak) self.itable.setFile(1, 0, None, - self.ittoc.getTrackStart(1), number) + self.itable.getTrackStart(1), number) logger.debug('unlinking %r', trackResult.filename) os.unlink(trackResult.filename) trackResult.filename = None logger.info('HTOA discarded, contains digital silence') else: self.itable.setFile(1, 0, trackResult.filename, - self.ittoc.getTrackStart(1), number) + self.itable.getTrackStart(1), number) else: self.itable.setFile(number, 1, trackResult.filename, - self.ittoc.getTrackLength(number), number) + self.itable.getTrackLength(number), number) self.program.saveRipResult() @@ -482,7 +482,7 @@ Log files will log the path to tracks relative to this directory. self.program.write_m3u(discName) try: - self.program.verifyImage(self.runner, self.ittoc) + self.program.verifyImage(self.runner, self.itable) except accurip.EntryNotFound: logger.warning('AccurateRip entry not found') From 342bce9be248cf1ea371c75dcdeba6db683e18da Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Sat, 21 Sep 2019 21:36:38 +0200 Subject: [PATCH 2/2] Make getFastToc() fast again. Broken since #345 was merged. Signed-off-by: Andreas Oberritter --- whipper/common/program.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/whipper/common/program.py b/whipper/common/program.py index e618a05..96686b0 100644 --- a/whipper/common/program.py +++ b/whipper/common/program.py @@ -96,7 +96,7 @@ class Program: logger.warning('cdrdao older than 1.2.3 has a pre-gap length bug.' ' See http://sourceforge.net/tracker/?func=detail&aid=604751&group_id=2171&atid=102171') # noqa: E501 - t = cdrdao.ReadTOCTask(device) + t = cdrdao.ReadTOCTask(device, fast_toc=True) runner.run(t) toc = t.toc.table