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

Fix logger statements having multiple arguments

Browse Source 
Some of the instructions have been rendered invalid during the conversion to logger statements...

Also performed various stylistic fixes
This commit is contained in:
JoeLametta
2018-12-14 11:02:20 +00:00
parent a23b214814
commit a4f654a3f3
21 changed files with 182 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
whipper/image/cue.py
View File

@@ -85,7 +85,7 @@ class CueFile(object):
currentTrack = None
counter = 0
logger.info('Parsing .cue file %r', self._path)
logger.info('parsing .cue file %r', self._path)
handle = codecs.open(self._path, 'r', 'utf-8')
for number, line in enumerate(handle.readlines()):

15
whipper/image/image.py
View File

@@ -135,7 +135,7 @@ class ImageVerifyTask(task.MultiSeparateTask):
self.addTask(taskk)
self._tasks.append((0, track, taskk))
except (KeyError, IndexError):
logger.debug('no htoa track')
logger.debug('no HTOA track')
for trackIndex, track in enumerate(cue.table.tracks):
logger.debug('verifying track %d', trackIndex + 1)
@@ -155,8 +155,8 @@ class ImageVerifyTask(task.MultiSeparateTask):
def stop(self):
for trackIndex, track, taskk in self._tasks:
if taskk.exception:
logger.debug('subtask %r had exception %r, shutting down' % (
taskk, taskk.exception))
logger.debug('subtask %r had exception %r, shutting down',
taskk, taskk.exception)
self.setException(taskk.exception)
break
@@ -195,17 +195,16 @@ class ImageEncodeTask(task.MultiSeparateTask):
root, ext = os.path.splitext(os.path.basename(path))
outpath = os.path.join(outdir, root + '.' + 'flac')
logger.debug('schedule encode to %r', outpath)
taskk = encode.FlacEncodeTask(path,
os.path.join(outdir,
root + '.' + 'flac'))
taskk = encode.FlacEncodeTask(
path, os.path.join(outdir, root + '.' + 'flac'))
self.addTask(taskk)
try:
htoa = cue.table.tracks[0].indexes[0]
logger.debug('encoding htoa track')
logger.debug('encoding HTOA track')
add(htoa)
except (KeyError, IndexError):
logger.debug('no htoa track')
logger.debug('no HTOA track')
pass
for trackIndex, track in enumerate(cue.table.tracks):

57
whipper/image/table.py
View File

