diff --git a/whipper/command/cd.py b/whipper/command/cd.py index 8500964b..e96e6e55 100644 --- a/whipper/command/cd.py +++ b/whipper/command/cd.py @@ -98,7 +98,6 @@ def do(self): self.ittoc = self.program.getFastToc(self.runner, self.device) # already show us some info based on this - self.program.getRipResult(self.ittoc.getCDDBDiscId()) 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 3dd5b6c7..eddc2990 100644 --- a/whipper/common/program.py +++ b/whipper/common/program.py @@ -27,7 +27,7 @@ import os import time -from whipper.common import accurip, cache, checksum, common, mbngs, path +from whipper.common import accurip, checksum, common, mbngs, path from whipper.program import cdrdao, cdparanoia from whipper.image import image from whipper.extern import freedb @@ -62,7 +62,6 @@ def __init__(self, config, record=False): :param record: whether to record results of API calls for playback. """ self._record = record - self._cache = cache.ResultCache() self._config = config d = {} @@ -106,37 +105,19 @@ def getFastToc(self, runner, device): def getTable(self, runner, cddbdiscid, mbdiscid, device, offset, toc_path): """ - Retrieve the Table either from the cache or the drive. + Retrieve the Table from the drive. :rtype: table.Table """ - tcache = cache.TableCache() - ptable = tcache.get(cddbdiscid, mbdiscid) itable = None tdict = {} - # Ignore old cache, since we do not know what offset it used. - if isinstance(ptable.object, dict): - tdict = ptable.object - - if offset in tdict: - itable = tdict[offset] - - if not itable: - logger.debug('getTable: cddbdiscid %s, mbdiscid %s not in cache ' - 'for offset %s, reading table', cddbdiscid, mbdiscid, - offset) - t = cdrdao.ReadTOCTask(device, toc_path=toc_path) - t.description = "Reading table" - runner.run(t) - itable = t.toc.table - tdict[offset] = itable - ptable.persist(tdict) - logger.debug('getTable: read table %r', itable) - else: - logger.debug('getTable: cddbdiscid %s, mbdiscid %s in cache ' - 'for offset %s', cddbdiscid, mbdiscid, offset) - logger.debug('getTable: loaded table %r', itable) + t = cdrdao.ReadTOCTask(device, toc_path=toc_path) + t.description = "Reading table" + runner.run(t) + itable = t.toc.table + tdict[offset] = itable + logger.debug('getTable: read table %r', itable) assert itable.hasTOC() @@ -146,20 +127,6 @@ def getTable(self, runner, cddbdiscid, mbdiscid, device, offset, itable.getMusicBrainzDiscId()) return itable - def getRipResult(self, cddbdiscid): - """ - Retrieve the persistable RipResult either from our cache (from a - previous, possibly aborted rip), or return a new one. - - :rtype: result.RipResult - """ - assert self.result is None - - self._presult = self._cache.getRipResult(cddbdiscid) - self.result = self._presult.object - - return self.result - @staticmethod def addDisambiguation(template_part, metadata): """Add disambiguation to template path part string."""