From 80528857e90ac60e2df35c58ed1235554659e556 Mon Sep 17 00:00:00 2001
From: simon987 <me@simon987>
Date: Sat, 18 Nov 2023 10:50:09 -0500
Subject: [PATCH] Duplicate media_comment field, fixes #440

---
 sist2-vue/src/components/InfoTable.vue    | 2 +-
 sist2-vue/src/views/Configuration.vue     | 1 +
 src/io/serialize.c                        | 3 +++
 src/main.c                                | 5 +++--
 src/sist.h                                | 4 ++--
 third-party/libscan/libscan/media/media.c | 1 +
 third-party/libscan/libscan/scan.h        | 1 +
 7 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/sist2-vue/src/components/InfoTable.vue b/sist2-vue/src/components/InfoTable.vue
index 2a1bc97..b0c316e 100644
--- a/sist2-vue/src/components/InfoTable.vue
+++ b/sist2-vue/src/components/InfoTable.vue
@@ -59,7 +59,7 @@ export default {
 
       const fields = [
         "title", "duration", "audioc", "videoc",
-        "bitrate", "artist", "album", "album_artist", "genre", "font_name", "author",
+        "bitrate", "artist", "album", "album_artist", "genre", "font_name", "author", "media_comment",
         "modified_by", "pages", "tag",
         "exif_make", "exif_software", "exif_exposure_time", "exif_fnumber", "exif_focal_length",
         "exif_user_comment", "exif_iso_speed_ratings", "exif_model", "exif_datetime",
diff --git a/sist2-vue/src/views/Configuration.vue b/sist2-vue/src/views/Configuration.vue
index 8bc59a4..49af018 100644
--- a/sist2-vue/src/views/Configuration.vue
+++ b/sist2-vue/src/views/Configuration.vue
@@ -81,6 +81,7 @@
                             <li><code>doc.artist</code></li>
                             <li><code>doc.title</code></li>
                             <li><code>doc.genre</code></li>
+                            <li><code>doc.media_comment</code></li>
                             <li><code>doc.album_artist</code></li>
                             <li><code>doc.exif_make</code></li>
                             <li><code>doc.exif_model</code></li>
diff --git a/src/io/serialize.c b/src/io/serialize.c
index 5af19a8..1f42913 100644
--- a/src/io/serialize.c
+++ b/src/io/serialize.c
@@ -30,6 +30,8 @@ char *get_meta_key_text(enum metakey meta_key) {
             return "genre";
         case MetaTitle:
             return "title";
+        case MetaMediaComment:
+            return "media_comment";
         case MetaFontName:
             return "font_name";
         case MetaExifMake:
@@ -159,6 +161,7 @@ void write_document(document_t *doc) {
             case MetaExifGpsLatitudeDec:
             case MetaExifGpsLatitudeRef:
             case MetaChecksum:
+            case MetaMediaComment:
             case MetaTitle: {
                 cJSON_AddStringToObject(json, get_meta_key_text(meta->key), meta->str_val);
                 buffer_size_guess += (int) strlen(meta->str_val);
diff --git a/src/main.c b/src/main.c
index a0a7ac1..63abd7b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,7 +11,6 @@
 #include "web/serve.h"
 #include "parsing/mime.h"
 #include "parsing/parse.h"
-#include "auth0/auth0_c_api.h"
 
 #include <signal.h>
 #include <pthread.h>
@@ -425,6 +424,8 @@ int set_to_negative_if_value_is_zero(UNUSED(struct argparse *self), const struct
         fprintf(stderr, "error: option `--%s` Value must be >= 0\n", option->long_name);
         exit(1);
     }
+
+    return 0;
 }
 
 int main(int argc, const char *argv[]) {
@@ -544,7 +545,7 @@ int main(int argc, const char *argv[]) {
             OPT_END(),
     };
 
-    struct argparse argparse;
+    struct argparse argparse = {};
     argparse_init(&argparse, options, usage, 0);
     argparse_describe(
             &argparse,
diff --git a/src/sist.h b/src/sist.h
index 8bb2162..ba74c3d 100644
--- a/src/sist.h
+++ b/src/sist.h
@@ -51,11 +51,11 @@
 #include <ctype.h>
 #include "git_hash.h"
 
-#define VERSION "3.4.0"
+#define VERSION "3.4.1"
 static const char *const Version = VERSION;
 static const int VersionMajor = 3;
 static const int VersionMinor = 4;
-static const int VersionPatch = 0;
+static const int VersionPatch = 1;
 
 #ifndef SIST_PLATFORM
 #define SIST_PLATFORM unknown
diff --git a/third-party/libscan/libscan/media/media.c b/third-party/libscan/libscan/media/media.c
index 16db23c..b5974d6 100644
--- a/third-party/libscan/libscan/media/media.c
+++ b/third-party/libscan/libscan/media/media.c
@@ -272,6 +272,7 @@ static void append_audio_meta(scan_media_ctx_t *ctx, AVFormatContext *pFormatCtx
             APPEND_TAG_META(MetaAlbum);
         } else if (strcmp(key, "comment") == 0) {
             append_tag_meta_if_not_exists(ctx, doc, tag, MetaContent);
+            APPEND_TAG_META(MetaMediaComment);
         }
     }
 }
diff --git a/third-party/libscan/libscan/scan.h b/third-party/libscan/libscan/scan.h
index 985875a..5bce878 100644
--- a/third-party/libscan/libscan/scan.h
+++ b/third-party/libscan/libscan/scan.h
@@ -63,6 +63,7 @@ enum metakey {
     MetaAlbumArtist,
     MetaGenre,
     MetaTitle,
+    MetaMediaComment,
     MetaFontName,
     MetaExifMake,
     MetaExifDescription,