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

34
whipper/common/accurip.py
View File

@@ -107,17 +107,15 @@ def calculate_checksums(track_paths):
track_count = len(track_paths)
v1_checksums = []
v2_checksums = []
logger.debug('checksumming %d tracks' % track_count)
logger.debug('checksumming %d tracks', track_count)
# This is done sequentially because it is very fast.
for i, path in enumerate(track_paths):
v1_sum = accuraterip_checksum(
path, i+1, track_count, wave=True, v2=False
)
if not v1_sum:
logger.error(
'could not calculate AccurateRip v1 checksum for track %d %r' %
(i+1, path)
)
logger.error('could not calculate AccurateRip v1 checksum '
'for track %d %r', i + 1, path)
v1_checksums.append(None)
else:
v1_checksums.append("%08x" % v1_sum)
@@ -125,10 +123,8 @@ def calculate_checksums(track_paths):
path, i+1, track_count, wave=True, v2=True
)
if not v2_sum:
logger.error(
'could not calculate AccurateRip v2 checksum for track %d %r' %
(i+1, path)
)
logger.error('could not calculate AccurateRip v2 checksum '
'for track %d %r', i + 1, path)
v2_checksums.append(None)
else:
v2_checksums.append("%08x" % v2_sum)
@@ -141,12 +137,11 @@ def _download_entry(path):
try:
resp = requests.get(url)
except requests.exceptions.ConnectionError as e:
logger.error('error retrieving AccurateRip entry: %r' % e)
logger.error('error retrieving AccurateRip entry: %r', e)
return None
if not resp.ok:
logger.error('error retrieving AccurateRip entry: %s %s %r' % (
resp.status_code, resp.reason, resp
))
logger.error('error retrieving AccurateRip entry: %s %s %r',
resp.status_code, resp.reason, resp)
return None
return resp.content
@@ -158,7 +153,7 @@ def _save_entry(raw_entry, path):
makedirs(dirname(path))
except OSError as e:
if e.errno != EEXIST:
logger.error('could not save entry to %s: %r' % (path, str(e)))
logger.error('could not save entry to %s: %s', path, e)
return
open(path, 'wb').write(raw_entry)
@@ -211,10 +206,9 @@ def _match_responses(tracks, responses):
track.AR[v]['DBConfidence'] = r.confidences[i]
logger.debug(
'track %d matched response %s in AccurateRip'
' database: %s crc %s confidence %s' %
(i, r.cddbDiscId, v, track.AR[v]['DBCRC'],
track.AR[v]['DBConfidence'])
)
' database: %s crc %s confidence %s',
i, r.cddbDiscId, v, track.AR[v]['DBCRC'],
track.AR[v]['DBConfidence'])
return any((
all([t.AR['v1']['DBCRC'] for t in tracks]),
all([t.AR['v2']['DBCRC'] for t in tracks])
@@ -268,9 +262,7 @@ def print_report(result):
print('track 0: unknown (not tracked)')
continue
if not (track.AR['v1']['CRC'] or track.AR['v2']['CRC']):
logger.error(
'no track AR CRC on non-HTOA track %d' % track.number
)
logger.error('no track AR CRC on non-HTOA track %d', track.number)
print('track %2d: unknown (error)' % track.number)
else:
print('track %2d: %-16s %-23s v1 [%s], v2 [%s], DB [%s]' % (

16
whipper/common/cache.py
View File

@@ -87,7 +87,7 @@ class Persister:
handle.close()
# do an atomic move
shutil.move(path, self._path)
logger.debug('saved persisted object to %r' % self._path)
logger.debug('saved persisted object to %r', self._path)
def _unpickle(self, default=None):
self.object = default
@@ -103,7 +103,7 @@ class Persister:
try:
self.object = pickle.load(handle)
logger.debug('loaded persisted object from %r' % self._path)
logger.debug('loaded persisted object from %r', self._path)
except Exception as e:
# TODO: restrict kind of caught exceptions?
# can fail for various reasons; in that case, pretend we didn't
@@ -143,9 +143,8 @@ class PersistedCache:
if hasattr(persister.object, 'instanceVersion'):
o = persister.object
if o.instanceVersion < o.__class__.classVersion:
logger.debug(
'key %r persisted object version %d is outdated',
key, o.instanceVersion)
logger.debug('key %r persisted object version %d '
'is outdated', key, o.instanceVersion)
persister.object = None
# FIXME: don't delete old objects atm
# persister.delete()
@@ -216,12 +215,11 @@ class TableCache:
ptable = self._pcache.get(cddbdiscid)
if ptable.object:
if ptable.object.getMusicBrainzDiscId() != mbdiscid:
logger.debug('cached table is for different mb id %r' % (
ptable.object.getMusicBrainzDiscId()))
logger.debug('cached table is for different mb id %r',
ptable.object.getMusicBrainzDiscId())
ptable.object = None
else:
logger.debug('no valid cached table found for %r' %
cddbdiscid)
logger.debug('no valid cached table found for %r', cddbdiscid)
if not ptable.object:
# get an empty persistable from the writable location

9
whipper/common/common.py
View File

@@ -263,8 +263,8 @@ def getRelativePath(targetPath, collectionPath):
Used to determine the path to use in .cue/.m3u files
"""
logger.debug('getRelativePath: target %r, collection %r' % (
targetPath, collectionPath))
logger.debug('getRelativePath: target %r, collection %r',
targetPath, collectionPath)
targetDir = os.path.dirname(targetPath)
collectionDir = os.path.dirname(collectionPath)
@@ -275,9 +275,8 @@ def getRelativePath(targetPath, collectionPath):
rel = os.path.relpath(
targetDir + os.path.sep,
collectionDir + os.path.sep)
logger.debug(
'getRelativePath: target and collection in different dir, %r' % rel
)
logger.debug('getRelativePath: target and collection '
'in different dir, %r', rel)
return os.path.join(rel, os.path.basename(targetPath))

7
whipper/common/config.py
View File

@@ -130,14 +130,13 @@ class Config:
if not name.startswith('drive:'):
continue
logger.debug('Looking at section %r' % name)
logger.debug('looking at section %r', name)
conf = {}
for key in ['vendor', 'model', 'release']:
locals()[key] = locals()[key].strip()
conf[key] = self._parser.get(name, key)
logger.debug("%s: '%s' versus '%s'" % (
key, locals()[key], conf[key]
))
logger.debug("%s: '%s' versus '%s'",
key, locals()[key], conf[key])
if vendor.strip() != conf['vendor']:
continue
if model.strip() != conf['model']:

2
whipper/common/drive.py
View File

@@ -36,7 +36,7 @@ def getAllDevicePaths():
# see https://savannah.gnu.org/bugs/index.php?38477
return [str(dev) for dev in _getAllDevicePathsPyCdio()]
except ImportError:
logger.info('Cannot import pycdio')
logger.info('cannot import pycdio')
return _getAllDevicePathsStatic()

20
whipper/common/mbngs.py
View File

@@ -93,7 +93,7 @@ def _record(record, which, name, what):
handle = open(filename, 'w')
handle.write(json.dumps(what))
handle.close()
logger.info('Wrote %s %s to %s', which, name, filename)
logger.info('wrote %s %s to %s', which, name, filename)
# credit is of the form [dict, str, dict, ... ]
# e.g. [
@@ -152,10 +152,9 @@ def _getMetadata(releaseShort, release, discid, country=None):
@rtype: L{DiscMetadata} or None
"""
logger.debug('getMetadata for release id %r',
release['id'])
logger.debug('getMetadata for release id %r', release['id'])
if not release['id']:
logger.warning('No id for release %r', release)
logger.warning('no id for release %r', release)
return None
assert release['id'], 'Release does not have an id'
@@ -183,7 +182,7 @@ def _getMetadata(releaseShort, release, discid, country=None):
discMD.artist = albumArtistName
discMD.sortName = discCredit.getSortName()
if 'date' not in release:
logger.warning("Release with ID '%s' (%s - %s) does not have a date",
logger.warning("release with ID '%s' (%s - %s) does not have a date",
release['id'], discMD.artist, release['title'])
else:
discMD.release = release['date']
@@ -235,9 +234,8 @@ def _getMetadata(releaseShort, release, discid, country=None):
# FIXME: unit of duration ?
track.duration = int(t['recording'].get('length', 0))
if not track.duration:
logger.warning(
'track %r (%r) does not have duration' %
(track.title, track.mbid))
logger.warning('track %r (%r) does not have duration',
track.title, track.mbid)
tainted = True
else:
duration += track.duration
@@ -297,8 +295,8 @@ def musicbrainz(discid, country=None, record=False):
import json
for release in result['disc']['release-list']:
formatted = json.dumps(release, sort_keys=False, indent=4)
logger.debug('result %s: artist %r, title %r' % (
formatted, release['artist-credit-phrase'], release['title']))
logger.debug('result %s: artist %r, title %r', formatted,
release['artist-credit-phrase'], release['title'])
# to get titles of recordings, we need to query the release with
# artist-credits
@@ -309,7 +307,7 @@ def musicbrainz(discid, country=None, record=False):
_record(record, 'release', release['id'], res)
releaseDetail = res['release']
formatted = json.dumps(releaseDetail, sort_keys=False, indent=4)
logger.debug('release %s' % formatted)
logger.debug('release %s', formatted)
md = _getMetadata(release, releaseDetail, discid, country)
if md:

45
whipper/common/program.py
View File

@@ -93,9 +93,8 @@ class Program:
from pkg_resources import parse_version as V
version = cdrdao.getCDRDAOVersion()
if V(version) < V('1.2.3rc2'):
logger.warning('cdrdao older than 1.2.3 has a '
'pre-gap length bug. '
'See http://sourceforge.net/tracker/?func=detail&aid=604751&group_id=2171&atid=102171') # noqa: E501
logger.warning('cdrdao older than 1.2.3 has a pre-gap length bug.'
' See http://sourceforge.net/tracker/?func=detail&aid=604751&group_id=2171&atid=102171') # noqa: E501
toc = cdrdao.ReadTOCTask(device).table
assert toc.hasTOC()
return toc
@@ -120,9 +119,9 @@ class Program:
itable = tdict[offset]
if not itable:
logger.debug('getTable: cddbdiscid %s, mbdiscid %s not '
'in cache for offset %s, reading table', (
cddbdiscid, mbdiscid, offset))
logger.debug('getTable: cddbdiscid %s, mbdiscid %s not in cache '
'for offset %s, reading table', cddbdiscid, mbdiscid,
offset)
t = cdrdao.ReadTableTask(device, out_path)
itable = t.table
tdict[offset] = itable
@@ -130,7 +129,7 @@ class Program:
logger.debug('getTable: read table %r', itable)
else:
logger.debug('getTable: cddbdiscid %s, mbdiscid %s in cache '
'for offset %s', (cddbdiscid, mbdiscid, offset))
'for offset %s', cddbdiscid, mbdiscid, offset)
logger.debug('getTable: loaded table %r', itable)
assert itable.hasTOC()
@@ -336,8 +335,8 @@ class Program:
if release:
metadatas = [m for m in metadatas if m.url.endswith(release)]
logger.debug('asked for release %r, only kept %r',
release, metadatas)
logger.debug('asked for release %r, only kept %r', release,
metadatas)
if len(metadatas) == 1:
logger.info('picked requested release id %s', release)
print('Artist: %s' % metadatas[0].artist.encode('utf-8'))
@@ -356,14 +355,13 @@ class Program:
releaseTitle = metadatas[0].releaseTitle
for i, metadata in enumerate(metadatas):
if not artist == metadata.artist:
logger.warning("artist 0: %r and artist %d: %r "
"are not the same", (
artist, i, metadata.artist))
logger.warning("artist 0: %r and artist %d: %r are "
"not the same", artist, i,
metadata.artist)
if not releaseTitle == metadata.releaseTitle:
logger.warning("title 0: %r and title %d: %r "
"are not the same", (
releaseTitle, i,
metadata.releaseTitle))
logger.warning("title 0: %r and title %d: %r are "
"not the same", releaseTitle, i,
metadata.releaseTitle)
if (not release and len(list(deltas)) > 1):
logger.warning('picked closest match in duration. '
@@ -410,7 +408,7 @@ class Program:
mbidTrack = track.mbid
mbidTrackArtist = track.mbidArtist
except IndexError as e:
logger.error('no track %d found, %r', (number, e))
logger.error('no track %d found, %r', number, e)
raise
else:
# htoa defaults to disc's artist
@@ -473,9 +471,8 @@ class Program:
raise
ret = trackResult.testcrc == t.checksum
logger.debug('verifyTrack: track result crc %r, '
'file crc %r, result %r',
trackResult.testcrc, t.checksum, ret)
logger.debug('verifyTrack: track result crc %r, file crc %r, '
'result %r', trackResult.testcrc, t.checksum, ret)
return ret
def ripTrack(self, runner, trackResult, offset, device, taglist,
@@ -511,10 +508,10 @@ class Program:
runner.run(t)
logger.debug('ripped track')
logger.debug('test speed %.3f/%.3f seconds', (
t.testspeed, t.testduration))
logger.debug('copy speed %.3f/%.3f seconds', (
t.copyspeed, t.copyduration))
logger.debug('test speed %.3f/%.3f seconds',
t.testspeed, t.testduration)
logger.debug('copy speed %.3f/%.3f seconds',
t.copyspeed, t.copyduration)
trackResult.testcrc = t.testchecksum
trackResult.copycrc = t.copychecksum
trackResult.peak = t.peak

12
whipper/common/task.py
View File

@@ -51,8 +51,7 @@ class PopenTask(task.Task):
raise
logger.debug('Started %r with pid %d', self.command,
self._popen.pid)
logger.debug('started %r with pid %d', self.command, self._popen.pid)
self.schedule(1.0, self._read, runner)
@@ -89,7 +88,7 @@ class PopenTask(task.Task):
self._done()
except Exception as e:
logger.debug('exception during _read(): %r', str(e))
logger.debug('exception during _read(): %s', e)
self.setException(e)
self.stop()
@@ -97,10 +96,9 @@ class PopenTask(task.Task):
assert self._popen.returncode is not None, "No returncode"
if self._popen.returncode >= 0:
logger.debug('Return code was %d', self._popen.returncode)
logger.debug('return code was %d', self._popen.returncode)
else:
logger.debug('Terminated with signal %d',
-self._popen.returncode)
logger.debug('terminated with signal %d', -self._popen.returncode)
self.setProgress(1.0)
@@ -113,7 +111,7 @@ class PopenTask(task.Task):
return
def abort(self):
logger.debug('Aborting, sending SIGTERM to %d', self._popen.pid)
logger.debug('aborting, sending SIGTERM to %d', self._popen.pid)
os.kill(self._popen.pid, signal.SIGTERM)
# self.stop()