.dockerignore

@@ -1,43 +0,0 @@
-.idea/
-*.sist2
-docs/
-test_i/
-test_i_inc/
-Testing/
-.drone.yml
-**/cmake_install.cmake
-**/CMakeCache.txt
-**/CMakeFiles/
-.cmake
-LICENSE
-Makefile
-**/*.md
-**/*.cbp
-VERSION
-**/node_modules/
-sist2-*-linux-debug
-sist2-*-linux
-sist2_debug
-sist2
-**/libscan-test-files
-**/scan_ub_test
-**/scan_a_test
-**/scan_test
-**/ext_ffmpeg
-**/ext_libmobi
-**/ext_libwpd
-**/core
-*.a
-tmp_scan/
-Dockerfile
-Dockerfile.arm64
-docker-compose.yml
-state.db
-*-journal
-build/
-__pycache__/
-sist2-vue/dist
-sist2-admin/frontend/dist
-*.fts
-.git
-third-party/libscan/third-party/ext_*/*

.drone.yml

@@ -1,108 +0,0 @@
-kind: pipeline
-type: docker
-name: amd64
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-  - name: submodules
-    image: alpine/git
-    commands:
-      - git submodule update --init --recursive
-  - name: docker
-    image: plugins/docker
-    depends_on:
-      - submodules
-    settings:
-      username:
-        from_secret: DOCKER_USER
-      password:
-        from_secret: DOCKER_PASSWORD
-      repo: sist2app/sist2
-      context: ./
-      dockerfile: ./Dockerfile
-      auto_tag: true
-      auto_tag_suffix: x64-linux
-      when:
-        event:
-          - tag
-  - name: build
-    image: sist2app/sist2-build
-    depends_on:
-    - submodules
-    commands:
-      - ./scripts/build.sh
-  - name: scp files
-    depends_on:
-      - build
-    image: appleboy/drone-scp
-    settings:
-      host:
-        from_secret: SSH_HOST
-      port:
-        from_secret: SSH_PORT
-      user:
-        from_secret: SSH_USER
-      key:
-        from_secret: SSH_KEY
-      target: ~/files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/
-      source:
-        - ./VERSION
-        - ./sist2-x64-linux
-        - ./sist2-x64-linux-debug
-
----
-kind: pipeline
-type: docker
-name: arm64
-
-platform:
-  arch: arm64
-
-steps:
-  - name: submodules
-    image: alpine/git
-    commands:
-      - git submodule update --init --recursive
-  - name: docker
-    image: plugins/docker
-    depends_on:
-      - submodules
-    settings:
-      username:
-        from_secret: DOCKER_USER
-      password:
-        from_secret: DOCKER_PASSWORD
-      repo: sist2app/sist2
-      context: ./
-      dockerfile: ./Dockerfile.arm64
-      auto_tag: true
-      auto_tag_suffix: arm64-linux
-      when:
-        event:
-          - tag
-  - name: build
-    image: sist2app/sist2-build-arm64
-    depends_on:
-      - submodules
-    commands:
-      - ./scripts/build_arm64.sh
-  - name: scp files
-    depends_on:
-      - build
-    image: appleboy/drone-scp
-    settings:
-      host:
-        from_secret: SSH_HOST
-      port:
-        from_secret: SSH_PORT
-      user:
-        from_secret: SSH_USER
-      key:
-        from_secret: SSH_KEY
-      target: ~/files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/arm_${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/
-      source:
-        - ./sist2-arm64-linux
-        - ./sist2-arm64-linux-debug

.gitattributes

@@ -0,0 +1,3 @@
+CMakeModules/* linguist-vendored
+web/js/*.min.js linguist-vendored
+web/css/*.min.css linguist-vendored

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,40 +0,0 @@
----
-name: "🐞 Bug Report"
-about: Submit a bug report 
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Device Information (please complete the following information):**
- - OS: `[e.g., Ubuntu 20.04, WSL2]`
- - Deployment: `[Linux, Linux ARM64 or Docker]`
- - Browser *(if relevant)*: `[e.g., chrome, safari]`
- - SIST2 Version: `[e.g., v2.9.0]`
- - Elasticsearch Version *(if relevant)* : ``
-
-**Command with arguments** 
-<!-- `ex: "scan ~/Documents -o ./i2 --threads 3 -q 1.0` -->
-
-**Describe the bug**
-<!-- A clear and concise description of what the bug is. -->
-
-**Steps To Reproduce**
-Please be specific!
-1. Go to '...'
-2. Click on '....'
-3. etc.
-
-**Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
-
-**Actual Behavior**
-<!-- A clear and concise description of what actually happens. -->
-
-**Screenshots**
-<!-- If applicable, add screenshots to help explain your problem. -->
-
-**Additional context**
-<!-- Add any other context about the problem here. If applicable, please include why you think the bug is occurring and/or troubleshooting you have already performed. -->
-<!-- If the issue is related to the `scan` module, please attach the files necessary to reproduce the error or email them to me[at]simon987.net. -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: SIST2 Documentation
-    url: https://github.com/simon987/sist2/blob/master/docs/USAGE.md
-    about: Check out the SIST2 documentation for answers to common questions

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,18 +0,0 @@
----
-name: "🚀 Feature Request"
-about: Suggest an idea for SIST2
-title: ''
-assignees: ''
-
----
-**Which SIST2 component is your Feature Request related to?**
-<!-- e.g., Scan, Index, or Web? -->
-
-**Is your feature request related to a problem? Please describe.**
-<!-- A clear and concise description of what the problem is. e.g., "I'm always frustrated when [...]" -->
-
-**What would you like to see happen?**
-<!-- A clear and concise description of what you want to happen. -->
-
-**Additional context**
-<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/issue-template.md

@@ -1,18 +0,0 @@
----
-name: Issue template
-about: General
-title: ''
-labels: ''
-assignees: ''
-
----
-
-sist2 version:
-
-Platform (Linux or Docker, x86-64 or arm64):
-
-Elasticsearch version:
-
-Command with arguments:  `ex: "scan ~/Documents -o ./i2 --threads 3 -q 1.0`
-
-If the issue is related to the `scan` module, please attach the files necessary to reproduce the error or email them to me[at]simon987.net.

.gitignore

@@ -1,49 +1,18 @@
 .idea
 thumbs
+test
 *.cbp
 CMakeCache.txt
 CMakeFiles
-cmake-build-default-event-trace
 cmake-build-debug
 cmake_install.cmake
 Makefile
 *.out
 LOG
 sist2*
-!sist2-vue/
-!sist2-admin
-!sist2_admin
-!sist2.py
-*.sist2/
+index.sist2/
 bundle*.css
 bundle.js
 *.a
 vgcore.*
 build/
-third-party/argparse
-*.idx/
-VERSION
-git_hash.h
-Testing/
-test_i
-test_i_inc
-node_modules/
-.cmake/
-i_inc/
-state.db
-*.pyc
-!sist2-admin/frontend/dist
-*.js.map
-sist2-vue/dist
-sist2-admin/frontend/dist
-.ninja_deps
-.ninja_log
-build.ninja
-src/web/static_generated.c
-src/magic_generated.c
-src/index/static_generated.c
-*.sist2
-*-shm
-*-journal
-.vscode
-*.fts

.gitmodules

@@ -1,15 +1,45 @@
-[submodule "third-party/argparse"]
-	path = third-party/argparse
-	url = https://github.com/simon987/argparse
-[submodule "third-party/libscan/third-party/utf8.h"]
-	path = third-party/libscan/third-party/utf8.h
+[submodule "argparse"]
+	path = argparse
+	url = https://github.com/cofyc/argparse
+[submodule "cJSON"]
+	path = cJSON
+	url = https://github.com/DaveGamble/cJSON
+[submodule "lmdb"]
+	path = lmdb
+	url = https://github.com/LMDB/lmdb
+[submodule "utf8.h"]
+	path = utf8.h
 	url = https://github.com/sheredom/utf8.h
-[submodule "third-party/libscan/third-party/antiword"]
-	path = third-party/libscan/third-party/antiword
-	url = https://github.com/simon987/antiword
-[submodule "third-party/libscan/third-party/libmobi"]
-	path = third-party/libscan/third-party/libmobi
-	url = https://github.com/bfabiszewski/libmobi
-[submodule "third-party/libscan/libscan-test-files"]
-	path = third-party/libscan/libscan-test-files
-	url = https://github.com/simon987/libscan-test-files
+[submodule "lib/bzip2-1.0.6"]
+	path = lib/bzip2-1.0.6
+	url = https://github.com/enthought/bzip2-1.0.6
+[submodule "lib/libmagic"]
+	path = lib/libmagic
+	url = https://github.com/threatstack/libmagic
+[submodule "lib/harfbuzz"]
+	path = lib/harfbuzz
+	url = https://github.com/harfbuzz/harfbuzz
+[submodule "lib/openjpeg"]
+	path = lib/openjpeg
+	url = https://github.com/uclouvain/openjpeg
+[submodule "lib/ffmpeg"]
+	path = lib/ffmpeg
+	url = https://git.ffmpeg.org/ffmpeg.git
+[submodule "lib/onion"]
+	path = lib/onion
+	url = https://github.com/davidmoreno/onion
+[submodule "lib/mupdf"]
+	path = lib/mupdf
+	url = git://git.ghostscript.com/mupdf.git
+[submodule "lib/tesseract"]
+	path = lib/tesseract
+	url = https://github.com/tesseract-ocr/tesseract
+[submodule "lib/leptonica"]
+	path = lib/leptonica
+	url = https://github.com/danbloomberg/leptonica
+[submodule "lib/libtiff"]
+	path = lib/libtiff
+	url = https://gitlab.com/libtiff/libtiff
+[submodule "lib/libpng"]
+	path = lib/libpng
+	url = https://github.com/glennrp/libpng

.teamcity/settings.kts

@@ -0,0 +1,69 @@
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.ExecBuildStep
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.exec
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+/*
+The settings script is an entry point for defining a TeamCity
+project hierarchy. The script should contain a single call to the
+project() function with a Project instance or an init function as
+an argument.
+
+VcsRoots, BuildTypes, Templates, and subprojects can be
+registered inside the project using the vcsRoot(), buildType(),
+template(), and subProject() methods respectively.
+
+To debug settings scripts in command-line, run the
+
+    mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate
+
+command and attach your debugger to the port 8000.
+
+To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
+-> Tool Windows -> Maven Projects), find the generate task node
+(Plugins -> teamcity-configs -> teamcity-configs:generate), the
+'Debug' option is available in the context menu for the task.
+*/
+
+version = "2019.2"
+
+project {
+
+    vcsRoot(HttpsGithubComSimon987sist2refsHeadsMaster)
+
+    buildType(Build)
+}
+
+object Build : BuildType({
+    name = "Build"
+
+    artifactRules = """
+        sist2
+        sist2_scan
+    """.trimIndent()
+
+    vcs {
+        root(HttpsGithubComSimon987sist2refsHeadsMaster)
+    }
+
+    steps {
+        exec {
+            name = "Build"
+            path = "./ci/build.sh"
+            dockerImage = "simon987/general_ci"
+            dockerImagePlatform = ExecBuildStep.ImagePlatform.Linux
+            dockerPull = true
+        }
+    }
+
+    triggers {
+        vcs {
+        }
+    }
+})
+
+object HttpsGithubComSimon987sist2refsHeadsMaster : GitVcsRoot({
+    name = "https://github.com/simon987/sist2#refs/heads/master"
+    url = "https://github.com/simon987/sist2"
+})

CMakeLists.txt

@@ -1,89 +1,86 @@
 cmake_minimum_required(VERSION 3.7)
-
-project(sist2)
 set(CMAKE_C_STANDARD 11)
 
+project(sist2 C)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMakeModules")
+
 option(SIST_DEBUG "Build a debug executable" on)
-option(SIST_FAST "Enable more optimisation flags" off)
-option(SIST_DEBUG_INFO "Turn on debug information in web interface" on)
-
-add_compile_definitions(
-        "SIST_PLATFORM=${SIST_PLATFORM}"
-)
-
-if (SIST_DEBUG)
-    add_compile_definitions(
-            "SIST_DEBUG=${SIST_DEBUG}"
-    )
-    set(VCPKG_BUILD_TYPE debug)
-else ()
-    set(VCPKG_BUILD_TYPE release)
-endif ()
-
-if (SIST_DEBUG_INFO)
-    add_compile_definitions(
-            "SIST_DEBUG_INFO=${SIST_DEBUG_INFO}"
-    )
-endif ()
-
-
-add_subdirectory(third-party/libscan)
-set(ARGPARSE_SHARED off)
-add_subdirectory(third-party/argparse)
 
 add_executable(
         sist2
-        # argparse
-        third-party/argparse/argparse.h third-party/argparse/argparse.c
-
         src/main.c
         src/sist.h
         src/io/walk.h src/io/walk.c
+        src/parsing/media.h src/parsing/media.c
+        src/parsing/pdf.h src/parsing/pdf.c
+        src/io/store.h src/io/store.c
         src/tpool.h src/tpool.c
         src/parsing/parse.h src/parsing/parse.c
-        src/parsing/magic_util.c src/parsing/magic_util.h
         src/io/serialize.h src/io/serialize.c
         src/parsing/mime.h src/parsing/mime.c src/parsing/mime_generated.c
+        src/parsing/text.h src/parsing/text.c
         src/index/web.c src/index/web.h
         src/web/serve.c src/web/serve.h
-        src/web/web_util.c src/web/web_util.h
+        src/web/auth_basic.h src/web/auth_basic.c
         src/index/elastic.c src/index/elastic.h
         src/util.c src/util.h
-        src/ctx.c src/ctx.h
-        src/types.h
+        src/ctx.h src/types.h src/parsing/font.c src/parsing/font.h
+        src/parsing/arc.c src/parsing/arc.h
+        src/parsing/doc.c src/parsing/doc.h
         src/log.c src/log.h
+        src/parsing/cbr.h src/parsing/cbr.c
+
+        # argparse
+        argparse/argparse.h argparse/argparse.c
+
+        # cJSON
+        cJSON/cJSON.h cJSON/cJSON.c
+
+        # LMDB
+        lmdb/libraries/liblmdb/lmdb.h lmdb/libraries/liblmdb/mdb.c
+        lmdb/libraries/liblmdb/midl.h lmdb/libraries/liblmdb/midl.c
         src/cli.c src/cli.h
-        src/database/database.c src/database/database.h
-        src/parsing/fs_util.h
 
-        src/auth0/auth0_c_api.h src/auth0/auth0_c_api.cpp
-
-        src/database/database_stats.c
-        src/database/database_schema.c
-        src/database/database_fts.c
-        src/web/web_fts.c
-        src/database/database_embeddings.c)
-set_target_properties(sist2 PROPERTIES LINKER_LANGUAGE C)
-
-target_link_directories(sist2 PRIVATE BEFORE ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/)
-set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib)
+        # utf8.h
+        utf8.h/utf8.h
+)
 
 find_package(PkgConfig REQUIRED)
+set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig/")
 
-find_package(cJSON CONFIG REQUIRED)
-find_package(unofficial-mongoose CONFIG REQUIRED)
-find_package(CURL CONFIG REQUIRED)
-find_library(MAGIC_LIB NAMES libmagic.a REQUIRED)
-find_package(unofficial-sqlite3 CONFIG REQUIRED)
-find_package(OpenBLAS CONFIG REQUIRED)
+find_package(Freetype REQUIRED)
 
+pkg_check_modules(GLIB REQUIRED glib-2.0)
+pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
+pkg_check_modules(UUID REQUIRED uuid)
+
+add_definitions(${UUID_CFLAGS_OTHER})
+add_definitions(${GLIB_CFLAGS_OTHER})
+add_definitions(${GOBJECT_CFLAGS_OTHER})
+add_definitions(${FREETYPE_CFLAGS_OTHER})
+
+list(REMOVE_ITEM GLIB_LIBRARIES pcre)
+list(REMOVE_ITEM GOBJECT_LIBRARIES pcre)
+list(REMOVE_ITEM UUID_LIBRARIES pcre)
 
 target_include_directories(
         sist2 PUBLIC
-        ${CMAKE_SOURCE_DIR}/third-party/onion/src/
-        ${CMAKE_SOURCE_DIR}/third-party/utf8.h/
-        ${CMAKE_SOURCE_DIR}/third-party/libscan/
-        ${CMAKE_SOURCE_DIR}/
+        ${GOBJECT_INCLUDE_DIRS}
+        ${GLIB_INCLUDE_DIRS}
+        ${PROJECT_SOURCE_DIR}/lib/ffmpeg/
+        ${FREETYPE_INCLUDE_DIRS}
+        ${UUID_INCLUDE_DIRS}
+        ${PROJECT_SOURCE_DIR}/
+        ${PROJECT_SOURCE_DIR}/lmdb/libraries/liblmdb/
+        ${PROJECT_SOURCE_DIR}/lib/onion/src/
+        ${PROJECT_SOURCE_DIR}/lib/mupdf/include/
+        ${PROJECT_SOURCE_DIR}/include/
+        /usr/include/libxml2/
+        ${PROJECT_SOURCE_DIR}/lib/tesseract/include/
+)
+target_link_directories(
+        sist2 PUBLIC
+        ${UUID_LIBRARY_DIRS}
 )
 
 target_compile_options(
@@ -100,66 +97,74 @@ if (SIST_DEBUG)
             -fstack-protector
             -fno-omit-frame-pointer
             -fsanitize=address
-            -fno-inline
-            #            -O2
     )
     target_link_options(
             sist2
             PRIVATE
             -fsanitize=address
-            -static-libasan
     )
     set_target_properties(
             sist2
             PROPERTIES
             OUTPUT_NAME sist2_debug
     )
-elseif (SIST_FAST)
-    target_compile_options(
-            sist2
-            PRIVATE
-
-            -Ofast
-            -march=native
-            -fno-stack-protector
-            -fomit-frame-pointer
-            -freciprocal-math
-    )
 else ()
     target_compile_options(
             sist2
             PRIVATE
-
             -Ofast
-#            -g
             -fno-stack-protector
             -fomit-frame-pointer
-            -w
     )
 endif ()
 
