From 44e160910c084ef2c3714e6e232d46e3152429ac Mon Sep 17 00:00:00 2001 From: Samantha Baldwin Date: Thu, 1 Mar 2018 21:14:15 -0500 Subject: [PATCH] remove -T/--toc-pickle --- whipper/command/cd.py | 9 +-------- whipper/common/program.py | 13 ++----------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/whipper/command/cd.py b/whipper/command/cd.py index d2a84cb3..9cfbfdb8 100644 --- a/whipper/command/cd.py +++ b/whipper/command/cd.py @@ -71,11 +71,6 @@ class _CD(BaseCommand): @staticmethod def add_arguments(parser): - # FIXME: have a cache of these pickles somewhere - parser.add_argument('-T', '--toc-pickle', - action="store", dest="toc_pickle", - help="pickle to use for reading and " - "writing the TOC") parser.add_argument('-R', '--release-id', action="store", dest="release_id", help="MusicBrainz release id to match to " @@ -103,9 +98,7 @@ def do(self): utils.unmount_device(self.device) # first, read the normal TOC, which is fast - self.ittoc = self.program.getFastToc(self.runner, - self.options.toc_pickle, - self.device) + self.ittoc = self.program.getFastToc(self.runner, self.device) # already show us some info based on this self.program.getRipResult(self.ittoc.getCDDBDiscId()) diff --git a/whipper/common/program.py b/whipper/common/program.py index 57b12642..30578dd4 100644 --- a/whipper/common/program.py +++ b/whipper/common/program.py @@ -95,24 +95,15 @@ def setWorkingDirectory(self, workingDirectory): logger.info('Changing to working directory %s' % workingDirectory) os.chdir(workingDirectory) - def getFastToc(self, runner, toc_pickle, device): + def getFastToc(self, runner, device): """Retrieve the normal TOC table from a toc pickle or the drive. Also retrieves the cdrdao version - - :param runner: - :type runner: - :param toc_pickle: - :type toc_pickle: - :param device: - :type device: - :returns: - :rtype: tuple of L{table.Table}, str """ def function(r, t): r.run(t) - ptoc = cache.Persister(toc_pickle or None) + ptoc = cache.Persister() if not ptoc.object: from pkg_resources import parse_version as V version = cdrdao.getCDRDAOVersion()