mirror of
https://github.com/simon987/sist2.git
synced 2025-04-19 10:16:42 +00:00
Duplicate media_comment field, fixes #440
This commit is contained in:
parent
ffa7f2ae84
commit
80528857e9
@ -59,7 +59,7 @@ export default {
|
|||||||
|
|
||||||
const fields = [
|
const fields = [
|
||||||
"title", "duration", "audioc", "videoc",
|
"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",
|
"modified_by", "pages", "tag",
|
||||||
"exif_make", "exif_software", "exif_exposure_time", "exif_fnumber", "exif_focal_length",
|
"exif_make", "exif_software", "exif_exposure_time", "exif_fnumber", "exif_focal_length",
|
||||||
"exif_user_comment", "exif_iso_speed_ratings", "exif_model", "exif_datetime",
|
"exif_user_comment", "exif_iso_speed_ratings", "exif_model", "exif_datetime",
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<li><code>doc.artist</code></li>
|
<li><code>doc.artist</code></li>
|
||||||
<li><code>doc.title</code></li>
|
<li><code>doc.title</code></li>
|
||||||
<li><code>doc.genre</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.album_artist</code></li>
|
||||||
<li><code>doc.exif_make</code></li>
|
<li><code>doc.exif_make</code></li>
|
||||||
<li><code>doc.exif_model</code></li>
|
<li><code>doc.exif_model</code></li>
|
||||||
|
@ -30,6 +30,8 @@ char *get_meta_key_text(enum metakey meta_key) {
|
|||||||
return "genre";
|
return "genre";
|
||||||
case MetaTitle:
|
case MetaTitle:
|
||||||
return "title";
|
return "title";
|
||||||
|
case MetaMediaComment:
|
||||||
|
return "media_comment";
|
||||||
case MetaFontName:
|
case MetaFontName:
|
||||||
return "font_name";
|
return "font_name";
|
||||||
case MetaExifMake:
|
case MetaExifMake:
|
||||||
@ -159,6 +161,7 @@ void write_document(document_t *doc) {
|
|||||||
case MetaExifGpsLatitudeDec:
|
case MetaExifGpsLatitudeDec:
|
||||||
case MetaExifGpsLatitudeRef:
|
case MetaExifGpsLatitudeRef:
|
||||||
case MetaChecksum:
|
case MetaChecksum:
|
||||||
|
case MetaMediaComment:
|
||||||
case MetaTitle: {
|
case MetaTitle: {
|
||||||
cJSON_AddStringToObject(json, get_meta_key_text(meta->key), meta->str_val);
|
cJSON_AddStringToObject(json, get_meta_key_text(meta->key), meta->str_val);
|
||||||
buffer_size_guess += (int) strlen(meta->str_val);
|
buffer_size_guess += (int) strlen(meta->str_val);
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
#include "web/serve.h"
|
#include "web/serve.h"
|
||||||
#include "parsing/mime.h"
|
#include "parsing/mime.h"
|
||||||
#include "parsing/parse.h"
|
#include "parsing/parse.h"
|
||||||
#include "auth0/auth0_c_api.h"
|
|
||||||
|
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <pthread.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);
|
fprintf(stderr, "error: option `--%s` Value must be >= 0\n", option->long_name);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, const char *argv[]) {
|
int main(int argc, const char *argv[]) {
|
||||||
@ -544,7 +545,7 @@ int main(int argc, const char *argv[]) {
|
|||||||
OPT_END(),
|
OPT_END(),
|
||||||
};
|
};
|
||||||
|
|
||||||
struct argparse argparse;
|
struct argparse argparse = {};
|
||||||
argparse_init(&argparse, options, usage, 0);
|
argparse_init(&argparse, options, usage, 0);
|
||||||
argparse_describe(
|
argparse_describe(
|
||||||
&argparse,
|
&argparse,
|
||||||
|
@ -51,11 +51,11 @@
|
|||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include "git_hash.h"
|
#include "git_hash.h"
|
||||||
|
|
||||||
#define VERSION "3.4.0"
|
#define VERSION "3.4.1"
|
||||||
static const char *const Version = VERSION;
|
static const char *const Version = VERSION;
|
||||||
static const int VersionMajor = 3;
|
static const int VersionMajor = 3;
|
||||||
static const int VersionMinor = 4;
|
static const int VersionMinor = 4;
|
||||||
static const int VersionPatch = 0;
|
static const int VersionPatch = 1;
|
||||||
|
|
||||||
#ifndef SIST_PLATFORM
|
#ifndef SIST_PLATFORM
|
||||||
#define SIST_PLATFORM unknown
|
#define SIST_PLATFORM unknown
|
||||||
|
1
third-party/libscan/libscan/media/media.c
vendored
1
third-party/libscan/libscan/media/media.c
vendored
@ -272,6 +272,7 @@ static void append_audio_meta(scan_media_ctx_t *ctx, AVFormatContext *pFormatCtx
|
|||||||
APPEND_TAG_META(MetaAlbum);
|
APPEND_TAG_META(MetaAlbum);
|
||||||
} else if (strcmp(key, "comment") == 0) {
|
} else if (strcmp(key, "comment") == 0) {
|
||||||
append_tag_meta_if_not_exists(ctx, doc, tag, MetaContent);
|
append_tag_meta_if_not_exists(ctx, doc, tag, MetaContent);
|
||||||
|
APPEND_TAG_META(MetaMediaComment);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
1
third-party/libscan/libscan/scan.h
vendored
1
third-party/libscan/libscan/scan.h
vendored
@ -63,6 +63,7 @@ enum metakey {
|
|||||||
MetaAlbumArtist,
|
MetaAlbumArtist,
|
||||||
MetaGenre,
|
MetaGenre,
|
||||||
MetaTitle,
|
MetaTitle,
|
||||||
|
MetaMediaComment,
|
||||||
MetaFontName,
|
MetaFontName,
|
||||||
MetaExifMake,
|
MetaExifMake,
|
||||||
MetaExifDescription,
|
MetaExifDescription,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user