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

Bug: whipper shouldn't abort if track rip succeeds on last allowed retry attempt

Browse Source 
Fixes #449.

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
This commit is contained in:
JoeLametta
2020-01-14 17:49:24 +00:00
parent 9e37219401
commit caa2c8b27d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
whipper/command/cd.py
View File

@@ -410,13 +410,12 @@ Log files will log the path to tracks relative to this directory.
if not os.path.exists(path): if not os.path.exists(path):
logger.debug('path %r does not exist, ripping...', path) logger.debug('path %r does not exist, ripping...', path)
tries = 0
# we reset durations for test and copy here # we reset durations for test and copy here
trackResult.testduration = 0.0 trackResult.testduration = 0.0
trackResult.copyduration = 0.0 trackResult.copyduration = 0.0
extra = "" extra = ""
while tries < MAX_TRIES: tries = 1
tries += 1 while tries <= MAX_TRIES:
if tries > 1: if tries > 1:
extra = " (try %d)" % tries extra = " (try %d)" % tries
logger.info('ripping track %d of %d%s: %s', logger.info('ripping track %d of %d%s: %s',
@@ -440,8 +439,10 @@ Log files will log the path to tracks relative to this directory.
# FIXME: catching too general exception (Exception) # FIXME: catching too general exception (Exception)
except Exception as e: except Exception as e:
logger.debug('got exception %r on try %d', e, tries) logger.debug('got exception %r on try %d', e, tries)
tries += 1
if tries == MAX_TRIES: if tries > MAX_TRIES:
tries -= 1
logger.critical('giving up on track %d after %d times', logger.critical('giving up on track %d after %d times',
number, tries) number, tries)
raise RuntimeError( raise RuntimeError(