Skip to content

Commit

Permalink
Handle missing self.options for whipper cd info
Browse files Browse the repository at this point in the history
The attributes working_directory, disc_template, output_directory and offset are not defined during whipper cd info and they are only needed for ripping. self.program.getTable doesn't need output_path to gather the tocfile.

Therefore, this part is excluded, if the attributes don't exist and an offset of 0 is used.

Fixes issue #375.

Co-authored-by: gorgobacka <tho.b.j@gmx.de>
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
Signed-off-by: gorgobacka <tho.b.j@gmx.de>
  • Loading branch information
JoeLametta and gorgobacka committed Oct 26, 2019
1 parent d9b49df commit 993dd6c
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions whipper/command/cd.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,23 @@ def do(self):
return -1

# Change working directory before cdrdao's task
if self.options.working_directory is not None:
if getattr(self.options, 'working_directory', False):
os.chdir(os.path.expanduser(self.options.working_directory))
out_bpath = self.options.output_directory.decode('utf-8')
# Needed to preserve cdrdao's tocfile
out_fpath = self.program.getPath(out_bpath,
self.options.disc_template,
self.mbdiscid,
self.program.metadata)
if hasattr(self.options, 'output_directory'):
out_bpath = self.options.output_directory.decode('utf-8')
# Needed to preserve cdrdao's tocfile
out_fpath = self.program.getPath(out_bpath,
self.options.disc_template,
self.mbdiscid,
self.program.metadata)
else:
out_fpath = None
# now, read the complete index table, which is slower
offset = getattr(self.options, 'offset', 0)
self.itable = self.program.getTable(self.runner,
self.ittoc.getCDDBDiscId(),
self.ittoc.getMusicBrainzDiscId(),
self.device, self.options.offset,
out_fpath)
self.device, offset, out_fpath)

assert self.itable.getCDDBDiscId() == self.ittoc.getCDDBDiscId(), \
"full table's id %s differs from toc id %s" % (
Expand Down

0 comments on commit 993dd6c

Please sign in to comment.