video metadata

CMakeLists.txt

@@ -116,10 +116,10 @@ if (WITH_SIST2)
 
     target_compile_options(sist2
             PRIVATE
-            -O3
+#            -O3
             #        -march=native
-            -fno-stack-protector
-            -fomit-frame-pointer
+#            -fno-stack-protector
+#            -fomit-frame-pointer
             )
 
     TARGET_LINK_LIBRARIES(

README.md

@@ -56,7 +56,7 @@ sist2 web --bind 0.0.0.0 --port 4321 ./my_idx1 ./my_idx2 ./my_idx3
 
 File type | Library | Content | Thumbnail | Metadata
 :---|:---|:---|:---|:---
-pdf,xps,cbz,cbr,fb2,epub | MuPDF | yes | yes, `png` | *planned* |
+pdf,xps,cbz,cbr,fb2,epub | MuPDF | yes | yes, `png` | title |
 `audio/*` | libav | - | yes, `jpeg` | ID3 tags |
 `video/*` | libav | - | yes, `jpeg` | *planned* |
 `image/*` | libav | - | yes, `jpeg` | *planned* |
@@ -85,7 +85,7 @@ binaries.
     ```bash
    pkg install cmake gcc yasm gmake bash ffmpeg e2fsprogs-uuid
    ```
-  __ 
+
 2. Build
     ```bash
     git clone --recurse-submodules https://github.com/simon987/sist2

src/main.c

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

src/parsing/font.c

@@ -15,12 +15,12 @@ typedef struct text_dimensions {
 } text_dimensions_t;
 
 typedef struct glyph {
-    unsigned int top;
-    unsigned int height;
-    unsigned int width;
-    unsigned int descent;
-    unsigned int ascent;
-    unsigned int advance_width;
+    int top;
+    int height;
+    int width;
+    int descent;
+    int ascent;
+    int advance_width;
     unsigned char *pixmap;
 } glyph_t;
 
@@ -39,10 +39,10 @@ glyph_t ft_glyph_to_glyph(FT_GlyphSlot slot) {
 
     glyph.pixmap = slot->bitmap.buffer;
 
-    glyph.width = slot->bitmap.width;
-    glyph.height = slot->bitmap.rows;
+    glyph.width = (int) slot->bitmap.width;
+    glyph.height = (int) slot->bitmap.rows;
     glyph.top = slot->bitmap_top;
-    glyph.advance_width = slot->advance.x / 64;
+    glyph.advance_width = (int) slot->advance.x / 64;
 
     glyph.descent = MAX(0, glyph.height - glyph.top);
     glyph.ascent = MAX(0, MAX(glyph.top, glyph.height) - glyph.descent);
@@ -50,10 +50,6 @@ glyph_t ft_glyph_to_glyph(FT_GlyphSlot slot) {
     return glyph;
 }
 
-__always_inline
-glyph_t get_glyph(char character, FT_Face face) {
-}
-
 text_dimensions_t text_dimension(char *text, FT_Face face) {
     text_dimensions_t dimensions;
 
@@ -62,7 +58,7 @@ text_dimensions_t text_dimension(char *text, FT_Face face) {
     int num_chars = (int) strlen(text);
 
     unsigned int max_ascent = 0;
-    unsigned int max_descent = 0;
+    int max_descent = 0;
 
     char pc = 0;
     for (int i = 0; i < num_chars; i++) {
@@ -72,7 +68,7 @@ text_dimensions_t text_dimension(char *text, FT_Face face) {
         glyph_t glyph = ft_glyph_to_glyph(face->glyph);
 
         max_descent = MAX(max_descent, glyph.descent);
-        max_ascent = MAX(max_ascent, glyph.ascent);
+        max_ascent = MAX(max_ascent, MAX(glyph.height, glyph.ascent));
 
         int kerning_x = kerning_offset(c, pc, face);
         dimensions.width += MAX(glyph.advance_width, glyph.width) + kerning_x;
@@ -195,6 +191,9 @@ void parse_font(const char *buf, size_t buf_len, document_t *doc) {
         glyph_t glyph = ft_glyph_to_glyph(face->glyph);
 
         pen.x += kerning_offset(c, pc, face);
+        if (pen.x <= 0) {
+            pen.x = ABS(glyph.advance_width - glyph.width);
+        }
         pen.y = dimensions.height - glyph.ascent - dimensions.baseline;
 
         draw_glyph(&glyph, pen.x, pen.y, dimensions, bitmap);

src/parsing/media.c

@@ -107,6 +107,15 @@ AVFrame *read_frame(AVFormatContext *pFormatCtx, AVCodecContext *decoder, int st
     return frame;
 }
 
+#define APPEND_TAG_META(doc, tag, keyname) \
+    text_buffer_t tex = text_buffer_create(4096); \
+    text_buffer_append_string(&tex, tag->value); \
+    meta_line_t *meta_tag = malloc(sizeof(meta_line_t) + tex.dyn_buffer.cur); \
+    meta_tag->key = keyname; \
+    strcpy(meta_tag->strval, tex.dyn_buffer.buf); \
+    APPEND_META(doc, meta_tag) \
+    text_buffer_destroy(&tex);
+
 void append_audio_meta(AVFormatContext *pFormatCtx, document_t *doc) {
 
     AVDictionaryEntry *tag = NULL;
@@ -115,35 +124,40 @@ void append_audio_meta(AVFormatContext *pFormatCtx, document_t *doc) {
         for (; *key; ++key) *key = (char) tolower(*key);
 
         if (strcmp(tag->key, "artist") == 0) {
-            size_t len = strlen(tag->value);
-            meta_line_t *meta_tag = malloc(sizeof(meta_line_t) + len);
-            meta_tag->key = MetaArtist;
-            memcpy(meta_tag->strval, tag->value, len);
-            APPEND_META(doc, meta_tag)
+            APPEND_TAG_META(doc, tag, MetaArtist)
         } else if (strcmp(tag->key, "genre") == 0) {
-            size_t len = strlen(tag->value);
-            meta_line_t *meta_tag = malloc(sizeof(meta_line_t) + len);
-            meta_tag->key = MetaGenre;
-            memcpy(meta_tag->strval, tag->value, len);
-            APPEND_META(doc, meta_tag)
+            APPEND_TAG_META(doc, tag, MetaGenre)
         } else if (strcmp(tag->key, "title") == 0) {
-            size_t len = strlen(tag->value);
-            meta_line_t *meta_tag = malloc(sizeof(meta_line_t) + len);
-            meta_tag->key = MetaTitle;
-            memcpy(meta_tag->strval, tag->value, len);
-            APPEND_META(doc, meta_tag)
+            APPEND_TAG_META(doc, tag, MetaTitle)
         } else if (strcmp(tag->key, "album_artist") == 0) {
-            size_t len = strlen(tag->value);
-            meta_line_t *meta_tag = malloc(sizeof(meta_line_t) + len);
-            meta_tag->key = MetaAlbumArtist;
-            memcpy(meta_tag->strval, tag->value, len);
-            APPEND_META(doc, meta_tag)
+            APPEND_TAG_META(doc, tag, MetaAlbumArtist)
         } else if (strcmp(tag->key, "album") == 0) {
-            size_t len = strlen(tag->value);
-            meta_line_t *meta_tag = malloc(sizeof(meta_line_t) + len);
-            meta_tag->key = MetaAlbum;
-            memcpy(meta_tag->strval, tag->value, len);
-            APPEND_META(doc, meta_tag)
+            APPEND_TAG_META(doc, tag, MetaAlbum)
+        }
+    }
+}
+
+void append_video_meta(AVFormatContext *pFormatCtx, document_t *doc, int include_audio_tags) {
+
+    meta_line_t *meta_duration = malloc(sizeof(meta_line_t));
+    meta_duration->key = MetaMediaDuration;
+    meta_duration->longval = pFormatCtx->duration / AV_TIME_BASE;
+    APPEND_META(doc, meta_duration)
+
+    meta_line_t *meta_bitrate = malloc(sizeof(meta_line_t));
+    meta_bitrate->key = MetaMediaBitrate;
+    meta_bitrate->intval = pFormatCtx->bit_rate;
+    APPEND_META(doc, meta_bitrate)
+
+    AVDictionaryEntry *tag = NULL;
+    while ((tag = av_dict_get(pFormatCtx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
+        char *key = tag->key;
+        for (; *key; ++key) *key = (char) tolower(*key);
+
+        if (strcmp(tag->key, "title") == 0 && include_audio_tags) {
+            APPEND_TAG_META(doc, tag, MetaTitle)
+        } else if (strcmp(tag->key, "comment") == 0) {
+            APPEND_TAG_META(doc, tag, MetaContent)
         }
     }
 }
@@ -207,15 +221,7 @@ void parse_media(const char *filepath, document_t *doc) {
 
         if (stream->nb_frames > 1) {
             //This is a video (not a still image)
-            meta_line_t *meta_duration = malloc(sizeof(meta_line_t));
-            meta_duration->key = MetaMediaDuration;
-            meta_duration->longval = pFormatCtx->duration / AV_TIME_BASE;
-            APPEND_META(doc, meta_duration)
-
-            meta_line_t *meta_bitrate = malloc(sizeof(meta_line_t));
-            meta_bitrate->key = MetaMediaBitrate;
-            meta_bitrate->intval = pFormatCtx->bit_rate;
-            APPEND_META(doc, meta_bitrate)
+            append_video_meta(pFormatCtx, doc, audio_stream == -1);
         }
 
         if (stream->codecpar->width <= 20 || stream->codecpar->height <= 20) {

src/util.c

@@ -89,6 +89,14 @@ void text_buffer_terminate_string(text_buffer_t *buf) {
     dyn_buffer_write_char(&buf->dyn_buffer, '\0');
 }
 
+int text_buffer_append_string(text_buffer_t *buf, char * str) {
+    char * ptr = str;
+    while (*ptr) {
+        text_buffer_append_char(buf, *ptr++);
+    }
+    text_buffer_terminate_string(buf);
+}
+
 int text_buffer_append_char(text_buffer_t *buf, int c) {
 
     if (SHOULD_IGNORE_CHAR(c)) {

src/util.h

@@ -56,6 +56,7 @@ text_buffer_t text_buffer_create(int max_size);
 
 void text_buffer_terminate_string(text_buffer_t *buf);
 
+int text_buffer_append_string(text_buffer_t *buf, char * str);
 int text_buffer_append_char(text_buffer_t *buf, int c);
 
 void incremental_put(GHashTable *table, unsigned long inode_no, int mtime);

web/css/dark.css

@@ -15,6 +15,8 @@ body {
     margin-top: 1em;
     background: #212121;
     color: #e0e0e0;
+    border-radius: 1px;
+    border: none;
 }
 
 .navbar-brand {

web/css/light.css

@@ -6,6 +6,7 @@ body {overflow-y:scroll;}
 
 .card {
     margin-top: 1em;
+    box-shadow: 0 .125rem .25rem rgba(0,0,0,.075) !important;
 }
 .navbar-brand {
     font-size: 1.75rem;
@@ -160,7 +161,7 @@ mark {
 .page-indicator {
     line-height: 1rem;
     padding: 0.5rem;
-    background: #212121;
+    background: #f8f9fa;
 }
 
 .btn-xs {

web/js/dom.js

@@ -82,7 +82,7 @@ function shouldPlayVideo(hit) {
  */
 function createDocCard(hit) {
     let docCard = document.createElement("div");
-    docCard.setAttribute("class", "card shadow-sm");
+    docCard.setAttribute("class", "card");
 
     let docCardBody = document.createElement("div");
     docCardBody.setAttribute("class", "card-body document");
@@ -257,7 +257,7 @@ function makePreloader() {
 
 function makePageIndicator(searchResult) {
     let pageIndicator = document.createElement("div");
-    pageIndicator.setAttribute("class", "page-indicator shadow-sm font-weight-light");
+    pageIndicator.setAttribute("class", "page-indicator font-weight-light");
     const totalHits = searchResult["hits"]["total"].hasOwnProperty("value")
         ? searchResult["hits"]["total"]["value"] : searchResult["hits"]["total"];
     pageIndicator.appendChild(document.createTextNode(docCount + " / " + totalHits));

web/js/search.js

@@ -23,7 +23,7 @@ jQuery["jsonPost"] = function (url, data) {
 
 window.onload = () => {
     $("#theme").on("click", () => {
-        if (document.cookie.length === 0) {
+        if (!document.cookie.includes("sist")) {
             document.cookie = "sist=dark";
         } else {
             document.cookie = "sist=; Max-Age=-99999999;";
@@ -116,7 +116,7 @@ $.jsonPost("es", {
 new autoComplete({
     selector: '#pathBar',
     minChars: 1,
-    delay: 75,
+    delay: 400,
     renderItem: function (item) {
         return '<div class="autocomplete-suggestion" data-val="' + item + '">' + item + '</div>';
     },
@@ -279,14 +279,6 @@ function search() {
         //Search stats
         searchResults.appendChild(makeStatsCard(searchResult));
 
-        //Autocomplete
-        if (searchResult.hasOwnProperty("suggest") && searchResult["suggest"].hasOwnProperty("path")) {
-            pathAutoComplete = [];
-            for (let i = 0; i < searchResult["suggest"]["path"][0]["options"].length; i++) {
-                pathAutoComplete.push(searchResult["suggest"]["path"][0]["options"][i].text)
-            }
-        }
-
         //Setup page
         let resultContainer = makeResultContainer();
         searchResults.appendChild(resultContainer);
@@ -298,7 +290,6 @@ function search() {
     });
 }
 
-let pathAutoComplete = [];
 let size_min = 0;
 let size_max = 10000000000000;
 
@@ -306,8 +297,8 @@ let searchDebounced = _.debounce(function () {
     coolingDown = false;
     search()
 }, 500);
+
 searchBar.addEventListener("keyup", searchDebounced);
-document.getElementById("pathBar").addEventListener("keyup", searchDebounced);
 
 //Size slider
 $("#sizeSlider").ionRangeSlider({
@@ -358,15 +349,18 @@ updateIndices();
 //Suggest
 function getPathChoices() {
     return new Promise(getPaths => {
-
-        let xhttp = new XMLHttpRequest();
-        xhttp.onreadystatechange = function () {
-            if (this.readyState === 4 && this.status === 200) {
-                getPaths(JSON.parse(xhttp.responseText))
+        $.jsonPost("es", {
+            suggest: {
+                path: {
+                    prefix: pathBar.value,
+                    completion: {
+                        field: "suggest-path",
+                        skip_duplicates: true,
+                        size: 10000
+                    }
+                }
             }
-        };
-        xhttp.open("GET", "suggest?prefix=" + pathBar.value, true);
-        xhttp.send();
-    });
+        }).then(resp => getPaths(resp["suggest"]["path"][0]["options"].map(opt => opt["_source"]["path"])));
+    })
 }