From 6e7449d137dcff071f62267a803118d202f2ed75 Mon Sep 17 00:00:00 2001 From: JustAnotherArchivist Date: Sun, 2 Feb 2020 05:11:16 +0000 Subject: [PATCH] Support column names in any capitalisation --- archivebot-jobs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/archivebot-jobs b/archivebot-jobs index 4b9e205..be70adf 100755 --- a/archivebot-jobs +++ b/archivebot-jobs @@ -66,7 +66,7 @@ then exit 1 fi column="${filter%%[=<>^$]*}" - if ! valid_column "${column}" + if ! valid_column "${column^^}" then echo "Invalid filter column: ${column}" >&2 exit 1 @@ -76,7 +76,7 @@ if [[ ${#sortcolumns[@]} -gt 0 ]] then for column in "${sortcolumns[@]}" do - if ! valid_column "${column}" + if ! valid_column "${column^^}" then echo "Invalid sort column: ${column}" >&2 exit 1 @@ -151,7 +151,7 @@ if True: # For sensible indentation import re match = re.match(r"^(?P[A-Za-z ]+)(?P[=<>^$])(?P.*)$", filter) filterDict = match.groupdict() - filterDict["column"] = filterDict["column"] + filterDict["column"] = filterDict["column"].upper() assert filterDict["column"] in columns columnIdx = columns.index(filterDict["column"]) compFunc = { @@ -165,8 +165,8 @@ if True: # For sensible indentation # Sort sortColumns = ('"$(printf "'%s', " "${sortcolumns[@]}")"') - assert all(column in columns for column in sortColumns) - sortColumnIdxs = tuple(columns.index(column) for column in sortColumns) + assert all(column.upper() in columns for column in sortColumns) + sortColumnIdxs = tuple(columns.index(column.upper()) for column in sortColumns) jobs = sorted(jobs, key = lambda job: tuple(job[columnIdx] for columnIdx in sortColumnIdxs)) # Print