Version bump

Fix .dockerignore, add docker build for arm64

.drone.yml

@@ -80,7 +80,7 @@ steps:
         from_secret: DOCKER_PASSWORD
       repo: simon987/sist2
       context: ./
-      dockerfile: ./Dockerfile
+      dockerfile: ./Dockerfile.arm64
       auto_tag: true
       auto_tag_suffix: arm64-linux
       when:

.gitattributes

@@ -1,3 +1,3 @@
 CMakeModules/* linguist-vendored
-web/js/*.min.js linguist-vendored
+**/*_generated.c linguist-vendored
-web/css/*.min.css linguist-vendored
+**/*_generated.h linguist-vendored

README.md

@@ -51,7 +51,7 @@ sist2 (Simple incremental search tool)
 1. Download sist2 executable
     1. Download the [latest sist2 release](https://github.com/simon987/sist2/releases) *
     1. *(or)* Download a [development snapshot](https://files.simon987.net/.gate/sist2/simon987_sist2/) *(Not recommended!)*
-    1. *(or)* `docker pull simon987/sist2:2.10.3-x64-linux`
+    1. *(or)* `docker pull simon987/sist2:2.11.0-x64-linux`
 
 1. See [Usage guide](docs/USAGE.md)
 

ci/build_arm64.sh

@@ -14,4 +14,4 @@ rm -rf CMakeFiles CMakeCache.txt
 cmake -DSIST_PLATFORM=arm64_linux -DSIST_DEBUG=on -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" .
 make -j $(nproc)
 strip sist2
-mv sist2 sist2-arm64-linux-debug
+mv sist2_debug sist2-arm64-linux-debug

sist2-vue/src/components/MimePicker.vue

@@ -43,7 +43,7 @@ export default {
   },
   methods: {
     handleTreeClick(node, e) {
-      if (e === "indeterminate" || e === "collapsed") {
+      if (e === "indeterminate" || e === "collapsed" || e === 'rendered' || e === "focused") {
         return;
       }
 

sist2-vue/src/components/TagPicker.vue

@@ -162,7 +162,7 @@ export default {
       });
     },
     handleTreeClick(node, e) {
-      if (e === "indeterminate" || e === "collapsed" || e === 'rendered') {
+      if (e === "indeterminate" || e === "collapsed" || e === 'rendered' || e === "focused") {
         return;
       }
 

src/cli.c

@@ -366,6 +366,10 @@ int web_args_validate(web_args_t *args, int argc, const char **argv) {
         args->lang = DEFAULT_LANG;
     }
 
+    if (args->tagline == NULL) {
+        args->tagline = DEFAULT_TAGLINE;
+    }
+
     if (strlen(args->lang) != 2) {
         fprintf(stderr, "Invalid --lang value, see usage\n");
         return 1;

src/ctx.c

@@ -2,6 +2,8 @@
 
 ScanCtx_t ScanCtx = {
         .stat_index_size = 0,
+        .dbg_current_files = NULL,
+        .pool = NULL
 };
 WebCtx_t WebCtx;
 IndexCtx_t IndexCtx;

src/main.c

@@ -43,30 +43,38 @@ void sig_handler(int signum) {
     LOG_ERROR("*SIGNAL HANDLER*", "=============================================\n\n");
     LOG_ERRORF("*SIGNAL HANDLER*", "Uh oh! Caught fatal signal: %s", strsignal(signum));
 
-    GHashTableIter iter;
+    if (ScanCtx.dbg_current_files != NULL) {
-    g_hash_table_iter_init(&iter, ScanCtx.dbg_current_files);
+        GHashTableIter iter;
+        g_hash_table_iter_init(&iter, ScanCtx.dbg_current_files);
 
-    void *key;
+        void *key;
-    void *value;
+        void *value;
-    while (g_hash_table_iter_next(&iter, &key, &value)) {
+        while (g_hash_table_iter_next(&iter, &key, &value)) {
-        parse_job_t *job = value;
+            parse_job_t *job = value;
 
-        if (isatty(STDERR_FILENO)) {
+            if (isatty(STDERR_FILENO)) {
-            LOG_DEBUGF(
+                LOG_DEBUGF(
-                    "*SIGNAL HANDLER*",
+                        "*SIGNAL HANDLER*",
-                    "Thread \033[%dm[%04llX]\033[0m was working on job '%s'",
+                        "Thread \033[%dm[%04llX]\033[0m was working on job '%s'",
-                    31 + ((unsigned int) key) % 7, key, job->filepath
+                        31 + ((unsigned int) key) % 7, key, job->filepath
-            );
+                );
-        } else {
+            } else {
-            LOG_DEBUGF(
+                LOG_DEBUGF(
-                    "*SIGNAL HANDLER*",
+                        "*SIGNAL HANDLER*",
-                    "THREAD [%04llX] was working on job %s",
+                        "THREAD [%04llX] was working on job %s",
-                    key, job->filepath
+                        key, job->filepath
-            );
+                );
+            }
         }
     }
 
-    tpool_dump_debug_info(ScanCtx.pool);
+    if (ScanCtx.pool != NULL) {
+        tpool_dump_debug_info(ScanCtx.pool);
+    }
+
+    if (IndexCtx.pool != NULL) {
+        tpool_dump_debug_info(IndexCtx.pool);
+    }
 
     LOG_INFO(
             "*SIGNAL HANDLER*",

src/sist.h

@@ -49,7 +49,7 @@
 #include <ctype.h>
 #include "git_hash.h"
 
-#define VERSION "2.11.0"
+#define VERSION "2.11.1"
 static const char *const Version = VERSION;
 
 #ifndef SIST_PLATFORM