text_buffer bug fixes & Sort option

scripts/index_static.py

@@ -14,4 +14,5 @@ def clean(filepath):
 for file in files:
     with open(file, "r") as f:
         data = json.dumps(json.load(f), separators=(",", ":")).encode()
+    data += b'\0'
     print("char %s[%d] = {%s};" % (clean(file), len(data), ",".join(str(int(b)) for b in data)))

src/index/elastic.c

@@ -116,7 +116,7 @@ void *create_bulk_buffer(int max, int *count, size_t *buf_len) {
     return buf;
 }
 
-void *print_errors(response_t *r) {
+void print_errors(response_t *r) {
     char * tmp = malloc(r->size + 1);
     memcpy(tmp, r->body, r->size);
     *(tmp + r->size) = '\0';

src/main.c

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

src/util.h

@@ -114,7 +114,7 @@ static void grow_buffer_small(dyn_buffer_t *buf) {
 }
 
 __always_inline
-static void dyn_buffer_write(dyn_buffer_t *buf, void *data, size_t size) {
+static void dyn_buffer_write(dyn_buffer_t *buf, const void *data, size_t size) {
     grow_buffer(buf, size);
 
     memcpy(buf->buf + buf->cur, data, size);
@@ -251,8 +251,17 @@ static int text_buffer_append_string(text_buffer_t *buf, const char *str, size_t
         return 0;
     }
 
+    if (len <= 4) {
+        for (int i = 0; i < len; i++) {
+            if (((utf8_int32_t)0xffffff80 & str[i]) == 0) {
+                dyn_buffer_write_char(&buf->dyn_buffer, str[i]);
+            }
+        }
+        return 0;
+    }
+
     utf8_int32_t c;
-    char tmp[4];
+    char tmp[16];
 
     do {
         ptr = utf8codepoint(ptr, &c);

src/web/serve.c

@@ -244,6 +244,16 @@ int search(UNUSED(void *p), onion_request *req, onion_response *res) {
         onion_response_write(res, r->body, r->size);
     } else {
         sist_log("serve.c", SIST_WARNING, "ElasticSearch error during query");
+        if (r->size != 0) {
+            char * tmp = malloc(r->size + 1);
+            memcpy(tmp, r->body, r->size);
+            *(tmp + r->size) = '\0';
+            cJSON *json = cJSON_Parse(tmp);
+            char *json_str = cJSON_Print(json);
+            sist_log("serve.c", SIST_WARNING, json_str);
+            free(json_str);
+            free(tmp);
+        }
         onion_response_set_code(res, HTTP_INTERNAL_ERROR);
     }
 

web/css/dark.css

@@ -37,6 +37,7 @@
     color: #BBB;
     text-overflow: ellipsis;
     overflow: hidden;
+    white-space: nowrap;
 }
 
 a {
@@ -221,23 +222,21 @@ body {
     width: 100%;
 }
 
-@media (min-width: 1200px) {
-    .card-columns {
-        column-count: 4;
-    }
-}
-
-@media (min-width: 1500px) {
+@media screen and (min-width: 1500px) {
     .container {
         max-width: 1440px;
     }
 
-    .card-columns {
-        column-count: 5;
+    .bricklayer-column-sizer {
+        width: 20% !important;
+    }
+
+    .bricklayer-column {
+        max-width: 20%;
     }
 }
 
-@media (min-width: 1800px) {
+@media screen and (min-width: 1800px) {
     .container {
         max-width: 1550px;
     }
@@ -411,7 +410,7 @@ option {
     max-height: 250px;
 }
 
-@media (max-width: 600px) {
+@media (max-width: 650px) {
     .media-expanded .fit {
         max-height: none;
     }

web/css/light.css

@@ -36,6 +36,7 @@
     color: #444;
     text-overflow: ellipsis;
     overflow: hidden;
+    white-space: nowrap;
 }
 
 body {
@@ -48,7 +49,9 @@ body {
 
 .card {
     margin-top: 1em;
-    box-shadow: 0 .125rem .25rem rgba(0, 0, 0, .075) !important;
+    box-shadow: 0 .125rem .25rem rgba(0, 0, 0, .08) !important;
+    border-radius: 0;
+    border: none;
 }
 
 .sub-document {
@@ -158,23 +161,22 @@ body {
     width: 100%;
 }
 
-@media (min-width: 1200px) {
-    .card-columns {
-        column-count: 4;
-    }
-}
 
-@media (min-width: 1500px) {
+@media screen and (min-width: 1500px) {
     .container {
         max-width: 1440px;
     }
 
-    .card-columns {
-        column-count: 5;
+    .bricklayer-column-sizer {
+        width: 20% !important;
+    }
+
+    .bricklayer-column {
+        max-width: 20%;
     }
 }
 
-@media (min-width: 1800px) {
+@media screen and (min-width: 1800px) {
     .container {
         max-width: 1550px;
     }
@@ -272,7 +274,7 @@ mark {
     max-height: 250px;
 }
 
-@media (max-width: 600px) {
+@media (max-width: 650px) {
     .media-expanded .fit {
         max-height: none;
     }

web/js/bricklayer.min.js

@@ -0,0 +1 @@
+!function t(e,n,r){function o(s,u){if(!n[s]){if(!e[s]){var l="function"==typeof require&&require;if(!u&&l)return l(s,!0);if(i)return i(s,!0);var a=new Error("Cannot find module '"+s+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[s]={exports:{}};e[s][0].call(p.exports,function(t){var n=e[s][1][t];return o(n?n:t)},p,p.exports,t,e,n,r)}return n[s].exports}for(var i="function"==typeof require&&require,s=0;s<r.length;s++)o(r[s]);return o}({1:[function(t,e,n){var r,o=this&&this.__extends||function(t,e){function n(){this.constructor=t}for(var r in e)e.hasOwnProperty(r)&&(t[r]=e[r]);t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)};!function(t){function e(t){return[].slice.call(t)}function n(t,e,n){if(window.CustomEvent)var r=new CustomEvent(e,{detail:n});else{var r=document.createEvent("CustomEvent");r.initCustomEvent(e,!0,!0,n)}return t.dispatchEvent(r)}var r={rulerClassName:"bricklayer-column-sizer",columnClassName:"bricklayer-column"},i=function(){function t(t){this.element=document.createElement("div"),this.element.className=t}return t.prototype.destroy=function(){this.element.parentNode.removeChild(this.element)},t}(),s=function(t){function e(){t.apply(this,arguments)}return o(e,t),e.prototype.getWidth=function(){this.element.setAttribute("style","\n        display: block;\n        visibility: hidden !important;\n        top: -1000px !important;\n      ");var t=this.element.offsetWidth;return this.element.removeAttribute("style"),t},e}(i),u=function(t){function e(){t.apply(this,arguments)}return o(e,t),e}(i),l=function(){function t(t,e){void 0===e&&(e=r),this.element=t,this.options=e,this.build(),this.buildResponsive()}return t.prototype.append=function(t){var n=this;if(Array.isArray(t))return void t.forEach(function(t){return n.append(t)});var r=this.findMinHeightColumn();this.elements=e(this.elements).concat([t]),this.applyPosition("append",r,t)},t.prototype.prepend=function(t){var n=this;if(Array.isArray(t))return void t.forEach(function(t){return n.prepend(t)});var r=this.findMinHeightColumn();this.elements=[t].concat(e(this.elements)),this.applyPosition("prepend",r,t)},t.prototype.on=function(t,e){return this.element.addEventListener("bricklayer."+t,e),this},t.prototype.redraw=function(){var t=this.columnCount;this.checkColumnCount(!1),this.reorderElements(t),n(this.element,"bricklayer.redraw",{columnCount:t})},t.prototype.destroy=function(){var t=this;this.ruler.destroy(),e(this.elements).forEach(function(e){return t.element.appendChild(e)}),e(this.getColumns()).forEach(function(t){return t.parentNode.removeChild(t)}),n(this.element,"bricklayer.destroy",{})},t.prototype.build=function(){this.ruler=new s(this.options.rulerClassName),this.elements=this.getElementsInOrder(),this.element.insertBefore(this.ruler.element,this.element.firstChild)},t.prototype.buildResponsive=function(){var t=this;window.addEventListener("resize",function(e){return t.checkColumnCount()}),this.checkColumnCount(),this.on("breakpoint",function(e){return t.reorderElements(e.detail.columnCount)}),this.columnCount>=1&&this.reorderElements(this.columnCount)},t.prototype.getColumns=function(){return this.element.querySelectorAll(":scope > ."+this.options.columnClassName)},t.prototype.findMinHeightColumn=function(){var t=e(this.getColumns()),n=t.map(function(t){return t.offsetHeight}),r=Math.min.apply(null,n);return t[n.indexOf(r)]},t.prototype.getElementsInOrder=function(){return this.element.querySelectorAll(":scope > *:not(."+this.options.columnClassName+"):not(."+this.options.rulerClassName+")")},t.prototype.checkColumnCount=function(t){void 0===t&&(t=!0);var e=this.getColumnCount();this.columnCount!==e&&(t&&n(this.element,"bricklayer.breakpoint",{columnCount:e}),this.columnCount=e)},t.prototype.reorderElements=function(t){var n=this;void 0===t&&(t=1),(t==1/0||1>t)&&(t=1);for(var r=e(this.elements).map(function(t){var e=t.parentNode?t.parentNode.removeChild(t):t;return e}),o=this.getColumns(),i=0;i<o.length;i++)o[i].parentNode.removeChild(o[i]);for(var i=0;t>i;i++){var s=new u(this.options.columnClassName).element;this.element.appendChild(s)}r.forEach(function(t){var e=n.findMinHeightColumn();e.appendChild(t)})},t.prototype.getColumnCount=function(){var t=this.element.offsetWidth,e=this.ruler.getWidth();return Math.round(t/e)},t.prototype.applyPosition=function(t,e,r){var o=this,i=function(i){var s=i+t.charAt(0).toUpperCase()+t.substr(1);n(o.element,"bricklayer."+s,{item:r,column:e})};switch(i("before"),t){case"append":e.appendChild(r);break;case"prepend":e.insertBefore(r,e.firstChild)}i("after")},t}();t.Container=l}(r||(r={})),function(t,n){"function"==typeof define&&define.amd?define(function(){return n()}):"undefined"!=typeof window&&t===window?t.Bricklayer=n():"object"==typeof e&&e.exports&&(e.exports=n())}("undefined"!=typeof window?window:this,function(){return r.Container})},{}]},{},[1]);

web/js/dom.js

@@ -447,6 +447,7 @@ function createDocLine(hit) {
     let link = document.createElement("a");
     link.setAttribute("href", "f/" + hit["_id"]);
     link.setAttribute("target", "_blank");
+    link.style.maxWidth = "calc(100% - 1.2rem)";
     link.appendChild(title);
 
     const titleDiv = document.createElement("div");
@@ -463,6 +464,9 @@ function createDocLine(hit) {
     let thumbnail = makeThumbnail(mimeCategory, hit, imgWrapper, true);
     if (thumbnail) {
         media.appendChild(imgWrapper);
+        titleDiv.style.maxWidth = "calc(100% - 64px)";
+    } else {
+        titleDiv.style.maxWidth = "100%";
     }
     media.appendChild(titleDiv);
 
@@ -530,6 +534,14 @@ function makeStatsCard(searchResult) {
     let statsCardBody = document.createElement("div");
     statsCardBody.setAttribute("class", "card-body");
 
+    // Stats
+    let stat = document.createElement("span");
+    const totalHits = searchResult["aggregations"]["total_count"]["value"];
+    stat.appendChild(document.createTextNode(totalHits + " results in " + searchResult["took"] + "ms"));
+
+    statsCardBody.appendChild(stat);
+
+    // Display mode
     const resultMode = document.createElement("div");
     resultMode.setAttribute("class", "btn-group btn-group-toggle");
     resultMode.setAttribute("data-toggle", "buttons");
@@ -537,11 +549,13 @@ function makeStatsCard(searchResult) {
 
     const listMode = document.createElement("label");
     listMode.setAttribute("class", "btn btn-primary");
-    listMode.appendChild(document.createTextNode("List"));
+    listMode.setAttribute("title", "List mode");
+    listMode.innerHTML = '<svg width="20px" height="20px" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"></path></svg>';
 
     const gridMode = document.createElement("label");
     gridMode.setAttribute("class", "btn btn-primary");
-    gridMode.appendChild(document.createTextNode("Grid"));
+    gridMode.setAttribute("title", "Grid mode");
+    gridMode.innerHTML = '<svg width="20px" height="20px" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M149.333 56v80c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V56c0-13.255 10.745-24 24-24h101.333c13.255 0 24 10.745 24 24zm181.334 240v-80c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.256 0 24.001-10.745 24.001-24zm32-240v80c0 13.255 10.745 24 24 24H488c13.255 0 24-10.745 24-24V56c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24zm-32 80V56c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.256 0 24.001-10.745 24.001-24zm-205.334 56H24c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24zM0 376v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H24c-13.255 0-24 10.745-24 24zm386.667-56H488c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24zm0 160H488c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H386.667c-13.255 0-24 10.745-24 24v80c0 13.255 10.745 24 24 24zM181.333 376v80c0 13.255 10.745 24 24 24h101.333c13.255 0 24-10.745 24-24v-80c0-13.255-10.745-24-24-24H205.333c-13.255 0-24 10.745-24 24z"></path></svg>';
 
     resultMode.appendChild(gridMode);
     resultMode.appendChild(listMode);
@@ -553,12 +567,8 @@ function makeStatsCard(searchResult) {
     }
 
     gridMode.addEventListener("click", () => {
-        console.log("what");
-        console.log(CONF.options);
         CONF.options.display = "grid";
-        console.log(CONF.options);
         CONF.save();
-        console.log(CONF.options);
         searchDebounced();
     });
     listMode.addEventListener("click", () => {
@@ -567,13 +577,46 @@ function makeStatsCard(searchResult) {
         searchDebounced();
     });
 
-    let stat = document.createElement("span");
-    const totalHits = searchResult["aggregations"]["total_count"]["value"];
-    stat.appendChild(document.createTextNode(totalHits + " results in " + searchResult["took"] + "ms"));
-
-    statsCardBody.appendChild(stat);
     statsCardBody.appendChild(resultMode);
 
+    // Sort mode
+    const sortMode = document.createElement("div");
+    sortMode.setAttribute("class", "dropdown");
+    sortMode.style.cssFloat = "right";
+    sortMode.style.marginRight = "10px";
+
+    const sortModeBtn = document.createElement("button");
+    sortModeBtn.setAttribute("class", "btn btn-md btn-primary dropdown-toggle");
+    sortModeBtn.setAttribute("id", "sortModeBtn");
+    sortModeBtn.setAttribute("type", "button");
+    sortModeBtn.setAttribute("data-toggle", "dropdown");
+    sortModeBtn.setAttribute("aria-haspopup", "true");
+    sortModeBtn.setAttribute("aria-expanded", "false");
+    sortModeBtn.setAttribute("title", "Sort options");
+    sortModeBtn.innerHTML = '<svg aria-hidden="true" width="20px" height="20px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path fill="currentColor" d="M41 288h238c21.4 0 32.1 25.9 17 41L177 448c-9.4 9.4-24.6 9.4-33.9 0L24 329c-15.1-15.1-4.4-41 17-41zm255-105L177 64c-9.4-9.4-24.6-9.4-33.9 0L24 183c-15.1 15.1-4.4 41 17 41h238c21.4 0 32.1-25.9 17-41z"></path></svg>';
+
+    const sortModeMenu = document.createElement("div");
+    sortModeMenu.setAttribute("class", "dropdown-menu");
+    sortModeMenu.setAttribute("aria-labelledby", "sortModeBtn");
+
+    Object.keys(SORT_MODES).forEach(mode => {
+        const item = document.createElement("div");
+        item.setAttribute("class", "dropdown-item");
+        item.appendChild(document.createTextNode(SORT_MODES[mode].text));
+        sortModeMenu.appendChild(item);
+
+        item.onclick = function() {
+            CONF.options.sort = mode;
+            CONF.save();
+            searchDebounced();
+        };
+    });
+
+    sortMode.appendChild(sortModeBtn);
+    sortMode.appendChild(sortModeMenu);
+
+    statsCardBody.appendChild(sortMode);
+
     if (totalHits !== 0) {
         let sizeStat = document.createElement("div");
         sizeStat.appendChild(document.createTextNode(humanFileSize(searchResult["aggregations"]["total_size"]["value"])));
@@ -589,7 +632,7 @@ function makeResultContainer() {
     let resultContainer = document.createElement("div");
 
     if (CONF.options.display === "grid") {
-        resultContainer.setAttribute("class", "card-columns");
+        resultContainer.setAttribute("class", "bricklayer");
     } else {
         resultContainer.setAttribute("class", "list-group");
     }

web/js/search.js

@@ -25,9 +25,49 @@ const CONF = new Settings();
 const _defaults = {
     display: "grid",
     fuzzy: true,
-    highlight: true
+    highlight: true,
+    sort: "score"
 };
 
+SORT_MODES = {
+    score: {
+        text: "Relevance",
+        mode: [
+            {_score: {order: "desc"}},
+            {_tie: {order: "asc"}}
+        ],
+        key: hit => hit["_score"]
+    },
+    date_asc: {
+        text: "Date (Ascending)", mode: [
+            {mtime: {order: "asc"}},
+            {_tie: {order: "asc"}}
+        ],
+        key: hit => hit["_source"]["mtime"]
+    },
+    date_desc: {
+        text: "Date (Descending)", mode: [
+            {mtime: {order: "desc"}},
+            {_tie: {order: "asc"}}
+        ],
+        key: hit => hit["_source"]["mtime"]
+    },
+    size_asc: {
+        text: "Size (Ascending)", mode: [
+            {size: {order: "asc"}},
+            {_tie: {order: "asc"}}
+        ],
+        key: hit => hit["_source"]["size"]
+    },
+    size_desc: {
+        text: "Size (Descending)", mode: [
+            {size: {order: "desc"}},
+            {_tie: {order: "asc"}}
+        ],
+        key: hit => hit["_source"]["size"]
+    },
+}
+
 function Settings() {
     this.options = {};
 
@@ -254,7 +294,8 @@ function insertHits(resultContainer, hits) {
     for (let i = 0; i < hits.length; i++) {
 
         if (CONF.options.display === "grid") {
-            resultContainer.appendChild(createDocCard(hits[i]));
+            console.log(resultContainer._brick)
+            resultContainer._brick.append(createDocCard(hits[i]));
         } else {
             resultContainer.appendChild(createDocLine(hits[i]));
         }
@@ -371,10 +412,7 @@ function search(after = null) {
                 filter: filters
             }
         },
-        "sort": [
-            {"_score": {"order": "desc"}},
-            {"_tie": {"order": "asc"}}
-        ],
+        "sort": SORT_MODES[CONF.options.sort].mode,
         aggs:
             {
                 total_size: {"sum": {"field": "size"}},
@@ -384,7 +422,7 @@ function search(after = null) {
     };
 
     if (after) {
-        q.search_after = [after["_score"], after["_id"]];
+        q.search_after = [SORT_MODES[CONF.options.sort].key(after), after["_id"]];
     }
 
     if (CONF.options.highlight) {
@@ -419,6 +457,10 @@ function search(after = null) {
         let resultContainer = makeResultContainer();
         searchResults.appendChild(resultContainer);
 
+        if (CONF.options.display === "grid") {
+            resultContainer._brick = new Bricklayer(resultContainer);
+        }
+
         window.setTimeout(() => {
             $(".sp").SmartPhoto({animationSpeed: 0, swipeTopToClose: true, showAnimation: false, forceInterval: 50});
         }, 100);
@@ -622,13 +664,6 @@ function createPathTree(target) {
     });
 
     pathTree.on("node.click", handlePathTreeClick(pathTree));
-
-    const button = document.querySelector("#pathBarHelper")
-    const tooltip = document.querySelector("#pathTreeTooltip")
-    Popper.createPopper(button, tooltip, {
-        trigger: "click",
-        placement: "right",
-    });
 }
 
 function updateSettings() {

web/search.html

@@ -11,7 +11,7 @@
 
 <nav class="navbar navbar-expand-lg">
     <a class="navbar-brand" href="/">sist2</a>
-    <span class="badge badge-pill version">v1.3.3</span>
+    <span class="badge badge-pill version">v1.3.4</span>
     <span class="tagline">Lightning-fast file system indexer and search tool </span>
     <button style="margin-left: auto" class="btn" type="button" data-toggle="modal" data-target="#settings" onclick="loadSettings()">Settings</button>
     <a id="theme" class="btn" title="Toggle theme" href="/">Theme</a>