From: Paul Hänsch <paul@plutz.net>
Date: Fri, 5 Feb 2021 12:00:34 +0000 (+0100)
Subject: always sort categories, caching and ordering for list in course filter
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=c432b3ea2bdde965ef26ef07138f305717d05b69;p=lobster

always sort categories, caching and ordering for list in course filter
---

diff --git a/cards/widgets.sh b/cards/widgets.sh
index 7dfa3ad..c0c0594 100755
--- a/cards/widgets.sh
+++ b/cards/widgets.sh
@@ -19,6 +19,19 @@ list_categories() {
   grep -vxE '^[ 	]*$' "${_DATA}/mappings/categories"
 }
 
+list_courses() {
+  local file name cachefile="${_DATA}/cache/courses.ui.cache"
+  if [ $cachefile -nt "${_DATA}/ical" ]; then
+    cat "$cachefile"
+  else
+    for file in "$_DATA/ical"/*.ics; do
+      name="$(pdi_value "$(pdi_load "$file")" SUMMARY |HTML)"
+      printf '%s	%s\n' "$file" "$name"
+    done \
+    | sort -k2 |tee "$cachefile"
+  fi
+}
+
 w_filter_item() {
 n=$3
 cat <<EOF
@@ -41,11 +54,11 @@ cat <<EOF
       [a href="/categories/" $(l10n edit_categories)]
     ]
     [fieldset .courses
-      $(for course in "$_DATA/ical"/*.ics; do
+      $(list_courses | while read course coursename; do
         printf '[label [checkbox "filter_course%i" "|%s" %s] %s ] ' \
                "$n" "$(HTML "${course##*/}")" \
                "$(printf %s "${course##*/}" |grep -qxEe "$2" && printf checked )" \
-               "$(pdi_value "$(pdi_load "$course")" SUMMARY |HTML)"
+               "$coursename"
       done)
     ]
   ]
diff --git a/categories/edit_categories.sh b/categories/edit_categories.sh
index 232499b..7ee6f36 100755
--- a/categories/edit_categories.sh
+++ b/categories/edit_categories.sh
@@ -23,7 +23,11 @@ remove="$(POST remove)"
 newcat="$(POST newcat)"
 
 if [ "$(POST add)" = "add" ]; then
-  printf %s\\n "$newcat" >>"$catfile"
+  categories="$( {
+    cat "$catfile"
+    printf %s\\n "$newcat"
+  } |sort -u )"
+  printf %s\\n "$categories" >"$catfile"
 elif [ "$remove" ]; then
   sed -E -i '/^'"${remove}"'$/d' "$catfile"
 fi