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

Improve error handling for invalid commands

Browse source
This commit is contained in:
Jack Wilsdon 2016-04-18 19:16:31 +01:00
parent 028c78adc8
commit dea091ee53
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
beetsplug/hook.py
View file

@ -45,23 +45,20 @@ class HookPlugin(BeetsPlugin):
def create_and_register_hook(self, event, command):
def hook_function(**kwargs):
if command is None or len(command) == 0:
self._log.error('invalid command "{0}"', command)
return
formatted_command = command.format(event=event, **kwargs)
encoded_command = formatted_command.decode(_arg_encoding())
command_pieces = shlex.split(encoded_command)
if len(command_pieces) == 0:
raise ConfigValueError('invalid command "{0}"'.format(
command))
self._log.debug('Running command "{0}" for event "{1}"',
self._log.debug('Running command "{0}" for event {1}',
encoded_command, event)
try:
subprocess.Popen(command_pieces).wait()
except OSError as e:
_, _, trace = sys.exc_info()
message = '{0}: {1}'.format(e, command_pieces[0])
raise OSError, message, trace
except OSError as exc:
self._log.error('hook for {0} failed: {1}', event, exc)
self.register_listener(event, hook_function)