Merge branch 'dev' of https://github.com/anusii/solidui into tony/154_download_files_from_other_app_folders

Author: tonypioneer

.githooks/pre-commit

@@ -15,3 +15,27 @@ fi
 
 echo "$result"
 printf "\e[32;1m%s\e[0m\n" 'Finished running dart format.'
+
+# Get the commit message.
+
+COMMIT_MSG=$(git log -1 --pretty=%B)
+
+# 20260123 gjw Check if the commit message starts with 'Bump version'
+# If it does then run `make versions` to update the version in any
+# files that require updating, based on the version from pubspec.yaml.
+# Then add any updated files to the commit. I add specific files
+# rather than using `.` just to avoid possibly adding things I was not
+# planning to. This way we always update, for example, the snap
+# version when we 'Bump version', avoiding missing this step, so the
+# installer builds that 'Bump version' triggers will get the correct
+# versions.
+
+if [[ $COMMIT_MSG == Bump\ version* ]]; then
+    printf "\e[33;1m%s\e[0m\n" 'Update versions.'
+
+    make versions
+    git add snap/snapcraft.yaml
+
+    printf "\e[32;1m%s\e[0m\n" 'Finished updating versions.'
+
+fi

.githooks/pre-push

@@ -7,13 +7,6 @@
 #
 # If this script exits with a non-zero status nothing will be pushed.
 
-PVER=$(egrep '^version:' pubspec.yaml | cut -d' ' -f2 | cut -d'+' -f1)
-
-if [ -d snap ]; then
-    printf "\e[33;1m%s\e[0m\n" 'Update snap version.'
-    perl -pi -e "s|^version:.*|version: ${PVER}|" snap/snapcraft.yaml;
-fi
-
 # Flutter Analyze
 
 printf "\e[33;1m%s\e[0m\n" 'Running flutter analyze.'

.github/workflows/ci.yaml

@@ -13,7 +13,7 @@ on:
     types: [opened, reopened, synchronize]
 
 env:
-  FLUTTER_VERSION: '3.38.5'
+  FLUTTER_VERSION: '3.38.9'
 
 jobs:
 

support/loc.sh

@@ -23,15 +23,17 @@ show_help() {
 # Function to cleanse lines.
 
 cleanse_lines() {
-    # Remove:
-    #   empty lines
-    #   comment only lines
-    #   import/library/@override
-    #   lines that start with }, ) or ]
-    #   lines that consist of '? [' or  ': ['
-    #   begins a parameter list, like `   names: [`
-    #
-    awk 'NF && !/^\s*\/\/|^\s*(import|library|@override)|^\s*[})\]]|^\s*(\?|:) \[|\s*\w*: \[/' "$1"
+    sed '1d' "$1" |
+	grep -v '^$' | # Remove empty lines
+	grep -v '^[[:space:]]*//' | # Remove comment only lines
+	grep -v '^\(import\|library\)' | # Remove library and import statements
+	grep -v '^\s*@' | # Remove directives
+	grep -v '^\s*[\}\)]' | # Remove linest that start with a bracket
+	grep -v '^\s*\]' | # Needed this as special case
+	grep -v '^\s*(\?|:) \[' | # Remove lines that consist of '? [' or  ': ['
+	grep -v '\s*\w*: \[' | # Remove  parameter list lines like `   names: [`
+	grep -v "^\s*['][^']*[']" | # Remove lines that are only a string.
+	cat
 }
 
 wc_cleanse_lines() {