Browse Source

Support column names in any capitalisation

master
JustAnotherArchivist 4 years ago
parent
commit
6e7449d137
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      archivebot-jobs

+ 5
- 5
archivebot-jobs View File

@@ -66,7 +66,7 @@ then
exit 1 exit 1
fi fi
column="${filter%%[=<>^$]*}" column="${filter%%[=<>^$]*}"
if ! valid_column "${column}"
if ! valid_column "${column^^}"
then then
echo "Invalid filter column: ${column}" >&2 echo "Invalid filter column: ${column}" >&2
exit 1 exit 1
@@ -76,7 +76,7 @@ if [[ ${#sortcolumns[@]} -gt 0 ]]
then then
for column in "${sortcolumns[@]}" for column in "${sortcolumns[@]}"
do do
if ! valid_column "${column}"
if ! valid_column "${column^^}"
then then
echo "Invalid sort column: ${column}" >&2 echo "Invalid sort column: ${column}" >&2
exit 1 exit 1
@@ -151,7 +151,7 @@ if True: # For sensible indentation
import re import re
match = re.match(r"^(?P<column>[A-Za-z ]+)(?P<op>[=<>^$])(?P<value>.*)$", filter) match = re.match(r"^(?P<column>[A-Za-z ]+)(?P<op>[=<>^$])(?P<value>.*)$", filter)
filterDict = match.groupdict() filterDict = match.groupdict()
filterDict["column"] = filterDict["column"]
filterDict["column"] = filterDict["column"].upper()
assert filterDict["column"] in columns assert filterDict["column"] in columns
columnIdx = columns.index(filterDict["column"]) columnIdx = columns.index(filterDict["column"])
compFunc = { compFunc = {
@@ -165,8 +165,8 @@ if True: # For sensible indentation


# Sort # Sort
sortColumns = ('"$(printf "'%s', " "${sortcolumns[@]}")"') 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)) jobs = sorted(jobs, key = lambda job: tuple(job[columnIdx] for columnIdx in sortColumnIdxs))


# Print # Print


Loading…
Cancel
Save