console log fixes, version bump

v2.11.4

.drone.yml

@@ -11,6 +11,21 @@ steps:
     image: simon987/sist2-build
     commands:
       - ./scripts/build.sh
+  - name: docker
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: DOCKER_USER
+      password:
+        from_secret: DOCKER_PASSWORD
+      repo: simon987/sist2
+      context: ./
+      dockerfile: ./Dockerfile
+      auto_tag: true
+      auto_tag_suffix: x64-linux
+      when:
+        event:
+          - tag
   - name: scp files
     image: appleboy/drone-scp
     settings:
@@ -27,21 +42,6 @@ steps:
         - ./VERSION
         - ./sist2-x64-linux
         - ./sist2-x64-linux-debug
-  - name: docker
-    image: plugins/docker
-    settings:
-      username:
-        from_secret: DOCKER_USER
-      password:
-        from_secret: DOCKER_PASSWORD
-      repo: simon987/sist2
-      context: ./
-      dockerfile: ./Dockerfile
-      auto_tag: true
-      auto_tag_suffix: x64-linux
-      when:
-        event:
-          - tag
 
 ---
 kind: pipeline

.gitmodules

@@ -1,3 +1,6 @@
+[submodule "third-party/libscan"]
+	path = third-party/libscan
+	url = https://github.com/simon987/libscan
 [submodule "third-party/argparse"]
 	path = third-party/argparse
 	url = https://github.com/simon987/argparse

Dockerfile.arm64

@@ -7,7 +7,7 @@ RUN cmake -DSIST_PLATFORM=arm64_linux -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE
 RUN make -j$(nproc)
 RUN strip sist2
 
