Jaculabilis
/
amanuensis
1
1
Fork 0
Code Issues 19 Pull Requests Projects 1 Releases Activity

Add @requires command wrapper

This commit is contained in:
Tim Van Baak 2020-01-15 21:53:45 -08:00
parent 6429bf7d6b
commit 7b6e9e644e
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
amanuensis/cli/helpers.py
View File

@ -1,5 +1,5 @@
# Standard library imports # Standard library imports
from argparse import ArgumentParser as AP from argparse import ArgumentParser, Namespace
from functools import wraps from functools import wraps
# These function wrappers allow us to use the same function for executing a # These function wrappers allow us to use the same function for executing a
@ -13,9 +13,9 @@ def add_argument(*args, **kwargs):
second_layer = command.__dict__.get('wrapper', False) second_layer = command.__dict__.get('wrapper', False)
@wraps(command) @wraps(command)
def augmented_command(cmd_args): def augmented_command(cmd_args):
if type(cmd_args) is AP: if type(cmd_args) is ArgumentParser:
cmd_args.add_argument(*args, **kwargs) cmd_args.add_argument(*args, **kwargs)
if type(cmd_args) is not AP or second_layer: if type(cmd_args) is not ArgumentParser or second_layer:
command(cmd_args) command(cmd_args)
augmented_command.__dict__['wrapper'] = True augmented_command.__dict__['wrapper'] = True
return augmented_command return augmented_command
@ -25,6 +25,25 @@ def no_argument(command):
"""Noops for subparsers""" """Noops for subparsers"""
@wraps(command) @wraps(command)
def augmented_command(cmd_args): def augmented_command(cmd_args):
if type(cmd_args) is not AP: if type(cmd_args) is not ArgumentParser:
command(cmd_args) command(cmd_args)
return augmented_command return augmented_command
# This wrapper is another verification step
def requires(argument, verify=lambda a: a is not None):
"""Errors out if the given argument is not present"""
def req_checker(command):
second_layer = command.__dict__.get('wrapper', False)
@wraps(command)
def augmented_command(cmd_args):
if type(cmd_args) is Namespace:
if not hasattr(cmd_args, argument) or not verify(getattr(cmd_args, argument)):
import config
config.logger.error(
"This command requires specifying {}".format(argument))
return -1
command(cmd_args)
augmented_command.__dict__['wrapper'] = True
return augmented_command
return req_checker