From b754b2b0bf30a72304d1103e64d17e94ec3b36a4 Mon Sep 17 00:00:00 2001 From: JoeLametta Date: Sun, 20 Sep 2020 13:07:14 +0000 Subject: [PATCH] Restore getRipResult method to fix regression The regression was introduced in commit 3acc3ffed67b83cc9e1f1b6ae42283840c92a488. The getRipResult method has been slimmed down to its essence. Fixes #508. Signed-off-by: JoeLametta --- whipper/command/cd.py | 1 + whipper/common/program.py | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/whipper/command/cd.py b/whipper/command/cd.py index a9516e0..6b41bae 100644 --- a/whipper/command/cd.py +++ b/whipper/command/cd.py @@ -99,6 +99,7 @@ class _CD(BaseCommand): self.ittoc = self.program.getFastToc(self.runner, self.device) # already show us some info based on this + self.program.getRipResult() print("CDDB disc id: %s" % self.ittoc.getCDDBDiscId()) self.mbdiscid = self.ittoc.getMusicBrainzDiscId() print("MusicBrainz disc id %s" % self.mbdiscid) diff --git a/whipper/common/program.py b/whipper/common/program.py index 7088453..50de26e 100644 --- a/whipper/common/program.py +++ b/whipper/common/program.py @@ -29,6 +29,7 @@ import time from tempfile import NamedTemporaryFile from whipper.common import accurip, checksum, common, mbngs, path from whipper.program import cdrdao, cdparanoia +from whipper.result import result from whipper.image import image from whipper.extern import freedb from whipper.extern.task import task @@ -134,6 +135,16 @@ class Program: itable.getMusicBrainzDiscId()) return itable + def getRipResult(self): + """ + Return a new RipResult. + + :rtype: result.RipResult + """ + assert self.result is None + self.result = result.RipResult() + return self.result + @staticmethod def addDisambiguation(template_part, metadata): """Add disambiguation to template path part string."""