-FROM --platform linux/arm64/v8 ubuntu:21.10
+FROM --platform="linux/arm64/v8" ubuntu:21.10
 
 RUN apt update && apt install -y curl libasan5 && rm -rf /var/lib/apt/lists/*
 

sist2-vue/src/components/IndexPicker.vue

@@ -133,11 +133,6 @@ export default Vue.extend({
   font-size: 80%;
 }
 
-.theme-black .version-badge {
-  color: #eee !important;
-  background: none;
-}
-
 .version-badge {
   color: #222 !important;
   background: none;

src/log.c

@@ -55,10 +55,14 @@ void vsist_logf(const char *filepath, int level, char *format, va_list ap) {
         log_len += 1;
     }
 
-    int ret = write(STDERR_FILENO, log_str, log_len);
+    if (PrintingProgressBar) {
-    if (ret == -1) {
+        PrintingProgressBar = FALSE;
-        LOG_FATALF("serialize.c", "Could not write index descriptor: %s", strerror(errno))
+        memmove(log_str + 1, log_str, log_len);
+        log_str[0] = '\n';
+        log_len += 1;
     }
+
+    write(STDERR_FILENO, log_str, log_len);
 }
 
 void sist_logf(const char *filepath, int level, char *format, ...) {
@@ -104,8 +108,12 @@ void sist_log(const char *filepath, int level, char *str) {
         );
     }
 
-    int ret = write(STDERR_FILENO, log_str, log_len);
+    if (PrintingProgressBar) {
-    if (ret == -1) {
+        PrintingProgressBar = FALSE;
-        LOG_FATALF("serialize.c", "Could not write index descriptor: %s", strerror(errno));
+        memmove(log_str + 1, log_str, log_len);
+        log_str[0] = '\n';
+        log_len += 1;
     }
+
+    write(STDERR_FILENO, log_str, log_len);
 }

src/main.c

@@ -433,7 +433,7 @@ void sist2_index(index_args_t *args) {
         cleanup = elastic_cleanup;
     }
 
-    IndexCtx.pool = tpool_create(args->threads, cleanup, FALSE, TRUE);
+    IndexCtx.pool = tpool_create(args->threads, cleanup, FALSE, args->print == 0);
     tpool_start(IndexCtx.pool);
 
     struct dirent *de;
@@ -518,8 +518,8 @@ void sist2_web(web_args_t *args) {
 
 
 int main(int argc, const char *argv[]) {
-//    sigsegv_handler = signal(SIGSEGV, sig_handler);
+    sigsegv_handler = signal(SIGSEGV, sig_handler);
-//    sigabrt_handler = signal(SIGABRT, sig_handler);
+    sigabrt_handler = signal(SIGABRT, sig_handler);
 
     setlocale(LC_ALL, "");
 

src/sist.h

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

src/tpool.c

@@ -191,7 +191,9 @@ void tpool_wait(tpool_t *pool) {
             }
         }
     }
-    progress_bar_print(1.0, ScanCtx.stat_tn_size, ScanCtx.stat_index_size);
+    if (pool->print_progress) {
+        progress_bar_print(1.0, ScanCtx.stat_tn_size, ScanCtx.stat_index_size);
+    }
     pthread_mutex_unlock(&(pool->work_mutex));
 
     LOG_INFO("tpool.c", "Worker threads finished")

src/util.c

@@ -84,6 +84,8 @@ char *expandpath(const char *path) {
     return expanded;
 }
 
+int PrintingProgressBar = 0;
+
 void progress_bar_print(double percentage, size_t tn_size, size_t index_size) {
 
     static int last_val = -1;
@@ -114,13 +116,21 @@ void progress_bar_print(double percentage, size_t tn_size, size_t index_size) {
         index_unit = 'M';
     }
 
-    printf(
+    if (tn_size == 0 && index_size == 0) {
-            "\r%3d%%[%.*s>%*s] TN:%3d%c IDX:%3d%c",
+        fprintf(stderr,
-            val, lpad, PBSTR, rpad, "",
+                "\r%3d%%[%.*s>%*s]",
-            (int) tn_size, tn_unit,
+                val, lpad, PBSTR, rpad, ""
-            (int) index_size, index_unit
+        );
-    );
+    } else {
-    fflush(stdout);
+        fprintf(stderr,
+                "\r%3d%%[%.*s>%*s] TN:%3d%c IDX:%3d%c",
+                val, lpad, PBSTR, rpad, "",
+                (int) tn_size, tn_unit,
+                (int) index_size, index_unit
+        );
+    }
+
+    PrintingProgressBar = TRUE;
 }
 
 GHashTable *incremental_get_table() {

src/util.h

@@ -19,6 +19,8 @@ char *expandpath(const char *path);
 
 dyn_buffer_t url_escape(char *str);
 
+extern int PrintingProgressBar;
+
 void progress_bar_print(double percentage, size_t tn_size, size_t index_size);
 
 GHashTable *incremental_get_table();

third-party/libscan/libscan/raw/raw.c

@@ -143,7 +143,7 @@ void parse_raw(scan_raw_ctx_t *ctx, vfile_t *f, document_t *doc) {
 
     libraw_gps_info_t gps = libraw_lib->other.parsed_gps;
     double gps_longitude_dec =
-            (gps.longitude[0] + gps.longitude[1] / 60 + gps.longitude[2] / 3600) * DMS_REF(gps.longref);
+            (gps.longtitude[0] + gps.longtitude[1] / 60 + gps.longtitude[2] / 3600) * DMS_REF(gps.longref);
     snprintf(tmp, sizeof(tmp), "%.15f", gps_longitude_dec);
     if (gps_longitude_dec != 0.0) {
         APPEND_STR_META(doc, MetaExifGpsLongitudeDec, tmp)
@@ -163,13 +163,7 @@ void parse_raw(scan_raw_ctx_t *ctx, vfile_t *f, document_t *doc) {
         return;
     }
 
-    int unpack_ret = libraw_unpack_thumb(libraw_lib);
+    libraw_unpack_thumb(libraw_lib);
-    if (unpack_ret != 0) {
-        CTX_LOG_ERRORF(f->filepath, "libraw_unpack_thumb returned error code %d", unpack_ret)
-        free(buf);
-        libraw_close(libraw_lib);
-        return;
-    }
 
     int errc = 0;
     libraw_processed_image_t *thumb = libraw_dcraw_make_mem_thumb(libraw_lib, &errc);

third-party/libscan/test/main.cpp

@@ -780,19 +780,6 @@ TEST(Arc, EncryptedZip) {
 }
 
 /* RAW */
-TEST(RAW, Segfault1) {
-    vfile_t f;
-    document_t doc;
-    load_doc_file("libscan-test-files/test_files/raw/segfault1.dng", &f, &doc);
-
-    parse_raw(&raw_ctx, &f, &doc);
-
-    ASSERT_EQ(get_meta(&doc, MetaWidth)->long_val, 3840);
-    ASSERT_EQ(get_meta(&doc, MetaHeight)->long_val, 7680);
-
-    cleanup(&doc, &f);
-}
-
 TEST(RAW, Panasonic) {
     vfile_t f;
     document_t doc;