benya/whipper-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed m3u and cue sheet generation

Browse Source 
Added conditional to `program.write_m3u()` to
ignore skipped tracks.

Added skipped_tracks support to the `Program` and
`image.ImageVerifyTask` classes to avoid crashing
when a file for a skipped track doesn't exist.

Added conditional to `accurip.calculate_checksums`
to check if a path exists before trying to calculate
checksums, this prevents `accuraterip-checksum.c` from
emitting an error message (`sf_open failed!`) when a
path doesn't exist (as when a track is skipped).

Signed-off-by: blueblots <63152708+blueblots@users.noreply.github.com>
This commit is contained in:
blueblots
2021-02-20 15:15:22 +00:00
committed by JoeLametta
parent 13e1ab6c14
commit 6505591462
4 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
whipper/command/cd.py
View File

@@ -487,18 +487,17 @@ Log files will log the path to tracks relative to this directory.
if self.options.keep_going:
logger.warning("track %d failed to rip.", number)
logger.debug("adding %s to skipped_tracks",
trackResult.filename)
self.skipped_tracks.append(trackResult.filename)
trackResult)
self.skipped_tracks.append(trackResult)
logger.debug("skipped_tracks = %s",
self.skipped_tracks)
trackResult.skipped = True
logger.debug('trackResult.skipped = True')
else:
raise RuntimeError("track can't be ripped. "
"Rip attempts number is equal "
"to %d",
self.options.max_retries)
if trackResult.filename in self.skipped_tracks:
if trackResult in self.skipped_tracks:
print("Skipping CRC comparison for track %d "
"due to rip failure" % number)
else:
@@ -529,14 +528,9 @@ Log files will log the path to tracks relative to this directory.
self.itable.setFile(1, 0, trackResult.filename,
self.itable.getTrackStart(1), number)
else:
if trackResult.filename in self.skipped_tracks:
logger.debug("track %d (%s) has been skipped; "
"not adding to self.itable",
number, trackResult.filename)
else:
self.itable.setFile(number, 1, trackResult.filename,
self.itable.getTrackLength(number),
number)
self.itable.setFile(number, 1, trackResult.filename,
self.itable.getTrackLength(number),
number)
# check for hidden track one audio
htoa = self.program.getHTOA()
@@ -571,6 +565,9 @@ Log files will log the path to tracks relative to this directory.
logger.debug('writing m3u file for %r', discName)
self.program.write_m3u(discName)
if len(self.skipped_tracks) > 0:
self.program.skipped_tracks = self.skipped_tracks
try:
self.program.verifyImage(self.runner, self.itable)
except accurip.EntryNotFound: