Open
Conversation
Forces recalculation of the TOC info when using a drive with a different offset.
JoeLametta
added a commit
to whipper-team/whipper
that referenced
this pull request
Nov 29, 2015
Contributor
|
This pull request makes morituri hang on This is a temporary ugly fix which solves this bug: --- cd.py
+++ cd_fix.py
@@ -113,11 +113,19 @@
self.program.ejectDevice(self.device)
return -1
- # now, read the complete index table, which is slower
+ # Ugly fix for broken commit
+ offset = 0
+ info = drive.getDeviceInfo(self.parentCommand.options.device)
+ if info:
+ try:
+ offset = self.getRootCommand().config.getReadOffset(*info)
+ except KeyError:
+ pass
+ # now, read the complete index table, which is slower
self.itable = self.program.getTable(self.runner,
self.ittoc.getCDDBDiscId(),
- self.ittoc.getMusicBrainzDiscId(), self.device, self.options.offset)
+ self.ittoc.getMusicBrainzDiscId(), self.device, offset)
assert self.itable.getCDDBDiscId() == self.ittoc.getCDDBDiscId(), \
"full table's id %s differs from toc id %s" % ( |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Forces recalculation of the TOC info when using a drive with a
different offset.