diff options
author | zlg <zlg@zlg.space> | 2018-10-18 16:36:39 -0700 |
---|---|---|
committer | zlg <zlg@zlg.space> | 2018-10-18 16:36:39 -0700 |
commit | 3ec2a2902caaf3e70deea650425339299af5d821 (patch) | |
tree | 158d1c8baf932bd05af7f5ac7878243358beb240 /src/vgstash_cli.py | |
parent | cli: Add zero-game import/export messages (diff) | |
download | vgstash-3ec2a2902caaf3e70deea650425339299af5d821.tar.gz vgstash-3ec2a2902caaf3e70deea650425339299af5d821.tar.bz2 vgstash-3ec2a2902caaf3e70deea650425339299af5d821.tar.xz vgstash-3ec2a2902caaf3e70deea650425339299af5d821.zip |
Catch when an invalid list filter is passed
Before, vgstash.DB.list_games() would default to 'allgames' and silently
hide it when a filter wasn't found. This commit ensures that the vgstash
package and CLI both indicate when an invalid filter is passed to them:
* vgstash.DB.list_games() will return False on a failure to match;
* vgstash_cli uses Click's Choice object to enforce the constraint
Diffstat (limited to '')
-rw-r--r-- | src/vgstash_cli.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/vgstash_cli.py b/src/vgstash_cli.py index 22cfc5a..db5853b 100644 --- a/src/vgstash_cli.py +++ b/src/vgstash_cli.py @@ -108,13 +108,15 @@ def add(title, system, ownership, progress, notes): @cli.command('list') -@click.argument('filter', required=False, default="allgames") +@click.argument('filter', type=click.Choice(vgstash.FILTERS.keys()), required=False, default="allgames") @click.option('--raw', '-r', is_flag=True, show_default=True, default=False, help="Output raw, pipe-delimited lines") @click.option('--width', '-w', type=str, required=False, default=get_terminal_size(fallback=(80,24)).columns, help="The width of the table to output, in characters.") def list_games(filter, raw, width): db = get_db() res = db.list_games(filter) first_pass = True + # res can be False if the filter doesn't exist, but Click should catch it + # and spit out an error before this function even starts. for r in res: if 'notes' in r.keys() and len(r['notes']) > 0: notes = r['notes'].replace('\n', '\\n') |