Skip to content

Commit

Permalink
Merge pull request #245 from RecursiveForest/remove-toc-pickle
Browse files Browse the repository at this point in the history
remove -T/--toc-pickle
  • Loading branch information
JoeLametta authored Mar 2, 2018
2 parents e0cec11 + 44e1609 commit f8fbfb5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
9 changes: 1 addition & 8 deletions whipper/command/cd.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down Expand Up @@ -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())
Expand Down
13 changes: 2 additions & 11 deletions whipper/common/program.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit f8fbfb5

Please sign in to comment.