add exif dateTime, allow some special characters in text meta

This commit is contained in:
simon 2020-02-09 08:47:13 -05:00
parent ebe852bd5a
commit 75f99025d9
7 changed files with 10 additions and 4 deletions

View File

@ -134,6 +134,8 @@ char *get_meta_key_text(enum metakey meta_key) {
return "exif_iso_speed_ratings"; return "exif_iso_speed_ratings";
case MetaExifModel: case MetaExifModel:
return "exif_model"; return "exif_model";
case MetaExifDateTime:
return "exif_datetime";
default: default:
return NULL; return NULL;
} }
@ -278,6 +280,7 @@ void read_index_bin(const char *path, const char *index_id, index_func func) {
case MetaExifFocalLength: case MetaExifFocalLength:
case MetaExifUserComment: case MetaExifUserComment:
case MetaExifIsoSpeedRatings: case MetaExifIsoSpeedRatings:
case MetaExifDateTime:
case MetaExifModel: case MetaExifModel:
case MetaTitle: { case MetaTitle: {
buf.cur = 0; buf.cur = 0;

View File

@ -6,7 +6,7 @@
#define EPILOG "Made by simon987 <me@simon987.net>. Released under GPL-3.0" #define EPILOG "Made by simon987 <me@simon987.net>. Released under GPL-3.0"
static const char *const Version = "1.2.8"; static const char *const Version = "1.2.9";
static const char *const usage[] = { static const char *const usage[] = {
"sist2 scan [OPTION]... PATH", "sist2 scan [OPTION]... PATH",
"sist2 index [OPTION]... INDEX", "sist2 index [OPTION]... INDEX",

View File

@ -209,6 +209,8 @@ append_video_meta(AVFormatContext *pFormatCtx, AVFrame *frame, document_t *doc,
APPEND_TAG_META(doc, tag, MetaExifIsoSpeedRatings) APPEND_TAG_META(doc, tag, MetaExifIsoSpeedRatings)
} else if (strcmp(tag->key, "ExposureTime") == 0) { } else if (strcmp(tag->key, "ExposureTime") == 0) {
APPEND_TAG_META(doc, tag, MetaExifExposureTime) APPEND_TAG_META(doc, tag, MetaExifExposureTime)
} else if (strcmp(tag->key, "DateTime") == 0) {
APPEND_TAG_META(doc, tag, MetaExifDateTime)
} }
} }
} }

View File

@ -39,6 +39,7 @@ enum metakey {
MetaExifUserComment = 20 | META_STR_MASK, MetaExifUserComment = 20 | META_STR_MASK,
MetaExifModel = 21 | META_STR_MASK, MetaExifModel = 21 | META_STR_MASK,
MetaExifIsoSpeedRatings = 22 | META_STR_MASK, MetaExifIsoSpeedRatings = 22 | META_STR_MASK,
MetaExifDateTime = 23 | META_STR_MASK,
//Note to self: this will break after 31 entries //Note to self: this will break after 31 entries
}; };

View File

@ -7,7 +7,7 @@
#define INITIAL_BUF_SIZE 1024 * 16 #define INITIAL_BUF_SIZE 1024 * 16
#define SHOULD_IGNORE_CHAR(c) !(SHOULD_KEEP_CHAR(c)) #define SHOULD_IGNORE_CHAR(c) !(SHOULD_KEEP_CHAR(c))
#define SHOULD_KEEP_CHAR(c) ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'z') || (c > 127)) #define SHOULD_KEEP_CHAR(c) ((c >= '\'' && c <= ';') || (c >= 'A' && c <= 'z') || (c > 127))
typedef struct dyn_buffer { typedef struct dyn_buffer {

File diff suppressed because one or more lines are too long

View File

@ -11,7 +11,7 @@
<nav class="navbar navbar-expand-lg"> <nav class="navbar navbar-expand-lg">
<a class="navbar-brand" href="/">sist2</a> <a class="navbar-brand" href="/">sist2</a>
<span class="badge badge-pill version">v1.2.8</span> <span class="badge badge-pill version">v1.2.9</span>
<span class="tagline">Lightning-fast file system indexer and search tool </span> <span class="tagline">Lightning-fast file system indexer and search tool </span>
<a style="margin-left: auto" id="theme" class="btn" title="Toggle theme" href="/">Theme</a> <a style="margin-left: auto" id="theme" class="btn" title="Toggle theme" href="/">Theme</a>
</nav> </nav>