-add_dependencies(
-        sist2
-        scan
-        argparse
-)
-
-target_link_libraries(
+TARGET_LINK_LIBRARIES(
         sist2
 
-        m
-        z
-        argparse
-        unofficial::mongoose::mongoose
-        CURL::libcurl
+        ${GLIB_LIBRARIES}
+        ${GOBJECT_LIBRARIES}
+        ${UUID_LIBRARIES}
+
+        # ffmpeg
+        ${PROJECT_SOURCE_DIR}/lib/libavcodec.a
+        ${PROJECT_SOURCE_DIR}/lib/libavformat.a
+        ${PROJECT_SOURCE_DIR}/lib/libavutil.a
+        ${PROJECT_SOURCE_DIR}/lib/libswscale.a
+        ${PROJECT_SOURCE_DIR}/lib/libswresample.a
+
+        # mupdf
+        ${PROJECT_SOURCE_DIR}/lib/libmupdf.a
+        ${PROJECT_SOURCE_DIR}/lib/libmupdf-third.a
+
+        # onion
+        ${PROJECT_SOURCE_DIR}/lib/libonion_static.a
 
         pthread
 
-        scan
+        m
+        bz2
+#        ${PROJECT_SOURCE_DIR}/lib/libmagic.a
+        magic
+        ${PROJECT_SOURCE_DIR}/lib/libharfbuzz.a
+        ${PROJECT_SOURCE_DIR}/lib/libopenjp2.a
+        freetype
+        archive
 
-        ${MAGIC_LIB}
-        unofficial::sqlite3::sqlite3
-        OpenBLAS::OpenBLAS
+        xml2
+
+        ${PROJECT_SOURCE_DIR}/lib/libtesseract.a
+        ${PROJECT_SOURCE_DIR}/lib/liblept.a
+        ${PROJECT_SOURCE_DIR}/lib/libtiff.a
+        ${PROJECT_SOURCE_DIR}/lib/libpng16.a
+        stdc++
+
+        # curl
+        ${PROJECT_SOURCE_DIR}/lib/libcurl.a
+        ${PROJECT_SOURCE_DIR}/lib/libcrypto.a
+        ${PROJECT_SOURCE_DIR}/lib/libssl.a
+        dl
+
+        pcre
 )
 
 add_custom_target(

CMakeModules/FindFFmpeg.cmake

@@ -0,0 +1,80 @@
+# - Try to find ffmpeg libraries (libavcodec, libavformat and libavutil)
+# Once done this will define
+#
+# FFMPEG_FOUND - system has ffmpeg or libav
+# FFMPEG_INCLUDE_DIR - the ffmpeg include directory
+# FFMPEG_LIBRARIES - Link these to use ffmpeg
+# FFMPEG_LIBAVCODEC
+# FFMPEG_LIBAVFORMAT
+# FFMPEG_LIBAVUTIL
+#
+# Copyright (c) 2008 Andreas Schneider <mail@cynapses.org>
+# Modified for other libraries by Lasse Kärkkäinen <tronic>
+# Modified for Hedgewars by Stepik777
+#
+# Redistribution and use is allowed according to the terms of the New
+# BSD license.
+#
+
+if (FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR)
+# in cache already
+set(FFMPEG_FOUND TRUE)
+else (FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR)
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+pkg_check_modules(_FFMPEG_AVCODEC libavcodec)
+pkg_check_modules(_FFMPEG_AVFORMAT libavformat)
+pkg_check_modules(_FFMPEG_AVUTIL libavutil)
+endif (PKG_CONFIG_FOUND)
+
+find_path(FFMPEG_AVCODEC_INCLUDE_DIR
+NAMES libavcodec/avcodec.h
+PATHS ${_FFMPEG_AVCODEC_INCLUDE_DIRS} /usr/include /usr/local/include /opt/local/include /sw/include
+PATH_SUFFIXES ffmpeg libav
+)
+
+find_library(FFMPEG_LIBAVCODEC
+NAMES avcodec
+PATHS ${_FFMPEG_AVCODEC_LIBRARY_DIRS} /usr/lib /usr/local/lib /opt/local/lib /sw/lib
+)
+
+find_library(FFMPEG_LIBAVFORMAT
+NAMES avformat
+PATHS ${_FFMPEG_AVFORMAT_LIBRARY_DIRS} /usr/lib /usr/local/lib /opt/local/lib /sw/lib
+)
+
+find_library(FFMPEG_LIBAVUTIL
+NAMES avutil
+PATHS ${_FFMPEG_AVUTIL_LIBRARY_DIRS} /usr/lib /usr/local/lib /opt/local/lib /sw/lib
+)
+
+if (FFMPEG_LIBAVCODEC AND FFMPEG_LIBAVFORMAT)
+set(FFMPEG_FOUND TRUE)
+endif()
+
+if (FFMPEG_FOUND)
+set(FFMPEG_INCLUDE_DIR ${FFMPEG_AVCODEC_INCLUDE_DIR})
+
+set(FFMPEG_LIBRARIES
+${FFMPEG_LIBAVCODEC}
+${FFMPEG_LIBAVFORMAT}
+${FFMPEG_LIBAVUTIL}
+)
+
+endif (FFMPEG_FOUND)
+
+if (FFMPEG_FOUND)
+if (NOT FFMPEG_FIND_QUIETLY)
+message(STATUS "Found FFMPEG or Libav: ${FFMPEG_LIBRARIES}, ${FFMPEG_INCLUDE_DIR}")
+endif (NOT FFMPEG_FIND_QUIETLY)
+else (FFMPEG_FOUND)
+if (FFMPEG_FIND_REQUIRED)
+message(FATAL_ERROR "Could not find libavcodec or libavformat or libavutil")
+endif (FFMPEG_FIND_REQUIRED)
+endif (FFMPEG_FOUND)
+
+endif (FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR)
+
+

CMakeModules/FindLibMagic.cmake

@@ -0,0 +1,100 @@
+
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013-2013, Lars Baehren <lbaehren@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#-------------------------------------------------------------------------------
+
+# - Check for the presence of LIBMAGIC
+#
+# The following variables are set when LIBMAGIC is found:
+#  LIBMAGIC_FOUND      = Set to true, if all components of LIBMAGIC have been
+#                        found.
+#  LIBMAGIC_INCLUDES   = Include path for the header files of LIBMAGIC
+#  LIBMAGIC_LIBRARIES  = Link these to use LIBMAGIC
+#  LIBMAGIC_LFLAGS     = Linker flags (optional)
+
+if (NOT LIBMAGIC_FOUND)
+
+  if (NOT LIBMAGIC_ROOT_DIR)
+    set (LIBMAGIC_ROOT_DIR ${CMAKE_INSTALL_PREFIX})
+  endif (NOT LIBMAGIC_ROOT_DIR)
+
+  ##____________________________________________________________________________
+  ## Check for the header files
+
+  find_path (LIBMAGIC_FILE_H
+    NAMES file/file.h
+    HINTS ${LIBMAGIC_ROOT_DIR} ${CMAKE_INSTALL_PREFIX}
+    PATH_SUFFIXES include
+    )
+  if (LIBMAGIC_FILE_H)
+    list (APPEND LIBMAGIC_INCLUDES ${LIBMAGIC_FILE_H})
+  endif (LIBMAGIC_FILE_H)
+
+  find_path (LIBMAGIC_MAGIC_H
+    NAMES magic.h
+    HINTS ${LIBMAGIC_ROOT_DIR} ${CMAKE_INSTALL_PREFIX}
+    PATH_SUFFIXES include include/linux
+    )
+  if (LIBMAGIC_MAGIC_H)
+    list (APPEND LIBMAGIC_INCLUDES ${LIBMAGIC_MAGIC_H})
+  endif (LIBMAGIC_MAGIC_H)
+
+  list (REMOVE_DUPLICATES LIBMAGIC_INCLUDES)
+
+  ##____________________________________________________________________________
+  ## Check for the library
+
+  find_library (LIBMAGIC_LIBRARIES magic
+    HINTS ${LIBMAGIC_ROOT_DIR} ${CMAKE_INSTALL_PREFIX}
+    PATH_SUFFIXES lib
+    )
+
+  ##____________________________________________________________________________
+  ## Actions taken when all components have been found
+
+  #find_package_handle_standard_args (LIBMAGIC DEFAULT_MSG LIBMAGIC_LIBRARIES LIBMAGIC_INCLUDES)
+
+  if (LIBMAGIC_FOUND)
+    if (NOT LIBMAGIC_FIND_QUIETLY)
+      message (STATUS "Found components for LIBMAGIC")
+      message (STATUS "LIBMAGIC_ROOT_DIR  = ${LIBMAGIC_ROOT_DIR}")
+      message (STATUS "LIBMAGIC_INCLUDES  = ${LIBMAGIC_INCLUDES}")
+      message (STATUS "LIBMAGIC_LIBRARIES = ${LIBMAGIC_LIBRARIES}")
+    endif (NOT LIBMAGIC_FIND_QUIETLY)
+  else (LIBMAGIC_FOUND)
+    if (LIBMAGIC_FIND_REQUIRED)
+      message (FATAL_ERROR "Could not find LIBMAGIC!")
+    endif (LIBMAGIC_FIND_REQUIRED)
+  endif (LIBMAGIC_FOUND)
+
+  ##____________________________________________________________________________
+  ## Mark advanced variables
+
+  mark_as_advanced (
+    LIBMAGIC_ROOT_DIR
+    LIBMAGIC_INCLUDES
+    LIBMAGIC_LIBRARIES
+    )
+
+endif (NOT LIBMAGIC_FOUND)

CMakeModules/FindOpenSSL.cmake

@@ -0,0 +1,478 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+macro(_OpenSSL_test_and_find_dependencies ssl_library crypto_library)
+  if((CMAKE_SYSTEM_NAME STREQUAL "Linux") AND
+     (("${ssl_library}" MATCHES "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$") OR
+      ("${crypto_library}" MATCHES "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$")))
+    set(_OpenSSL_has_dependencies TRUE)
+    find_package(Threads)
+  else()
+    set(_OpenSSL_has_dependencies FALSE)
+  endif()
+endmacro()
+
+function(_OpenSSL_add_dependencies libraries_var library)
+  if(CMAKE_THREAD_LIBS_INIT)
+    list(APPEND ${libraries_var} ${CMAKE_THREAD_LIBS_INIT})
+  endif()
+  list(APPEND ${libraries_var} ${CMAKE_DL_LIBS})
+  set(${libraries_var} ${${libraries_var}} PARENT_SCOPE)
+endfunction()
+
+function(_OpenSSL_target_add_dependencies target)
+  if(_OpenSSL_has_dependencies)
+    set_property( TARGET ${target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads )
+    set_property( TARGET ${target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS} )
+  endif()
+endfunction()
+
+if (UNIX)
+  find_package(PkgConfig QUIET)
+  pkg_check_modules(_OPENSSL QUIET openssl)
+endif ()
+
+# Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
+if(OPENSSL_USE_STATIC_LIBS)
+  set(_openssl_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+  if(WIN32)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+  else()
+    set(CMAKE_FIND_LIBRARY_SUFFIXES .a )
+  endif()
+endif()
+
+if (WIN32)
+  # http://www.slproweb.com/products/Win32OpenSSL.html
+  set(_OPENSSL_ROOT_HINTS
+    ${OPENSSL_ROOT_DIR}
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
+    ENV OPENSSL_ROOT_DIR
+    )
+  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
+  set(_OPENSSL_ROOT_PATHS
+    "${_programfiles}/OpenSSL"
+    "${_programfiles}/OpenSSL-Win32"
+    "${_programfiles}/OpenSSL-Win64"
+    "C:/OpenSSL/"
+    "C:/OpenSSL-Win32/"
+    "C:/OpenSSL-Win64/"
+    )
+  unset(_programfiles)
+else ()
+  set(_OPENSSL_ROOT_HINTS
+    ${OPENSSL_ROOT_DIR}
+    ENV OPENSSL_ROOT_DIR
+    )
+endif ()
+
+set(_OPENSSL_ROOT_HINTS_AND_PATHS
+    HINTS ${_OPENSSL_ROOT_HINTS}
+    PATHS ${_OPENSSL_ROOT_PATHS}
+    )
+
+find_path(OPENSSL_INCLUDE_DIR
+  NAMES
+    openssl/ssl.h
+  ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+  HINTS
+    ${_OPENSSL_INCLUDEDIR}
+  PATH_SUFFIXES
+    include
+)
+
+if(WIN32 AND NOT CYGWIN)
+  if(MSVC)
+    # /MD and /MDd are the standard values - if someone wants to use
+    # others, the libnames have to change here too
+    # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
+    # enable OPENSSL_MSVC_STATIC_RT to get the libs build /MT (Multithreaded no-DLL)
+    # In Visual C++ naming convention each of these four kinds of Windows libraries has it's standard suffix:
+    #   * MD for dynamic-release
+    #   * MDd for dynamic-debug
+    #   * MT for static-release
+    #   * MTd for static-debug
+
+    # Implementation details:
+    # We are using the libraries located in the VC subdir instead of the parent directory even though :
+    # libeay32MD.lib is identical to ../libeay32.lib, and
+    # ssleay32MD.lib is identical to ../ssleay32.lib
+    # enable OPENSSL_USE_STATIC_LIBS to use the static libs located in lib/VC/static
+
+    if (OPENSSL_MSVC_STATIC_RT)
+      set(_OPENSSL_MSVC_RT_MODE "MT")
+    else ()
+      set(_OPENSSL_MSVC_RT_MODE "MD")
+    endif ()
+
+    # Since OpenSSL 1.1, lib names are like libcrypto32MTd.lib and libssl32MTd.lib
+    if( "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8" )
+        set(_OPENSSL_MSVC_ARCH_SUFFIX "64")
+    else()
+        set(_OPENSSL_MSVC_ARCH_SUFFIX "32")
+    endif()
+
+    if(OPENSSL_USE_STATIC_LIBS)
+      set(_OPENSSL_PATH_SUFFIXES
+        "lib/VC/static"
+        "VC/static"
+        "lib"
+        )
+    else()
+      set(_OPENSSL_PATH_SUFFIXES
+        "lib/VC"
+        "VC"
+        "lib"
+        )
+    endif ()
+
+    find_library(LIB_EAY_DEBUG
+      NAMES
+        libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}${_OPENSSL_MSVC_RT_MODE}d
+        libcrypto${_OPENSSL_MSVC_RT_MODE}d
+        libcryptod
+        libeay32${_OPENSSL_MSVC_RT_MODE}d
+        libeay32d
+        cryptod
+      NAMES_PER_DIR
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        ${_OPENSSL_PATH_SUFFIXES}
+    )
+
+    find_library(LIB_EAY_RELEASE
+      NAMES
+        libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}${_OPENSSL_MSVC_RT_MODE}
+        libcrypto${_OPENSSL_MSVC_RT_MODE}
+        libcrypto
+        libeay32${_OPENSSL_MSVC_RT_MODE}
+        libeay32
+        crypto
+      NAMES_PER_DIR
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        ${_OPENSSL_PATH_SUFFIXES}
+    )
+
+    find_library(SSL_EAY_DEBUG
+      NAMES
+        libssl${_OPENSSL_MSVC_ARCH_SUFFIX}${_OPENSSL_MSVC_RT_MODE}d
+        libssl${_OPENSSL_MSVC_RT_MODE}d
+        libssld
+        ssleay32${_OPENSSL_MSVC_RT_MODE}d
+        ssleay32d
+        ssld
+      NAMES_PER_DIR
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        ${_OPENSSL_PATH_SUFFIXES}
+    )
+
+    find_library(SSL_EAY_RELEASE
+      NAMES
+        libssl${_OPENSSL_MSVC_ARCH_SUFFIX}${_OPENSSL_MSVC_RT_MODE}
+        libssl${_OPENSSL_MSVC_RT_MODE}
+        libssl
+        ssleay32${_OPENSSL_MSVC_RT_MODE}
+        ssleay32
+        ssl
+      NAMES_PER_DIR
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        ${_OPENSSL_PATH_SUFFIXES}
+    )
+
+    set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")
+    set(LIB_EAY_LIBRARY_RELEASE "${LIB_EAY_RELEASE}")
+    set(SSL_EAY_LIBRARY_DEBUG "${SSL_EAY_DEBUG}")
+    set(SSL_EAY_LIBRARY_RELEASE "${SSL_EAY_RELEASE}")
+
+    include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+    select_library_configurations(LIB_EAY)
+    select_library_configurations(SSL_EAY)
+
+    mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE
+                     SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
+    set(OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
+    set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
+  elseif(MINGW)
+    # same player, for MinGW
+    set(LIB_EAY_NAMES crypto libeay32)
+    set(SSL_EAY_NAMES ssl ssleay32)
+    find_library(LIB_EAY
+      NAMES
+        ${LIB_EAY_NAMES}
+      NAMES_PER_DIR
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib/MinGW"
+        "lib"
+    )
+
+    find_library(SSL_EAY
+      NAMES
+        ${SSL_EAY_NAMES}
+      NAMES_PER_DIR
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib/MinGW"
+        "lib"
+    )
+
+    mark_as_advanced(SSL_EAY LIB_EAY)
+    set(OPENSSL_SSL_LIBRARY ${SSL_EAY} )
+    set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
+    unset(LIB_EAY_NAMES)
+    unset(SSL_EAY_NAMES)
+  else()
+    # Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
+    find_library(LIB_EAY
+      NAMES
+        libcrypto
+        libeay32
+      NAMES_PER_DIR
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      HINTS
+        ${_OPENSSL_LIBDIR}
+      PATH_SUFFIXES
+        lib
+    )
+
+    find_library(SSL_EAY
+      NAMES
+        libssl
+        ssleay32
+      NAMES_PER_DIR
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      HINTS
+        ${_OPENSSL_LIBDIR}
+      PATH_SUFFIXES
+        lib
+    )
+
+    mark_as_advanced(SSL_EAY LIB_EAY)
+    set(OPENSSL_SSL_LIBRARY ${SSL_EAY} )
+    set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
+  endif()
+else()
+
+  find_library(OPENSSL_SSL_LIBRARY
+    NAMES
+      ssl
+      ssleay32
+      ssleay32MD
+    NAMES_PER_DIR
+    ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+    HINTS
+      ${_OPENSSL_LIBDIR}
+    PATH_SUFFIXES
+      lib
+  )
+
+  find_library(OPENSSL_CRYPTO_LIBRARY
+    NAMES
+      crypto
+    NAMES_PER_DIR
+    ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+    HINTS
+      ${_OPENSSL_LIBDIR}
+    PATH_SUFFIXES
+      lib
+  )
+
+  mark_as_advanced(OPENSSL_CRYPTO_LIBRARY OPENSSL_SSL_LIBRARY)
+
+endif()
+
+# compat defines
+set(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY})
+set(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
+_OpenSSL_test_and_find_dependencies("${OPENSSL_SSL_LIBRARY}" "${OPENSSL_CRYPTO_LIBRARY}")
+if(_OpenSSL_has_dependencies)
+  _OpenSSL_add_dependencies( OPENSSL_SSL_LIBRARIES "${OPENSSL_SSL_LIBRARY}" )
+  _OpenSSL_add_dependencies( OPENSSL_CRYPTO_LIBRARIES "${OPENSSL_CRYPTO_LIBRARY}" )
+endif()
+
+function(from_hex HEX DEC)
+  string(TOUPPER "${HEX}" HEX)
+  set(_res 0)
+  string(LENGTH "${HEX}" _strlen)
+
+  while (_strlen GREATER 0)
+    math(EXPR _res "${_res} * 16")
+    string(SUBSTRING "${HEX}" 0 1 NIBBLE)
+    string(SUBSTRING "${HEX}" 1 -1 HEX)
+    if (NIBBLE STREQUAL "A")
+      math(EXPR _res "${_res} + 10")
+    elseif (NIBBLE STREQUAL "B")
+      math(EXPR _res "${_res} + 11")
+    elseif (NIBBLE STREQUAL "C")
+      math(EXPR _res "${_res} + 12")
+    elseif (NIBBLE STREQUAL "D")
+      math(EXPR _res "${_res} + 13")
+    elseif (NIBBLE STREQUAL "E")
+      math(EXPR _res "${_res} + 14")
+    elseif (NIBBLE STREQUAL "F")
+      math(EXPR _res "${_res} + 15")
+    else()
+      math(EXPR _res "${_res} + ${NIBBLE}")
+    endif()
+
+    string(LENGTH "${HEX}" _strlen)
+  endwhile()
+
+  set(${DEC} ${_res} PARENT_SCOPE)
+endfunction()
+
+if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+  file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+       REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+
+  if(openssl_version_str)
+    # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
+    # The status gives if this is a developer or prerelease and is ignored here.
+    # Major, minor, and fix directly translate into the version numbers shown in
+    # the string. The patch field translates to the single character suffix that
+    # indicates the bug fix state, which 00 -> nothing, 01 -> a, 02 -> b and so
+    # on.
+
+    string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F]).*$"
+           "\\1;\\2;\\3;\\4;\\5" OPENSSL_VERSION_LIST "${openssl_version_str}")
+    list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
+    list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
+    from_hex("${OPENSSL_VERSION_MINOR}" OPENSSL_VERSION_MINOR)
+    list(GET OPENSSL_VERSION_LIST 2 OPENSSL_VERSION_FIX)
+    from_hex("${OPENSSL_VERSION_FIX}" OPENSSL_VERSION_FIX)
+    list(GET OPENSSL_VERSION_LIST 3 OPENSSL_VERSION_PATCH)
+
+    if (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
+      from_hex("${OPENSSL_VERSION_PATCH}" _tmp)
+      # 96 is the ASCII code of 'a' minus 1
+      math(EXPR OPENSSL_VERSION_PATCH_ASCII "${_tmp} + 96")
+      unset(_tmp)
+      # Once anyone knows how OpenSSL would call the patch versions beyond 'z'
+      # this should be updated to handle that, too. This has not happened yet
+      # so it is simply ignored here for now.
+      string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING)
+    endif ()
+
+    set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
+  endif ()
+endif ()
+
+set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES} )
+list(REMOVE_DUPLICATES OPENSSL_LIBRARIES)
+
+foreach(_comp IN LISTS OpenSSL_FIND_COMPONENTS)
+  if(_comp STREQUAL "Crypto")
+    if(EXISTS "${OPENSSL_INCLUDE_DIR}" AND
+        (EXISTS "${OPENSSL_CRYPTO_LIBRARY}" OR
+        EXISTS "${LIB_EAY_LIBRARY_DEBUG}" OR
+        EXISTS "${LIB_EAY_LIBRARY_RELEASE}")
+    )
+      set(OpenSSL_${_comp}_FOUND TRUE)
+    else()
+      set(OpenSSL_${_comp}_FOUND FALSE)
+    endif()
+  elseif(_comp STREQUAL "SSL")
+    if(EXISTS "${OPENSSL_INCLUDE_DIR}" AND
+        (EXISTS "${OPENSSL_SSL_LIBRARY}" OR
+        EXISTS "${SSL_EAY_LIBRARY_DEBUG}" OR
+        EXISTS "${SSL_EAY_LIBRARY_RELEASE}")
+    )
+      set(OpenSSL_${_comp}_FOUND TRUE)
+    else()
+      set(OpenSSL_${_comp}_FOUND FALSE)
+    endif()
+  else()
+    message(WARNING "${_comp} is not a valid OpenSSL component")
+    set(OpenSSL_${_comp}_FOUND FALSE)
+  endif()
+endforeach()
+unset(_comp)
+
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+find_package_handle_standard_args(OpenSSL
+  REQUIRED_VARS
+    OPENSSL_CRYPTO_LIBRARY
+    OPENSSL_INCLUDE_DIR
+  VERSION_VAR
+    OPENSSL_VERSION
+  HANDLE_COMPONENTS
+  FAIL_MESSAGE
+    "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
+)
+
+mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
+
+if(OPENSSL_FOUND)
+  if(NOT TARGET OpenSSL::Crypto AND
+      (EXISTS "${OPENSSL_CRYPTO_LIBRARY}" OR
+        EXISTS "${LIB_EAY_LIBRARY_DEBUG}" OR
+        EXISTS "${LIB_EAY_LIBRARY_RELEASE}")
+      )
+    add_library(OpenSSL::Crypto UNKNOWN IMPORTED)
+    set_target_properties(OpenSSL::Crypto PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
+    if(EXISTS "${OPENSSL_CRYPTO_LIBRARY}")
+      set_target_properties(OpenSSL::Crypto PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+        IMPORTED_LOCATION "${OPENSSL_CRYPTO_LIBRARY}")
+    endif()
+    if(EXISTS "${LIB_EAY_LIBRARY_RELEASE}")
+      set_property(TARGET OpenSSL::Crypto APPEND PROPERTY
+        IMPORTED_CONFIGURATIONS RELEASE)
+      set_target_properties(OpenSSL::Crypto PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+        IMPORTED_LOCATION_RELEASE "${LIB_EAY_LIBRARY_RELEASE}")
+    endif()
+    if(EXISTS "${LIB_EAY_LIBRARY_DEBUG}")
+      set_property(TARGET OpenSSL::Crypto APPEND PROPERTY
+        IMPORTED_CONFIGURATIONS DEBUG)
+      set_target_properties(OpenSSL::Crypto PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+        IMPORTED_LOCATION_DEBUG "${LIB_EAY_LIBRARY_DEBUG}")
+    endif()
+    _OpenSSL_target_add_dependencies(OpenSSL::Crypto)
+  endif()
+
+  if(NOT TARGET OpenSSL::SSL AND
+      (EXISTS "${OPENSSL_SSL_LIBRARY}" OR
+        EXISTS "${SSL_EAY_LIBRARY_DEBUG}" OR
+        EXISTS "${SSL_EAY_LIBRARY_RELEASE}")
+      )
+    add_library(OpenSSL::SSL UNKNOWN IMPORTED)
+    set_target_properties(OpenSSL::SSL PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
+    if(EXISTS "${OPENSSL_SSL_LIBRARY}")
+      set_target_properties(OpenSSL::SSL PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+        IMPORTED_LOCATION "${OPENSSL_SSL_LIBRARY}")
+    endif()
+    if(EXISTS "${SSL_EAY_LIBRARY_RELEASE}")
+      set_property(TARGET OpenSSL::SSL APPEND PROPERTY
+        IMPORTED_CONFIGURATIONS RELEASE)
+      set_target_properties(OpenSSL::SSL PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+        IMPORTED_LOCATION_RELEASE "${SSL_EAY_LIBRARY_RELEASE}")
+    endif()
+    if(EXISTS "${SSL_EAY_LIBRARY_DEBUG}")
+      set_property(TARGET OpenSSL::SSL APPEND PROPERTY
+        IMPORTED_CONFIGURATIONS DEBUG)
+      set_target_properties(OpenSSL::SSL PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+        IMPORTED_LOCATION_DEBUG "${SSL_EAY_LIBRARY_DEBUG}")
+    endif()
+    if(TARGET OpenSSL::Crypto)
+      set_target_properties(OpenSSL::SSL PROPERTIES
+        INTERFACE_LINK_LIBRARIES OpenSSL::Crypto)
+    endif()
+    _OpenSSL_target_add_dependencies(OpenSSL::SSL)
+  endif()
+endif()
+
+# Restore the original find library ordering
+if(OPENSSL_USE_STATIC_LIBS)
+  set(CMAKE_FIND_LIBRARY_SUFFIXES ${_openssl_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+endif()

CMakeModules/FindPackageHandleStandardArgs.cmake

@@ -0,0 +1,268 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake)
+
+# internal helper macro
+macro(_FPHSA_FAILURE_MESSAGE _msg)
+  set (__msg "${_msg}")
+  if (FPHSA_REASON_FAILURE_MESSAGE)
+    string(APPEND __msg "\n    Reason given by package: ${FPHSA_REASON_FAILURE_MESSAGE}\n")
+  endif()
+  if (${_NAME}_FIND_REQUIRED)
+    message(FATAL_ERROR "${__msg}")
+  else ()
+    if (NOT ${_NAME}_FIND_QUIETLY)
+      message(STATUS "${__msg}")
+    endif ()
+  endif ()
+endmacro()
+
+
+# internal helper macro to generate the failure message when used in CONFIG_MODE:
+macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
+  # <PackageName>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
+  if(${_NAME}_CONFIG)
+    _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing:${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
+  else()
+    # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
+    # List them all in the error message:
+    if(${_NAME}_CONSIDERED_CONFIGS)
+      set(configsText "")
+      list(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
+      math(EXPR configsCount "${configsCount} - 1")
+      foreach(currentConfigIndex RANGE ${configsCount})
+        list(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
+        list(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
+        string(APPEND configsText "\n    ${filename} (version ${version})")
+      endforeach()
+      if (${_NAME}_NOT_FOUND_MESSAGE)
+        if (FPHSA_REASON_FAILURE_MESSAGE)
+          string(PREPEND FPHSA_REASON_FAILURE_MESSAGE "${${_NAME}_NOT_FOUND_MESSAGE}\n    ")
+        else()
+          set(FPHSA_REASON_FAILURE_MESSAGE "${${_NAME}_NOT_FOUND_MESSAGE}")
+        endif()
+      else()
+        string(APPEND configsText "\n")
+      endif()
+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:${configsText}")
+
+    else()
+      # Simple case: No Config-file was found at all:
+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
+    endif()
+  endif()
+endmacro()
+
+
+function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
+
+# Set up the arguments for `cmake_parse_arguments`.
+  set(options  CONFIG_MODE  HANDLE_COMPONENTS)
+  set(oneValueArgs  FAIL_MESSAGE  REASON_FAILURE_MESSAGE VERSION_VAR  FOUND_VAR)
+  set(multiValueArgs REQUIRED_VARS)
+
+# Check whether we are in 'simple' or 'extended' mode:
+  set(_KEYWORDS_FOR_EXTENDED_MODE  ${options} ${oneValueArgs} ${multiValueArgs} )
+  list(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
+
+  if(${INDEX} EQUAL -1)
+    set(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
+    set(FPHSA_REQUIRED_VARS ${ARGN})
+    set(FPHSA_VERSION_VAR)
+  else()
+    cmake_parse_arguments(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${_FIRST_ARG} ${ARGN})
+
+    if(FPHSA_UNPARSED_ARGUMENTS)
+      message(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
+    endif()
+
+    if(NOT FPHSA_FAIL_MESSAGE)
+      set(FPHSA_FAIL_MESSAGE  "DEFAULT_MSG")
+    endif()
+
+    # In config-mode, we rely on the variable <PackageName>_CONFIG, which is set by find_package()
+    # when it successfully found the config-file, including version checking:
+    if(FPHSA_CONFIG_MODE)
+      list(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
+      list(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
+      set(FPHSA_VERSION_VAR ${_NAME}_VERSION)
+    endif()
+
+    if(NOT FPHSA_REQUIRED_VARS)
+      message(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
+    endif()
+  endif()
+
+# now that we collected all arguments, process them
+
+  if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")
+    set(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
+  endif()
+
+  list(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
+
+  string(TOUPPER ${_NAME} _NAME_UPPER)
+  string(TOLOWER ${_NAME} _NAME_LOWER)
+
+  if(FPHSA_FOUND_VAR)
+    if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$"  OR  FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$")
+      set(_FOUND_VAR ${FPHSA_FOUND_VAR})
+    else()
+      message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.")
+    endif()
+  else()
+    set(_FOUND_VAR ${_NAME_UPPER}_FOUND)
+  endif()
+
+  # collect all variables which were not found, so they can be printed, so the
+  # user knows better what went wrong (#6375)
+  set(MISSING_VARS "")
+  set(DETAILS "")
+  # check if all passed variables are valid
+  set(FPHSA_FOUND_${_NAME} TRUE)
+  foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
+    if(NOT ${_CURRENT_VAR})
+      set(FPHSA_FOUND_${_NAME} FALSE)
+      string(APPEND MISSING_VARS " ${_CURRENT_VAR}")
+    else()
+      string(APPEND DETAILS "[${${_CURRENT_VAR}}]")
+    endif()
+  endforeach()
+  if(FPHSA_FOUND_${_NAME})
+    set(${_NAME}_FOUND TRUE)
+    set(${_NAME_UPPER}_FOUND TRUE)
+  else()
+    set(${_NAME}_FOUND FALSE)
+    set(${_NAME_UPPER}_FOUND FALSE)
+  endif()
+
+  # component handling
+  unset(FOUND_COMPONENTS_MSG)
+  unset(MISSING_COMPONENTS_MSG)
+
+  if(FPHSA_HANDLE_COMPONENTS)
+    foreach(comp ${${_NAME}_FIND_COMPONENTS})
+      if(${_NAME}_${comp}_FOUND)
+
+        if(NOT DEFINED FOUND_COMPONENTS_MSG)
+          set(FOUND_COMPONENTS_MSG "found components:")
+        endif()
+        string(APPEND FOUND_COMPONENTS_MSG " ${comp}")
+
+      else()
+
+        if(NOT DEFINED MISSING_COMPONENTS_MSG)
+          set(MISSING_COMPONENTS_MSG "missing components:")
+        endif()
+        string(APPEND MISSING_COMPONENTS_MSG " ${comp}")
+
+        if(${_NAME}_FIND_REQUIRED_${comp})
+          set(${_NAME}_FOUND FALSE)
+          string(APPEND MISSING_VARS " ${comp}")
+        endif()
+
+      endif()
+    endforeach()
+    set(COMPONENT_MSG "${FOUND_COMPONENTS_MSG} ${MISSING_COMPONENTS_MSG}")
+    string(APPEND DETAILS "[c${COMPONENT_MSG}]")
+  endif()
+
+  # version handling:
+  set(VERSION_MSG "")
+  set(VERSION_OK TRUE)
+
+  # check with DEFINED here as the requested or found version may be "0"
+  if (DEFINED ${_NAME}_FIND_VERSION)
+    if(DEFINED ${FPHSA_VERSION_VAR})
+      set(_FOUND_VERSION ${${FPHSA_VERSION_VAR}})
+
+      if(${_NAME}_FIND_VERSION_EXACT)       # exact version required
+        # count the dots in the version string
+        string(REGEX REPLACE "[^.]" "" _VERSION_DOTS "${_FOUND_VERSION}")
+        # add one dot because there is one dot more than there are components
+        string(LENGTH "${_VERSION_DOTS}." _VERSION_DOTS)
+        if (_VERSION_DOTS GREATER ${_NAME}_FIND_VERSION_COUNT)
+          # Because of the C++ implementation of find_package() ${_NAME}_FIND_VERSION_COUNT
+          # is at most 4 here. Therefore a simple lookup table is used.
+          if (${_NAME}_FIND_VERSION_COUNT EQUAL 1)
+            set(_VERSION_REGEX "[^.]*")
+          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 2)
+            set(_VERSION_REGEX "[^.]*\\.[^.]*")
+          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 3)
+            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*")
+          else ()
+            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*\\.[^.]*")
+          endif ()
+          string(REGEX REPLACE "^(${_VERSION_REGEX})\\..*" "\\1" _VERSION_HEAD "${_FOUND_VERSION}")
+          unset(_VERSION_REGEX)
+          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _VERSION_HEAD)
+            set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
+            set(VERSION_OK FALSE)
+          else ()
+            set(VERSION_MSG "(found suitable exact version \"${_FOUND_VERSION}\")")
+          endif ()
+          unset(_VERSION_HEAD)
+        else ()
+          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _FOUND_VERSION)
+            set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
+            set(VERSION_OK FALSE)
+          else ()
+            set(VERSION_MSG "(found suitable exact version \"${_FOUND_VERSION}\")")
+          endif ()
+        endif ()
+        unset(_VERSION_DOTS)
+
+      else()     # minimum version specified:
+        if (${_NAME}_FIND_VERSION VERSION_GREATER _FOUND_VERSION)
+          set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
+          set(VERSION_OK FALSE)
+        else ()
+          set(VERSION_MSG "(found suitable version \"${_FOUND_VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")")
+        endif ()
+      endif()
+
+    else()
+
+      # if the package was not found, but a version was given, add that to the output:
+      if(${_NAME}_FIND_VERSION_EXACT)
+         set(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
+      else()
+         set(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
+      endif()
+
+    endif()
+  else ()
+    # Check with DEFINED as the found version may be 0.
+    if(DEFINED ${FPHSA_VERSION_VAR})
+      set(VERSION_MSG "(found version \"${${FPHSA_VERSION_VAR}}\")")
+    endif()
+  endif ()
+
+  if(VERSION_OK)
+    string(APPEND DETAILS "[v${${FPHSA_VERSION_VAR}}(${${_NAME}_FIND_VERSION})]")
+  else()
+    set(${_NAME}_FOUND FALSE)
+  endif()
+
+
+  # print the result:
+  if (${_NAME}_FOUND)
+    FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}")
+  else ()
+
+    if(FPHSA_CONFIG_MODE)
+      _FPHSA_HANDLE_FAILURE_CONFIG_MODE()
+    else()
+      if(NOT VERSION_OK)
+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
+      else()
+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing:${MISSING_VARS}) ${VERSION_MSG}")
+      endif()
+    endif()
+
+  endif ()
+
+  set(${_NAME}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
+  set(${_NAME_UPPER}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
+endfunction()

CMakeModules/FindPackageMessage.cmake

@@ -0,0 +1,48 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindPackageMessage
+------------------
+
+.. code-block:: cmake
+
+  find_package_message(<name> "message for user" "find result details")
+
+This function is intended to be used in FindXXX.cmake modules files.
+It will print a message once for each unique find result.  This is
+useful for telling the user where a package was found.  The first
+argument specifies the name (XXX) of the package.  The second argument
+specifies the message to display.  The third argument lists details
+about the find result so that if they change the message will be
+displayed again.  The macro also obeys the QUIET argument to the
+find_package command.
+
+Example:
+
+.. code-block:: cmake
+
+  if(X11_FOUND)
+    find_package_message(X11 "Found X11: ${X11_X11_LIB}"
+      "[${X11_X11_LIB}][${X11_INCLUDE_DIR}]")
+  else()
+   ...
+  endif()
+#]=======================================================================]
+
+function(find_package_message pkg msg details)
+  # Avoid printing a message repeatedly for the same find result.
+  if(NOT ${pkg}_FIND_QUIETLY)
+    string(REPLACE "\n" "" details "${details}")
+    set(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg})
+    if(NOT "${details}" STREQUAL "${${DETAILS_VAR}}")
+      # The message has not yet been printed.
+      message(STATUS "${msg}")
+
+      # Save the find details in the cache to avoid printing the same
+      # message again.
+      set("${DETAILS_VAR}" "${details}"
+        CACHE INTERNAL "Details about finding ${pkg}")
+    endif()
+  endif()
+endfunction()

Docker/Dockerfile

@@ -0,0 +1,22 @@
+FROM ubuntu:19.10
+MAINTAINER simon987 <me@simon987.net>
+
+RUN apt update
+RUN apt install -y libglib2.0-0 libcurl4 libmagic1 libharfbuzz-bin libopenjp2-7 libarchive13 liblzma5 libzstd1 liblz4-1 \
+ curl libtiff5 libpng16-16 libpcre3
+
+RUN mkdir -p /usr/share/tessdata && \
+    cd /usr/share/tessdata/ && \
+    curl -o /usr/share/tessdata/hin.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/hin.traineddata &&\
+    curl -o /usr/share/tessdata/jpn.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/jpn.traineddata &&\
+    curl -o /usr/share/tessdata/eng.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/eng.traineddata &&\
+    curl -o /usr/share/tessdata/fra.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/fra.traineddata &&\
+    curl -o /usr/share/tessdata/rus.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/rus.traineddata &&\
+    curl -o /usr/share/tessdata/spa.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/spa.traineddata && ls -lh
+
+ADD sist2 /root/sist2
+
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
+ENTRYPOINT ["/root/sist2"]

Docker/build.sh

@@ -0,0 +1,15 @@
+rm ./sist2
+cp ../sist2 .
+strip sist2
+
+version=$(./sist2 --version)
+
+echo "Version ${version}"
+docker build . -t simon987/sist2:${version} -t simon987/sist2:latest \
+  -t docker.pkg.github.com/simon987/sist2/sist2:latest -t docker.pkg.github.com/simon987/sist2/sist2:${version}
+docker push simon987/sist2:${version}
+docker push simon987/sist2:latest
+docker push docker.pkg.github.com/simon987/sist2/sist2:latest
+docker push docker.pkg.github.com/simon987/sist2/sist2:${version}
+
+docker run --rm -it simon987/sist2 -v

Dockerfile

@@ -1,52 +0,0 @@
-FROM sist2app/sist2-build as build
-
-WORKDIR /build/
-
-COPY scripts scripts
-COPY schema schema
-COPY CMakeLists.txt .
-COPY third-party third-party
-COPY src src
-COPY sist2-vue sist2-vue
-COPY sist2-admin sist2-admin
-
-RUN cd sist2-vue/ && npm install && npm run build
-RUN cd sist2-admin/frontend/ && npm install && npm run build
-
-RUN mkdir build && cd build && cmake -DSIST_PLATFORM=x64_linux_docker -DSIST_DEBUG_INFO=on -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-RUN cd build && make -j$(nproc)
-RUN strip build/sist2 || mv build/sist2_debug build/sist2
-
-FROM --platform="linux/amd64" ubuntu@sha256:965fbcae990b0467ed5657caceaec165018ef44a4d2d46c7cdea80a9dff0d1ea
-
-ENV LANG C.UTF-8
-ENV LC_ALL C.UTF-8
-
-ENTRYPOINT ["/root/sist2"]
-
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y curl libasan5 libmagic1 python3  \
-    python3-pip git tesseract-ocr && rm -rf /var/lib/apt/lists/*
-
-RUN mkdir -p /usr/share/tessdata && \
-    cd /usr/share/tessdata/ && \
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/hin.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/hin.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/jpn.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/jpn.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/eng.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/eng.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/fra.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/fra.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/rus.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/rus.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/osd.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/osd.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/spa.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/spa.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/deu.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/deu.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/equ.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/equ.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/pol.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/pol.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/chi_sim.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/chi_sim.traineddata
-
-# sist2
-COPY --from=build /build/build/sist2 /root/sist2
-
-# sist2-admin
-WORKDIR /root/sist2-admin
-COPY sist2-admin/requirements.txt /root/sist2-admin/
-RUN ln /usr/bin/python3 /usr/bin/python
-RUN python -m pip install --no-cache -r /root/sist2-admin/requirements.txt
-COPY --from=build /build/sist2-admin/ /root/sist2-admin/

Dockerfile.arm64

@@ -1,53 +0,0 @@
-FROM sist2app/sist2-build-arm64 as build
-
-WORKDIR /build/
-
-COPY scripts scripts
-COPY schema schema
-COPY CMakeLists.txt .
-COPY third-party third-party
-COPY src src
-COPY sist2-vue sist2-vue
-COPY sist2-admin sist2-admin
-
-RUN cd sist2-vue/ && npm install && npm run build
-RUN cd sist2-admin/frontend/ && npm install && npm run build
-
-WORKDIR /build/
-ADD . /build/
-RUN mkdir build && cd build && cmake -DSIST_PLATFORM=arm64_linux_docker -DSIST_DEBUG_INFO=on -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-RUN cd build && make -j$(nproc)
-RUN strip build/sist2 || mv build/sist2_debug build/sist2
-
-FROM --platform=linux/arm64/v8 ubuntu@sha256:537da24818633b45fcb65e5285a68c3ec1f3db25f5ae5476a7757bc8dfae92a3
-
-WORKDIR /root
-
-ENV LANG C.UTF-8
-ENV LC_ALL C.UTF-8
-
-ENTRYPOINT ["/root/sist2"]
-
-RUN apt update && apt install -y curl libasan5 libmagic1 tesseract-ocr python3-pip python3 git && rm -rf /var/lib/apt/lists/*
-
-RUN mkdir -p /usr/share/tessdata && \
-    cd /usr/share/tessdata/ && \
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/hin.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/hin.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/jpn.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/jpn.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/eng.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/eng.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/fra.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/fra.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/rus.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/rus.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/osd.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/osd.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/spa.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/spa.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/deu.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/deu.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/equ.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/equ.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/pol.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/pol.traineddata &&\
-    curl -o /usr/share/tesseract-ocr/4.00/tessdata/chi_sim.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/chi_sim.traineddata
-
-# sist2
-COPY --from=build /build/build/sist2 /root/sist2
-
-# sist2-admin
-COPY sist2-admin/requirements.txt sist2-admin/
-RUN python3 -m pip install --no-cache -r sist2-admin/requirements.txt
-COPY --from=build /build/sist2-admin/ sist2-admin/

README.md

@@ -1,10 +1,6 @@
-![GitHub](https://img.shields.io/github/license/sist2app/sist2.svg)
-[![CodeFactor](https://www.codefactor.io/repository/github/sist2app/sist2/badge?s=05daa325188aac4eae32c786f3d9cf4e0593f822)](https://www.codefactor.io/repository/github/sist2app/sist2)
-[![Development snapshots](https://ci.simon987.net/api/badges/simon987/sist2/status.svg)](https://files.simon987.net/.gate/sist2/simon987_sist2/)
-
-**Demo**: [sist2.simon987.net](https://sist2.simon987.net/)
-
-**Community URL:** [Discord](https://discord.gg/2PEjDy3Rfs)
+![GitHub](https://img.shields.io/github/license/simon987/sist2.svg)
+[![CodeFactor](https://www.codefactor.io/repository/github/simon987/sist2/badge?s=05daa325188aac4eae32c786f3d9cf4e0593f822)](https://www.codefactor.io/repository/github/simon987/sist2)
+[![Development snapshots](https://ci.simon987.net/app/rest/builds/buildType(Sist2_Build)/statusIcon)](https://files.simon987.net/artifacts/Sist2/Build/)
 
 # sist2
 
@@ -12,218 +8,128 @@ sist2 (Simple incremental search tool)
 
 *Warning: sist2 is in early development*
 
-![search panel](docs/sist2.gif)
+![sist2.png](sist2.png)
 
 ## Features
 
 * Fast, low memory usage, multi-threaded
-* Manage & schedule scan jobs with simple web interface (Docker only)
 * Mobile-friendly Web interface
-* Extracts text and metadata from common file types \*
+* Portable (all its features are packaged in a single executable)
+* Extracts text from common file types \*
 * Generates thumbnails \*
 * Incremental scanning
-* Manual tagging from the UI and automatic tagging based on file attributes via [user scripts](docs/scripting.md)
+* Automatic tagging from file attributes via [user scripts](scripting/README.md)
 * Recursive scan inside archive files \*\*
 * OCR support with tesseract \*\*\*
-* Stats page & disk utilisation visualization
-* Named-entity recognition (client-side) \*\*\*\*
+
 
 \* See [format support](#format-support)    
 \*\* See [Archive files](#archive-files)    
 \*\*\* See [OCR](#ocr)    
-\*\*\*\* See [Named-Entity Recognition](#NER)
 
 ## Getting Started
 
-### Using Docker Compose *(Windows/Linux/Mac)*
-
-```yaml
-services:
-  elasticsearch:
-    image: elasticsearch:7.17.9
-    restart: unless-stopped
-    volumes:
-      # This directory must have 1000:1000 permissions (or update PUID & PGID below)
-      - /data/sist2-es-data/:/usr/share/elasticsearch/data
-    environment:
-      - "discovery.type=single-node"
-      - "ES_JAVA_OPTS=-Xms2g -Xmx2g"
-      - "PUID=1000"
-      - "PGID=1000"
-  sist2-admin:
-    image: sist2app/sist2:x64-linux
-    restart: unless-stopped
-    volumes:
-      - /data/sist2-admin-data/:/sist2-admin/
-      - /<path to index>/:/host
-    ports:
-      - 4090:4090
-      # NOTE: Don't expose this port publicly!
-      - 8080:8080
-    working_dir: /root/sist2-admin/
-    entrypoint: python3
-    command:
-      - /root/sist2-admin/sist2_admin/app.py
-```
-
-Navigate to http://localhost:8080/ to configure sist2-admin.
-
-### Using the executable file *(Linux/WSL only)*
-
-1. Choose search backend (See [comparison](#search-backends)):
-    * **Elasticsearch**: have an Elasticsearch (version >= 6.8.X, ideally >=7.14.0) instance running
+1. Have an Elasticsearch (>= 6.X.X) instance running
     1. Download [from official website](https://www.elastic.co/downloads/elasticsearch)
-        2. *(or)* Run using docker:
+    1. *(or)* Run using docker:
         ```bash
-            docker run -d -p 9200:9200 -e "discovery.type=single-node" elasticsearch:7.17.9
+       docker run -d --name es1 --net sist2_net -p 9200:9200 \
+            -e "discovery.type=single-node" elasticsearch:7.5.2
         ```
-    * **SQLite**: No installation required
+    1. *(or)* Run using docker-compose:
+        ```yaml
+          elasticsearch:
+            image: docker.elastic.co/elasticsearch/elasticsearch:7.5.2
+            environment:
+              - discovery.type=single-node
+              - "ES_JAVA_OPTS=-Xms1G -Xmx2G"
+        ```
+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/artifacts/Sist2/Build/) *(Not recommended!)*
+    1. *(or)* `docker pull simon987/sist2:latest`
 
-2. Download the [latest sist2 release](https://github.com/sist2app/sist2/releases).
-   Select the file corresponding to your CPU architecture and mark the binary as executable with `chmod +x`.
-3. See [usage guide](docs/USAGE.md) for command line usage.
+1. See [Usage guide](USAGE.md)
    
-Example usage:
 
-1. Scan a directory: `sist2 scan ~/Documents --output ./documents.sist2`
-2. Prepare search index:
-    * **Elasticsearch**: `sist2 index --es-url http://localhost:9200 ./documents.sist2`
-    * **SQLite**: `sist2 sqlite-index --search-index ./search.sist2 ./documents.sist2`
-3. Start web interface: 
-   * **Elasticsearch**: `sist2 web ./documents.sist2`
-   * **SQLite**: `sist2 web --search-index ./search.sist2 ./documents.sist2`
+\* *Windows users*: **sist2** runs under [WSL](https://en.wikipedia.org/wiki/Windows_Subsystem_for_Linux)    
+
+
+## Example usage
+
+See [Usage guide](USAGE.md) for more details
+
+1. Scan a directory: `sist2 scan ~/Documents -o ./docs_idx`
+1. Push index to Elasticsearch: `sist2 index ./docs_idx`
+1. Start web interface: `sist2 web ./docs_idx`
+
 
 ## Format support
 
-| File type                                                                 | Library                                                                      | Content  | Thumbnail   | Metadata                                                                                                                               |
-|:--------------------------------------------------------------------------|:-----------------------------------------------------------------------------|:---------|:------------|:---------------------------------------------------------------------------------------------------------------------------------------|
-| pdf,xps,fb2,epub                                                          | MuPDF                                                                        | text+ocr | yes         | author, title                                                                                                                          |
-| cbz,cbr                                                                   | [libscan](https://github.com/sist2app/sist2/tree/master/third-party/libscan) | -        | yes         | -                                                                                                                                      |
-| `audio/*`                                                                 | ffmpeg                                                                       | -        | yes         | ID3 tags                                                                                                                               |
-| `video/*`                                                                 | ffmpeg                                                                       | -        | yes         | title, comment, artist                                                                                                                 |
-| `image/*`                                                                 | ffmpeg                                                                       | ocr      | yes         | [Common EXIF tags](https://github.com/sist2app/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                                                                       | no       | yes         | Common EXIF tags, GPS tags                                                                                                             |
-| ttf,ttc,cff,woff,fnt,otf                                                  | Freetype2                                                                    | -        | yes, `bmp`  | Name & style                                                                                                                           |
-| `text/plain`                                                              | [libscan](https://github.com/sist2app/sist2/tree/master/third-party/libscan) | yes      | no          | -                                                                                                                                      |
-| html, xml                                                                 | [libscan](https://github.com/sist2app/sist2/tree/master/third-party/libscan) | yes      | no          | -                                                                                                                                      |
-| tar, zip, rar, 7z, ar ...                                                 | Libarchive                                                                   | yes\*    | -           | no                                                                                                                                     |
-| docx, xlsx, pptx                                                          | [libscan](https://github.com/sist2app/sist2/tree/master/third-party/libscan) | yes      | if embedded | creator, modified_by, title                                                                                                            |
-| doc (MS Word 97-2003)                                                     | antiword                                                                     | yes      | no          | author, title                                                                                                                          |
-| mobi, azw, azw3                                                           | libmobi                                                                      | yes      | yes         | author, title                                                                                                                          |
-| wpd (WordPerfect)                                                         | libwpd                                                                       | yes      | no          | *planned*                                                                                                                              |
-| json, jsonl, ndjson                                                       | [libscan](https://github.com/sist2app/sist2/tree/master/third-party/libscan) | yes      | -           | -                                                                                                                                      |
+File type | Library | Content | Thumbnail | Metadata
+:---|:---|:---|:---|:---
+pdf,xps,cbz,cbr,fb2,epub | MuPDF | text+ocr | yes, `png` | title |
+`audio/*` | ffmpeg | - | yes, `jpeg` | ID3 tags |
+`video/*` | ffmpeg | - | yes, `jpeg` | title, comment, artist |
+`image/*` | ffmpeg | - | yes, `jpeg` | [Common EXIF tags](https://github.com/simon987/sist2/blob/efdde2734eca9b14a54f84568863b7ffd59bdba3/src/parsing/media.c#L190) |
+ttf,ttc,cff,woff,fnt,otf | Freetype2 | - | yes, `bmp` | Name & style |
+`text/plain` | *(none)* | yes | no | - |
+tar, zip, rar, 7z, ar ...  | Libarchive | yes\* | - | no |
+docx, xlsx, pptx | *(none)* | yes | no | no |
 
 \* *See [Archive files](#archive-files)*
  
 ### Archive files
-
-**sist2** will scan files stored into archive files (zip, tar, 7z...) as if they were directly in the file system.
-Recursive (archives inside archives)
+**sist2** will scan files stored into archive files (zip, tar, 7z...) as if
+they were directly in the file system. Recursive (archives inside archives)
 scan is also supported.
 
 **Limitations**:
-
-* Support for parsing media files with formats that require *seek* (e.g. `.gif`, `.mp4` w/ fragmented metadata etc.)
-  is limitted (see `--mem-buffer` option)
+* Parsing media files with formats that require
+*seek* (e.g. `.gif`, `.mp4` w/ fragmented metadata etc.) is not supported.
 * Archive files are scanned sequentially, by a single thread. On systems where
-  **sist2** is not I/O bound, scans might be faster when larger archives are split into smaller parts.
+**sist2** is not I/O bound, scans might be faster when larger archives are split
+ into smaller parts.
+
+To check if a media file can be parsed without *seek*, execute `cat file.mp4 | ffprobe -`
+ 
  
 ### OCR
 
-You can enable OCR support for ebook (pdf,xps,fb2,epub) or image file types with the
-`--ocr-lang <lang>` option in combination with `--ocr-images` and/or `--ocr-ebooks`.
-Download the language data files with your package manager (`apt install tesseract-ocr-eng`) or
-directly [from Github](https://github.com/tesseract-ocr/tesseract/wiki/Data-Files).
+You can enable OCR support for pdf,xps,cbz,cbr,fb2,epub file types with the
+`--ocr <lang>` option. Download the language data files with your
+package manager (`apt install tesseract-ocr-eng`) or directly [from Github](https://github.com/tesseract-ocr/tesseract/wiki/Data-Files).
 
-The `sist2app/sist2` image comes with common languages
-(hin, jpn, eng, fra, rus, spa, chi_sim, deu, pol) pre-installed.
-
-You can use the `+` separator to specify multiple languages. The language
-name must be identical to the `*.traineddata` file installed on your system
-(use `chi_sim` rather than `chi-sim`).
-
-Examples:
+The `simon987/sist2` image comes with common languages 
+(hin, jpn, eng, fra, rus, spa) pre-installed.
 
+Examples
 ```bash
-sist2 scan --ocr-ebooks --ocr-lang jpn ~/Books/Manga/
-sist2 scan --ocr-images --ocr-lang eng ~/Images/Screenshots/
-sist2 scan --ocr-ebooks --ocr-images --ocr-lang eng+chi_sim ~/Chinese-Bilingual/
+sist2 scan --ocr jpn ~/Books/Manga/
+sist2 scan --ocr eng ~/Books/Textbooks/
 ```
 
-### Search backends
-
-sist2 v3.0.7+ supports SQLite search backend. The SQLite search backend has
-fewer features and generally comparable query performance for medium-size
-indices, but it uses much less memory and is easier to set up.
-
-|                                              |                       SQLite                        |                                                             Elasticsearch                                                             |
-|----------------------------------------------|:---------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------------------------:|
-| Requires separate search engine installation |                                                     |                                                                   ✓                                                                   |
-| Memory footprint                             |                        ~20MB                        |                                                                >500MB                                                                 |
-| Query syntax                                 |      [fts5](https://www.sqlite.org/fts5.html)       | [query_string](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-string-syntax) |
-| Fuzzy search                                 |                                                     |                                                                   ✓                                                                   |
-| Media Types tree real-time updating          |                                                     |                                                                   ✓                                                                   |
-| Manual tagging                               |                          ✓                          |                                                                   ✓                                                                   |
-| User scripts                                 |                          ✓                          |                                                                   ✓                                                                   |
-| Media Type breakdown for search results      |                                                     |                                                                   ✓                                                                   |
-| Embeddings search                            |                      ✓ *O(n)*                       |                                                              ✓ *O(logn)*                                                              |
-
-### NER
-
-sist2 v3.0.4+ supports named-entity recognition (NER). Simply add a supported repository URL to
-**Configuration** > **Machine learning options** > **Model repositories**
-to enable it.
-
-The text processing is done in your browser, no data is sent to any third-party services.
-See [sist2app/sist2-ner-models](https://github.com/sist2app/sist2-ner-models) for more details.
-
-#### List of available repositories:
-
-| URL                                                                                                     | Maintainer                              | Purpose |
-|---------------------------------------------------------------------------------------------------------|-----------------------------------------|---------|
-| [sist2app/sist2-ner-models](https://raw.githubusercontent.com/sist2app/sist2-ner-models/main/repo.json) | [sist2app](https://github.com/sist2app) | General |
-
-<details>
-  <summary>Screenshot</summary>
-
-![ner](docs/ner.png)
-
-</details>
 
 ## Build from source
 
-You can compile **sist2** by yourself if you don't want to use the pre-compiled binaries
-
-### Using docker
-
-```bash
-git clone --recursive https://github.com/sist2app/sist2/
-cd sist2
-docker build . -t my-sist2-image
-# Copy sist2 executable from docker image
-docker run --rm --entrypoint cat my-sist2-image /root/sist2 > sist2-x64-linux
-```
-
-### Using a linux computer
+You can compile **sist2** by yourself if you don't want to use the pre-compiled
+binaries.
 
 1. Install compile-time dependencies
 
+    *(Debian)*
     ```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 nodejs
+    apt install git cmake pkg-config libglib2.0-dev \
+        libssl-dev uuid-dev python3 libmagic-dev libfreetype6-dev \
+        libcurl4-openssl-dev libbz2-dev yasm libharfbuzz-dev ragel \
+        libarchive-dev libtiff5 libpng16-16 libpango1.0-dev \
+        libxml2-dev libopenjp2-7-dev libleptonica-dev
    ```
 
-2. Install vcpkg using my fork: https://github.com/sist2app/vcpkg
-3. Install vcpkg dependencies
-
+2. Build
     ```bash
-    vcpkg install openblas curl[core,openssl] sqlite3[core,fts5,json1] cpp-jwt pcre cjson brotli libarchive[core,bzip2,libxml2,lz4,lzma,lzo] pthread tesseract libxml2 libmupdf[ocr] gtest mongoose libmagic libraw gumbo ffmpeg[core,avcodec,avformat,swscale,swresample,webp,opus,mp3lame,vpx,zlib]
-    ```
-
-4. Build
-    ```bash
-    git clone --recursive https://github.com/sist2app/sist2/
-    (cd sist2-vue; npm install; npm run build)
-    (cd sist2-admin/frontend; npm install; npm run build)
-    cmake -DSIST_DEBUG=off -DCMAKE_TOOLCHAIN_FILE=<VCPKG_ROOT>/scripts/buildsystems/vcpkg.cmake .
+    git clone --recurse-submodules https://github.com/simon987/sist2
+    ./scripts/get_static_libs.sh
+    cmake .
     make
     ```

USAGE.md

@@ -0,0 +1,275 @@
+# Usage
+
+*More examples (specifically with docker/compose) are in progress*
+
+* [scan](#scan)
+    * [options](#scan-options)
+    * [examples](#scan-examples)
+    * [index format](#index-format)
+* [index](#index)
+    * [options](#index-options)
+    * [examples](#index-examples)
+* [web](#web)
+    * [options](#web-options)
+    * [examples](#web-examples)
+    * [rewrite_url](#rewrite_url)
+    * [link to specific indices](#link-to-specific-indices)
+
+```
+Usage: sist2 scan [OPTION]... PATH
+   or: sist2 index [OPTION]... INDEX
+   or: sist2 web [OPTION]... INDEX...
+Lightning-fast file system indexer and search tool.
+
+    -h, --help            show this help message and exit
+    -v, --version         Show version and exit
+    --verbose             Turn on logging
+    --very-verbose        Turn on debug messages
+
+Scan options
+    -t, --threads=<int>   Number of threads. DEFAULT=1
+    -q, --quality=<flt>   Thumbnail quality, on a scale of 1.0 to 31.0, 1.0 being the best. DEFAULT=5
+    --size=<int>          Thumbnail size, in pixels. Use negative value to disable. DEFAULT=500
+    --content-size=<int>  Number of bytes to be extracted from text documents. Use negative value to disable. DEFAULT=32768
+    --incremental=<str>   Reuse an existing index and only scan modified files.
+    -o, --output=<str>    Output directory. DEFAULT=index.sist2/
+    --rewrite-url=<str>   Serve files from this url instead of from disk.
+    --name=<str>          Index display name. DEFAULT: (name of the directory)
+    --depth=<int>         Scan up to DEPTH subdirectories deep. Use 0 to only scan files in PATH. DEFAULT: -1
+    --archive=<str>       Archive file mode (skip|list|shallow|recurse). skip: Don't parse, list: only get file names as text, shallow: Don't parse archives inside archives. DEFAULT: recurse
+    --ocr=<str>           Tesseract language (use tesseract --list-langs to see which are installed on your machine)
+    -e, --exclude=<str>   Files that match this regex will not be scanned
+    --fast                Only index file names & mime type
+
+Index options
+    --es-url=<str>        Elasticsearch url with port. DEFAULT=http://localhost:9200
+    -p, --print           Just print JSON documents to stdout.
+    --script-file=<str>   Path to user script.
+    --batch-size=<int>    Index batch size. DEFAULT: 100
+    -f, --force-reset     Reset Elasticsearch mappings and settings. (You must use this option the first time you use the index command)
+
+Web options
+    --es-url=<str>        Elasticsearch url. DEFAULT=http://localhost:9200
+    --bind=<str>          Listen on this address. DEFAULT=localhost
+    --port=<str>          Listen on this port. DEFAULT=4090
+    --auth=<str>          Basic auth in user:password format
+Made by simon987 <me@simon987.net>. Released under GPL-3.0
+
+```
+
+## Scan
+
+### Scan options
+
+* `-t, --threads` 
+      Number of threads for file parsing. **Do not set a number higher than `$(nproc)`!**.
+* `-q, --quality` 
+    Thumbnail quality, on a scale of 1.0 to 31.0, 1.0 being the best. *Does not affect PDF thumbnails quality*
+* `--size` 
+    Thumbnail size in pixels.
+* `--content-size` 
+    Number of bytes of text to be extracted from the content of files (plain text and PDFs).
+    Repeated whitespace and special characters do not count toward this limit.
+* `--incremental`
+    Specify an existing index. Information about files in this index that were not modified (based on *mtime* attribute)
+    will be copied to the new index and will not be parsed again.
+* `-o, --output` Output directory. 
+* `--rewrite-url` Set the `rewrite_url` option for the web module (See [rewrite_url](#rewrite_url)) 
+* `--name` Set the `name` option for the web module
+* `--depth` Maximum scan dept. Set to 0 only scan files directly in the root directory, set to -1 for infinite depth
+* `--archive` Archive file mode.
+    * skip: Don't parse
+    * list: Only get file names as text
+    * shallow: Don't parse archives inside archives.
+    * recurse: Scan archives recursively (default)
+* `--ocr` See [OCR](README.md#OCR)
+* `-e, --exclude` Regex pattern to exclude files. A file is excluded if the pattern matches any 
+    part of the full absolute path.
+    
+    Examples: 
+    * `-e ".*\.ttf"`: Ignore ttf files
+    * `-e ".*\.(ttf|rar)"`: Ignore ttf and rar files
+    * `-e "^/mnt/backups/"`: Ignore all files in the `/mnt/backups/` directory
+    * `-e "^/mnt/Data[12]/"`: Ignore all files in the `/mnt/Data1/` and `/mnt/Data2/` directory
+    * `-e "(^/usr/)|(^/var/)|(^/media/DRIVE-A/tmp/)|(^/media/DRIVE-B/Trash/)"` Exclude the
+     `/usr`, `/var`, `/media/DRIVE-A/tmp`, `/media/DRIVE-B/Trash` directories
+* `--fast` Only index file names and mime type
+
+### Scan examples
+
+Simple scan
+```bash
+sist2 scan ~/Documents
+
+sist2 scan \
+    --threads 4 --content-size 16000000 --quality 1.0 --archive shallow \
+    --name "My Documents" --rewrite-url "http://nas.domain.local/My Documents/" \
+    ~/Documents -o ./documents.idx/
+```
+
+Incremental scan
+```
+sist2 scan --incremental ./orig_idx/ -o ./updated_idx/ ~/Documents
+```
+
+### Index format
+
+A typical `binary` type index structure looks like this:
+```
+documents.idx/
+├── descriptor.json
+├── _index_139965416830720
+├── _index_139965425223424
+├── _index_139965433616128
+├── _index_139965442008832
+└── thumbs
+    ├── data.mdb
+    └── lock.mdb
+```
+
+The `_index_*` files contain the raw binary index data and are not meant to be
+read by other applications. The format is generally compatible across different 
+sist2 versions.
+
+The `thumbs/` folder is a [LMDB](https://en.wikipedia.org/wiki/Lightning_Memory-Mapped_Database)
+database containing the thumbnails.
+
+The `descriptor.json` file contains general information about the index. The 
+following fields are safe to modify manually: `root`, `name`, [rewrite_url](#rewrite_url) and `timestamp`.
+
+
+*Advanced usage*
+
+Instead of using the `scan` module, you can also import an index generated
+by a third party application. The 'external' index must have the following format:
+
+```
+my_index/
+├── descriptor.json
+├── _index_0
+└── thumbs
+    ├── data.mdb
+    └── lock.mdb
+```
+
+*descriptor.json*:
+```json
+{
+    "uuid": "<valid UUID4>",
+    "version": "_external_v1",
+    "root": "(optional)",
+    "name": "<name>",
+    "rewrite_url": "(optional)",
+    "type": "json",
+    "timestamp": 1578971024
+}
+```
+
+*_index_0*: NDJSON format (One json object per line)
+
+```json
+{
+  "_id": "unique uuid for the file",
+  "index": "index uuid4 (same one as descriptor.json!)",
+  "mime": "application/x-cbz",
+  "size": 14341204,
+  "mtime": 1578882996,
+  "extension": "cbz",
+  "name": "my_book",
+  "path": "path/to/books",
+  "content": "text contents of the book",
+  "title": "Title of the book",
+  "tag": ["genre.fiction", "author.someguy", "etc..."],
+  "_keyword": [
+    {"k": "ISBN", "v": "ABCD34789231"}
+  ],
+  "_text": [
+    {"k": "other", "v": "This will be indexed as text"}
+  ]
+}
+```
+
+You can find the full list of supported fields [here](src/io/serialize.c#L90)
+
+The `_keyword.*` items will be indexed and searchable as **keyword** fields (only full matches allowed).
+The `_text.*` items will be indexed and searchable as **text** fields (fuzzy searching allowed)
+
+
+*thumbs/*:
+
+LMDB key-value store. Keys are **binary** 128-bit UUID4s (`_id` field)
+and values are raw image bytes.
+
+Importing an external `binary` type index is technically possible but
+it is currently unsupported and has no guaranties of back/forward compatibility.
+
+
+## Index
+### Index options
+ * `--es-url` 
+ Elasticsearch url and port. If you are using docker, make sure that both containers are on the
+ same network.
+ * `-p, --print` 
+    Print index in JSON format to stdout.
+ * `--script-file` 
+    Path to user script. See [Scripting](scripting/README.md).
+ * `--batch-size=<int>` 
+    Index batch size. Indexing is generally faster with larger batches, but payloads that
+    are too large will fail and additional overhead for retrying with smaller sizes may slow
+    down the process.
+ * `-f, --force-reset` 
+    Reset Elasticsearch mappings and settings.
+    **(You must use this option the first time you use the index command)**.
+    
+### Index examples
+
+**Push to elasticsearch**
+```bash
+sist2 index --force-reset --batch-size 1000 --es-url http://localhost:9200 ./my_index/
+sist2 index ./my_index/
+```
+
+**Save index in JSON format**
+```bash
+sist2 index --print ./my_index/ > my_index.ndjson
+```
+
+**Inspect contents of an index**
+```bash
+sist2 index --print ./my_index/ | jq | less
+```
+
+## Web
+
+### Web options
+ * `--es-url=<str>` Elasticsearch url.
+ * `--bind=<str>` Listen on this address.
+ * `--port=<str>` Listen on this port.
+ * `--auth=<str>` Basic auth in user:password format
+ 
+### Web examples
+
+**Single index**
+```bash
+sist2 web --auth admin:hunter2 --bind 0.0.0.0 --port 8888 my_index
+```
+
+**Multiple indices**
+```bash
+# Indices will be displayed in this order in the web interface
+sist2 web index1 index2 index3 index4
+```
+
+### rewrite_url
+
+When the `rewrite_url` field is not empty, the web module ignores the `root`
+field and will return a HTTP redirect to `<rewrite_url><path>/<name><extension>`
+instead of serving the file from disk. 
+Both the `root` and `rewrite_url` fields are safe to manually modify from the 
+`descriptor.json` file.
+
+### Link to specific indices
+
+To link to specific indices, you can add a list of comma-separated index name to 
+the URL: `?i=<name>,<name>`. By default, indices with `"(nsfw)"` in their name are
+not displayed.

argparse

@@ -0,0 +1 @@
+Subproject commit 4ed6099cb33245b06343518b9f3c45ac56e8283c

cJSON

@@ -0,0 +1 @@
+Subproject commit e8077d01500279a7b45b8cd7a0ae94ea7ad5748a

ci/build.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+./scripts/get_static_libs.sh
+
+rm -rf CMakeFiles CmakeCache.txt
+cmake -DSIST_DEBUG=off .
+make
+strip sist2
+
+rm -rf CMakeFiles CmakeCache.txt
+cmake -DSIST_DEBUG=on .
+make

contrib/systemd/Makefile

@@ -1,7 +0,0 @@
-install:
-	install sist2-update-all.sh /usr/bin/sist2-update-all.sh
-	install sist2-update-files.sh /usr/bin/sist2-update-files.sh
-	install sist2-update-nextcloud.sh /usr/bin/sist2-update-nextcloud.sh
-	install sist2-update.service /etc/systemd/system/sist2-update.service
-	install sist2-update.timer /etc/systemd/system/sist2-update.timer
-	systemctl daemon-reload

contrib/systemd/README.md

@@ -1,31 +0,0 @@
-# Systemd integration example
-
-This example contains my (yatli) personal configuration for sist2 auto-updating.
-The following indices are involved in this configuration:
-
-| Index     | Path             | Description                                |
-|-----------|------------------|--------------------------------------------|
-| files     | /zpool/files     | Main file repository                       |
-| nextcloud | /zpool/nextcloud | Externally synchronized to a cloud account |
-
-The systemd integration achieves automatic sist2 scanning & indexing everyday at 3:00AM.
-
-### Tailoring the configuration for yourself
-
-`sist2-update-all.sh` calls update scripts for each sist2 index. Add or remove
-update scripts accordingly to suit your need. Each update script (e.g.
-`sist2-update-files.sh`) has important parameters laid down at the beginning so
-make sure to edit them to point to your files and index locations.
-
-### Installation
-
-```bash
-# install the services and scripts
-sudo make install
-# enable & start the timer
-sudo systemctl enable sist2-update.timer
-sudo systemctl start sist2-update.timer
-# verify that the timer has been enabled
-systemctl list-timers --all
-```
-

contrib/systemd/sist2-update-all.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-echo "Update index: Files"
-source ${__dir}/sist2-update-files.sh
-echo "Update index: Nextcloud"
-source ${__dir}/sist2-update-nextcloud.sh
-echo "Done. Restarting sist2."
-docker restart sist2-sist2-1

contrib/systemd/sist2-update-files.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-set -e
-DATE=$(date +%Y_%m_%d)
-CONTENT=/zpool/files
-ORIG=/mnt/ssd/sist-index/files.idx
-NEW=/mnt/ssd/sist-index/files_$DATE.idx
-EXCLUDE='ZArchives|TorrentStore|TorrentDownload|624f0c59-1fef-44f6-95e9-7483296f2833|ubuntu-full-2021-12-07'
-NAME=Files
-#REWRITE_URL="http://localhost:33333/activate?collection=$NAME&path="
-REWRITE_URL=""
-
-sist2 scan \
-  --threads 14 \
-  --mem-throttle 32768 \
-  --thumbnail-quality 2 \
-  --name $NAME \
-  --ocr-lang=eng+chi_sim \
-  --ocr-ebooks \
-  --ocr-images \
-  --exclude=$EXCLUDE \
-  --rewrite-url=$REWRITE_URL \
-  --incremental=$ORIG \
-  --output=$NEW \
-  $CONTENT
-echo ">>> Scan complete"
-rm -rf $ORIG
-mv $NEW $ORIG 
-
-unset http_proxy
-unset https_proxy
-unset HTTP_PROXY
-unset HTTPS_PROXY
-sist2 index $ORIG --incremental-index
-echo ">>> Index complete"

contrib/systemd/sist2-update-nextcloud.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-set -e
-DATE=$(date +%Y_%m_%d)
-CONTENT=/zpool/nextcloud/v-yadli
-ORIG=/mnt/ssd/sist-index/nextcloud.idx
-NEW=/mnt/ssd/sist-index/nextcloud_$DATE.idx
-EXCLUDE='Yatao|.*263418493\\/Image\\/.*'
-NAME=NextCloud
-# REWRITE_URL="http://localhost:33333/activate?collection=$NAME&path="
-REWRITE_URL=""
-
-sist2 scan \
-  --threads 14 \
-  --mem-throttle 32768 \
-  --thumbnail-quality 2 \
-  --name $NAME \
-  --ocr-lang=eng+chi_sim \
-  --ocr-ebooks \
-  --ocr-images \
-  --exclude=$EXCLUDE \
-  --rewrite-url=$REWRITE_URL \
-  --incremental=$ORIG \
-  --output=$NEW \
-  $CONTENT
-echo ">>> Scan complete"
-rm -rf $ORIG
-mv $NEW $ORIG 
-
-unset http_proxy
-unset https_proxy
-unset HTTP_PROXY
-unset HTTPS_PROXY
-sist2 index $ORIG --incremental-index

contrib/systemd/sist2-update.service

@@ -1,6 +0,0 @@
-[Unit]
-Description=sist2-update
-
-[Service]
-User=yatli
-ExecStart=/bin/bash /usr/bin/sist2-update-all.sh

contrib/systemd/sist2-update.timer

@@ -1,10 +0,0 @@
-[Unit]
-Description=sist2-update
-
-[Timer]
-OnCalendar=*-*-* 3:00:00
-Persistent=true
-Unit=sist2-update.service
-
-[Install]
-WantedBy=timers.target

docker-compose.yml

@@ -1,29 +0,0 @@
-version: "3"
-
-services:
-  elasticsearch:
-    image: elasticsearch:7.17.9
-    container_name: sist2-es
-    volumes:
-      # This directory must have 1000:1000 permissions (or update PUID & PGID below)
-      - /data/sist2-es-data/:/usr/share/elasticsearch/data
-    environment:
-      - "discovery.type=single-node"
-      - "ES_JAVA_OPTS=-Xms2g -Xmx2g"
-      - "PUID=1000"
-      - "PGID=1000"
-  sist2-admin:
-    build:
-      context: .
-    container_name: sist2-admin
-    volumes:
-      - /data/sist2-admin-data/:/sist2-admin/
-      - /<path to index>/:/host
-    ports:
-      - 4090:4090
-      # NOTE: Don't export this port publicly!
-      - 8080:8080
-    working_dir: /root/sist2-admin/
-    entrypoint: python3
-    command:
-      - /root/sist2-admin/sist2_admin/app.py

docs/USAGE.md

@@ -1,232 +0,0 @@
-# Usage
-
-```
-Usage: sist2 scan [OPTION]... PATH
-   or: sist2 index [OPTION]... INDEX
-   or: sist2 sqlite-index [OPTION]... INDEX
-   or: sist2 web [OPTION]... INDEX...
-
-Lightning-fast file system indexer and search tool.
-
-    -h, --help                        show this help message and exit
-    -v, --version                     Print version and exit.
-    --verbose                         Turn on logging.
-    --very-verbose                    Turn on debug messages.
-    --json-logs                       Output logs in JSON format.
-
-Scan options
-    -t, --threads=<int>               Number of threads. DEFAULT: 1
-    -q, --thumbnail_count-quality=<int>     Thumbnail quality, on a scale of 0 to 100, 100 being the best. DEFAULT: 50
-    --thumbnail_count-size=<int>            Thumbnail size, in pixels. DEFAULT: 552
-    --thumbnail_count-count=<int>           Number of thumbnails to generate. Set a value > 1 to create video previews, set to 0 to disable thumbnails. DEFAULT: 1
-    --content-size=<int>              Number of bytes to be extracted from text documents. Set to 0 to disable. DEFAULT: 32768
-    -o, --output=<str>                Output index file path. DEFAULT: index.sist2
-    --incremental                     If the output file path exists, only scan new or modified files.
-    --optimize-index                  Defragment index file after scan to reduce its file size.
-    --rewrite-url=<str>               Serve files from this url instead of from disk.
-    --name=<str>                      Index display name. DEFAULT: index
-    --depth=<int>                     Scan up to DEPTH subdirectories deep. Use 0 to only scan files in PATH. DEFAULT: -1
-    --archive=<str>                   Archive file mode (skip|list|shallow|recurse). skip: don't scan, list: only save file names as text, shallow: don't scan archives inside archives. DEFAULT: recurse
-    --archive-passphrase=<str>        Passphrase for encrypted archive files
-    --ocr-lang=<str>                  Tesseract language (use 'tesseract --list-langs' to see which are installed on your machine)
-    --ocr-images                      Enable OCR'ing of image files.
-    --ocr-ebooks                      Enable OCR'ing of ebook files.
-    -e, --exclude=<str>               Files that match this regex will not be scanned.
-    --fast                            Only index file names & mime type.
-    --treemap-threshold=<str>         Relative size threshold for treemap (see USAGE.md). DEFAULT: 0.0005
-    --mem-buffer=<int>                Maximum memory buffer size per thread in MiB 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.
-    --list-file=<str>                 Specify a list of newline-delimited paths to be scanned instead of normal directory traversal. Use '-' to read from stdin.
-
-Index options
-    -t, --threads=<int>               Number of threads. DEFAULT: 1
-    --es-url=<str>                    Elasticsearch url with port. DEFAULT: http://localhost:9200
-    --es-insecure-ssl                 Do not verify SSL connections to Elasticsearch.
-    --es-index=<str>                  Elasticsearch index name. DEFAULT: sist2
-    -p, --print                       Print JSON documents to stdout instead of indexing to elasticsearch.
-    --incremental-index               Conduct incremental indexing. Assumes that the old index is already ingested in Elasticsearch.
-    --script-file=<str>               Path to user script.
-    --mappings-file=<str>             Path to Elasticsearch mappings.
-    --settings-file=<str>             Path to Elasticsearch settings.
-    --async-script                    Execute user script asynchronously.
-    --batch-size=<int>                Index batch size. DEFAULT: 70
-    -f, --force-reset                 Reset Elasticsearch mappings and settings.
-
-sqlite-index options
-    --search-index=<str>              Path to search index. Will be created if it does not exist yet.
-
-Web options
-    --es-url=<str>                    Elasticsearch url. DEFAULT: http://localhost:9200
-    --es-insecure-ssl                 Do not verify SSL connections to Elasticsearch.
-    --search-index=<str>              Path to SQLite search index.
-    --es-index=<str>                  Elasticsearch index name. DEFAULT: sist2
-    --bind=<str>                      Listen for connections on this address. DEFAULT: localhost:4090
-    --auth=<str>                      Basic auth in user:password format
-    --auth0-audience=<str>            API audience/identifier
-    --auth0-domain=<str>              Application domain
-    --auth0-client-id=<str>           Application client ID
-    --auth0-public-key-file=<str>     Path to Auth0 public key file extracted from <domain>/pem
-    --tag-auth=<str>                  Basic auth in user:password format for tagging
-    --tagline=<str>                   Tagline in navbar
-    --dev                             Serve html & js files from disk (for development)
-    --lang=<str>                      Default UI language. Can be changed by the user
-
-Made by simon987 <me@simon987.net>. Released under GPL-3.0
-```
-
-#### Thumbnail database size estimation
-
-See chart below for rough estimate of thumbnail_count size vs. thumbnail_count size & quality arguments:
-
-For example, `--thumbnail_count-size=500`, `--thumbnail_count-quality=50` for a directory with 8 million images will create a thumbnail_count database 
-that is about `8000000 * 11.8kB = 94.4GB`.
-
-![thumbnail_size](thumbnail_size.png)
-
-### Scan examples
-
-Simple scan
-```bash
-sist2 scan ~/Documents
-
-sist2 scan \
-    --threads 4 --content-size 16000000 --thumbnail_count-quality 2 --archive shallow \
-    --name "My Documents" --rewrite-url "http://nas.domain.local/My Documents/" \
-    ~/Documents -o ./documents.sist2
-```
-
-Incremental scan
-
-If the index file does not exist, `--incremental` has no effect.
-```bash
-sist scan ~/Documents -o ./documents.sist2
-sist scan ~/Documents -o ./documents.sist2 --incremental
-# or
-sist scan ~/Documents -o ./documents.sist2 --incremental
-sist scan ~/Documents -o ./documents.sist2 --incremental
-```
-
-### Index documents to Elasticsearch search backend
-
-```bash
-sist2 index --force-reset --batch-size 1000 --es-url http://localhost:9200 ./my_index.sist2
-sist2 index ./my_index.sist2
-```
-
-#### Index documents to SQLite search backend
-```bash
-# The search index will be created if it does not exist already
-sist2 sqlite-index ./index1.sist2 --search-index search.sist2
-sist2 sqlite-index ./index2.sist2 --search-index search.sist2
-```
-
-**Save index in JSON format**
-```bash
-sist2 index --print ./my_index.sist2 > my_index.ndjson
-```
-
-**Inspect contents of an index**
-```bash
-sist2 index --print ./my_index.sist2 | jq | less
-```
-
-## Web
-
-### Web examples
-
-**Single index (Elasticsearch backend)**
-```bash
-sist2 web --auth admin:hunter2 --bind 0.0.0.0:8888 my_index.sist2
-```
-
-**Multiple indices (Elasticsearch backend)**
-```bash
-# Indices will be displayed in this order in the web interface
-sist2 web index1.sist2 index2.sist2 index3.sist2 index4.sist2
-```
-
-**SQLite search backend**
-```bash
-sist2 web --search-index search.sist2 index1.sist2
-```
-
-#### Auth0 authentication
-
-See [auth0.md](auth0.md)
-
-### rewrite_url
-
-When the `rewrite_url` field is not empty, the web module ignores the `root`
-field and will return a HTTP redirect to `<rewrite_url><path>/<name><extension>`
-instead of serving the file from disk. 
-Both the `root` and `rewrite_url` fields are safe to manually modify from the 
-`descriptor.json` file.
-
-# Elasticsearch
-
-Elasticsearch versions >=6.8.0, 7.X.X and 8.X.X are supported by sist2. 
-
-Using a version >=7.14.0 is recommended to enable the following features:
-
-- Bug fix for large documents (See #198)
-
-Using a version >=8.0.0 is recommended to enable the following features:
-
-- Approximate KNN search for Embeddings search (faster queries).
-
-When using a legacy version of ES, a notice will be displayed next to the sist2 version in the web UI.
-If you don't care about the features above, you can ignore it or disable it in the configuration page.
-
-# Embeddings search
-
-Since v3.2.0, User scripts can be used to generate _embeddings_ (vector of float32 numbers) which are stored in the .sist2 index file 
-(see [scripting](scripting.md)). Embeddings can be used for:
-
-* Nearest-neighbor queries (e.g. "return the documents most similar to this one")
-* Semantic searches (e.g. "return the documents that are most closely related to the given topic")
-
-In theory, embeddings can be created for any type of documents (image, text, audio etc.).
-
-For example, the [clip](https://github.com/sist2app/sist2-script-clip) User Script, generates 512-d embeddings of images
-(videos are also supported using the thumbnails generated by sist2). When the user enters a query in the "Embeddings Search"
-textbox, the query's embedding is generated in their browser, leveraging the ONNX web runtime.
-
-<details>
-  <summary>Screenshots</summary>
- 
- ![embeddings-1](embeddings-1.png)
- ![embeddings-2](embeddings-2.png)
-
-1. Embeddings search bar. You can select the model using the dropdown on the left.
-2. This icon appears for indices with embeddings search enabled.
-3. Documents with this icon have embeddings. Click on the icon to perform KNN search.
-</details>
-
-
-# Tagging
-
-### Manual tagging
-
-You can modify tags of individual documents directly from the 
- `web` interface. Note that you can setup authentication for this feature
- with the `--tag-auth` option (See [web options](#web-options))
-
-![manual_tag](manual_tag.png)
-
-Tags that are manually added are saved both in the 
- index folder (in `/tags/`) and in Elasticsearch*. When re-`index`ing, 
- they are read from the index and automatically applied.
- 
-You can safely copy the `/tags/` database to another index.
-
-See [Automatic tagging](#automatic-tagging) for information about tag 
- hierarchies and tag colors.
-
-\* *It can take a few seconds to take effect in new search queries.*
-
-
-### Automatic tagging
-
-See [scripting](scripting.md) documentation.

docs/auth0.md

@@ -1,19 +0,0 @@
-
-# Authentication with Auth0
-
-1. Create a new Auth0 application (Single page app)
-2. Create a new Auth0 API:
-   1. Choose `RS256` signing algorithm
-   2. Set identifier (audience) to `https://sist2`
-3. Download the Auth0 certificate from https://<domain>.auth0.com/pem (you can find the domain Applications->Basic information)
-4. Extract the public key from the certificate using `openssl x509 -pubkey -noout -in cert.pem > pubkey.txt`
-5. Start the sist2 web server
-
-Example options:
-```bash
-sist2 web \
-  --auth0-client-id XXX \
-  --auth0-audience https://sist2 \
-  --auth0-domain YYY.auth0.com \
-  --auth0-public-key-file /ZZZ/pubkey.txt
-```

lib/bzip2-1.0.6

@@ -0,0 +1 @@
+Subproject commit 288acf97a15d558f96c24c89f578b724d6e06b0c

lib/ffmpeg

@@ -0,0 +1 @@
+Subproject commit e27a35e0458224ef6f47753f248ba84ec8284818

lib/harfbuzz

@@ -0,0 +1 @@
+Subproject commit b7617f6b3cfa0abf10292ea79bcd53ef61a08e90

lib/leptonica

@@ -0,0 +1 @@
+Subproject commit 320b4bbb025db7f8c68d3c2b0b9d9fad459c7af3

lib/libmagic

@@ -0,0 +1 @@
+Subproject commit 1249b5cd02c3b6fb9b917d16c76bc76c862932b6

lib/libpng

@@ -0,0 +1 @@
+Subproject commit 301f7a14295a3bdfaf406dbb5004d0784dc137ea

lib/libtiff

@@ -0,0 +1 @@
+Subproject commit a6d3c1d64b655f5f151a01fda2b7b0bf50cc61aa

lib/mupdf

@@ -0,0 +1 @@
+Subproject commit 1e1ac03fe4c8bfd9022d945b05e0cc1343827399

lib/onion

@@ -0,0 +1 @@
+Subproject commit 2b3b230b79ecae119b7eb847f2f9545a46bef13c

lib/openjpeg

@@ -0,0 +1 @@
+Subproject commit 563ecfb55ca77c0fc5ea19e4885e00f55ec82ca9

lib/tesseract

@@ -0,0 +1 @@
+Subproject commit 90405ad0e3bdb7b779d8edaf147bff496873f84b

lmdb

@@ -0,0 +1 @@
+Subproject commit 5c012bbe033f9bbb273078b07dded59f080d348d

mime.csv

@@ -1,4 +1,3 @@
-application/x-matlab-data,mat
 application/arj, arj
 application/base64, mme
 application/binhex, hqx
@@ -14,7 +13,7 @@ application/epub+zip, epub
 application/freeloader, frl
 application/futuresplash, spl
 application/groupwise, vew
-application/gzip, gz|tgz
+application/gzip, gz
 application/hta, hta
 application/i-deas, unv
 application/iges, iges|igs
@@ -23,14 +22,13 @@ application/java-archive, jar
 application/java, class
 application/javascript,
 application/json, json
-application/ndjson, jsonl|ndjson
 application/marc, mrc
 application/mbedlet, mbd
 application/mime, aps
 application/mspowerpoint, ppz
 application/msword, doc|dot|w6w|wiz|word
 application/netmc, mcp
-application/octet-stream, bin|dump|gpg|pack|idx
+application/octet-stream, bin|dump|gpg
 application/oda, oda
 application/ogg, ogv
 application/pdf, pdf
@@ -80,7 +78,9 @@ application/vocaltec-media-desc, vmd
 application/vocaltec-media-file, vmf
 application/warc, warc
 application/winhelp, hlp
-application/wordperfect, wp|wp5|wp6|wpd|w60|w61
+application/wordperfect6.0, w60
+application/wordperfect6.1, w61
+application/wordperfect, wp|wp5|wp6|wpd
 application/x-123, wk1
 application/x-7z-compressed, 7z
 application/x-aim, aim
@@ -111,7 +111,7 @@ application/x-dbf, dbf
 application/x-dbt,
 application/x-debian-package, deb
 application/x-deepv, deepv
-application/x-director, dir|dxr
+application/x-director, dcr|dir|dxr
 application/x-dmp, dmp
 application/x-dosdriver,
 application/x-dosexec, dll
@@ -157,6 +157,7 @@ application/x-livescreen, ivy
 application/x-lotus, wq1
 application/x-lz4+json, jsonlz4
 application/x-lz4, lz4
+application/x-lz4, lz4
 application/x-lzh-compressed,
 application/x-lzh, lzh
 application/x-lzip, lz
@@ -174,7 +175,6 @@ application/x-mif, mif
 application/x-mix-transfer, nix
 application/xml, opf
 application/x-mobipocket-ebook, mobi
-application/vnd.amazon.mobi8-ebook, azw|azw3
 application/x-msaccess, accdb
 application/x-ms-compress-szdd, fon
 application/x-ms-pdb, pdb
@@ -244,7 +244,7 @@ audio/make, funk|my|pfunk
 audio/midi, kar
 audio/mid, rmi
 audio/mp4, m4b
-audio/mpeg, m2a|mpa|mpga
+audio/mpeg, m2a|mpa
 audio/ogg, ogg
 audio/s3m, s3m
 audio/tsp-audio, tsi
@@ -346,10 +346,7 @@ text/javascript, js
 text/mcf, mcf
 text/pascal, pas
 text/PGP,
-text/plain, com|cmd|conf|def|g|idc|list|lst|mar|sdml|text|txt|md|groovy|license|properties|desktop|ini|rst|cmake|ipynb|readme|less|lo|go|yml|d|cs|hpp|srt|nfo|sfv|m3u|csv|eml|make|log|markdown|yaml
-text/x-script.python, pyx
-text/csv,
-application/vnd.coffeescript, coffee
+text/plain, com|cmd|conf|def|g|idc|list|lst|mar|sdml|text|txt|md|groovy|license|properties|desktop|ini|rst|cmake|ipynb|readme|less|lo|go|yml|d|cs|hpp|srt|nfo|sfv|m3u|csv|eml
 text/richtext, rt|rtf|rtx
 text/rtf,
 text/scriplet, wsc
@@ -385,7 +382,7 @@ text/x-pascal, p
 text/x-perl, pl
 text/x-php, php
 text/x-po, po
-text/x-python, py|pyi
+text/x-python, py
 text/x-ruby, rb
 text/x-sass, sass
 text/x-scss, scss
@@ -430,23 +427,3 @@ video/x-msvideo, divx
 video/x-qtc, qtc
 video/x-sgi-movie, movie|mv
 x-epoc/x-sisx-app,
-application/x-zstd-dictionary,
-application/vnd.ms-outlook, msg
-image/x-olympus-orf, orf
-image/x-nikon-nef, nef
-image/x-fuji-raf, raf
-image/x-panasonic-raw, rw2|raw
-image/x-adobe-dng, dng
-image/x-canon-cr2, cr2
-image/x-canon-crw, crw
-image/x-dcraw,
-image/x-kodak-dcr, dcr
-image/x-kodak-k25, k25
-image/x-kodak-kdc, kdc
-image/x-minolta-mrw, mrw
-image/x-pentax-pef, pef
-image/x-sigma-x3f, xf3
-image/x-sony-arw, arw
-image/x-sony-sr2, sr2
-image/x-sony-srf, srf
-image/x-epson-erf, erf

schema/mappings.json

@@ -4,44 +4,18 @@
       "type": "keyword",
       "doc_values": true
     },
-    "checksum": {
-      "type": "keyword",
-      "index": false
-    },
     "_depth": {
       "type": "integer"
     },
     "path": {
       "type": "text",
       "analyzer": "path_analyzer",
-      "copy_to": "suggest-path",
       "fielddata": true,
-      "fields": {
-        "nGram": {
-          "type": "text",
-          "analyzer": "my_nGram"
-        },
-        "text": {
-          "type": "text",
-          "analyzer": "content_analyzer"
-        }
-      }
-    },
-    "suggest-path": {
-      "type": "completion",
-      "analyzer": "case_insensitive_kw_analyzer"
+      "index_prefixes": {}
     },
     "mime": {
       "type": "keyword"
     },
-    "parent": {
-      "type": "keyword",
-      "index": false
-    },
-    "thumbnail": {
-      "type": "integer",
-      "index": false
-    },
     "videoc": {
       "type": "keyword",
       "index": false
@@ -51,7 +25,7 @@
       "index": false
     },
     "duration": {
-      "type": "integer",
+      "type": "float",
       "index": false
     },
     "width": {
@@ -62,13 +36,8 @@
       "type": "integer",
       "index": false
     },
-    "pages": {
-      "type": "integer",
-      "index": false
-    },
     "mtime": {
-      "type": "date",
-      "format": "epoch_second"
+      "type": "integer"
     },
     "size": {
       "type": "long"
@@ -79,7 +48,6 @@
     "name": {
       "analyzer": "content_analyzer",
       "type": "text",
-      "fielddata": true,
       "fields": {
         "nGram": {
           "type": "text",
@@ -140,14 +108,7 @@
       }
     },
     "tag": {
-      "type": "text",
-      "fielddata": true,
-      "analyzer": "tag_analyzer",
-      "copy_to": "suggest-tag"
-    },
-    "suggest-tag": {
-      "type": "completion",
-      "analyzer": "case_insensitive_kw_analyzer"
+      "type": "keyword"
     },
     "exif_make": {
       "type": "text"
@@ -172,76 +133,6 @@
     },
     "exif_user_comment": {
       "type": "text"
-    },
-    "exif_gps_longitude_ref": {
-      "type": "keyword",
-      "index": false
-    },
-    "exif_gps_longitude_dms": {
-      "type": "keyword",
-      "index": false
-    },
-    "exif_gps_longitude_dec": {
-      "type": "keyword",
-      "index": false
-    },
-    "exif_gps_latitude_ref": {
-      "type": "keyword",
-      "index": false
-    },
-    "exif_gps_latitude_dms": {
-      "type": "keyword",
-      "index": false
-    },
-    "exif_gps_latitude_dec": {
-      "type": "keyword",
-      "index": false
-    },
-    "author": {
-      "type": "text"
-    },
-    "modified_by": {
-      "type": "text"
-    },
-    "emb.384.*": {
-      "type": "dense_vector",
-      "dims": 384
-    },
-    "emb.idx_384.*": {
-      "type": "dense_vector",
-      "dims": 384,
-      "index": true,
-      "similarity": "cosine"
-    },
-    "emb.idx_512.clip": {
-      "type": "dense_vector",
-      "dims": 512,
-      "index": true,
-      "similarity": "cosine"
-    },
-    "emb.512.*": {
-      "type": "dense_vector",
-      "dims": 512
-    },
-    "emb.idx_768.*": {
-      "type": "dense_vector",
-      "dims": 768,
-      "index": true,
-      "similarity": "cosine"
-    },
-    "emb.768.*": {
-      "type": "dense_vector",
-      "dims": 768
-    },
-    "emb.idx_1024.*": {
-      "type": "dense_vector",
-      "dims": 1024,
-      "index": true,
-      "similarity": "cosine"
-    },
-    "emb.1024.*": {
-      "type": "dense_vector",
-      "dims": 1024
     }
   }
 }

schema/settings.json

@@ -1,22 +1,15 @@
 {
   "index": {
     "refresh_interval": "30s",
-    "codec": "best_compression",
-    "number_of_replicas": 0,
-    "highlight.max_analyzed_offset": 1000000
+    "codec": "best_compression"
   },
   "analysis": {
     "tokenizer": {
       "path_tokenizer": {
-        "type": "path_hierarchy",
-        "delimiter": "/"
-      },
-      "tag_tokenizer": {
-        "type": "path_hierarchy",
-        "delimiter": "."
+        "type": "path_hierarchy"
       },
       "my_nGram_tokenizer": {
-        "type": "ngram",
+        "type": "nGram",
         "min_gram": 3,
         "max_gram": 3
       }
@@ -28,12 +21,6 @@
           "lowercase"
         ]
       },
-      "tag_analyzer": {
-        "tokenizer": "tag_tokenizer",
-        "filter": [
-          "lowercase"
-        ]
-      },
       "case_insensitive_kw_analyzer": {
         "tokenizer": "keyword",
         "filter": [

schema/settings_legacy.json

@@ -1,58 +0,0 @@
-{
-  "index": {
-    "refresh_interval": "30s",
-    "codec": "best_compression",
-    "number_of_replicas": 0
-  },
-  "analysis": {
-    "tokenizer": {
-      "path_tokenizer": {
-        "type": "path_hierarchy",
-        "delimiter": "/"
-      },
-      "tag_tokenizer": {
-        "type": "path_hierarchy",
-        "delimiter": "."
-      },
-      "my_nGram_tokenizer": {
-        "type": "nGram",
-        "min_gram": 3,
-        "max_gram": 3
-      }
-    },
-    "analyzer": {
-      "path_analyzer": {
-        "tokenizer": "path_tokenizer",
-        "filter": [
-          "lowercase"
-        ]
-      },
-      "tag_analyzer": {
-        "tokenizer": "tag_tokenizer",
-        "filter": [
-          "lowercase"
-        ]
-      },
-      "case_insensitive_kw_analyzer": {
-        "tokenizer": "keyword",
-        "filter": [
-          "lowercase"
-        ]
-      },
-      "my_nGram": {
-        "tokenizer": "my_nGram_tokenizer",
-        "filter": [
-          "lowercase",
-          "asciifolding"
-        ]
-      },
-      "content_analyzer": {
-        "tokenizer": "standard",
-        "filter": [
-          "lowercase",
-          "asciifolding"
-        ]
-      }
-    }
-  }
-}

scripting/README.md

@@ -1,34 +1,6 @@
 ## User scripts
 
-User scripts are used to augment your sist2 index with additional metadata, neural network embeddings, tags etc.
-
-
-Since version 3.2.0, user scripts are written in Python, and are ran against the sist2 index file. User scripts do not 
-need a connection to the search backend.
-
-You can create a user script based on a template from the sist2-admin interface:
-
-![sist2-admin-scripts](sist2-admin-scripts.png)
-
-User scripts leverage the [sist2-python](https://github.com/simon987/sist2-python) library to interface with the
-index file*. You can find sist2-python documentation and examples
-here: [sist2-python.readthedocs.io](https://sist2-python.readthedocs.io/).
-
-If you are not using the sist2-admin interface, you can run user scripts manually from the command line:
-
-```
-pip install git+https://github.com/simon987/sist2-python.git
-
-python my_script.py /path/to/my_index.sist2
-```
-
-\* It is possible to manually update the index using raw SQL queries, but the database schema is not stable and
-can change at any time; it is recommended to use the more stable sist2-python wrapper instead.
-
-<hr>
-
-<details>
-  <summary>Legacy user scripts (sist2 version < 3.2.0)</summary>
+*This document is under construction, more in-depth guide coming soon*
 
 During the `index` step, you can use the `--script-file <script>` option to
 modify documents or add user tags. This option is mainly used to
@@ -41,7 +13,6 @@ without programming experience at all if you're somewhat familiar with
 regex.
 
 This is the base structure of the documents we're working with:
-
 ```json
 {
   "_id": "e171405c-fdb5-4feb-bb32-82637bc32084",
@@ -64,12 +35,11 @@ This is the base structure of the documents we're working with:
 
 This script checks if the `genre` attribute exists, if it does
 it adds the `genre.<genre>` tag. 
-
 ```Java
 ArrayList tags = ctx._source.tag = new ArrayList();
 
 if (ctx._source?.genre != null) {
-    tags.add("genre." + ctx._source.genre.toLowerCase());
+    tags.add("genre." + ctx._source.genre.toLowerCase())
 }
 ```
 
@@ -77,12 +47,11 @@ You can use `.` to create a hierarchical tag tree:
 
 ![scripting/genre_example](genre_example.png)
 
-To use regular expressions, you need to add this line in `/etc/elasticsearch/elasticsearch.yml`
 
+To use regular expressions, you need to add this line in `/etc/elasticsearch/elasticsearch.yml`
 ```yaml
 script.painless.regex.enabled: true
 ```
-
 Or, if you're using docker add `-e "script.painless.regex.enabled=true"`
 
 **Tag color**
@@ -93,18 +62,16 @@ hexadecimal color code (`#RRGGBBAA`) to the tag name.
 ### Examples
 
 If `(20XX)` is in the file name, add the `year.<year>` tag:
-
 ```Java
 ArrayList tags = ctx._source.tag = new ArrayList();
 
 Matcher m = /[\(\.+](20[0-9]{2})[\)\.+]/.matcher(ctx._source.name);
 if (m.find()) {
-    tags.add("year." + m.group(1));
+    tags.add("year." + m.group(1))
 }
 ```
 
 Use default *Calibre* folder structure to infer author.
-
 ```Java
 ArrayList tags = ctx._source.tag = new ArrayList();
 
@@ -119,7 +86,6 @@ if (ctx._source.name.contains("-") && ctx._source.extension == "pdf") {
 
 If the file matches a specific pattern `AAAA-000 fName1 lName1, <fName2 lName2>...`, add the `actress.<actress>` and 
 `studio.<studio>` tag:
-
 ```Java
 ArrayList tags = ctx._source.tag = new ArrayList();
 
@@ -136,18 +102,26 @@ if (m.find()) {
 ```
 
 Set the name of the last folder (`/path/to/<studio>/file.mp4`) to `studio.<studio>` tag
-
 ```Java
 ArrayList tags = ctx._source.tag = new ArrayList();
 
 if (ctx._source.path != "") {
-    String[] names = ctx._source.path.splitOnToken('/');
+    String[] names = ctx._source.path.splitOnToken('/');
+    tags.add("studio." + names[names.length-1]);
+}
+```
+
+Set the name of the last folder (`/path/to/<studio>/file.mp4`) to `studio.<studio>` tag
+```Java
+ArrayList tags = ctx._source.tag = new ArrayList();
+
+if (ctx._source.path != "") {
+    String[] names = ctx._source.path.splitOnToken('/');
     tags.add("studio." + names[names.length-1]);
 }
 ```
 
 Parse `EXIF:F Number` tag
-
 ```Java
 if (ctx._source?.exif_fnumber != null) {
     String[] values = ctx._source.exif_fnumber.splitOnToken(' ');
@@ -160,7 +134,6 @@ if (ctx._source?.exif_fnumber != null) {
 ```
 
 Display year and months from `EXIF:DateTime` tag
-
 ```Java
 if (ctx._source?.exif_datetime != null) {
     SimpleDateFormat parser = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");
@@ -177,6 +150,3 @@ if (ctx._source?.exif_datetime != null) {
 }
 
 ```
-
-</details>
-

scripts/before_build.sh

@@ -1,13 +1,17 @@
 #!/usr/bin/env bash
 
-(
-  cd ..
-  rm -rf index.sist2
+rm -rf index.sist2/
 
-  python3 scripts/mime.py > src/parsing/mime_generated.c
-  python3 scripts/serve_static.py > src/web/static_generated.c
-  python3 scripts/index_static.py > src/index/static_generated.c
-  python3 scripts/magic_static.py > src/magic_generated.c
+rm web/js/bundle.js 2> /dev/null
+cat `ls web/js/*.min.js` > web/js/bundle.js
+cat web/js/{util,dom,search}.js >> web/js/bundle.js
 
-  printf "static const char *const Sist2CommitHash = \"%s\";\n" $(git rev-parse HEAD) > src/git_hash.h
-)
+rm web/css/bundle*.css 2> /dev/null
+cat web/css/*.min.css > web/css/bundle.css
+cat web/css/light.css >> web/css/bundle.css
+cat web/css/*.min.css > web/css/bundle_dark.css
+cat web/css/dark.css >> web/css/bundle_dark.css
+
+python3 scripts/mime.py > src/parsing/mime_generated.c
+python3 scripts/serve_static.py > src/web/static_generated.c
+python3 scripts/index_static.py > src/index/static_generated.c

scripts/build.sh

@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-VCPKG_ROOT="/vcpkg"
-
-(
-  cd sist2-vue/
-  npm install
-  npm run build
-) &
-
-(
-  cd sist2-admin/frontend/
-  npm install
-  npm run build
-) &
-
-wait
-
-mkdir build
-(
-  cd build
-  cmake -DSIST_PLATFORM=x64_linux -DSIST_DEBUG_INFO=on -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" ..
-  make -j $(nproc)
-  strip sist2
-  ./sist2 -v > VERSION
-)
-mv build/sist2 sist2-x64-linux
-
-(
-  cd build
-  rm -rf CMakeFiles CMakeCache.txt
-  cmake -DSIST_PLATFORM=x64_linux -DSIST_DEBUG_INFO=on -DSIST_DEBUG=on -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" ..
-  make -j  $(nproc)
-)
-mv build/sist2_debug sist2-x64-linux-debug

scripts/build_arm64.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-VCPKG_ROOT="/vcpkg"
-
-git submodule update --init --recursive
-
-(
-  cd sist2-vue/
-  npm install
-  npm run build
-) &
-
-(
-  cd sist2-admin/frontend/
-  npm install
-  npm run build
-) &
-
-wait
-
-mkdir build
-(
-  cd build
-  cmake -DSIST_PLATFORM=arm64_linux -DSIST_DEBUG_INFO=on -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" ..
-  make -j $(nproc)
-  strip sist2
-)
-mv build/sist2 sist2-arm64-linux
-
-rm -rf CMakeFiles CMakeCache.txt
-(
-  cd build
-  cmake -DSIST_PLATFORM=arm64_linux -DSIST_DEBUG_INFO=on -DSIST_DEBUG=on -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" ..
-  make -j $(nproc)
-)
-mv build/sist2_debug sist2-arm64-linux-debug

scripts/get_static_libs.sh

@@ -0,0 +1,128 @@
+#!/usr/bin/env bash
+
+THREADS=$(nproc)
+
+cd lib
+
+cd mupdf
+CFLAGS=-fPIC make USE_SYSTEM_HARFBUZZ=yes USE_SYSTEM_OPENJPEG=yes HAVE_X11=no HAVE_GLUT=no -j $THREADS
+cd ..
+
+mv mupdf/build/release/libmupdf.a .
+mv mupdf/build/release/libmupdf-third.a .
+
+# openjp2
+cd openjpeg
+cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-O3 -DNDEBUG -fPIC"
+make -j $THREADS
+cd ..
+mv openjpeg/bin/libopenjp2.a .
+
+# harfbuzz
+cd harfbuzz
+./autogen.sh
+CFLAGS=-fPIC ./configure --disable-shared --enable-static
+make -j $THREADS
+cd ..
+mv harfbuzz/src/.libs/libharfbuzz.a .
+
+# ffmpeg
+cd ffmpeg
+./configure --disable-shared --enable-static --disable-ffmpeg --disable-ffplay \
+ --disable-ffprobe --disable-doc\
+ --disable-manpages --disable-postproc --disable-avfilter \
+ --disable-alsa --disable-lzma --disable-xlib --disable-debug\
+ --disable-vdpau --disable-vaapi --disable-sdl2 --disable-network\
+ --extra-cflags=-fPIC
+make -j $THREADS
+cd ..
+
+mv ffmpeg/libavcodec/libavcodec.a .
+mv ffmpeg/libavformat/libavformat.a .
+mv ffmpeg/libavutil/libavutil.a .
+mv ffmpeg/libswresample/libswresample.a .
+mv ffmpeg/libswscale/libswscale.a .
+
+# onion
+cd onion
+mkdir build 2> /dev/null
+cd build
+cmake -DONION_USE_SSL=false -DONION_USE_PAM=false -DONION_USE_PNG=false -DONION_USE_JPEG=false \
+-DONION_USE_JPEG=false -DONION_USE_XML2=false -DONION_USE_SYSTEMD=false -DONION_USE_SQLITE3=false \
+-DONION_USE_REDIS=false -DONION_USE_GC=false -DONION_USE_TESTS=false -DONION_EXAMPLES=false \
+-DONION_USE_BINDINGS_CPP=false ..
+make -j $THREADS
+cd ../..
+
+mv onion/build/src/onion/libonion_static.a .
+
+#bzip2
+cd bzip2-1.0.6
+make -j $THREADS
+cd ..
+mv bzip2-1.0.6/libbz2.a .
+
+# magic
+cd libmagic
+./autogen.sh
+./configure --enable-static --disable-shared
+make -j $THREADS
+cd ..
+mv libmagic/src/.libs/libmagic.a .
+
+# tesseract
+cd tesseract
+mkdir build
+cd build
+cmake -DSTATIC=on -DBUILD_TRAINING_TOOLS=off -DBUILD_TESTS=off -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_FLAGS="-fPIC" -DAUTO_OPTIMIZE=off ..
+make -j $THREADS
+cd ../..
+mv tesseract/build/libtesseract.a .
+
+# leptonica
+cd leptonica
+./autogen.sh
+CFLAGS="-fPIC" ./configure --without-zlib --without-jpeg --without-giflib \
+  --without-giflib --without-libwebp --without-libwebpmux --without-libopenjpeg \
+  --enable-static --disable-shared
+make -j $THREADS
+cd ..
+mv leptonica/src/.libs/liblept.a .
+
+# tiff
+cd libtiff
+./autogen.sh
+CFLAGS="-fPIC" CXXFLAGS="-fPIC" CXX_FLAGS="-fPIC" ./configure --enable-static --disable-shared --disable-lzw --disable-jpeg --disable-webp \
+  --disable-lzma --disable-zstd --disable-jbig
+make -j $THREADS
+cd ..
+mv libtiff/libtiff/.libs/libtiff.a .
+
+# png
+cd libpng
+CFLAGS="-fPIC" ./configure --enable-static --disable-shared
+make -j $THREADS
+cd ..
+mv libpng/.libs/libpng16.a .
+
+# openssl...
+git clone --depth 1 -b OpenSSL_1_1_0-stable https://github.com/openssl/openssl
+cd openssl
+./config --prefix=$(pwd)/../ssl
+make depend
+make -j $THREADS
+make install
+cd ..
+mv ./openssl/libcrypto.a ./openssl/libssl.a .
+
+# curl
+wget -nc https://curl.haxx.se/download/curl-7.68.0.tar.gz
+tar -xzf curl-7.68.0.tar.gz
+cd curl-7.68.0
+./configure --disable-ldap --disable-ldaps --without-librtmp --disable-rtsp --disable-crypto-auth \
+  --disable-smtp --without-libidn2 --without-nghttp2 --without-brotli --enable-static --disable-shared \
+  --without-libpsl --with-ssl=$(pwd)/../ssl
+make -j $THREADS
+cd ..
+mv curl-7.68.0/lib/.libs/libcurl.a .

scripts/index_static.py

@@ -3,7 +3,6 @@ import json
 files = [
     "schema/mappings.json",
     "schema/settings.json",
-    "schema/settings_legacy.json",
     "schema/pipeline.json",
 ]
 
@@ -15,5 +14,4 @@ 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)))

scripts/magic_static.py

@@ -1,16 +0,0 @@
-
-MAGIC_PATHS = [
-    "/vcpkg/installed/x64-linux/share/libmagic/misc/magic.mgc",
-    "/work/vcpkg/installed/x64-linux/share/libmagic/misc/magic.mgc",
-    "/usr/lib/file/magic.mgc"
-]
-
-for path in MAGIC_PATHS:
-    try:
-        with open(path, "rb") as f:
-            data = f.read()
-        break
-    except:
-        continue
-
-print("char magic_database_buffer[%d] = {%s};" % (len(data), ",".join(str(int(b)) for b in data)))

scripts/mime.py

@@ -1,12 +1,8 @@
-import zlib
-
 mimes = {}
 noparse = set()
 ext_in_hash = set()
-mime_ids = {}
 
 major_mime = {
-    "sist2": 0,
     "model": 1,
     "example": 2,
     "message": 3,
@@ -22,6 +18,7 @@ major_mime = {
 
 pdf = (
     "application/pdf",
+    "application/x-cbz",
     "application/epub+zip",
     "application/vnd.ms-xpsdocument",
 )
@@ -65,47 +62,10 @@ doc = (
     "application/vnd.openxmlformats-officedocument.presentationml.presentation"
 )
 
-mobi = (
-    "application/x-mobipocket-ebook",
-    "application/vnd.amazon.mobi8-ebook"
-)
-
-markup = (
-    "text/xml",
-    "text/html",
-    "text/x-sgml"
-)
-
-raw = (
-    "image/x-olympus-orf",
-    "image/x-nikon-nef",
-    "image/x-fuji-raf",
-    "image/x-panasonic-raw",
-    "image/x-adobe-dng",
-    "image/x-canon-cr2",
-    "image/x-canon-crw",
-    "image/x-dcraw",
-    "image/x-kodak-dcr",
-    "image/x-kodak-k25",
-    "image/x-kodak-kdc",
-    "image/x-minolta-mrw",
-    "image/x-pentax-pef",
-    "image/x-sigma-x3f",
-    "image/x-sony-arw",
-    "image/x-sony-sr2",
-    "image/x-sony-srf",
-    "image/x-minolta-mrw",
-    "image/x-pentax-pef",
-    "image/x-epson-erf",
-)
-
 cnt = 1
 
 
 def mime_id(mime):
-    if mime in mime_ids:
-        return mime_ids[mime]
-
     global cnt
     major = mime.split("/")[0]
     mime_id = str((major_mime[major] << 16) + cnt)
@@ -122,16 +82,8 @@ def mime_id(mime):
         mime_id += " | 0x08000000"
     elif mime in doc:
         mime_id += " | 0x04000000"
-    elif mime in mobi:
-        mime_id += " | 0x02000000"
-    elif mime in markup:
-        mime_id += " | 0x01000000"
-    elif mime in raw:
-        mime_id += " | 0x00800000"
     elif mime == "application/x-empty":
-        cnt -= 1
         return "1"
-    mime_ids[mime] = mime_id
     return mime_id
 
 
@@ -139,40 +91,24 @@ def clean(t):
     return t.replace("/", "_").replace(".", "_").replace("+", "_").replace("-", "_")
 
 
-def crc(s):
-    return zlib.crc32(s.encode()) & 0xffffffff
-
-
-with open("scripts/mime.csv") as f:
+with open("mime.csv") as f:
     for l in f:
         mime, ext_list = l.split(",")
         if l.startswith("!"):
             mime = mime[1:]
             noparse.add(mime)
-        ext = [x.strip() for x in ext_list.split("|") if x.strip() != ""]
+        ext = [x.strip() for x in ext_list.split("|")]
         mimes[mime] = ext
 
-    seen_crc = set()
-    for ext in mimes.values():
-        for e in ext:
-            if crc(e) in seen_crc:
-                raise Exception("CRC32 collision")
-            seen_crc.add(crc(e))
-
-    seen_crc = set()
-    for mime in mimes.keys():
-        if crc(mime) in seen_crc:
-            raise Exception("CRC32 collision")
-        seen_crc.add(crc(mime))
-
     print("// **Generated by mime.py**")
     print("#ifndef MIME_GENERATED_C")
     print("#define MIME_GENERATED_C")
+    print("#include <glib-2.0/glib.h>\n")
     print("#include <stdlib.h>\n")
     # Enum
     print("enum mime {")
     for mime, ext in sorted(mimes.items()):
-        print(f"{clean(mime)}={mime_id(mime)},")
+        print("    " + clean(mime) + "=" + mime_id(mime) + ",")
     print("};")
 
     # Enum -> string
@@ -183,28 +119,20 @@ with open("scripts/mime.csv") as f:
     print("default: return NULL;}}")
 
     # Ext -> Enum
-    print("unsigned int mime_extension_lookup(unsigned long extension_crc32) {"
-          "switch (extension_crc32) {")
+    print("GHashTable *mime_get_ext_table() {"
+          "GHashTable *ext_table = g_hash_table_new(g_str_hash, g_str_equal);")
     for mime, ext in mimes.items():
-        if len(ext) > 0:
-            for e in ext:
-                print(f"case {crc(e)}:", end="")
-            print(f"return {clean(mime)};")
-    print("default: return 0;}}")
+        for e in [e for e in ext if e]:
+            print("g_hash_table_insert(ext_table, \"" + e + "\", (gpointer)" + clean(mime) + ");")
+            if e in ext_in_hash:
+                raise Exception("extension already in hash: " + e)
+            ext_in_hash.add(e)
+    print("return ext_table;}")
 
     # string -> Enum
-    print("unsigned int mime_name_lookup(unsigned long mime_crc32) {"
-          "switch (mime_crc32) {")
-    for mime in mimes.keys():
-        print(f"case {crc(mime)}: return {clean(mime)};")
-
-    print("default: return 0;}}")
-
-    # mime list
-
-    mime_list = ",".join(mime_id(x) for x in mimes.keys()) + ",0"
-
-    print(f"unsigned int mime_ids[] = {{{mime_list}}};")
-    print("unsigned int* get_mime_ids() { return mime_ids; }")
-
+    print("GHashTable *mime_get_mime_table() {"
+          "GHashTable *mime_table = g_hash_table_new(g_str_hash, g_str_equal);")
+    for mime, ext in mimes.items():
+        print("g_hash_table_insert(mime_table, \"" + mime + "\", (gpointer)" + clean(mime) + ");")
+    print("return mime_table;}")
     print("#endif")

scripts/serve_static.py

@@ -1,10 +1,10 @@
 files = [
-    "sist2-vue/src/assets/favicon.ico",
-    "sist2-vue/dist/css/chunk-vendors.css",
-    "sist2-vue/dist/css/index.css",
-    "sist2-vue/dist/js/chunk-vendors.js",
-    "sist2-vue/dist/js/index.js",
-    "sist2-vue/dist/index.html",
+    "web/css/bundle.css",
+    "web/css/bundle_dark.css",
+    "web/js/bundle.js",
+    "web/img/sprite-skin-flat.png",
+    "web/img/sprite-skin-flat-dark.png",
+    "web/search.html",
 ]
 
 
@@ -13,10 +13,6 @@ def clean(filepath):
 
 
 for file in files:
-    try:
     with open(file, "rb") as f:
         data = f.read()
-    except:
-        data = bytes([])
-
     print("char %s[%d] = {%s};" % (clean(file), len(data), ",".join(str(int(b)) for b in data)))

scripts/sqlite_extension.c

@@ -1,84 +0,0 @@
-#include <sqlite3ext.h>
-#include <string.h>
-#include <stdlib.h>
-
-SQLITE_EXTENSION_INIT1
-
-static int sep_rfind(const char *str) {
-    for (int i = (int) strlen(str); i >= 0; i--) {
-        if (str[i] == '/') {
-            return i;
-        }
-    }
-    return -1;
-}
-
-void path_parent_func(sqlite3_context *ctx, int argc, sqlite3_value **argv) {
-    if (argc != 1 || sqlite3_value_type(argv[0]) != SQLITE_TEXT) {
-        sqlite3_result_error(ctx, "Invalid parameters", -1);
-    }
-
-    const char *value = (const char *) sqlite3_value_text(argv[0]);
-
-    int stop = sep_rfind(value);
-    if (stop == -1) {
-        sqlite3_result_null(ctx);
-        return;
-    }
-    char parent[4096 * 3];
-    strncpy(parent, value, stop);
-
-    sqlite3_result_text(ctx, parent, stop, SQLITE_TRANSIENT);
-}
-
-void random_func(sqlite3_context *ctx, int argc, sqlite3_value **argv) {
-    if (argc != 1 || sqlite3_value_type(argv[0]) != SQLITE_INTEGER) {
-        sqlite3_result_error(ctx, "Invalid parameters", -1);
-    }
-
-    char state_buf[32] = {0,};
-    struct random_data buf;
-    int result;
-
-    long seed = sqlite3_value_int64(argv[0]);
-
-    initstate_r((int) seed, state_buf, sizeof(state_buf), &buf);
-
-    random_r(&buf, &result);
-
-    sqlite3_result_int(ctx, result);
-}
-
-
-int sqlite3_extension_init(
-        sqlite3 *db,
-        char **pzErrMsg,
-        const sqlite3_api_routines *pApi
-) {
-    SQLITE_EXTENSION_INIT2(pApi);
-
-
-    sqlite3_create_function(
-            db,
-            "path_parent",
-            1,
-            SQLITE_UTF8,
-            NULL,
-            path_parent_func,
-            NULL,
-            NULL
-    );
-
-    sqlite3_create_function(
-            db,
-            "random_seeded",
-            1,
-            SQLITE_UTF8,
-            NULL,
-            random_func,
-            NULL,
-            NULL
-    );
-
-    return SQLITE_OK;
-}

scripts/sqlite_extension_compile.sh

@@ -1 +0,0 @@
-gcc -I/mnt/work/vcpkg/installed/x64-linux/include -g -fPIC -shared sqlite_extension.c -o sist2funcs.so

scripts/start_dev_es.sh

@@ -1,3 +0,0 @@
-docker run --rm -it --name "sist2-dev-es3"\
-       	-p 9200:9200 -e "discovery.type=single-node" \
-	-e "ES_JAVA_OPTS=-Xms8g -Xmx8g" elasticsearch:7.17.9

scripts/start_dev_es_6.sh

@@ -1,3 +0,0 @@
-docker run --rm -it --name "sist2-dev-es-6"\
-       	-p 9202:9200 -e "discovery.type=single-node" \
-	-e "ES_JAVA_OPTS=-Xms8g -Xmx8g" elasticsearch:6.8.0

scripts/start_dev_es_8.sh

@@ -1,3 +0,0 @@
-docker run --rm -it --name "sist2-dev-es3"\
-       	-p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" \
-	-e "ES_JAVA_OPTS=-Xms8g -Xmx8g" elasticsearch:8.7.0

scripts/test_in_docker.sh

@@ -1,7 +0,0 @@
-docker build . -t tmp
-
-docker run --rm -it\
-  -v $(pwd):/host \
-  tmp \
-  scan --ocr-lang eng --ocr-ebooks -t6 --incremental --very-verbose \
-  -o /host/docker.sist2 /host/third-party/libscan/libscan-test-files/test_files/

sist2-admin/frontend/babel.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
-}

sist2-admin/frontend/package.json

@@ -1,49 +0,0 @@
-{
-  "name": "sist2-admin-vue",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "watch": "vue-cli-service build --watch"
-  },
-  "dependencies": {
-    "axios": "^1.6.0",
-    "bootstrap-vue": "^2.21.2",
-    "core-js": "^3.6.5",
-    "moment": "^2.29.3",
-    "socket.io-client": "^4.5.1",
-    "vue": "^2.6.14",
-    "vue-i18n": "^8.24.4",
-    "vue-router": "^3.5.4",
-    "vuex": "^3.4.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~5.0.8",
-    "@vue/cli-plugin-router": "~5.0.8",
-    "@vue/cli-plugin-vuex": "~5.0.8",
-    "@vue/cli-service": "~5.0.8",
-    "babel-eslint": "^10.1.0",
-    "bootstrap": "^4.5.2",
-    "vue-template-compiler": "^2.6.11"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
-    ],
-    "parserOptions": {
-      "parser": "babel-eslint"
-    },
-    "rules": {}
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
-}

sist2-admin/frontend/public/index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>serve_favicon_ico.ico">
-    <title>sist2-admin</title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>

sist2-admin/frontend/src/App.vue

@@ -1,105 +0,0 @@
-<template>
-    <div id="app">
-        <NavBar></NavBar>
-        <b-container class="pt-4">
-            <b-alert show dismissible variant="info">
-                This is a beta version of sist2-admin. Please submit bug reports, usability issues and feature requests
-                to the <a href="https://github.com/sist2app/sist2/issues/new/choose" target="_blank">issue tracker on
-                Github</a>. Thank you!
-            </b-alert>
-            <router-view v-if="$store.state.sist2AdminInfo"/>
-        </b-container>
-    </div>
-</template>
-
-<script>
-import NavBar from "@/components/NavBar";
-import Sist2AdminApi from "@/Sist2AdminApi";
-
-export default {
-    components: {NavBar},
-    data() {
-        return {
-            socket: null
-        }
-    },
-    mounted() {
-        Sist2AdminApi.getSist2AdminInfo()
-            .then(resp => this.$store.commit("setSist2AdminInfo", resp.data));
-        this.$store.dispatch("loadBrowserSettings");
-        this.connectNotifications();
-        // this.socket.onclose = this.connectNotifications;
-    },
-    methods: {
-        connectNotifications() {
-            if (window.location.protocol === "https:") {
-                this.socket = new WebSocket(`wss://${window.location.host}/notifications`);
-            } else {
-                this.socket = new WebSocket(`ws://${window.location.host}/notifications`);
-            }
-            this.socket.onopen = () => {
-                this.socket.send("Hello from client");
-            }
-
-            this.socket.onmessage = e => {
-                const notification = JSON.parse(e.data);
-                if (notification.message) {
-                    notification.messageString = this.$t(notification.message).toString();
-                }
-
-                this.$store.dispatch("notify", notification)
-            }
-        }
-    }
-}
-</script>
-
-<style>
-html, body {
-    height: 100%;
-}
-
-#app {
-    /*font-family: Avenir, Helvetica, Arial, sans-serif;*/
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-    /*text-align: center;*/
-    color: #2c3e50;
-    padding-bottom: 1em;
-    min-height: 100%;
-}
-
-.info-icon {
-    width: 1rem;
-    min-width: 1rem;
-    margin-right: 0.2rem;
-    cursor: pointer;
-    line-height: 1rem;
-    height: 1rem;
-    min-height: 1rem;
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIKICAgICB2aWV3Qm94PSIwIDAgNDI2LjY2NyA0MjYuNjY3IiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA0MjYuNjY3IDQyNi42Njc7IiBmaWxsPSIjZmZmIj4KPGc+CiAgICA8Zz4KICAgICAgICA8Zz4KICAgICAgICAgICAgPHJlY3QgeD0iMTkyIiB5PSIxOTIiIHdpZHRoPSI0Mi42NjciIGhlaWdodD0iMTI4Ii8+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMTMuMzMzLDBDOTUuNDY3LDAsMCw5NS40NjcsMCwyMTMuMzMzczk1LjQ2NywyMTMuMzMzLDIxMy4zMzMsMjEzLjMzM1M0MjYuNjY3LDMzMS4yLDQyNi42NjcsMjEzLjMzMwogICAgICAgICAgICAgICAgUzMzMS4yLDAsMjEzLjMzMywweiBNMjEzLjMzMywzODRjLTk0LjA4LDAtMTcwLjY2Ny03Ni41ODctMTcwLjY2Ny0xNzAuNjY3UzExOS4yNTMsNDIuNjY3LDIxMy4zMzMsNDIuNjY3CiAgICAgICAgICAgICAgICBTMzg0LDExOS4yNTMsMzg0LDIxMy4zMzNTMzA3LjQxMywzODQsMjEzLjMzMywzODR6Ii8+CiAgICAgICAgICAgIDxyZWN0IHg9IjE5MiIgeT0iMTA2LjY2NyIgd2lkdGg9IjQyLjY2NyIgaGVpZ2h0PSI0Mi42NjciLz4KICAgICAgICA8L2c+CiAgICA8L2c+CjwvZz4KPC9zdmc+Cg==);
-    filter: brightness(45%);
-    display: block;
-}
-
-.tabs {
-    margin-top: 10px;
-}
-
-.modal-title {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-}
-
-@media screen and (min-width: 1500px) {
-    .container {
-        max-width: 1440px;
-    }
-}
-
-label {
-    margin-top: 0.5rem;
-    margin-bottom: 0;
-}
-</style>

sist2-admin/frontend/src/Sist2AdminApi.js

@@ -1,179 +0,0 @@
-import axios from "axios";
-
-class Sist2AdminApi {
-
-    constructor() {
-        this.baseUrl = window.location.protocol + "//" + window.location.host;
-    }
-
-    getJobs() {
-        return axios.get(`${this.baseUrl}/api/job`);
-    }
-
-    getFrontends() {
-        return axios.get(`${this.baseUrl}/api/frontend`);
-    }
-
-    getTasks() {
-        return axios.get(`${this.baseUrl}/api/task`);
-    }
-
-    killTask(taskId) {
-        return axios.post(`${this.baseUrl}/api/task/${taskId}/kill`)
-    }
-
-    getTaskHistory() {
-        return axios.get(`${this.baseUrl}/api/task/history`);
-    }
-
-    /**
-     * @param {string} name
-     */
-    getJob(name) {
-        return axios.get(`${this.baseUrl}/api/job/${name}`);
-    }
-
-    getSearchBackend(name) {
-        return axios.get(`${this.baseUrl}/api/search_backend/${name}`);
-    }
-
-    updateSearchBackend(name, data) {
-        return axios.put(`${this.baseUrl}/api/search_backend/${name}`, data);
-    }
-
-    getSearchBackends() {
-        return axios.get(`${this.baseUrl}/api/search_backend`);
-    }
-
-    deleteBackend(name) {
-        return axios.delete(`${this.baseUrl}/api/search_backend/${name}`)
-    }
-
-    createBackend(name) {
-        return axios.post(`${this.baseUrl}/api/search_backend/${name}`);
-    }
-
-    getFrontend(name) {
-        return axios.get(`${this.baseUrl}/api/frontend/${name}`);
-    }
-
-    /**
-     * @param {string} name
-     */
-    startFrontend(name) {
-        return axios.post(`${this.baseUrl}/api/frontend/${name}/start`);
-    }
-
-    /**
-     * @param {string} name
-     */
-    stopFrontend(name) {
-        return axios.post(`${this.baseUrl}/api/frontend/${name}/stop`);
-    }
-
-    /**
-     * @param {string} name
-     * @param job
-     */
-    updateJob(name, job) {
-        return axios.put(`${this.baseUrl}/api/job/${name}`, job);
-    }
-
-    /**
-     * @param {string} name
-     * @param frontend
-     */
-    updateFrontend(name, frontend) {
-        return axios.put(`${this.baseUrl}/api/frontend/${name}`, frontend);
-    }
-
-    /**
-     * @param {string} name
-     * @param {bool} full
-     */
-    runJob(name, full) {
-        return axios.get(`${this.baseUrl}/api/job/${name}/run`, {
-            params: {full}
-        });
-    }
-
-    /**
-     * @param {string} name
-     */
-    deleteJob(name) {
-        return axios.delete(`${this.baseUrl}/api/job/${name}`);
-    }
-
-    /**
-     * @param {string} name
-     */
-    deleteFrontend(name) {
-        return axios.delete(`${this.baseUrl}/api/frontend/${name}`);
-    }
-
-    /**
-     * @param {string} name
-     */
-    createJob(name) {
-        return axios.post(`${this.baseUrl}/api/job/${name}`);
-    }
-
-    /**
-     * @param {string} name
-     */
-    createFrontend(name) {
-        return axios.post(`${this.baseUrl}/api/frontend/${name}`);
-    }
-
-    pingEs(url, insecure) {
-        return axios.get(`${this.baseUrl}/api/ping_es`, {params: {url, insecure}});
-    }
-
-    getSist2AdminInfo() {
-        return axios.get(`${this.baseUrl}/api`);
-    }
-
-    getLogsToDelete(jobName, n) {
-        return axios.get(`${this.baseUrl}/api/job/${jobName}/logs_to_delete`, {
-            params: {n: n}
-        });
-    }
-
-    deleteTaskLogs(taskId) {
-        return axios.post(`${this.baseUrl}/api/task/${taskId}/delete_logs`);
-    }
-
-    getUserScripts() {
-        return axios.get(`${this.baseUrl}/api/user_script`);
-    }
-
-    getUserScript(name) {
-        return axios.get(`${this.baseUrl}/api/user_script/${name}`);
-    }
-
-    createUserScript(name, template) {
-        return axios.post(`${this.baseUrl}/api/user_script/${name}`, null, {
-            params: {
-                template: template
-            }
-        });
-    }
-
-    updateUserScript(name, data) {
-        return axios.put(`${this.baseUrl}/api/user_script/${name}`, data);
-    }
-
-    deleteUserScript(name) {
-        return axios.delete(`${this.baseUrl}/api/user_script/${name}`);
-    }
-
-    testUserScript(name, job) {
-        return axios.get(`${this.baseUrl}/api/user_script/${name}/run`, {
-            params: {
-                job: job
-            }
-        });
-    }
-}
-
-export default new Sist2AdminApi()

sist2-admin/frontend/src/components/FrontendListItem.vue

@@ -1,31 +0,0 @@
-<template>
-  <b-list-group-item action :to="`/frontend/${frontend.name}`">
-
-    <div class="d-flex w-100 justify-content-between">
-      <h5 class="mb-1" style="display: block">
-        {{ frontend.name }}
-        <b-badge variant="light">{{ formatBindAddress(frontend.web_options.bind) }}</b-badge>
-      </h5>
-
-      <div>
-        <b-badge v-if="frontend.running" variant="success">{{$t("online")}}</b-badge>
-        <b-badge v-else variant="secondary">{{$t("offline")}}</b-badge>
-      </div>
-    </div>
-
-  </b-list-group-item>
-</template>
-
-<script>
-import {formatBindAddress} from "@/util";
-
-export default {
-  name: "FrontendListItem",
-  props: ["frontend"],
-  data() {
-    return {
-      formatBindAddress
-    }
-  }
-}
-</script>

sist2-admin/frontend/src/components/JobCheckboxGroup.vue

@@ -1,54 +0,0 @@
-<template>
-    <div>
-        <h5>{{ $t("selectJobs") }}</h5>
-        <b-progress v-if="loading" striped animated value="100"></b-progress>
-        <b-form-group v-else>
-            <b-form-checkbox-group
-                    v-if="jobs.length > 0"
-                    :checked="frontend.jobs"
-                    @input="frontend.jobs = $event; $emit('input')"
-            >
-                <div v-for="job in jobs" :key="job.name">
-                    <b-form-checkbox :disabled="job.status !== 'indexed'"
-                                     :value="job.name">
-                        <template #default><span
-                                :title="job.status !== 'indexed' ? $t('jobOptions.notIndexed') : ''"
-                        >[{{ job.name }}]</span></template>
-                    </b-form-checkbox>
-                    <br/>
-                </div>
-            </b-form-checkbox-group>
-            <div v-else>
-                <span class="text-muted">{{ $t('jobOptions.noJobAvailable') }}</span>
-                <router-link to="/">{{ $t("create") }}</router-link>
-            </div>
-        </b-form-group>
-    </div>
-</template>
-
-<script>
-import Sist2AdminApi from "@/Sist2AdminApi";
-
-export default {
-    name: "JobCheckboxGroup",
-    props: ["frontend"],
-    mounted() {
-        Sist2AdminApi.getJobs().then(resp => {
-            this._jobs = resp.data;
-            this.loading = false;
-        });
-    },
-    computed: {
-        jobs() {
-            return this._jobs
-                .filter(job => job.index_options.search_backend === this.frontend.web_options.search_backend)
-        }
-    },
-    data() {
-        return {
-            loading: true,
-            _jobs: null
-        }
-    }
-}
-</script>

sist2-admin/frontend/src/components/JobListItem.vue

@@ -1,55 +0,0 @@
-<template>
-  <b-list-group-item class="flex-column align-items-start" action :to="`job/${job.name}`">
-
-    <div class="d-flex w-100 justify-content-between">
-      <div>
-        <h5 class="mb-1">
-          {{ job.name }}
-        </h5>
-      </div>
-      <div>
-        <b-row>
-          <b-col>
-            <small v-if="job.last_index_date">
-              {{ $t("scanned") }} {{ formatLastIndexDate(job.last_index_date) }}</small>
-            <div v-else>&nbsp;</div>
-          </b-col>
-        </b-row>
-        <b-row v-if="job.schedule_enabled">
-          <b-col>
-            <small><code>{{job.cron_expression }}</code></small>
-          </b-col>
-        </b-row>
-        <b-row v-else>
-          <b-col>
-            &nbsp;
-          </b-col>
-        </b-row>
-
-      </div>
-    </div>
-
-  </b-list-group-item>
-</template>
-
-<script>
-import moment from "moment";
-
-export default {
-  name: "JobListItem",
-  props: ["job"],
-  methods: {
-    formatLastIndexDate(dateString) {
-      if (dateString === null) {
-        return "";
-      }
-
-      return moment.utc(dateString).local().fromNow();
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

sist2-admin/frontend/src/components/JobOptions.vue

@@ -1,94 +0,0 @@
-<template>
-    <div>
-        <b-form-checkbox :checked="desktopNotificationsEnabled" @change="updateNotifications($event)">
-            {{ $t("jobOptions.desktopNotifications") }}
-        </b-form-checkbox>
-
-        <b-form-checkbox v-model="job.schedule_enabled" @change="update()">
-            {{ $t("jobOptions.scheduleEnabled") }}
-        </b-form-checkbox>
-
-        <label>{{ $t("jobOptions.cron") }}</label>
-        <b-form-input class="text-monospace" :state="cronValid" v-model="job.cron_expression"
-                      :disabled="!job.schedule_enabled" @change="update()"></b-form-input>
-
-        <label>{{ $t("jobOptions.keepNLogs") }}</label>
-        <b-input-group>
-            <b-form-input type="number" v-model="job.keep_last_n_logs" @change="update()"></b-form-input>
-            <b-input-group-append>
-                <b-button variant="danger" @click="onDeleteNowClick()">{{ $t("jobOptions.deleteNow") }}</b-button>
-            </b-input-group-append>
-        </b-input-group>
-
-    </div>
-</template>
-
-<script>
-
-import Sist2AdminApi from "@/Sist2AdminApi";
-
-export default {
-    name: "JobOptions",
-    props: ["job"],
-    data() {
-        return {
-            cronValid: undefined,
-            logsToDelete: null
-        }
-    },
-    computed: {
-        desktopNotificationsEnabled() {
-            return this.$store.state.jobDesktopNotificationMap[this.job.name];
-        }
-    },
-    mounted() {
-        this.cronValid = this.checkCron(this.job.cron_expression)
-    },
-    methods: {
-        checkCron(expression) {
-            return /((((\d+,)+\d+|(\d+([/-])\d+)|\d+|\*) ?){5,7})/.test(expression);
-        },
-        updateNotifications(value) {
-            this.$store.dispatch("setJobDesktopNotification", {
-                job: this.job.name,
-                enabled: value
-            });
-        },
-        update() {
-            if (this.job.schedule_enabled) {
-                this.cronValid = this.checkCron(this.job.cron_expression);
-            } else {
-                this.cronValid = undefined;
-            }
-
-            if (this.cronValid !== false) {
-                this.$emit("change", this.job);
-            }
-        },
-        onDeleteNowClick() {
-            Sist2AdminApi.getLogsToDelete(this.job.name, this.job.keep_last_n_logs).then(resp => {
-                const toDelete = resp.data;
-                const message = `Delete ${toDelete.length} log files?`;
-
-                this.$bvModal.msgBoxConfirm(message, {
-                    title: this.$t("confirmation"),
-                    size: "sm",
-                    buttonSize: "sm",
-                    okVariant: "danger",
-                    okTitle: this.$t("delete"),
-                    cancelTitle: this.$t("cancel"),
-                    footerClass: "p-2",
-                    hideHeaderClose: false,
-                    centered: true
-                }).then(value => {
-                    if (value) {
-                        toDelete.forEach(row => {
-                            Sist2AdminApi.deleteTaskLogs(row["id"]);
-                        });
-                    }
-                });
-            })
-        }
-    },
-}
-</script>

sist2-admin/frontend/src/components/JobSelect.vue

@@ -1,34 +0,0 @@
-<template>
-    <b-progress v-if="loading" striped animated value="100"></b-progress>
-    <span v-else-if="jobs.length === 0"></span>
-    <b-form-select v-else :options="jobs" text-field="name" value-field="name"
-                   @change="$emit('change', $event)" :value="$t('selectJob')"></b-form-select>
-</template>
-
-<script>
-import Sist2AdminApi from "@/Sist2AdminApi";
-
-export default {
-    name: "JobSelect",
-    mounted() {
-        Sist2AdminApi.getJobs().then(resp => {
-            this._jobs = resp.data;
-            this.loading = false;
-        });
-    },
-    computed: {
-        jobs() {
-            return [
-                {name: this.$t("selectJob"), disabled: true},
-                ...this._jobs.filter(job => job.index_path)
-            ]
-        }
-    },
-    data() {
-        return {
-            loading: true,
-            _jobs: null
-        }
-    }
-}
-</script>

sist2-admin/frontend/src/components/NavBar.vue

@@ -1,69 +0,0 @@
-<template>
-  <b-navbar>
-    <b-navbar-brand to="/">
-      <Sist2Icon></Sist2Icon>
-    </b-navbar-brand>
-
-    <b-button class="ml-auto" to="/task" variant="link">{{ $t("tasks") }}</b-button>
-  </b-navbar>
-</template>
-
-<script>
-import Sist2Icon from "@/components/icons/Sist2Icon";
-
-export default {
-  name: "NavBar",
-  components: {Sist2Icon},
-  methods: {
-    tagline() {
-      return this.$store.state.sist2Info.tagline;
-    },
-    sist2Version() {
-      return this.$store.state.sist2Info.version;
-    },
-    isDebug() {
-      return this.$store.state.sist2Info.debug;
-    },
-    isLegacy() {
-      return this.$store.state.sist2Info.esVersionLegacy;
-    },
-    hideLegacy() {
-      return this.$store.state.optHideLegacy;
-    }
-  }
-}
-</script>
-
-<style scoped>
-.navbar {
-  box-shadow: 0 0.125rem 0.25rem rgb(0 0 0 / 8%) !important;
-  border-radius: 0;
-}
-
-.theme-black .navbar {
-  background: #546b7a30;
-  border-bottom: none;
-}
-
-.navbar-brand {
-  color: #222 !important;
-  font-size: 1.75rem;
-  padding: 0;
-}
-
-.navbar-brand:hover {
-  color: #000 !important;
-}
-
-.version {
-  color: #222 !important;
-  margin-left: -18px;
-  margin-top: -14px;
-  font-size: 11px;
-  font-family: monospace;
-}
-
-.btn-link {
-  color: #222;
-}
-</style>

sist2-admin/frontend/src/components/ScanOptions.vue

@@ -1,110 +0,0 @@
-<template>
-  <div>
-    <label>{{ $t("scanOptions.path") }}</label>
-    <b-form-input v-model="options.path" @change="update()"></b-form-input>
-
-    <label>{{ $t("scanOptions.threads") }}</label>
-    <b-form-input type="number" min="1" v-model="options.threads" @change="update()"></b-form-input>
-
-    <label>{{ $t("scanOptions.thumbnailQuality") }}</label>
-    <b-form-input type="number" min="0" max="100" v-model="options.thumbnail_quality" @change="update()"></b-form-input>
-
-    <label>{{ $t("scanOptions.thumbnailCount") }}</label>
-    <b-form-input type="number" min="0" max="1000" v-model="options.thumbnail_count" @change="update()"></b-form-input>
-
-    <label>{{ $t("scanOptions.thumbnailSize") }}</label>
-    <b-form-input type="number" min="100" v-model="options.thumbnail_size" @change="update()"></b-form-input>
-
-    <label>{{ $t("scanOptions.contentSize") }}</label>
-    <b-form-input type="number" min="0" v-model="options.content_size" @change="update()"></b-form-input>
-
-    <label>{{ $t("scanOptions.rewriteUrl") }}</label>
-    <b-form-input v-model="options.rewrite_url" @change="update()"></b-form-input>
-
-    <label>{{ $t("scanOptions.depth") }}</label>
-    <b-form-input type="number" min="0" v-model="options.depth" @change="update()"></b-form-input>
-
-    <label>{{ $t("scanOptions.archive") }}</label>
-    <b-form-select :options="['skip', 'list', 'shallow', 'recurse']" v-model="options.archive"
-                   @change="update()"></b-form-select>
-
-    <label>{{ $t("scanOptions.archivePassphrase") }}</label>
-    <b-form-input v-model="options.archive_passphrase" @change="update()"></b-form-input>
-
-    <label>{{ $t("scanOptions.ocrLang") }}</label>
-    <b-alert variant="danger" show v-if="selectedOcrLangs.length === 0 && !disableOcrLang">{{ $t("scanOptions.ocrLangAlert") }}</b-alert>
-    <b-checkbox-group :disabled="disableOcrLang" v-model="selectedOcrLangs" @input="onOcrLangChange">
-      <b-checkbox v-for="lang in ocrLangs" :key="lang" :value="lang">{{ lang }}</b-checkbox>
-    </b-checkbox-group>
-
-    <!--    <b-form-input readonly v-model="options.ocr_lang" @change="update()"></b-form-input>-->
-
-    <div style="height: 10px"></div>
-
-    <b-form-checkbox v-model="options.ocr_images" @change="update()">
-      {{ $t("scanOptions.ocrImages") }}
-    </b-form-checkbox>
-
-    <b-form-checkbox v-model="options.ocr_ebooks" @change="update()">
-      {{ $t("scanOptions.ocrEbooks") }}
-    </b-form-checkbox>
-
-    <label>{{ $t("scanOptions.exclude") }}</label>
-    <b-form-input v-model="options.exclude" @change="update()"
-                  :placeholder="$t('scanOptions.excludePlaceholder')"></b-form-input>
-
-    <div style="height: 10px"></div>
-
-    <b-form-checkbox v-model="options.fast" @change="update()">
-      {{ $t("scanOptions.fast") }}
-    </b-form-checkbox>
-
-    <b-form-checkbox v-model="options.checksums" @change="update()">
-      {{ $t("scanOptions.checksums") }}
-    </b-form-checkbox>
-
-    <b-form-checkbox v-model="options.read_subtitles" @change="update()">
-      {{ $t("scanOptions.readSubtitles") }}
-    </b-form-checkbox>
-
-    <b-form-checkbox v-model="options.optimize_index" @change="update()">
-        {{ $t("scanOptions.optimizeIndex") }}
-    </b-form-checkbox>
-
-    <label>{{ $t("scanOptions.treemapThreshold") }}</label>
-    <b-form-input type="number" min="0" v-model="options.treemap_threshold" @change="update()"></b-form-input>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: "ScanOptions",
-  props: ["options"],
-  data() {
-    return {
-      disableOcrLang: false,
-      selectedOcrLangs: []
-    }
-  },
-  computed: {
-    ocrLangs() {
-      return this.$store.state.sist2AdminInfo?.tesseract_langs || [];
-    }
-  },
-  methods: {
-    onOcrLangChange() {
-      this.options.ocr_lang = this.selectedOcrLangs.join("+");
-      this.update();
-    },
-    update() {
-      this.disableOcrLang = this.options.ocr_images === false && this.options.ocr_ebooks === false;
-      this.$emit("change", this.options);
-    },
-  },
-  mounted() {
-    this.disableOcrLang = this.options.ocr_images === false && this.options.ocr_ebooks === false;
-    this.selectedOcrLangs = this.options.ocr_lang ? this.options.ocr_lang.split("+") : [];
-  }
-}
-</script>

sist2-admin/frontend/src/components/SearchBackendListItem.vue

@@ -1,24 +0,0 @@
-<template>
-    <b-list-group-item action :to="`/searchBackend/${backend.name}`">
-
-        <div class="d-flex w-100 justify-content-between">
-            <h5 class="mb-1">
-                {{ backend.name }}
-            </h5>
-
-            <div>
-                <b-badge v-if="backend.backend_type === 'sqlite'" variant="info">SQLite</b-badge>
-                <b-badge v-else variant="info">Elasticsearch</b-badge>
-            </div>
-        </div>
-
-    </b-list-group-item>
-</template>
-
-<script>
-
-export default {
-    name: "SearchBackendListItem",
-    props: ["backend"],
-}
-</script>

sist2-admin/frontend/src/components/SearchBackendSelect.vue

@@ -1,37 +0,0 @@
-<template>
-    <b-progress v-if="loading" striped animated value="100"></b-progress>
-    <div v-else>
-        <label>{{$t("backendOptions.searchBackend")}}</label>
-        <b-select :options="options" :value="value" @change="$emit('change', $event)"></b-select>
-    </div>
-</template>
-
-<script>
-import Sist2AdminApi from "@/Sist2AdminApi";
-
-export default {
-    name: "SearchBackendSelect",
-    props: ["value"],
-    data() {
-        return {
-            loading: true,
-            backends: null,
-        }
-    },
-    computed: {
-        options() {
-            return this.backends.map(backend => backend.name)
-        }
-    },
-    mounted() {
-        Sist2AdminApi.getSearchBackends().then(resp => {
-            this.loading = false;
-            this.backends = resp.data
-        })
-    }
-}
-</script>
-
-<style scoped>
-
-</style>

sist2-admin/frontend/src/components/TaskListItem.vue

@@ -1,57 +0,0 @@
-<template>
-  <b-list-group-item>
-    <b-row style="height: 50px">
-      <b-col><h5>{{ task.display_name }}</h5></b-col>
-      <b-col class="shrink">
-        <router-link class="btn btn-link" :to="`/log/${task.id}`">{{ $t("logs") }}</router-link>
-      </b-col>
-      <b-col class="shrink">
-        <b-btn variant="link" @click="killTask(task.id)">{{ $t("kill") }}</b-btn>
-      </b-col>
-    </b-row>
-
-    <b-row>
-      <b-col>
-        <b-progress :max="task.progress.count">
-          <b-progress-bar :value="task.progress.done" :label-html="label" :striped="!task.progress.waiting"/>
-        </b-progress>
-      </b-col>
-    </b-row>
-
-  </b-list-group-item>
-</template>
-
-<script>
-import sist2AdminApi from "@/Sist2AdminApi";
-
-export default {
-  name: "TaskListItem",
-  props: ["task"],
-  computed: {
-    label() {
-
-      const count = this.task.progress.count;
-      const done = this.task.progress.done;
-
-      return `<span>${done}/${count}</span>`
-    }
-  },
-  methods: {
-    killTask(taskId) {
-      sist2AdminApi.killTask(taskId).then(() => {
-        this.$bvToast.toast(this.$t("killConfirmation"), {
-          title: this.$t("killConfirmationTitle"),
-          variant: "success",
-          toaster: "b-toaster-bottom-right"
-        });
-      });
-    }
-  }
-}
-</script>
-
-<style scoped>
-.shrink {
-  flex-grow: inherit;
-}
-</style>

sist2-admin/frontend/src/components/UserScriptListItem.vue

@@ -1,18 +0,0 @@
-<template>
-    <b-list-group-item action :to="`/userScript/${script.name}`">
-
-        <div class="d-flex w-100 justify-content-between">
-            <h5 class="mb-1">
-                {{ script.name }}
-            </h5>
-        </div>
-    </b-list-group-item>
-</template>
-
-<script>
-
-export default {
-    name: "UserScriptListItem",
-    props: ["script"],
-}
-</script>

sist2-admin/frontend/src/components/UserScriptPicker.vue

@@ -1,88 +0,0 @@
-<template>
-    <b-progress v-if="loading" striped animated value="100"></b-progress>
-
-    <b-row v-else>
-        <b-col cols="6">
-            <h5>Selected scripts</h5>
-            <b-list-group>
-                <b-list-group-item v-for="script in selectedScripts" :key="script"
-                                   button
-                                   @click="onRemoveScript(script)"
-                                   class="d-flex justify-content-between align-items-center">
-                    {{ script }}
-                    <b-button-group>
-                        <b-button variant="light" @click.stop="moveUpScript(script)">↑</b-button>
-                        <b-button variant="light" @click.stop="moveDownScript(script)">↓</b-button>
-                    </b-button-group>
-                </b-list-group-item>
-            </b-list-group>
-        </b-col>
-        <b-col cols="6">
-            <h5>Available scripts</h5>
-            <b-list-group>
-                <b-list-group-item v-for="script in availableScripts" :key="script" button
-                                   @click="onSelectScript(script)">
-                    {{ script }}
-                </b-list-group-item>
-            </b-list-group>
-        </b-col>
-    </b-row>
-
-  <!--    <b-checkbox-group v-else :options="scripts" stacked :checked="selectedScripts"-->
-  <!--                      @input="$emit('change', $event)"></b-checkbox-group>-->
-</template>
-
-<script>
-import Sist2AdminApi from "@/Sist2AdminApi";
-
-export default {
-    name: "UserScriptPicker",
-    props: ["selectedScripts"],
-    data() {
-        return {
-            loading: true,
-            scripts: []
-        }
-    },
-    computed: {
-        availableScripts() {
-            return this.scripts.filter(script => !this.selectedScripts.includes(script))
-        }
-    },
-    mounted() {
-        Sist2AdminApi.getUserScripts().then(resp => {
-            this.scripts = resp.data.map(script => script.name);
-            this.loading = false;
-        });
-    },
-    methods: {
-        onSelectScript(name) {
-            this.selectedScripts.push(name);
-            this.$emit("change", this.selectedScripts)
-        },
-        onRemoveScript(name) {
-            this.selectedScripts.splice(this.selectedScripts.indexOf(name), 1);
-            this.$emit("change", this.selectedScripts);
-        },
-        moveUpScript(name) {
-            const index = this.selectedScripts.indexOf(name);
-            if (index > 0) {
-                this.selectedScripts.splice(index, 1);
-                this.selectedScripts.splice(index - 1, 0, name);
-            }
-            this.$emit("change", this.selectedScripts);
-        },
-        moveDownScript(name) {
-            const index = this.selectedScripts.indexOf(name);
-            if (index < this.selectedScripts.length - 1) {
-                this.selectedScripts.splice(index, 1);
-                this.selectedScripts.splice(index + 1, 0, name);
-            }
-            this.$emit("change", this.selectedScripts);
-        }
-    }
-}
-</script>
-
-<style scoped>
-</style>

sist2-admin/frontend/src/components/WebOptions.vue

@@ -1,73 +0,0 @@
-<template>
-  <div>
-    <h4>{{ $t("webOptions.title") }}</h4>
-    <b-card>
-      <label>{{ $t("webOptions.lang") }}</label>
-      <b-form-select v-model="options.lang" :options="['en', 'fr', 'zh-CN', 'pl', 'de']"
-                     @change="update()"></b-form-select>
-
-      <label>{{ $t("webOptions.bind") }}</label>
-      <b-form-input v-model="options.bind" @change="update()"></b-form-input>
-
-      <label>{{ $t("webOptions.tagline") }}</label>
-      <b-form-textarea v-model="options.tagline" @change="update()"></b-form-textarea>
-
-      <label>{{ $t("webOptions.auth") }}</label>
-      <b-form-input v-model="options.auth" @change="update()"></b-form-input>
-
-      <label>{{ $t("webOptions.tagAuth") }}</label>
-      <b-form-input v-model="options.tag_auth" @change="update()" :disabled="Boolean(options.auth)"></b-form-input>
-
-      <b-form-checkbox v-model="options.verbose" @change="update()">
-        {{$t("webOptions.verbose")}}
-      </b-form-checkbox>
-    </b-card>
-
-    <br>
-    <h4>Auth0 options</h4>
-    <b-card>
-      <label>{{ $t("webOptions.auth0Audience") }}</label>
-      <b-form-input v-model="options.auth0_audience" @change="update()"></b-form-input>
-
-      <label>{{ $t("webOptions.auth0Domain") }}</label>
-      <b-form-input v-model="options.auth0_domain" @change="update()"></b-form-input>
-
-      <label>{{ $t("webOptions.auth0ClientId") }}</label>
-      <b-form-input v-model="options.auth0_client_id" @change="update()"></b-form-input>
-
-      <label>{{ $t("webOptions.auth0PublicKey") }}</label>
-      <b-textarea rows="10" v-model="options.auth0_public_key" @change="update()"></b-textarea>
-    </b-card>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: "WebOptions",
-  props: ["options", "frontendName"],
-  data() {
-    return {
-      showEsTestAlert: false,
-      esTestOk: false,
-      esTestMessage: ""
-    }
-  },
-  methods: {
-    update() {
-
-      console.log(this.options)
-      if (this.options.auth && this.options.tag_auth) {
-        // If both are set, remove tagAuth
-        this.options.tag_auth = "";
-      }
-
-      this.$emit("change", this.options);
-    },
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

sist2-admin/frontend/src/components/icons/Sist2Icon.vue

@@ -1,40 +0,0 @@
-<template>
-  <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width="27.868069mm"
-      height="7.6446671mm"
-      viewBox="0 0 27.868069 7.6446671"
-  >
-    <g transform="translate(-4.5018313,-4.1849793)">
-      <g
-          style="fill: currentColor;fill-opacity:1;stroke:none;stroke-width:0.26458332">
-        <path
-            d="m 6.3153296,11.829646 q -0.7717014,0 -1.8134983,-0.337619 v -0.916395 q 1.0128581,0.511252 1.803852,0.511252 0.5643067,0 0.901926,-0.236334 0.3376194,-0.236333 0.3376194,-0.63183 0,-0.3424428 -0.2845649,-0.5498376 Q 6.980922,9.4566645 6.3635609,9.3264399 L 5.9921796,9.2492698 Q 5.2301245,9.0949295 4.8732126,8.7428407 4.5211238,8.3859288 4.5211238,7.7733908 q 0,-0.7765245 0.5305447,-1.1961372 0.5305447,-0.4196126 1.5096409,-0.4196126 0.829579,0 1.6061036,0.3183268 V 7.3441319 Q 7.4101809,6.9004036 6.5854251,6.9004036 q -1.1671984,0 -1.1671984,0.7958171 0,0.2604492 0.1012858,0.4147895 0.1012858,0.1495171 0.3858507,0.2556261 0.2845649,0.1012858 0.8392253,0.2122179 l 0.3569119,0.067524 q 1.3408312,0.2652724 1.3408312,1.4614098 0,0.80064 -0.5691298,1.263661 -0.5691298,0.458197 -1.5578722,0.458197 z"
-            style="stroke-width:0.26458332"
-        />
-        <path
-            d="m 11.943927,5.3087694 q -0.144694,0 -0.144694,-0.144694 V 4.3296733 q 0,-0.144694 0.144694,-0.144694 h 0.694531 q 0.144694,0 0.144694,0.144694 v 0.8344021 q 0,0.144694 -0.144694,0.144694 z M 13.5645,11.728361 q -0.795817,0 -1.234722,-0.511253 -0.434082,-0.516075 -0.434082,-1.4469398 V 6.9823969 H 10.714028 V 6.2878656 h 2.069124 v 3.4823026 q 0,0.5884228 0.221864,0.8971028 0.221865,0.308681 0.6463,0.308681 h 1.036974 v 0.752409 z"
-            style="stroke-width:0.26458332"
-        />
-        <path
-            d="m 18.209178,11.829646 q -0.771701,0 -1.813498,-0.337619 v -0.916395 q 1.012858,0.511252 1.803852,0.511252 0.564306,0 0.901926,-0.236334 0.337619,-0.236333 0.337619,-0.63183 0,-0.3424428 -0.284565,-0.5498376 Q 18.87477,9.4566645 18.257409,9.3264399 l -0.371381,-0.07717 Q 17.123973,9.0949295 16.767061,8.7428407 16.414972,8.3859288 16.414972,7.7733908 q 0,-0.7765245 0.530545,-1.1961372 0.530545,-0.4196126 1.509641,-0.4196126 0.829579,0 1.606103,0.3183268 v 0.8681641 q -0.757232,-0.4437283 -1.581988,-0.4437283 -1.167198,0 -1.167198,0.7958171 0,0.2604492 0.101286,0.4147895 0.101286,0.1495171 0.385851,0.2556261 0.284565,0.1012858 0.839225,0.2122179 l 0.356912,0.067524 q 1.340831,0.2652724 1.340831,1.4614098 0,0.80064 -0.56913,1.263661 -0.56913,0.458197 -1.557872,0.458197 z"
-            style="stroke-width:0.26458332"
-        />
-        <path
-            d="m 25.207545,11.709068 q -0.993565,0 -1.408355,-0.40032 -0.409966,-0.405143 -0.409966,-1.3794164 V 6.9775737 H 21.947107 V 6.2878656 h 1.442117 V 4.8746874 l 0.887457,-0.3858507 v 1.7990289 h 2.016069 v 0.6897081 h -2.016069 v 2.9517579 q 0,0.5932454 0.226687,0.8344024 0.226687,0.236333 0.790994,0.236333 h 0.998388 v 0.709001 z"
-            style="stroke-width:0.26458332"
-        />
-        <path
-            d="m 27.995317,11.043476 q 0,-0.178456 0.120578,-0.299035 0.274919,-0.289388 0.651123,-0.684885 0.376205,-0.4003199 0.805464,-0.8681638 0.327973,-0.356912 0.491959,-0.5353679 0.16881,-0.1832791 0.255626,-0.2845649 0.09164,-0.1012858 0.178456,-0.2073948 0.255626,-0.3086805 0.405144,-0.5257215 0.15434,-0.2170411 0.250803,-0.4292589 0.168809,-0.3762045 0.168809,-0.7524089 0,-0.5980686 -0.352089,-0.935688 -0.356911,-0.3424425 -0.979096,-0.3424425 -0.863341,0 -1.938899,0.6414768 V 4.8361023 q 0.491959,-0.2363335 0.979096,-0.3569119 0.47749,-0.1205783 0.945334,-0.1205783 0.501606,0 0.940511,0.1350477 0.438905,0.1350478 0.766878,0.4244358 0.289388,0.2556261 0.463021,0.6270074 0.173633,0.3665582 0.173633,0.829579 0,0.4726671 -0.212218,0.9501574 -0.106109,0.2411567 -0.274919,0.4726671 -0.163986,0.2266873 -0.424435,0.540191 Q 31.270225,8.501684 31.077299,8.718725 30.884374,8.9357661 30.628748,9.2106847 30.445469,9.4084332 30.286305,9.5675966 30.131965,9.72676 29.958332,9.9003928 29.7847,10.069203 29.558012,10.300713 29.336148,10.5274 29.012998,10.869843 h 3.356901 v 0.819932 h -4.374582 z"
-            style="stroke-width:0.26458332"
-        />
-      </g>
-    </g>
-  </svg>
-</template>
-
-<script>
-export default {
-  name: "Sist2Icon"
-}
-</script>

sist2-admin/frontend/src/i18n/messages.js

@@ -1,143 +0,0 @@
-export default {
-    en: {
-        start: "Start",
-        stop: "Stop",
-        go: "Go",
-        online: "online",
-        offline: "offline",
-        view: "View",
-        delete: "Delete",
-        runNow: "Index now",
-        runNowFull: "Full re-index",
-        create: "Create",
-        cancel: "Cancel",
-        test: "Test",
-        confirmation: "Confirmation",
-
-        jobTitle: "job configuration",
-        tasks: "Tasks",
-        runningTasks: "Running tasks",
-        frontends: "Frontends",
-        jobDisabled: "There is no valid index for this job",
-        status: "Status",
-
-        taskHistory: "Task history",
-        taskName: "Task name",
-        taskStarted: "Started",
-        taskDuration: "Duration",
-        taskStatus: "Status",
-        logs: "Logs",
-        kill: "Kill",
-        killConfirmation: "SIGTERM signal sent to sist2 process",
-        killConfirmationTitle: "Confirmation",
-        follow: "Follow",
-        wholeFile: "Whole file",
-        logLevel: "Log level",
-        logMode: "Follow mode",
-        logFile: "Reading log file",
-
-        jobs: "Jobs",
-        newJobName: "New job name",
-        newJobHelp: "Create a new job to get started!",
-        newFrontendName: "New frontend name",
-        scanned: "last scan",
-        autoStart: "Start automatically",
-
-        runJobConfirmationTitle: "Task queued",
-        runJobConfirmation: "Check the Tasks page to monitor the status.",
-
-        extraQueryArgs: "Extra query arguments when launching from sist2-admin",
-        customUrl: "Custom URL when launching from sist2-admin",
-
-        searchBackends: "Search backends",
-        searchBackendTitle: "search backend configuration",
-        newBackendName: "New search backend name",
-
-        frontendTab: "Frontend",
-        backendTab: "Backend",
-        scripts: "User Scripts",
-        script: "User Script",
-        testScript: "Test/debug User Script",
-        newScriptName: "New script name",
-        scriptType: "Script type",
-        scriptCode: "Script code (Python)",
-        scriptOptions: "User scripts",
-        gitRepository: "Git repository URL",
-        extraArgs: "Extra command line arguments",
-
-        couldNotStartFrontend: "Could not start frontend",
-        couldNotStartFrontendBody: "Unable to start the frontend, check server logs for more details.",
-
-        selectJobs: "Available jobs",
-        selectJob: "Select a job",
-        webOptions: {
-            title: "Web options",
-            lang: "UI Language",
-            bind: "Listen address",
-            tagline: "Tagline in navbar",
-            auth: "Basic auth in user:password format",
-            tagAuth: "Basic auth in user:password format for tagging",
-            auth0Audience: "Auth0 audience",
-            auth0Domain: "Auth0 domain",
-            auth0ClientId: "Auth0 client ID",
-            auth0PublicKey: "Auth0 public key",
-            verbose: "Verbose logs"
-        },
-        backendOptions: {
-            title: "Search backend options",
-            searchBackend: "Search backend",
-            type: "Search backend type",
-            esUrl: "Elasticsearch URL",
-            esIndex: "Elasticsearch index name",
-            esInsecure: "Do not verify SSL connections to Elasticsearch.",
-            threads: "Number of threads",
-            batchSize: "Index batch size",
-            script: "User script",
-            searchIndex: "Search index file location"
-        },
-        scanOptions: {
-            title: "Scanning options",
-            path: "Path",
-            threads: "Number of threads",
-            memThrottle: "Total memory threshold in MiB for scan throttling",
-            thumbnailQuality: "Thumbnail quality, on a scale of 0 to 100, 100 being the best",
-            thumbnailCount: "Number of thumbnails to generate. Set a value > 1 to create video previews, set to 0 to disable thumbnails.",
-            thumbnailSize: "Thumbnail size, in pixels",
-            contentSize: "Number of bytes to be extracted from text documents. Set to 0 to disable",
-            rewriteUrl: "Serve files from this url instead of from disk",
-            depth: "Scan up to this many subdirectories deep",
-            archive: "Archive file mode",
-            archivePassphrase: "Passphrase for encrypted archive files",
-            ocrLang: "Tesseract language",
-            ocrLangAlert: "You must select at least one language",
-            ocrEbooks: "Enable OCR'ing of ebook files",
-            ocrImages: "Enable OCR'ing of image files",
-            exclude: "Files that match this regex will not be scanned",
-            excludePlaceholder: "Exclude",
-            fast: "Only index file names & mime type",
-            checksums: "Calculate file checksums when scanning",
-            readSubtitles: "Read subtitles from media files",
-            memBuffer: "Maximum memory buffer size per thread in MiB for files inside archives",
-            treemapThreshold: "Relative size threshold for treemap",
-            optimizeIndex: "Defragment index file after scan to reduce its file size."
-        },
-        jobOptions: {
-            title: "Job options",
-            cron: "Job schedule",
-            keepNLogs: "Keep last N log files. Set to -1 to keep all logs.",
-            deleteNow: "Delete now",
-            scheduleEnabled: "Enable scheduled re-scan",
-            noJobAvailable: "No jobs available for this search backend.",
-            notIndexed: "Has not been indexed yet",
-            noBackendError: "You must select a search backend to run this job",
-            desktopNotifications: "Desktop notifications"
-        },
-        frontendOptions: {
-            title: "Advanced options",
-            noJobSelectedWarning: "You must select at least one job to start this frontend"
-        },
-        notifications: {
-            indexCompleted: "Task completed for [$JOB$]"
-        }
-    }
-}

sist2-admin/frontend/src/main.js

@@ -1,31 +0,0 @@
-import Vue from 'vue'
-
-import { BootstrapVue, IconsPlugin } from 'bootstrap-vue'
-
-import "bootstrap/dist/css/bootstrap.min.css"
-import "bootstrap-vue/dist/bootstrap-vue.min.css"
-
-Vue.use(BootstrapVue);
-Vue.use(IconsPlugin);
-
-import App from './App.vue';
-import router from './router';
-import store from './store';
-import VueI18n from "vue-i18n";
-import messages from "@/i18n/messages";
-
-Vue.use(VueI18n);
-
-const i18n = new VueI18n({
-  locale: "en",
-  messages: messages
-});
-
-Vue.config.productionTip = false
-
-new Vue({
-  router,
-  store,
-  i18n,
-  render: h => h(App)
-}).$mount('#app')

sist2-admin/frontend/src/router/index.js

@@ -1,57 +0,0 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
-import Home from '../views/Home.vue'
-import Job from "@/views/Job";
-import Tasks from "@/views/Tasks";
-import Frontend from "@/views/Frontend";
-import Tail from "@/views/Tail";
-import SearchBackend from "@/views/SearchBackend.vue";
-import UserScript from "@/views/UserScript.vue";
-
-Vue.use(VueRouter);
-
-const routes = [
-  {
-    path: "/task",
-    name: "Tasks",
-    component: Tasks
-  },
-  {
-    path: "/:tab?",
-    name: "Home",
-    component: Home
-  },
-  {
-    path: "/job/:name",
-    name: "Job",
-    component: Job
-  },
-  {
-    path: "/frontend/:name",
-    name: "Frontend",
-    component: Frontend
-  },
-  {
-    path: "/searchBackend/:name",
-    name: "SearchBackend",
-    component: SearchBackend
-  },
-  {
-    path: "/userScript/:name",
-    name: "UserScript",
-    component: UserScript
-  },
-  {
-    path: "/log/:taskId",
-    name: "Tail",
-    component: Tail
-  },
-]
-
-const router = new VueRouter({
-  mode: "hash",
-  base: process.env.BASE_URL,
-  routes
-})
-
-export default router

sist2-admin/frontend/src/store/index.js

@@ -1,63 +0,0 @@
-import Vue from "vue";
-import Vuex from "vuex";
-
-Vue.use(Vuex);
-
-function saveBrowserSettings(state) {
-    const settings = {
-        jobDesktopNotificationMap: state.jobDesktopNotificationMap
-    };
-    localStorage.setItem("sist2-admin-settings", JSON.stringify(settings));
-
-    console.log("SAVED");
-    console.log(settings);
-}
-
-export default new Vuex.Store({
-    state: {
-        sist2AdminInfo: null,
-        jobDesktopNotificationMap: {}
-    },
-    mutations: {
-        setSist2AdminInfo: (state, payload) => state.sist2AdminInfo = payload,
-        setJobDesktopNotificationMap: (state, payload) => state.jobDesktopNotificationMap = payload,
-    },
-    actions: {
-        notify: async ({state}, notification) => {
-
-            if (!state.jobDesktopNotificationMap[notification.job]) {
-                console.log("pass");
-                return;
-            }
-
-            new Notification(notification.messageString.replace("$JOB$", notification.job));
-        },
-        setJobDesktopNotification: async ({state}, {job, enabled}) => {
-
-            if (enabled === true) {
-                const permission = await Notification.requestPermission()
-
-                if (permission !== "granted") {
-                    return false;
-                }
-            }
-
-            state.jobDesktopNotificationMap[job] = enabled;
-            saveBrowserSettings(state);
-
-            return true;
-        },
-        loadBrowserSettings({commit}) {
-            const settingString = localStorage.getItem("sist2-admin-settings");
-
-            if (!settingString) {
-                return;
-            }
-
-            const settings = JSON.parse(settingString);
-
-            commit("setJobDesktopNotificationMap", settings["jobDesktopNotificationMap"]);
-        }
-    },
-    modules: {}
-})