From a011b7e97bc9e640f2392df3a5c2879d17880056 Mon Sep 17 00:00:00 2001 From: simon987 Date: Tue, 9 Jun 2020 21:40:53 -0400 Subject: [PATCH] Fragment size setting --- src/main.c | 2 +- src/static/css/dark.css | 1 + src/static/css/light.css | 1 + src/static/js/dom.js | 10 ++-------- src/static/js/search.js | 3 +++ src/static/js/util.js | 5 ++++- src/static/search.html | 8 +++++++- src/static/stats.html | 16 +++++++++++----- src/web/static_generated.c | 12 ++++++------ 9 files changed, 36 insertions(+), 22 deletions(-) diff --git a/src/main.c b/src/main.c index 2326065..1cc3971 100644 --- a/src/main.c +++ b/src/main.c @@ -22,7 +22,7 @@ #define EPILOG "Made by simon987 . Released under GPL-3.0" -static const char *const Version = "2.4.1"; +static const char *const Version = "2.4.2"; static const char *const usage[] = { "sist2 scan [OPTION]... PATH", "sist2 index [OPTION]... INDEX", diff --git a/src/static/css/dark.css b/src/static/css/dark.css index c81565c..b947bb3 100644 --- a/src/static/css/dark.css +++ b/src/static/css/dark.css @@ -266,6 +266,7 @@ mark { margin: 3px; white-space: normal; color: rgb(224, 224, 224); + overflow: hidden; } .irs-single, .irs-from, .irs-to { diff --git a/src/static/css/light.css b/src/static/css/light.css index aff3f75..fa9e1e4 100644 --- a/src/static/css/light.css +++ b/src/static/css/light.css @@ -205,6 +205,7 @@ mark { margin: 3px; white-space: normal; color: #000; + overflow: hidden; } .irs-single, .irs-from, .irs-to { diff --git a/src/static/js/dom.js b/src/static/js/dom.js index dac18e3..d32412c 100644 --- a/src/static/js/dom.js +++ b/src/static/js/dom.js @@ -27,18 +27,12 @@ function gifOver(thumbnail, hit) { } function getContentHighlight(hit) { - const re = RegExp(//g); - - const sortByMathCount = (a, b) => { - return b.match(re).length - a.match(re).length; - }; - if (hit.hasOwnProperty("highlight")) { if (hit["highlight"].hasOwnProperty("content")) { - return hit["highlight"]["content"].sort(sortByMathCount)[0]; + return hit["highlight"]["content"][0]; } else if (hit["highlight"].hasOwnProperty("content.nGram")) { - return hit["highlight"]["content.nGram"].sort(sortByMathCount)[0]; + return hit["highlight"]["content.nGram"][0]; } } diff --git a/src/static/js/search.js b/src/static/js/search.js index e7d34cb..3516f67 100644 --- a/src/static/js/search.js +++ b/src/static/js/search.js @@ -417,6 +417,9 @@ function search(after = null) { q.highlight = { pre_tags: [""], post_tags: [""], + fragment_size: CONF.options.fragmentSize, + number_of_fragments: 1, + order: "score", fields: { content: {}, // "content.nGram": {}, diff --git a/src/static/js/util.js b/src/static/js/util.js index dab7df6..63b3d71 100644 --- a/src/static/js/util.js +++ b/src/static/js/util.js @@ -100,7 +100,8 @@ const _defaults = { treemapGroupingDepth: 3, treemapColor: "PuBuGn", treemapSize: "large", - suggestPath: true + suggestPath: true, + fragmentSize: 100 }; function loadSettings() { @@ -116,6 +117,7 @@ function loadSettings() { $("#settingTreemapSize").val(CONF.options.treemapSize); $("#settingTreemapType").val(CONF.options.treemapType); $("#settingSuggestPath").prop("checked", CONF.options.suggestPath); + $("#settingFragmentSize").val(CONF.options.fragmentSize); } function Settings() { @@ -158,6 +160,7 @@ function updateSettings() { CONF.options.treemapSize = $("#settingTreemapSize").val(); CONF.options.treemapType = $("#settingTreemapType").val(); CONF.options.suggestPath = $("#settingSuggestPath").prop("checked"); + CONF.options.fragmentSize = $("#settingFragmentSize").val(); CONF.save(); if (typeof searchDebounced !== "undefined") { diff --git a/src/static/search.html b/src/static/search.html index da5da49..ee5fa2a 100644 --- a/src/static/search.html +++ b/src/static/search.html @@ -11,7 +11,7 @@