From 3a882b5b8006c3688d65fb1e1e889cfd5c3e8609 Mon Sep 17 00:00:00 2001 From: ElliottKasoar <45317199+ElliottKasoar@users.noreply.github.com> Date: Tue, 11 Jun 2024 14:05:18 +0100 Subject: [PATCH] Tidy code --- abcd/frontends/commandline/commands.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/abcd/frontends/commandline/commands.py b/abcd/frontends/commandline/commands.py index 238941fa..03309907 100644 --- a/abcd/frontends/commandline/commands.py +++ b/abcd/frontends/commandline/commands.py @@ -190,12 +190,11 @@ def key_add(*, db, query, keys, **kwargs): for query in query ] else: - test = ("AND", query, ("OR", *(("NAME", key) for key in data.keys()))) + test = ("AND", query, ("OR", *(("NAME", key) for key in data))) + elif isinstance(db, OpenSearchDatabase): + test = " OR ".join(f"{key}:*" for key in data) else: - if isinstance(db, OpenSearchDatabase): - test = " OR ".join(f"{key}:*" for key in data) - else: - test = ("OR", *(("NAME", key) for key in data.keys())) + test = ("OR", *(("NAME", key) for key in data)) if db.count(query=test): print( @@ -236,7 +235,7 @@ def key_delete(*, db, query, yes, keys, **kwargs): for query in query ] else: - query = ("AND", query, ("OR", *(("NAME", key) for key in data.keys()))) + query = ("AND", query, ("OR", *(("NAME", key) for key in data))) if not yes: print( @@ -246,7 +245,7 @@ def key_delete(*, db, query, yes, keys, **kwargs): ) exit(1) - for k in data.keys(): + for k in data: db.delete_property(k, query=query)