Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-24 09:33:46 +01:00
Code Issues Projects Releases Wiki Activity

Offer a chance to fix YAML parse errors

Browse source 
An alternative to 749ef85638 by @jmwatte.
This commit is contained in:
Adrian Sampson 2015-11-16 12:27:32 -08:00
parent bb39cd509d
commit feabf1a6ef
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
beetsplug/edit.py
View file

@ -166,28 +166,38 @@ class EditPlugin(plugins.BeetsPlugin):
If something goes wrong during editing, return None to indicate
the process should abort.
"""
# Ask the user to edit the data.
# Set up a temporary file with the initial data for editi
new = NamedTemporaryFile(suffix='.yaml', delete=False)
old_str = dump(data)
new.write(old_str)
new.close()
edit(new.name)
# Read the data back after editing and check whether anything
# changed.
with open(new.name) as f:
new_str = f.read()
os.remove(new.name)
if new_str == old_str:
ui.print_("No changes; aborting.")
return None
# Parse the updated data.
# Loop until we have parseable data.
try:
return load(new_str)
except yaml.YAMLError as e:
ui.print_("Invalid YAML: {}".format(e))
return None
while True:
# Ask the user to edit the data.
edit(new.name)
# Read the data back after editing and check whether anything
# changed.
with open(new.name) as f:
new_str = f.read()
if new_str == old_str:
ui.print_("No changes; aborting.")
return None
# Parse the updated data.
try:
return load(new_str)
except yaml.YAMLError as e:
ui.print_("Invalid YAML: {}".format(e))
if not ui.input_yn("Edit again to fix? (Y/n)", True):
return None
# Remove the temporary file before returning.
finally:
os.remove(new.name)
def apply_data(self, objs, old_data, new_data):
"""Take potentially-updated data and apply it to a set of Model