README.md

@@ -50,8 +50,7 @@ sist2 (Simple incremental search tool)
         ```
 1. Download sist2 executable
     1. Download the [latest sist2 release](https://github.com/simon987/sist2/releases) *
-    1. *(or)* Download a [development snapshot](https://files.simon987.net/.gate/sist2/simon987_sist2/) *(Not
-       recommended!)*
+    1. *(or)* Download a [development snapshot](https://files.simon987.net/.gate/sist2/simon987_sist2/) *(Not recommended!)*
     1. *(or)* `docker pull simon987/sist2:2.11.2-x64-linux`
 
 1. See [Usage guide](docs/USAGE.md)
@@ -71,20 +70,19 @@ See [Usage guide](docs/USAGE.md) for more details
 File type | Library | Content | Thumbnail | Metadata
 :---|:---|:---|:---|:---
 pdf,xps,fb2,epub | MuPDF | text+ocr | yes | author, title |
-cbz,cbr | [libscan](https://github.com/simon987/libscan) | - | yes | - |
+cbz,cbr | *(none)* | - | yes | - |
 `audio/*` | ffmpeg | - | yes | ID3 tags |
 `video/*` | ffmpeg | - | yes | title, comment, artist |
 `image/*` | ffmpeg | - | yes | [Common EXIF tags](https://github.com/simon987/sist2/blob/efdde2734eca9b14a54f84568863b7ffd59bdba3/src/parsing/media.c#L190), GPS tags |
 raw, rw2, dng, cr2, crw, dcr, k25, kdc, mrw, pef, xf3, arw, sr2, srf, erf  | LibRaw | - | yes | Common EXIF tags, GPS tags |
 ttf,ttc,cff,woff,fnt,otf | Freetype2 | - | yes, `bmp` | Name & style |
-`text/plain` | [libscan](https://github.com/simon987/libscan) | yes | no | - |
-html, xml | [libscan](https://github.com/simon987/libscan) | yes | no | - |
+`text/plain` | *(none)* | yes | no | - |
+html, xml | *(none)* | yes | no | - |
 tar, zip, rar, 7z, ar ...  | Libarchive | yes\* | - | no |
-docx, xlsx, pptx | [libscan](https://github.com/simon987/libscan) | yes | if embedded | creator, modified_by, title |
+docx, xlsx, pptx | *(none)* | yes | if embedded | creator, modified_by, title |
 doc (MS Word 97-2003) | antiword | yes | yes | author, title |
 mobi, azw, azw3 | libmobi | yes | no | author, title |
 wpd (WordPerfect) | libwpd | yes | no | *planned* |
-json, jsonl, ndjson | [libscan](https://github.com/simon987/libscan) | yes | - | - |
 
 \* *See [Archive files](#archive-files)*
 
@@ -137,7 +135,7 @@ docker run --rm my-sist2-image cat /root/sist2 > sist2-x64-linux
    ```bash
    apt install gcc g++ python3 yasm ragel automake autotools-dev wget libtool libssl-dev curl zip unzip tar xorg-dev libglu1-mesa-dev libxcursor-dev libxml2-dev libxinerama-dev gettext nasm git
    ```
-
+   
 1. Apply vcpkg patches, as per [sist2-build](https://github.com/simon987/sist2-build) Dockerfile
 
 1. Install vcpkg dependencies

docs/USAGE.md

@@ -49,7 +49,6 @@ Scan options
     --mem-buffer=<int>            Maximum memory buffer size per thread in MB for files inside archives (see USAGE.md). DEFAULT: 2000
     --read-subtitles              Read subtitles from media files.
     --fast-epub                   Faster but less accurate EPUB parsing (no thumbnails, metadata)
-    --checksums                   Calculate file checksums when scanning.
 
 Index options
     -t, --threads=<int>           Number of threads. DEFAULT=1
@@ -130,9 +129,6 @@ Exec-script options
     To check if a media file can be parsed without *seek*, execute `cat file.mp4 | ffprobe -`
 * `--read-subtitles` When enabled, will attempt to read the subtitles stream from media files.
 * `--fast-epub` Much faster but less accurate EPUB parsing. When enabled, sist2 will use a simple HTML parser to read epub files instead of the MuPDF library. No thumbnails are generated and author/title metadata are not parsed.
-* `--checksums` Calculate file checksums (sha1) when scanning files. This option does not cause any additional read 
-  operations. Checksums are not calculated for all file types, unless the file is inside an archive. When enabled, duplicate
-  files are hidden in the web UI (this behaviour can be toggled in the Configuration page).
 
 ### Scan examples
 

sist2-vue/package-lock.json

@@ -23,6 +23,7 @@
         "vue-color": "^2.8.1",
         "vue-i18n": "^8.24.4",
         "vue-masonry-wall": "^0.3.2",
+        "vue-multiselect": "^2.1.6",
         "vue-router": "^3.2.0",
         "vue-simple-suggest": "^1.11.1",
         "vuex": "^3.4.0"
@@ -13603,6 +13604,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/vue-multiselect": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.6.tgz",
+      "integrity": "sha512-s7jmZPlm9FeueJg1RwJtnE9KNPtME/7C8uRWSfp9/yEN4M8XcS/d+bddoyVwVnvFyRh9msFo0HWeW0vTL8Qv+w==",
+      "engines": {
+        "node": ">= 4.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
     "node_modules/vue-observe-visibility": {
       "version": "0.4.6",
       "resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz",
@@ -26366,6 +26376,11 @@
         "vue-observe-visibility": "^0.4.6"
       }
     },
+    "vue-multiselect": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.6.tgz",
+      "integrity": "sha512-s7jmZPlm9FeueJg1RwJtnE9KNPtME/7C8uRWSfp9/yEN4M8XcS/d+bddoyVwVnvFyRh9msFo0HWeW0vTL8Qv+w=="
+    },
     "vue-observe-visibility": {
       "version": "0.4.6",
       "resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz",

sist2-vue/package.json

@@ -22,6 +22,7 @@
     "vue-color": "^2.8.1",
     "vue-i18n": "^8.24.4",
     "vue-masonry-wall": "^0.3.2",
+    "vue-multiselect": "^2.1.6",
     "vue-router": "^3.2.0",
     "vue-simple-suggest": "^1.11.1",
     "vuex": "^3.4.0"

sist2-vue/src/components/IndexPicker.vue

@@ -1,95 +1,93 @@
 <template>
-  <div v-if="isMobile">
-    <b-form-select
-        :value="selectedIndicesIds"
-        @change="onSelect($event)"
-        :options="indices" multiple :select-size="6" text-field="name"
-        value-field="id"></b-form-select>
-  </div>
-  <div v-else>
-    <b-list-group id="index-picker-desktop">
-      <b-list-group-item
-          v-for="idx in indices"
-          @click="toggleIndex(idx)"
-          class="d-flex justify-content-between align-items-center list-group-item-action pointer">
-        <div class="d-flex">
-          <b-checkbox @change="toggleIndex(idx)" :checked="isSelected(idx)"></b-checkbox>
-          {{ idx.name }}
-          <span class="text-muted timestamp-text ml-2">{{ formatIdxDate(idx.timestamp) }}</span>
-        </div>
-        <b-badge class="version-badge">v{{ idx.version }}</b-badge>
-      </b-list-group-item>
-    </b-list-group>
-  </div>
+  <VueMultiselect
+      multiple
+      label="name"
+      :value="selectedIndices"
+      :options="indices"
+      :close-on-select="indices.length <= 1"
+      :placeholder="$t('indexPickerPlaceholder')"
+      @select="addItem"
+      @remove="removeItem">
+
+    <template slot="option" slot-scope="idx">
+      <b-row>
+        <b-col>
+          <span class="mr-1">{{ idx.option.name }}</span>
+          <SmallBadge pill :text="idx.option.version"></SmallBadge>
+        </b-col>
+      </b-row>
+      <b-row class="mt-1">
+        <b-col>
+          <span>{{ formatIdxDate(idx.option.timestamp) }}</span>
+        </b-col>
+      </b-row>
+    </template>
+
+  </VueMultiselect>
 </template>
 
 <script lang="ts">
+import VueMultiselect from "vue-multiselect"
 import SmallBadge from "./SmallBadge.vue"
 import {mapActions, mapGetters} from "vuex";
+import {Index} from "@/Sist2Api";
 import Vue from "vue";
 import {format} from "date-fns";
 
 export default Vue.extend({
   components: {
+    VueMultiselect,
     SmallBadge
   },
   data() {
     return {
-      loading: true,
+      loading: true
     }
   },
   computed: {
     ...mapGetters([
       "indices", "selectedIndices"
     ]),
-    selectedIndicesIds() {
-      return this.selectedIndices.map(idx => idx.id)
-    },
-    isMobile() {
-      return window.innerWidth <= 650;
-    }
   },
   methods: {
     ...mapActions({
       setSelectedIndices: "setSelectedIndices"
     }),
-    onSelect(value) {
-      this.setSelectedIndices(this.indices.filter(idx => value.includes(idx.id)));
+    removeItem(val: Index): void {
+      this.setSelectedIndices(this.selectedIndices.filter((item: Index) => item !== val))
+    },
+    addItem(val: Index): void {
+      this.setSelectedIndices([...this.selectedIndices, val])
     },
     formatIdxDate(timestamp: number): string {
       return format(new Date(timestamp * 1000), "yyyy-MM-dd");
-    },
-    toggleIndex(index) {
-      if (this.isSelected(index)) {
-        this.setSelectedIndices(this.selectedIndices.filter(idx => idx.id != index.id));
-      } else {
-        this.setSelectedIndices([index, ...this.selectedIndices]);
-      }
-    },
-    isSelected(index) {
-      return this.selectedIndices.find(idx => idx.id == index.id) != null;
     }
   },
 })
 </script>
 
-<style scoped>
-.timestamp-text {
-  line-height: 24px;
-  font-size: 80%;
+<style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
+
+<style>
+.multiselect__option {
+  padding: 5px 10px;
 }
 
-.version-badge {
-  color: #222 !important;
-  background: none;
+.multiselect__content-wrapper {
+  overflow: hidden;
 }
 
-.list-group-item {
-  padding: 0.2em 0.4em;
+.theme-black .multiselect__tags {
+  background: #37474F;
+  border: 1px solid #616161 !important
 }
 
-#index-picker-desktop {
-  overflow-y: auto;
-  max-height: 132px;
+.theme-black .multiselect__input {
+  color: #dbdbdb;
+  background: #37474F;
+}
+
+.theme-black .multiselect__content-wrapper {
+  border: none
 }
 </style>

src/sist.h

@@ -51,7 +51,7 @@
 #include <ctype.h>
 #include "git_hash.h"
 
-#define VERSION "2.11.3"
+#define VERSION "2.11.2"
 static const char *const Version = VERSION;
 
 #ifndef SIST_PLATFORM