Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-01-07 08:32:06 +01:00
Code Issues Projects Releases Wiki Activity

feat(import): Improve error reporting when reading paths from logfile

Browse source
This commit is contained in:
Jan Holthuis 2022-06-28 22:10:11 +02:00
parent 3e37d0163e
commit cfc34826a2
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
beets/ui/commands.py
View file

@ -84,21 +84,38 @@ def _paths_from_logfile(path):
command.
"""
with open(path, mode="r", encoding="utf-8") as fp:
for line in fp:
for i, line in enumerate(fp, start=1):
verb, sep, paths = line.rstrip("\n").partition(" ")
if not sep:
raise ValueError("malformed line in logfile")
raise ValueError(f"line {i} is invalid")
# Ignore informational lines that don't need to be re-imported.
if verb in {"import", "duplicate-keep", "duplicate-replace"}:
continue
if verb not in {"asis", "skip", "duplicate-skip"}:
raise ValueError(f"unknown verb {verb} found in logfile")
raise ValueError(f"line {i} contains unknown verb {verb}")
yield os.path.commonpath(paths.split("; "))
def _parse_logfiles(logfiles):
"""Parse all `logfiles` and yield paths from it."""
for logfile in logfiles:
try:
yield from _paths_from_logfile(syspath(normpath(logfile)))
except ValueError as err:
raise ui.UserError('malformed logfile {}: {}'.format(
util.displayable_path(logfile),
str(err)
)) from err
except IOError as err:
raise ui.UserError('unreadable logfile {}: {}'.format(
util.displayable_path(logfile),
str(err)
)) from err
# fields: Shows a list of available fields for queries and format strings.
def _print_keys(query):
@ -977,20 +994,7 @@ def import_func(lib, opts, args):
# The paths from the logfiles go into a separate list to allow handling
# errors differently from user-specified paths.
paths_from_logfiles = []
for logfile in opts.from_logfiles or []:
try:
paths_from_logfiles.extend(
list(_paths_from_logfile(syspath(normpath(logfile))))
)
except ValueError as err:
raise ui.UserError('malformed logfile {}'.format(
util.displayable_path(logfile),
)) from err
except IOError as err:
raise ui.UserError('unreadable logfile {}'.format(
util.displayable_path(logfile),
)) from err
paths_from_logfiles = list(_parse_logfiles(opts.from_logfiles or []))
if not paths and not paths_from_logfiles:
raise ui.UserError('no path specified')