Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-12 02:12:10 +01:00
Code Issues Projects Releases Wiki Activity

address a few leftover FIXMEs for confit

Browse source
This commit is contained in:
Adrian Sampson 2012-10-27 18:55:49 -07:00
parent 7158c01ff8
commit 2fb6943f95
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
beets/ui/__init__.py
View file

@ -406,8 +406,16 @@ def get_replacements():
"""Confit validation function that reads regex/string pairs.
"""
pairs = config['replace'].as_pairs()
# FIXME handle regex compilation errors
return [(re.compile(k), v) for (k, v) in pairs]
replacements = []
for pattern, value in pairs:
try:
replacements.append((re.compile(pattern), value))
except re.error:
raise UserError(
u'malformed regular expression in replace: {0}'.format(
pattern
))
return replacements
def _pick_format(album, fmt=None):
"""Pick a format string for printing Album or Item objects,
@ -631,9 +639,10 @@ def _raw_main(args, configfh):
config.add_args(options)
# Open library file.
dbpath = config['library'].as_filename()
try:
lib = library.Library(
config['library'].as_filename(),
dbpath,
config['directory'].as_filename(),
get_path_formats(),
config['art_filename'].get(unicode),
@ -641,7 +650,9 @@ def _raw_main(args, configfh):
get_replacements(),
)
except sqlite3.OperationalError:
raise UserError("database file %s could not be opened" % FIXME)
raise UserError(u"database file {0} could not be opened".format(
util.displayable_path(dbpath)
))
plugins.send("library_opened", lib=lib)
# Configure the logger.
@ -649,9 +660,13 @@ def _raw_main(args, configfh):
log.setLevel(logging.DEBUG)
else:
log.setLevel(logging.INFO)
log.debug(u'data directory: %s' % util.displayable_path('FIXME'))
log.debug(u'library database: %s' % util.displayable_path(lib.path))
log.debug(u'library directory: %s' % util.displayable_path(lib.directory))
log.debug(u'data directory: {0}\n'
u'library database: {1}\n'
u'library directory: {2}'.format(
util.displayable_path(config.config_dir()),
util.displayable_path(lib.path),
util.displayable_path(lib.directory),
))
# Invoke the subcommand.
subcommand.func(lib, suboptions, subargs)