@@ -333,8 +333,8 @@ class Table(object):
@returns: the 28-character base64-encoded disc ID
"""
if self.mbdiscid:
logger.debug('getMusicBrainzDiscId: returning cached %r'
% self.mbdiscid)
logger.debug('getMusicBrainzDiscId: returning cached %r',
self.mbdiscid)
return self.mbdiscid
values = self._getMusicBrainzValues()
@@ -381,7 +381,7 @@ class Table(object):
assert len(result) == 28, \
"Result should be 28 characters, not %d" % len(result)
logger.debug('getMusicBrainzDiscId: returning %r' % result)
logger.debug('getMusicBrainzDiscId: returning %r', result)
self.mbdiscid = result
return result
@@ -489,7 +489,7 @@ class Table(object):
targetPath = common.getRelativePath(path, cuePath)
line = 'FILE "%s" WAVE' % targetPath
lines.append(line)
logger.debug('writeFile: %r' % line)
logger.debug('writeFile: %r', line)
# header
main = ['PERFORMER', 'TITLE']
@@ -530,11 +530,11 @@ class Table(object):
counter = index.counter
if index.path:
logger.debug('counter %d, writeFile' % counter)
logger.debug('counter %d, writeFile', counter)
writeFile(index.path)
for i, track in enumerate(self.tracks):
logger.debug('track i %r, track %r' % (i, track))
logger.debug('track i %r, track %r', i, track)
# FIXME: skip data tracks for now
if not track.audio:
continue
@@ -545,7 +545,7 @@ class Table(object):
for number in indexes:
index = track.indexes[number]
logger.debug('index %r, %r' % (number, index))
logger.debug('index %r, %r', number, index)
# any time the source counter changes to a higher value,
# write a FILE statement
@@ -553,9 +553,9 @@ class Table(object):
# at counter 0 here
if index.counter > counter:
if index.path:
logger.debug('counter %d, writeFile' % counter)
logger.debug('counter %d, writeFile', counter)
writeFile(index.path)
logger.debug('setting counter to index.counter %r' %
logger.debug('setting counter to index.counter %r',
index.counter)
counter = index.counter
@@ -564,7 +564,7 @@ class Table(object):
wroteTrack = True
line = " TRACK %02d %s" % (i + 1, 'AUDIO')
lines.append(line)
logger.debug('%r' % line)
logger.debug('%r', line)
for key in CDTEXT_FIELDS:
if key in track.cdtext:
@@ -620,7 +620,7 @@ class Table(object):
while True:
track = self.tracks[t - 1]
index = track.getIndex(i)
logger.debug('Clearing path on track %d, index %d', t, i)
logger.debug('clearing path on track %d, index %d', t, i)
index.path = None
index.relative = None
try:
@@ -639,9 +639,8 @@ class Table(object):
@type track: C{int}
@type index: C{int}
"""
logger.debug('setFile: track %d, index %d, path %r, '
'length %r, counter %r', track, index, path, length,
counter)
logger.debug('setFile: track %d, index %d, path %r, length %r, '
'counter %r', track, index, path, length, counter)
t = self.tracks[track - 1]
i = t.indexes[index]
@@ -654,9 +653,9 @@ class Table(object):
i.path = path
i.relative = i.absolute - start
i.counter = counter
logger.debug('Setting path %r, relative %r on '
'track %d, index %d, counter %r',
path, i.relative, track, index, counter)
logger.debug('setting path %r, relative %r on track %d, '
'index %d, counter %r', path, i.relative, track,
index, counter)
try:
track, index = self.getNextTrackIndex(track, index)
t = self.tracks[track - 1]
@@ -682,13 +681,13 @@ class Table(object):
assert track.number == t
assert index.number == i
if index.counter is None:
logger.debug('Track %d, index %d has no counter', t, i)
logger.debug('track %d, index %d has no counter', t, i)
break
if index.counter != counter:
logger.debug(
'Track %d, index %d has a different counter', t, i)
logger.debug('track %d, index %d has a different counter',
t, i)
break
logger.debug('Setting absolute offset %d on track %d, index %d',
logger.debug('setting absolute offset %d on track %d, index %d',
index.relative, t, i)
if index.absolute is not None:
if index.absolute != index.relative:
@@ -722,18 +721,16 @@ class Table(object):
for i in list(t.indexes.values()):
if i.absolute is not None:
i.absolute += self.leadout + gap
logger.debug('Fixing track %02d, index %02d, '
'absolute %d' % (
t.number, i.number, i.absolute))
logger.debug('fixing track %02d, index %02d, absolute %d',
t.number, i.number, i.absolute)
if i.counter is not None:
i.counter += sourceCounter
logger.debug('Fixing track %02d, index %02d, '
'counter %d' % (
t.number, i.number, i.counter))
logger.debug('fixing track %02d, index %02d, counter %d',
t.number, i.number, i.counter)
self.tracks.append(t)
self.leadout += other.leadout + gap # FIXME
logger.debug('Fixing leadout, now %d', self.leadout)
logger.debug('fixing leadout, now %d', self.leadout)
def _getSessionGap(self, session):
# From cdrecord multi-session info:
@@ -841,13 +838,13 @@ class Table(object):
Check if this table can be used to generate a .cue file
"""
if not self.hasTOC():
logger.debug('No TOC, cannot cue')
logger.debug('no TOC, cannot cue')
return False
for t in self.tracks:
for i in list(t.indexes.values()):
if i.relative is None:
logger.debug('Track %02d, Index %02d does not '
logger.debug('track %02d, Index %02d does not '
'have relative', t.number, i.number)
return False

43
whipper/image/toc.py
View File

@@ -109,8 +109,8 @@ class Sources:
@type counter: int
@param offset: the absolute disc offset where this source starts
"""
logger.debug('Appending source, counter %d, abs offset %d, '
'source %r' % (counter, offset, source))
logger.debug('appending source, counter %d, abs offset %d, '
'source %r', counter, offset, source)
self._sources.append((counter, offset, source))
def get(self, offset):
@@ -152,8 +152,8 @@ class TocFile(object):
absolute = absoluteOffset + trackOffset
# this may be in a new source, so calculate relative
c, o, s = self._sources.get(absolute)
logger.debug('at abs offset %d, we are in source %r' % (
absolute, s))
logger.debug('at abs offset %d, we are in source %r',
absolute, s)
counterStart = self._sources.getCounterStart(c)
relative = absolute - counterStart
@@ -161,10 +161,9 @@ class TocFile(object):
absolute=absolute,
relative=relative,
counter=c)
logger.debug(
'[track %02d index %02d] trackOffset %r, added %r',
currentTrack.number, i, trackOffset,
currentTrack.getIndex(i))
logger.debug('[track %02d index %02d] trackOffset %r, added %r',
currentTrack.number, i, trackOffset,
currentTrack.getIndex(i))
def parse(self):
currentFile = None
@@ -209,11 +208,11 @@ class TocFile(object):
# is a limitation of our parser approach
if state == 'HEADER':
self.table.cdtext[key] = value
logger.debug('Found disc CD-Text %s: %r', key, value)
logger.debug('found disc CD-Text %s: %r', key, value)
elif state == 'TRACK':
if key != 'ISRC' or not currentTrack \
or currentTrack.isrc is not None:
logger.debug('Found track CD-Text %s: %r',
logger.debug('found track CD-Text %s: %r',
key, value)
currentTrack.cdtext[key] = value
@@ -221,7 +220,7 @@ class TocFile(object):
m = _CATALOG_RE.search(line)
if m:
self.table.catalog = m.group('catalog')
logger.debug("Found catalog number %s", self.table.catalog)
logger.debug("found catalog number %s", self.table.catalog)
# look for TRACK lines
m = _TRACK_RE.search(line)
@@ -260,23 +259,23 @@ class TocFile(object):
m = _PRE_EMPHASIS_RE.search(line)
if m:
currentTrack.pre_emphasis = True
logger.debug('Track has PRE_EMPHASIS')
logger.debug('track has PRE_EMPHASIS')
# look for ISRC lines
m = _ISRC_RE.search(line)
if m:
isrc = m.group('isrc')
currentTrack.isrc = isrc
logger.debug('Found ISRC code %s', isrc)
logger.debug('found ISRC code %s', isrc)
# look for SILENCE lines
m = _SILENCE_RE.search(line)
if m:
length = m.group('length')
logger.debug('SILENCE of %r', length)
logger.debug('silence of %r', length)
self._sources.append(counter, absoluteOffset, None)
if currentFile is not None:
logger.debug('SILENCE after FILE, increasing counter')
logger.debug('silence after file, increasing counter')
counter += 1
relativeOffset = 0
currentFile = None
@@ -286,7 +285,7 @@ class TocFile(object):
m = _ZERO_RE.search(line)
if m:
if currentFile is not None:
logger.debug('ZERO after FILE, increasing counter')
logger.debug('zero after file, increasing counter')
counter += 1
relativeOffset = 0
currentFile = None
@@ -299,13 +298,13 @@ class TocFile(object):
filePath = m.group('name')
start = m.group('start')
length = m.group('length')
logger.debug('FILE %s, start %r, length %r',
logger.debug('file %s, start %r, length %r',
filePath, common.msfToFrames(start),
common.msfToFrames(length))
if not currentFile or filePath != currentFile.path:
counter += 1
relativeOffset = 0
logger.debug('track %d, switched to new FILE, '
logger.debug('track %d, switched to new file, '
'increased counter to %d',
trackNumber, counter)
currentFile = File(filePath, common.msfToFrames(start),
@@ -319,12 +318,12 @@ class TocFile(object):
if m:
filePath = m.group('name')
length = m.group('length')
logger.debug('FILE %s, length %r',
logger.debug('file %s, length %r',
filePath, common.msfToFrames(length))
if not currentFile or filePath != currentFile.path:
counter += 1
relativeOffset = 0
logger.debug('track %d, switched to new FILE, '
logger.debug('track %d, switched to new file, '
'increased counter to %d',
trackNumber, counter)
# FIXME: assume that a MODE2_FORM_MIX track always starts at 0
@@ -343,8 +342,8 @@ class TocFile(object):
length = common.msfToFrames(m.group('length'))
c, o, s = self._sources.get(absoluteOffset)
logger.debug('at abs offset %d, we are in source %r' % (
absoluteOffset, s))
logger.debug('at abs offset %d, we are in source %r',
absoluteOffset, s)
counterStart = self._sources.getCounterStart(c)
relativeOffset = absoluteOffset - counterStart