Update readme

.gitignore

@@ -11,7 +11,7 @@ Makefile
 LOG
 sist2*
 index.sist2/
-bundle*.css
+bundle.css
 bundle.js
 *.a
 vgcore.*

.gitmodules

@@ -16,18 +16,3 @@
 [submodule "lmdb"]
 	path = lmdb
 	url = https://github.com/LMDB/lmdb
-[submodule "utf8.h"]
-	path = utf8.h
-	url = https://github.com/sheredom/utf8.h
-[submodule "lib/openjpeg"]
-	path = lib/openjpeg
-	url = https://github.com/uclouvain/openjpeg
-[submodule "lib/harfbuzz"]
-	path = lib/harfbuzz
-	url = https://github.com/harfbuzz/harfbuzz
-[submodule "lib/libmagic"]
-	path = lib/libmagic
-	url = https://github.com/threatstack/libmagic
-[submodule "lib/bzip2-1.0.6"]
-	path = lib/bzip2-1.0.6
-	url = https://github.com/enthought/bzip2-1.0.6

CMakeLists.txt

@@ -1,14 +1,10 @@
 cmake_minimum_required(VERSION 3.7)
 set(CMAKE_C_STANDARD 11)
 
-option(WITH_SIST2 "Build main executable" ON)
-option(WITH_SIST2_SCAN "Build scan executable" ON)
-
 project(sist2 C)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMakeModules")
 
-if (WITH_SIST2)
-    add_executable(
+add_executable(
         sist2
         src/main.c
         src/sist.h
@@ -23,7 +19,6 @@ if (WITH_SIST2)
         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/auth_basic.h src/web/auth_basic.c
         src/index/elastic.c src/index/elastic.h
         src/util.c src/util.h
         src/ctx.h src/types.h src/parsing/font.c src/parsing/font.h
@@ -37,45 +32,7 @@ if (WITH_SIST2)
         # 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
-
-            # utf8.h
-            utf8.h/utf8.h
-            src/parsing/arc.c src/parsing/arc.h)
-endif ()
-
-if (WITH_SIST2_SCAN)
-    add_executable(
-            sist2_scan
-            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/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/util.c src/util.h
-            src/ctx.h src/types.h src/parsing/font.c src/parsing/font.h
-
-            # 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
-
-            # utf8.h
-            utf8.h/utf8.h
-            src/parsing/arc.c src/parsing/arc.h)
-endif ()
+        src/cli.c src/cli.h)
 
 find_package(PkgConfig REQUIRED)
 set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig/")
@@ -89,47 +46,51 @@ pkg_check_modules(GLIB REQUIRED glib-2.0)
 pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
 pkg_check_modules(UUID REQUIRED uuid)
 
+include_directories(${LIBMAGIC_INCLUDE_DIRS})
+link_directories(${LIBMAGIC_LIBRARY_DIRS})
 add_definitions(${LIBMAGIC_CFLAGS_OTHER})
+
+link_directories(${UUID_LIBRARY_DIRS})
+include_directories(${UUID_INCLUDE_DIRS})
 add_definitions(${UUID_CFLAGS_OTHER})
+
+include_directories(${GLIB_INCLUDE_DIRS})
+link_directories(${GLIB_LIBRARY_DIRS})
 add_definitions(${GLIB_CFLAGS_OTHER})
+
+include_directories(${GOBJECT_INCLUDE_DIRS})
+link_directories(${GOBJECT_LIBRARY_DIRS})
 add_definitions(${GOBJECT_CFLAGS_OTHER})
-add_definitions(${FREETYPE_CFLAGS_OTHER})
+
+link_directories(${FFMPEG_LIBRARY_DIRS})
+include_directories(${FFMPEG_INCLUDE_DIRS})
+
+include_directories(${OPENSSL_INCLUDE_DIR})
+link_directories(${OPENSSL_CRYPTO_LIBRARY})
 
 list(REMOVE_ITEM GLIB_LIBRARIES pcre)
 list(REMOVE_ITEM GOBJECT_LIBRARIES pcre)
 list(REMOVE_ITEM UUID_LIBRARIES pcre)
 
-if (WITH_SIST2)
-    target_include_directories(
-            sist2 PUBLIC
-            ${LIBMAGIC_INCLUDE_DIRS}
-            ${GOBJECT_INCLUDE_DIRS}
-            ${OPENSSL_INCLUDE_DIR}
-            ${FFMPEG_INCLUDE_DIRS}
-            ${GLIB_INCLUDE_DIRS}
-            ${FREETYPE_INCLUDE_DIRS}
-            ${UUID_INCLUDE_DIRS}
+include_directories(${FREETYPE_INCLUDE_DIRS})
+add_definitions(${FREETYPE_CFLAGS_OTHER})
+
+include_directories(
         ${PROJECT_SOURCE_DIR}/
         ${PROJECT_SOURCE_DIR}/lmdb/libraries/liblmdb/
         ${PROJECT_SOURCE_DIR}/lib/onion/src/
         ${PROJECT_SOURCE_DIR}/lib/mupdf/include/
-    )
-    target_link_directories(
-            sist2 PUBLIC
-            ${UUID_LIBRARY_DIRS}
-            ${FFMPEG_LIBRARY_DIRS}
-    )
+)
 
-
-    target_compile_options(sist2
+target_compile_options(sist2
         PRIVATE
-            -Ofast
+        -O3
 #        -march=native
         -fno-stack-protector
         -fomit-frame-pointer
         )
 
-    TARGET_LINK_LIBRARIES(
+TARGET_LINK_LIBRARIES(
         sist2
 
         ${GLIB_LIBRARIES}
@@ -137,13 +98,13 @@ if (WITH_SIST2)
         ${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
-            #        ${FFMPEG_LIBRARIES}
-            #        swscale
+#        ${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
+        ${FFMPEG_LIBRARIES}
+        swscale
 
         # mupdf
         ${PROJECT_SOURCE_DIR}/lib/libmupdf.a
@@ -157,93 +118,10 @@ if (WITH_SIST2)
         m
         bz2
         magic
-            ${PROJECT_SOURCE_DIR}/lib/libharfbuzz.a
-            ${PROJECT_SOURCE_DIR}/lib/libopenjp2.a
-            freetype
-            archive
-    )
-
-endif ()
-
-if (WITH_SIST2_SCAN)
-
-    set_target_properties(
-            sist2_scan
-            PROPERTIES COMPILE_DEFINITIONS SIST_SCAN_ONLY
-    )
-    set_target_properties(
-            sist2_scan
-            PROPERTIES
-            COMPILE_DEFINITIONS SIST_SCAN_ONLY
-            LINK_FLAGS -static
-    )
-    target_include_directories(
-            sist2_scan PUBLIC
-            ${LIBMAGIC_INCLUDE_DIRS}
-            ${GOBJECT_INCLUDE_DIRS}
-            ${OPENSSL_INCLUDE_DIR}
-            ${FFMPEG_INCLUDE_DIRS}
-            ${GLIB_INCLUDE_DIRS}
-            ${UUID_INCLUDE_DIRS}
-            ${FREETYPE_INCLUDE_DIRS}
-            ${PROJECT_SOURCE_DIR}/
-            ${PROJECT_SOURCE_DIR}/lmdb/libraries/liblmdb/
-            ${PROJECT_SOURCE_DIR}/lib/onion/src/
-            ${PROJECT_SOURCE_DIR}/lib/mupdf/include/
-    )
-    target_link_directories(
-            sist2_scan PUBLIC
-            ${UUID_LIBRARY_DIRS}
-            ${FFMPEG_LIBRARY_DIRS}
-    )
-    target_compile_options(sist2_scan
-            PRIVATE
-            -Ofast
-            #        -march=native
-            -fno-stack-protector
-            -fomit-frame-pointer
-            )
-    TARGET_LINK_LIBRARIES(
-            sist2_scan
-
-            ${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
-
-            ${PROJECT_SOURCE_DIR}/lib/libbz2.a
-            ${PROJECT_SOURCE_DIR}/lib/libmagic.a
-
-            pthread
-            m
-            ${PROJECT_SOURCE_DIR}/lib/libharfbuzz.a
-            ${PROJECT_SOURCE_DIR}/lib/libopenjp2.a
-            freetype
-
-            ${PROJECT_SOURCE_DIR}/lib/libarchive.a
-            ${PROJECT_SOURCE_DIR}/lib/liblz4.a
-            ${PROJECT_SOURCE_DIR}/lib/liblzma.a
-            ${PROJECT_SOURCE_DIR}/lib/libzstd.a
-    )
-endif ()
+)
 
 add_custom_target(
         before_sist2
         COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/before_build.sh
 )
-
-IF (WITH_SIST2)
-    add_dependencies(sist2 before_sist2)
-else ()
-    add_dependencies(sist2_scan before_sist2)
-endif ()
+add_dependencies(sist2 before_sist2)

CMakeModules/FindFFmpeg.cmake

@@ -1,80 +0,0 @@
-# - 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

@@ -1,100 +0,0 @@
-
-#-------------------------------------------------------------------------------
-# 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

@@ -1,478 +0,0 @@
-# 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

@@ -1,268 +0,0 @@
-# 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

@@ -1,48 +0,0 @@
-# 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

@@ -1,9 +0,0 @@
-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
-
-ADD sist2 /root/sist2
-
-ENTRYPOINT ["/root/sist2"]

Docker/build.sh

@@ -1,9 +0,0 @@
-rm ./sist2
-cp ../sist2 .
-
-version=$(./sist2 --version)
-
-echo "Version ${version}"
-docker build . -t simon987/sist2:${version} -t simon987/sist2:latest
-docker push simon987/sist2:${version}
-docker push simon987/sist2:latest

README.md

@@ -9,32 +9,29 @@ sist2 (Simple incremental search tool)
 
 ## Features
 
-* Fast, low memory usage, multi-threaded
+* Fast, low memory usage
 * Portable (all its features are packaged in a single executable)
 * Extracts text from common file types\*
 * Generates thumbnails\*
 * Incremental scanning
-* Automatic tagging from file attributes via [user scripts](scripting/README.md)
-* Recursive scan inside archive files \*\*
 
 
 \* See [format support](#format-support)
-\** See [Archive files](#archive-files)
 
 ## Getting Started
 
 1. Have an [Elasticsearch](https://www.elastic.co/downloads/elasticsearch) instance running
-1. 
-    1. Download the [latest sist2 release](https://github.com/simon987/sist2/releases) *
-    1. *(or)* `docker pull simon987/sist2:latest`
+1. Download the [latest sist2 release](https://github.com/simon987/sist2/releases)
 
+*Windows users*: `sist2` runs under [WSL](https://en.wikipedia.org/wiki/Windows_Subsystem_for_Linux)
 
-\* *Windows users*: **sist2** runs under [WSL](https://en.wikipedia.org/wiki/Windows_Subsystem_for_Linux)    
-\* *Mac users*: See [#1](https://github.com/simon987/sist2/issues/1)
+*Mac users*: See [#1](https://github.com/simon987/sist2/issues/1)
 
 
 ## Example usage
 
+![demo](demo.gif)
+
 See help page `sist2 --help` for more details.
 
 **Scan a directory**
@@ -55,60 +52,18 @@ sist2 index --print ./my_idx > raw_documents.ndjson
 sist2 web --bind 0.0.0.0 --port 4321 ./my_idx1 ./my_idx2 ./my_idx3
 ```
 
-### Use sist2 with docker
-
-**scan**
-```bash
-docker run -it \
-    -v /path/to/files/:/files \
-    -v $PWD/out/:/out \
-    simon987/sist2 scan -t 4 /files -o /out/my_idx1
-```
-**index**
-```bash
-docker run -it --network host\
-    -v $PWD/out/:/out \
-    simon987/sist2 index /out/my_idx1
-```
-
-**web**
-```bash
-docker run --rm --network host -d --name sist2\
-    -v $PWD/out/my_idx:/idx \
-    -v $PWD/my/files:/files
-    simon987/sist2 web --bind 0.0.0.0 /idx
-docker stop sist2
-```
-
-
 ## Format support
 
 File type | Library | Content | Thumbnail | Metadata
 :---|:---|:---|:---|:---
-pdf,xps,cbz,fb2,epub | MuPDF | yes | yes, `png` | title |
-`audio/*` | ffmpeg | - | yes, `jpeg` | ID3 tags |
-`video/*` | ffmpeg | - | yes, `jpeg` | title, comment, artist |
-`image/*` | ffmpeg | - | yes, `jpeg` | `EXIF:Artist`, `EXIF:ImageDescription` |
+pdf,xps,cbz,cbr,fb2,epub | MuPDF | yes | yes, `png` | *planned* |
+`audio/*` | libav | - | yes, `jpeg` | ID3 tags |
+`video/*` | libav | - | yes, `jpeg` | *planned* |
+`image/*` | libav | - | yes, `jpeg` | *planned* |
 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 |  | yes | no | *planned* |
+docx, xlsx, pptx |  | *planned* | no | *planned* |
 
-\* *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)
-scan is also supported.
-
-**Limitations**:
-* 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.
-
-To check if a media file can be parsed without *seek*, execute `cat file.mp4 | ffprobe -`
 
 
 
@@ -124,13 +79,7 @@ binaries.
     apt install git cmake pkg-config libglib2.0-dev\
         libssl-dev uuid-dev libavformat-dev libswscale-dev \
         python3 libmagic-dev libfreetype6-dev libcurl-dev \
-        libbz2-dev yasm libharfbuzz-dev ragel
-   ```
-    *(FreeBSD)*
-    ```bash
-   pkg install cmake gcc yasm gmake bash ffmpeg e2fsprogs-uuid\
-        autotools ragel
-   ```
+        libbz2-dev yasm
    
 2. Build
     ```bash

mime.csv

@@ -91,7 +91,7 @@ application/x-esrehber, es
 application/x-excel, xla|xld|xlk|xlt|xlv
 application/x-executable, exe
 application/x-font-sfn,
-application/x-font-ttf, ttf|ttc
+application/x-font-ttf, ttf
 application/x-freelance, pre
 application/x-git,
 application/x-gsp, gsp
@@ -252,9 +252,8 @@ text/html, acgi|htm|html|htmls|htx|shtml
 text/javascript, js
 text/mcf, mcf
 text/pascal, pas
-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
+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
 text/richtext, rt|rtf|rtx
-text/rtf,
 text/scriplet, wsc
 text/x-awk, awk
 !video/x-jng, jng
@@ -264,7 +263,7 @@ image/x-xwindowdump, xwd
 !image/vnd.adobe.photoshop, psd
 text/tab-separated-values, tsv
 text/troff, man|me|ms|roff|t|tr
-text/uri-list, uji|unis|uri|uris
+text/uri-list, uni|unis|uri|uris
 text/vnd.abc, abc
 text/vnd.fmi.flexstor, flx
 text/vnd.wap.wmlscript, wmls
@@ -358,61 +357,3 @@ application/x-innosetup,
 application/winhelp, hlp
 image/x-tga,
 application/x-wine-extension-ini,
-application/x-cbz, cbz
-application/x-cbr, cbr
-application/x-ms-compress-szdd, fon
-application/x-atari-7800-rom, a78
-application/x-nes-rom, nes
-application/x-font-pfm, pfm
-application/x-gettext-translation,
-image/wmf,
-application/pgp-keys,
-image/x-3ds, 3ds
-application/x-lz4, lz4
-application/vnd.openxmlformats-officedocument.presentationml.presentation, pptx
-application/vnd.oasis.opendocument.presentation, odp
-application/x-msaccess, accdb
-application/vnd.oasis.opendocument.spreadsheet, ods
-audio/x-aiff, aiff|aif
-text/x-ms-regedit, reg
-application/x-gamecube-rom,
-application/x-nintendo-ds-rom,
-text/x-objective-c,
-application/x-font-gdos,
-application/x-apple-diskimage,
-application/x-zstd, zst
-video/x-m4v, m4v
-message/news,
-application/vnd.symbian.install,
-application/x-lzh-compressed,
-application/x-dosdriver,
-application/vnd.tcpdump.pcap, pcap
-x-epoc/x-sisx-app,
-application/x-avira-qua,
-video/MP2T,
-application/x-snappy-framed,
-application/x-lz4+json, jsonlz4
-application/x-dmp, dmp
-application/zlib, z
-application/x-pgp-keyring,
-application/x-gdbm,
-application/x-font-pf2, pf2
-application/x-zip,
-application/x-coredump,
-application/x-java-jmod, jmod
-application/x-terminfo,
-application/x-terminfo2,
-application/x-arc,
-application/vnd.lotus-1-2-3,
-image/x-win-bitmap,
-application/x-maxis-dbpf,
-text/PGP,
-audio/x-hx-aac-adts,
-application/x-chrome-extension,
-image/heic, heic
-image/x-gem,
-application/x-lzma, lzma
-application/warc, warc
-application/x-lz4, lz4
-application/x-lzip, lz
-application/x-lzop, lzo

schema/mappings.json

@@ -80,9 +80,6 @@
           "analyzer": "my_nGram"
         }
       }
-    },
-    "tag": {
-      "type": "keyword"
     }
   }
 }

schema/settings.json

@@ -1,6 +1,6 @@
 {
   "index": {
-    "refresh_interval": "30s",
+    "refresh_interval": "-1",
     "codec": "best_compression"
   },
   "analysis": {
@@ -24,15 +24,13 @@
       "my_nGram": {
         "tokenizer": "my_nGram_tokenizer",
         "filter": [
-          "lowercase",
-          "asciifolding"
+          "lowercase"
         ]
       },
       "content_analyzer": {
         "tokenizer": "standard",
         "filter": [
-          "lowercase",
-          "asciifolding"
+          "lowercase"
         ]
       }
     }

scripting/README.md

@@ -1,117 +0,0 @@
-## User scripts
-
-*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
-implement automatic tagging based on file attributes.
-
-The scripting language used 
-([Painless Scripting Language](https://www.elastic.co/guide/en/elasticsearch/painless/7.4/index.html)) 
-is very similar to Java, but you should be able to create user scripts
-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",
-  "_index": "sist2",
-  "_type": "_doc",
-  "_source": {
-    "index": "206b3050-e821-421a-891d-12fcf6c2db0d",
-    "mime": "application/json",
-    "size": 1799,
-    "mtime": 1545443685,
-    "extension": "md",
-    "name": "README",
-    "path": "sist2/scripting",
-    "content": "..."
-  }
-}
-```
-
-**Example script**
-
-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())
-}
-```
-
-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`
-```yaml
-script.painless.regex.enabled: true
-```
-Or, if you're using docker add `-e "script.painless.regex.enabled=true"`
-
-### 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))
-}
-```
-
-Use default *Calibre* folder structure to infer author.
-```Java
-ArrayList tags = ctx._source.tag = new ArrayList();
-
-// We expect the book path to look like this:
-//  /path/to/Calibre Library/Author/Title/Title - Author.pdf
-
-if (ctx._source.name.contains("-") && ctx._source.extension == "pdf") {
-    String[] names = ctx._source.name.splitOnToken('-');
-    tags.add("author." + names[1].strip());
-}
-```
-
-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();
-
-Matcher m = /([A-Z]{4})-[0-9]{3} (.*)/.matcher(ctx._source.name);
-if (m.find()) {
-    tags.add("studio." + m.group(1));
-
-    // Take the matched group (.*), and add a tag for
-    //  each name, separated by comma
-    for (String name : m.group(2).splitOnToken(',')) {
-        tags.add("actress." + name);
-    }
-}
-```
-
-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]);
-}
-```
-
-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]);
-}
-```

scripts/before_build.sh

@@ -1,16 +1,14 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 rm -rf index.sist2/
 
 rm web/js/bundle.js 2> /dev/null
-cat `ls web/js/*.min.js` > web/js/bundle.js
+cat `ls -v web/js/*.min.js` > web/js/bundle.js
 cat web/js/{util,dom,search}.js >> web/js/bundle.js
 
-rm web/css/bundle*.css 2> /dev/null
+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
+cat web/css/main.css >> web/css/bundle.css
 
 python3 scripts/mime.py > src/parsing/mime_generated.c
 python3 scripts/serve_static.py > src/web/static_generated.c

scripts/get_static_libs.sh

@@ -1,29 +1,13 @@
-#!/usr/bin/env bash
+#!/bin/bash
 cd lib
 
 cd mupdf
-USE_SYSTEM_HARFBUZZ=yes USE_SYSTEM_OPENJPEG=yes HAVE_X11=no HAVE_GLUT=no make -j 4
+HAVE_X11=no HAVE_GLUT=no make -j 4
 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 -march=native -DNDEBUG"
-cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-O3"
-make -j 4
-cd ..
-mv openjpeg/bin/libopenjp2.a .
-
-# harfbuzz
-cd harfbuzz
-./autogen.sh
-./configure --disable-shared --enable-static
-make -j 4
-cd ..
-mv harfbuzz/src/.libs/libharfbuzz.a .
-
 # ffmpeg
 cd ffmpeg
 ./configure --disable-shared --enable-static --disable-ffmpeg --disable-ffplay \
@@ -52,54 +36,4 @@ make -j 4
 cd ../..
 
 mv onion/build/src/onion/libonion_static.a .
-
-#bzip2
-cd bzip2-1.0.6
-make -j 4
-cd ..
-mv bzip2-1.0.6/libbz2.a .
-
-# magic
-cd libmagic
-./autogen.sh
-./configure --enable-static --disable-shared
-make -j 4
-cd ..
-mv libmagic/src/.libs/libmagic.a .
-
-# libarchive
-git clone https://github.com/libarchive/libarchive
-cd libarchive/build
-./autogen.sh
-cd ..
-./configure --without-nettle --without-expat --without-xml2 --without-openssl
-make -j 4
-cd ..
-mv libarchive/.libs/libarchive.a .
-
-# lz4
-git clone https://github.com/lz4/lz4
-cd lz4
-make -j 4
-cd ..
-mv lz4/lib/liblz4.a .
-
-# lzma
-wget https://newcontinuum.dl.sourceforge.net/project/lzmautils/xz-5.2.3.tar.gz
-tar -xzf xz-5.2.3.tar.gz
-rm xz-5.2.3.tar.gz
-cd xz-5.2.3
-./autogen.sh
-./configure
-make -j 4
-cd ..
-mv xz-5.2.3/src/liblzma/.libs/liblzma.a .
-
-# zstd
-git clone https://github.com/facebook/zstd
-cd zstd
-make -j 4
-cd ..
-mv zstd/lib/libzstd.a .
-
 cd ..

scripts/get_static_libs_freebsd.sh

@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-cd lib
-
-# mupdf
-cd mupdf
-HAVE_X11=no HAVE_GLUT=no gmake -j 4
-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 -march=native -DNDEBUG"
-cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-O3"
-gmake -j 4
-cd ..
-mv openjpeg/bin/libopenjp2.a .
-
-# harfbuzz
-cd harfbuzz
-./autogen.sh
-./configure --disable-shared --enable-static
-gmake -j 4
-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
-gmake -j 4
-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 .
-
-#bzip2
-cd bzip2-1.0.6
-make -j 4
-cd ..
-mv bzip2-1.0.6/libbz2.a .
-
-# magic
-cd libmagic
-./autogen.sh
-./configure --enable-static --disable-shared
-make -j 4
-cd ..
-mv libmagic/src/.libs/libmagic.a .
-
-cd ..

scripts/mime.py

@@ -12,20 +12,18 @@ major_mime = {
     "audio": 7,
     "image": 8,
     "text": 9,
-    "application": 10,
-    "x-epoc": 11,
+    "application": 10
 }
 
 pdf = (
     "application/pdf",
+    "application/x-cbr",
     "application/x-cbz",
-    "application/epub+zip",
     "application/vnd.ms-xpsdocument",
 )
 
 font = (
     "application/vnd.ms-opentype",
-    "application/x-ms-compress-szdd"
     "application/x-font-sfn",
     "application/x-font-ttf",
     "font/otf",
@@ -34,28 +32,6 @@ font = (
     "font/woff2"
 )
 
-# Archive "formats"
-archive = (
-    "application/x-tar",
-    "application/zip",
-    "application/x-rar",
-    "application/x-arc",
-    "application/x-warc",
-    "application/x-7z-compressed",
-)
-
-# Archive "filters"
-arc_filter = (
-    "application/gzip",
-    "application/x-bzip2",
-    "application/x-xz",
-    "application/x-zstd",
-    "application/x-lzma",
-    "application/x-lz4",
-    "application/x-lzip",
-    "application/x-lzop",
-)
-
 cnt = 1
 
 
@@ -70,10 +46,6 @@ def mime_id(mime):
         mime_id += " | 0x40000000"
     elif mime in font:
         mime_id += " | 0x20000000"
-    elif mime in archive:
-        mime_id += " | 0x10000000"
-    elif mime in arc_filter:
-        mime_id += " | 0x08000000"
     elif mime == "application/x-empty":
         return "1"
     return mime_id
@@ -99,7 +71,7 @@ with open("mime.csv") as f:
     print("#include <stdlib.h>\n")
     # Enum
     print("enum mime {")
-    for mime, ext in sorted(mimes.items()):
+    for mime, ext in mimes.items():
         print("    " + clean(mime) + "=" + mime_id(mime) + ",")
     print("};")
 

scripts/serve_static.py

@@ -1,9 +1,8 @@
 files = [
     "web/css/bundle.css",
-    "web/css/bundle_dark.css",
     "web/js/bundle.js",
+    "web/img/bg-bars.png",
     "web/img/sprite-skin-flat.png",
-    "web/img/sprite-skin-flat-dark.png",
     "web/search.html",
 ]
 

src/cli.c

@@ -1,13 +1,12 @@
 #include "cli.h"
 
 #define DEFAULT_OUTPUT "index.sist2/"
-#define DEFAULT_CONTENT_SIZE 32768
-#define DEFAULT_QUALITY 5
-#define DEFAULT_SIZE 500
+#define DEFAULT_CONTENT_SIZE 4096
+#define DEFAULT_QUALITY 15
+#define DEFAULT_SIZE 200
 #define DEFAULT_REWRITE_URL ""
 
 #define DEFAULT_ES_URL "http://localhost:9200"
-#define DEFAULT_BATCH_SIZE 100
 
 #define DEFAULT_BIND_ADDR "localhost"
 #define DEFAULT_PORT "4090"
@@ -15,39 +14,19 @@
 
 scan_args_t *scan_args_create() {
     scan_args_t *args = calloc(sizeof(scan_args_t), 1);
-
-    args->depth = -1;
-
     return args;
 }
 
-void scan_args_destroy(scan_args_t *args) {
-    if (args->name != NULL) {
-        free(args->name);
-    }
-    if (args->path != NULL) {
-        free(args->path);
-    }
-    if (args->output != NULL) {
-        free(args->output);
-    }
-    free(args);
+index_args_t *index_args_create() {
+    index_args_t *args = calloc(sizeof(index_args_t), 1);
+    return args;
 }
 
-#ifndef SIST_SCAN_ONLY
-
-void index_args_destroy(index_args_t *args) {
-    //todo
-    free(args);
+web_args_t *web_args_create() {
+    web_args_t *args = calloc(sizeof(web_args_t), 1);
+    return args;
 }
 
-void web_args_destroy(web_args_t *args) {
-    //todo
-    free(args);
-}
-
-#endif
-
 int scan_args_validate(scan_args_t *args, int argc, const char **argv) {
     if (argc < 2) {
         fprintf(stderr, "Required positional argument: PATH.\n");
@@ -56,7 +35,7 @@ int scan_args_validate(scan_args_t *args, int argc, const char **argv) {
 
     char *abs_path = abspath(argv[1]);
     if (abs_path == NULL) {
-        fprintf(stderr, "File not found: %s\n", argv[1]);
+        fprintf(stderr, "File not found: %s", argv[1]);
         return 1;
     } else {
         args->path = abs_path;
@@ -65,7 +44,7 @@ int scan_args_validate(scan_args_t *args, int argc, const char **argv) {
     if (args->incremental != NULL) {
         abs_path = abspath(args->incremental);
         if (abs_path == NULL) {
-            fprintf(stderr, "File not found: %s\n", args->incremental);
+            fprintf(stderr, "File not found: %s", args->incremental);
             return 1;
         }
     }
@@ -79,13 +58,16 @@ int scan_args_validate(scan_args_t *args, int argc, const char **argv) {
 
     if (args->size == 0) {
         args->size = DEFAULT_SIZE;
-    } else if (args->size > 0 && args->size < 32) {
-        printf("Invalid size: %d\n", args->content_size);
+    } else if (args->size <= 0) {
+        fprintf(stderr, "Invalid size: %d\n", args->size);
         return 1;
     }
 
     if (args->content_size == 0) {
         args->content_size = DEFAULT_CONTENT_SIZE;
+    } else if (args->content_size <= 0) {
+        fprintf(stderr, "Invalid content-size: %d\n", args->content_size);
+        return 1;
     }
 
     if (args->threads == 0) {
@@ -108,12 +90,6 @@ int scan_args_validate(scan_args_t *args, int argc, const char **argv) {
         return 1;
     }
 
-    if (args->depth < 0) {
-        args->depth = G_MAXINT32;
-    } else {
-        args->depth += 1;
-    }
-
     if (args->name == NULL) {
         args->name = g_path_get_basename(args->output);
     }
@@ -121,24 +97,9 @@ int scan_args_validate(scan_args_t *args, int argc, const char **argv) {
     if (args->rewrite_url == NULL) {
         args->rewrite_url = DEFAULT_REWRITE_URL;
     }
-
-    if (args->archive == NULL || strcmp(args->archive, "recurse") == 0) {
-        args->archive_mode = ARC_MODE_RECURSE;
-    } else if (strcmp(args->archive, "list") == 0) {
-        args->archive_mode = ARC_MODE_LIST;
-    } else if (strcmp(args->archive, "shallow") == 0) {
-        args->archive_mode = ARC_MODE_SHALLOW;
-    } else if (strcmp(args->archive, "skip") == 0) {
-        args->archive_mode = ARC_MODE_SKIP;
-    } else {
-        fprintf(stderr, "Archive mode must be one of (skip, list, shallow, recurse), got '%s'", args->archive);
-        return 1;
-    }
     return 0;
 }
 
-#ifndef SIST_SCAN_ONLY
-
 int index_args_validate(index_args_t *args, int argc, const char **argv) {
 
     if (argc < 2) {
@@ -148,47 +109,15 @@ int index_args_validate(index_args_t *args, int argc, const char **argv) {
 
     char *index_path = abspath(argv[1]);
     if (index_path == NULL) {
-        fprintf(stderr, "File not found: %s\n", argv[1]);
+        fprintf(stderr, "File not found: %s", argv[1]);
         return 1;
     } else {
         args->index_path = argv[1];
-        free(index_path);
     }
 
     if (args->es_url == NULL) {
         args->es_url = DEFAULT_ES_URL;
     }
-
-    if (args->script_path != NULL) {
-        struct stat info;
-        int res = stat(args->script_path, &info);
-
-        if (res == -1) {
-            fprintf(stderr, "Error opening script file '%s': %s\n", args->script_path, strerror(errno));
-            return 1;
-        }
-
-        int fd = open(args->script_path, O_RDONLY);
-        if (fd == -1) {
-            fprintf(stderr, "Error opening script file '%s': %s\n", args->script_path, strerror(errno));
-            return 1;
-        }
-
-        args->script = malloc(info.st_size + 1);
-        res = read(fd, args->script, info.st_size);
-        if (res == -1) {
-            fprintf(stderr, "Error reading script file '%s': %s\n", args->script_path, strerror(errno));
-            return 1;
-        }
-
-        *(args->script + info.st_size) = '\0';
-        close(fd);
-    }
-
-    if (args->batch_size == 0) {
-        args->batch_size = DEFAULT_BATCH_SIZE;
-    }
-
     return 0;
 }
 
@@ -211,34 +140,16 @@ int web_args_validate(web_args_t *args, int argc, const char **argv) {
         args->port = DEFAULT_PORT;
     }
 
-    if (args->credentials != NULL) {
-        args->b64credentials = onion_base64_encode(args->credentials, (int) strlen(args->credentials));
-        //Remove trailing newline
-        *(args->b64credentials + strlen(args->b64credentials) - 1) = '\0';
-    }
-
     args->index_count = argc - 1;
     args->indices = argv + 1;
 
     for (int i = 0; i < args->index_count; i++) {
         char *abs_path = abspath(args->indices[i]);
         if (abs_path == NULL) {
-            fprintf(stderr, "File not found: %s\n", abs_path);
+            fprintf(stderr, "File not found: %s", abs_path);
             return 1;
         }
     }
     return 0;
 }
 
-index_args_t *index_args_create() {
-    index_args_t *args = calloc(sizeof(index_args_t), 1);
-    return args;
-}
-
-web_args_t *web_args_create() {
-    web_args_t *args = calloc(sizeof(web_args_t), 1);
-    return args;
-}
-
-#endif
-

src/cli.h

@@ -12,24 +12,13 @@ typedef struct scan_args {
     char *output;
     char *rewrite_url;
     char *name;
-    int depth;
     char *path;
-    char *archive;
-    archive_mode_t archive_mode;
 } scan_args_t;
 
-scan_args_t *scan_args_create();
-void scan_args_destroy(scan_args_t *args);
-int scan_args_validate(scan_args_t *args, int argc, const char **argv);
-
-#ifndef SIST_SCAN_ONLY
 typedef struct index_args {
     char *es_url;
     const char *index_path;
-    const char *script_path;
-    char *script;
     int print;
-    int batch_size;
     int force_reset;
 } index_args_t;
 
@@ -37,20 +26,16 @@ typedef struct web_args {
     char *es_url;
     char *bind;
     char *port;
-    char *credentials;
-    char *b64credentials;
     int index_count;
     const char **indices;
 } web_args_t;
 
+scan_args_t *scan_args_create();
 index_args_t *index_args_create();
-void index_args_destroy(index_args_t *args);
-
 web_args_t *web_args_create();
-void web_args_destroy(web_args_t *args);
 
+int scan_args_validate(scan_args_t *args, int argc, const char **argv);
 int index_args_validate(index_args_t *args, int argc, const char **argv);
 int web_args_validate(web_args_t *args, int argc, const char **argv);
-#endif
 
 #endif

src/ctx.h

@@ -15,8 +15,6 @@ struct {
     int threads;
     int content_size;
     float tn_qscale;
-    int depth;
-    archive_mode_t archive_mode;
 
     size_t stat_tn_size;
     size_t stat_index_size;
@@ -28,19 +26,15 @@ struct {
 } ScanCtx;
 
 
-#ifndef SIST_SCAN_ONLY
 struct {
     char *es_url;
-    int batch_size;
 } IndexCtx;
 
 struct {
     char *es_url;
     int index_count;
-    char *b64credentials;
     struct index_t indices[16];
 } WebCtx;
-#endif
 
 
 #endif

src/index/elastic.c

@@ -6,9 +6,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <cJSON/cJSON.h>
+#include <src/ctx.h>
 
 #include "static_generated.c"
 
+#define BULK_INDEX_SIZE 100
 
 typedef struct es_indexer {
     int queued;
@@ -52,40 +54,6 @@ void index_json(cJSON *document, const char uuid_str[UUID_STR_LEN]) {
     elastic_index_line(bulk_line);
 }
 
-void execute_update_script(const char *script, const char index_id[UUID_STR_LEN]) {
-
-    cJSON *body = cJSON_CreateObject();
-    cJSON *script_obj = cJSON_AddObjectToObject(body, "script");
-    cJSON_AddStringToObject(script_obj, "lang", "painless");
-    cJSON_AddStringToObject(script_obj, "source", script);
-
-    cJSON *query = cJSON_AddObjectToObject(body, "query");
-    cJSON *term_obj = cJSON_AddObjectToObject(query, "term");
-    cJSON_AddStringToObject(term_obj, "index", index_id);
-
-    char * str = cJSON_Print(body);
-
-    char bulk_url[4096];
-    snprintf(bulk_url, 4096, "%s/sist2/_update_by_query?pretty", Indexer->es_url);
-    response_t *r = web_post(bulk_url, str, "Content-Type: application/json");
-    printf("Executed user script <%d>\n", r->status_code);
-    cJSON *resp = cJSON_Parse(r->body);
-
-    cJSON_free(str);
-    cJSON_Delete(body);
-    free_response(r);
-
-    cJSON *error = cJSON_GetObjectItem(resp, "error");
-    if (error != NULL) {
-        char *error_str = cJSON_Print(error);
-
-        fprintf(stderr, "User script error: \n%s\n", error_str);
-        cJSON_free(error_str);
-    }
-
-    cJSON_Delete(resp);
-}
-
 void elastic_flush() {
 
     if (Indexer == NULL) {
@@ -102,8 +70,7 @@ void elastic_flush() {
 
     while (line != NULL) {
         char action_str[512];
-        snprintf(action_str, 512,
-                "{\"index\":{\"_id\":\"%s\", \"_type\":\"_doc\", \"_index\":\"sist2\"}}\n", line->uuid_str);
+        snprintf(action_str, 512, "{\"index\":{\"_id\": \"%s\"}}\n", line->uuid_str);
         size_t action_str_len = strlen(action_str);
 
         size_t line_len = strlen(line->line);
@@ -130,30 +97,8 @@ void elastic_flush() {
     char bulk_url[4096];
     snprintf(bulk_url, 4096, "%s/sist2/_bulk", Indexer->es_url);
     response_t *r = web_post(bulk_url, buf, "Content-Type: application/x-ndjson");
-
-    if (r->status_code == 0) {
-        fprintf(stderr, "Could not connect to %s, make sure that elasticsearch is running!\n", IndexCtx.es_url);
-        exit(1);
-    }
-
     printf("Indexed %3d documents (%zukB) <%d>\n", count, buf_cur / 1024, r->status_code);
-
-    cJSON *ret_json = cJSON_Parse(r->body);
-    if (cJSON_GetObjectItem(ret_json, "errors")->valueint != 0) {
-        cJSON *err;
-        cJSON_ArrayForEach(err, cJSON_GetObjectItem(ret_json, "items")) {
-            if (cJSON_GetObjectItem(cJSON_GetObjectItem(err, "index"), "status")->valueint != 201) {
-                char* str = cJSON_Print(err);
-                fprintf(stderr, "%s\n", str);
-                cJSON_free(str);
-            }
-        }
-    }
-
-    cJSON_Delete(ret_json);
-
     free_response(r);
-    free(buf);
 }
 
 void elastic_index_line(es_bulk_line_t *line) {
@@ -172,14 +117,15 @@ void elastic_index_line(es_bulk_line_t *line) {
 
     Indexer->queued += 1;
 
-    if (Indexer->queued >= IndexCtx.batch_size) {
+    if (Indexer->queued >= BULK_INDEX_SIZE) {
         elastic_flush();
     }
 }
 
 es_indexer_t *create_indexer(const char *url) {
 
-    char *es_url = malloc(strlen(url) + 1);
+    size_t url_len = strlen(url);
+    char *es_url = malloc(url_len);
     strcpy(es_url, url);
 
     es_indexer_t *indexer = malloc(sizeof(es_indexer_t));
@@ -192,7 +138,7 @@ es_indexer_t *create_indexer(const char *url) {
     return indexer;
 }
 
-void destroy_indexer(char * script, char index_id[UUID_STR_LEN]) {
+void destroy_indexer() {
 
     char url[4096];
 
@@ -201,15 +147,6 @@ void destroy_indexer(char * script, char index_id[UUID_STR_LEN]) {
     printf("Refresh index <%d>\n", r->status_code);
     free_response(r);
 
-    if (script != NULL) {
-        execute_update_script(script, index_id);
-    }
-
-    snprintf(url, sizeof(url), "%s/sist2/_refresh", IndexCtx.es_url);
-    r = web_post(url, "", NULL);
-    printf("Refresh index <%d>\n", r->status_code);
-    free_response(r);
-
     snprintf(url, sizeof(url), "%s/sist2/_forcemerge", IndexCtx.es_url);
     r = web_post(url, "", NULL);
     printf("Merge index <%d>\n", r->status_code);
@@ -250,7 +187,7 @@ void elastic_init(int force_reset) {
         printf("Update settings <%d>\n", r->status_code);
         free_response(r);
 
-        snprintf(url, 4096, "%s/sist2/_mappings/_doc?include_type_name=true", IndexCtx.es_url);
+        snprintf(url, 4096, "%s/sist2/_mappings", IndexCtx.es_url);
         r = web_put(url, mappings_json, "Content-Type: application/json");
         printf("Update mappings <%d>\n", r->status_code);
         free_response(r);
@@ -264,13 +201,8 @@ void elastic_init(int force_reset) {
 
 cJSON *elastic_get_document(const char *uuid_str) {
     char url[4096];
-    snprintf(url, 4096, "%s/sist2/_doc/%s", WebCtx.es_url, uuid_str);
+    snprintf(url, 4096, "%s/sist2/_source/%s", WebCtx.es_url, uuid_str);
 
     response_t *r = web_get(url);
-    cJSON *json = NULL;
-    if (r->status_code == 200) {
-        json = cJSON_Parse(r->body);
-    }
-    free_response(r);
-    return json;
+    return cJSON_Parse(r->body);
 }

src/index/elastic.h

@@ -24,7 +24,7 @@ void index_json(cJSON *document, const char uuid_str[UUID_STR_LEN]);
 
 es_indexer_t *create_indexer(const char* es_url);
 
-void destroy_indexer(char *script, char index_id[UUID_STR_LEN]);
+void destroy_indexer();
 
 void elastic_init(int force_reset);
 

src/index/web.c

@@ -49,19 +49,18 @@ response_t *web_post(const char *url, const char *data, const char *header) {
     curl_easy_setopt(curl, CURLOPT_POST, 1);
     curl_easy_setopt(curl, CURLOPT_USERAGENT, "sist2");
 
-    struct curl_slist *headers = NULL;
     if (header != NULL) {
+        struct curl_slist *headers = NULL;
         headers = curl_slist_append(headers, header);
         curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
     }
 
     curl_easy_setopt(curl, CURLOPT_POSTFIELDS, data);
 
-    curl_easy_perform(curl);
+    int r1 = curl_easy_perform(curl);
     curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->status_code);
 
     curl_easy_cleanup(curl);
-    curl_slist_free_all(headers);
 
     resp->body = buffer.buf;
     resp->size = buffer.cur;

src/io/serialize.c

@@ -1,7 +1,7 @@
 #include "src/ctx.h"
 #include "serialize.h"
 
-static __thread int index_fd = -1;
+static __thread int IndexFd = -1;
 
 typedef struct {
     unsigned char uuid[16];
@@ -54,12 +54,6 @@ index_descriptor_t read_index_descriptor(char *path) {
     struct stat info;
     stat(path, &info);
     int fd = open(path, O_RDONLY);
-
-    if (fd == -1) {
-        fprintf(stderr, "Invalid/corrupt index (Could not find descriptor)\n");
-        exit(1);
-    }
-
     char *buf = malloc(info.st_size + 1);
     read(fd, buf, info.st_size);
     *(buf + info.st_size) = '\0';
@@ -72,7 +66,7 @@ index_descriptor_t read_index_descriptor(char *path) {
     strcpy(descriptor.root, cJSON_GetObjectItem(json, "root")->valuestring);
     strcpy(descriptor.name, cJSON_GetObjectItem(json, "name")->valuestring);
     strcpy(descriptor.rewrite_url, cJSON_GetObjectItem(json, "rewrite_url")->valuestring);
-    descriptor.root_len = (short) strlen(descriptor.root);
+    descriptor.root_len = (short)strlen(descriptor.root);
     strcpy(descriptor.version, cJSON_GetObjectItem(json, "version")->valuestring);
     strcpy(descriptor.uuid, cJSON_GetObjectItem(json, "uuid")->valuestring);
 
@@ -111,8 +105,6 @@ char *get_meta_key_text(enum metakey meta_key) {
             return "title";
         case MetaFontName:
             return "font_name";
-        case MetaParent:
-            return "parent";
         default:
             return NULL;
     }
@@ -121,13 +113,13 @@ char *get_meta_key_text(enum metakey meta_key) {
 
 void write_document(document_t *doc) {
 
-    if (index_fd == -1) {
+    if (IndexFd == -1) {
         char dstfile[PATH_MAX];
-        pthread_t self = pthread_self();
-        snprintf(dstfile, PATH_MAX, "%s_index_%lu", ScanCtx.index.path, self);
-        index_fd = open(dstfile, O_CREAT | O_WRONLY | O_APPEND, S_IRUSR | S_IWUSR);
+        pid_t tid = syscall(SYS_gettid);
+        snprintf(dstfile, PATH_MAX, "%s_index_%d", ScanCtx.index.path, tid);
+        IndexFd = open(dstfile, O_CREAT | O_WRONLY | O_APPEND, S_IRUSR | S_IWUSR);
 
-        if (index_fd == -1) {
+        if (IndexFd == -1) {
             perror("open");
         }
     }
@@ -160,16 +152,13 @@ void write_document(document_t *doc) {
     }
     dyn_buffer_write_char(&buf, '\n');
 
-    int res = write(index_fd, buf.buf, buf.cur);
-    if (res == -1) {
-        perror("write");
-    }
+    write(IndexFd, buf.buf, buf.cur);
     ScanCtx.stat_index_size += buf.cur;
     dyn_buffer_destroy(&buf);
 }
 
-void thread_cleanup() {
-    close(index_fd);
+void serializer_cleanup() {
+    close(IndexFd);
 }
 
 void read_index(const char *path, const char index_id[UUID_STR_LEN], index_func func) {
@@ -192,7 +181,7 @@ void read_index(const char *path, const char index_id[UUID_STR_LEN], index_func
         uuid_unparse(line.uuid, uuid_str);
 
         cJSON_AddStringToObject(document, "mime", mime_get_mime_text(line.mime));
-        cJSON_AddNumberToObject(document, "size", (double) line.size);
+        cJSON_AddNumberToObject(document, "size", (double)line.size);
         cJSON_AddNumberToObject(document, "mtime", line.mtime);
 
         int c;
@@ -208,27 +197,18 @@ void read_index(const char *path, const char index_id[UUID_STR_LEN], index_func
             *(buf.buf + line.ext) = '\0';
         }
         cJSON_AddStringToObject(document, "name", buf.buf + line.base);
-        if (line.base > 0) {
         *(buf.buf + line.base - 1) = '\0';
         cJSON_AddStringToObject(document, "path", buf.buf);
-        } else {
-            cJSON_AddStringToObject(document, "path", "");
-        }
 
         enum metakey key = getc(file);
         while (key != '\n') {
             switch (key) {
                 case MetaWidth:
-                case MetaHeight: {
-                    int value;
-                    fread(&value, sizeof(int), 1, file);
-                    cJSON_AddNumberToObject(document, get_meta_key_text(key), value);
-                    break;
-                }
+                case MetaHeight:
                 case MetaMediaDuration:
                 case MetaMediaBitrate: {
-                    long value;
-                    fread(&value, sizeof(long), 1, file);
+                    int value;
+                    fread(&value, sizeof(int), 1, file);
                     cJSON_AddNumberToObject(document, get_meta_key_text(key), value);
                     break;
                 }
@@ -249,30 +229,23 @@ void read_index(const char *path, const char index_id[UUID_STR_LEN], index_func
                 case MetaAlbumArtist:
                 case MetaGenre:
                 case MetaFontName:
-                case MetaParent:
                 case MetaTitle: {
                     buf.cur = 0;
                     while ((c = getc(file)) != 0) {
-                        if (SHOULD_KEEP_CHAR(c) || c == ' ') {
                         dyn_buffer_write_char(&buf, (char) c);
                     }
-                    }
                     dyn_buffer_write_char(&buf, '\0');
                     cJSON_AddStringToObject(document, get_meta_key_text(key), buf.buf);
                     break;
                 }
-                default:
-                    fprintf(stderr, "Invalid meta key (corrupt index): %x\n", key);
-                    break;
             }
 
             key = getc(file);
         }
 
         func(document, uuid_str);
-        cJSON_Delete(document);
+        cJSON_free(document);
     }
-    dyn_buffer_destroy(&buf);
     fclose(file);
 }
 
@@ -316,7 +289,6 @@ void incremental_copy(store_t *store, store_t *dst_store, const char *filepath,
             size_t buf_len;
             char *buf = store_read(store, (char *) line.uuid, 16, &buf_len);
             store_write(dst_store, (char *) line.uuid, 16, buf, buf_len);
-            free(buf);
 
             char c;
             while ((c = (char) getc(file))) {

src/io/serialize.h

@@ -18,7 +18,7 @@ void incremental_read(GHashTable *table, const char *filepath);
 /**
  * Must be called after write_document
  */
-void thread_cleanup();
+void serializer_cleanup();
 
 void write_index_descriptor(char *path, index_descriptor_t *desc);
 

src/io/store.c

@@ -15,7 +15,7 @@ store_t *store_create(char *path) {
     );
 
     if (open_ret != 0) {
-        fprintf(stderr, "Error while opening store: %s (%s)\n", mdb_strerror(open_ret), path);
+        fprintf(stderr, "Error while opening store: %s", mdb_strerror(open_ret));
         exit(1);
     }
 
@@ -64,7 +64,7 @@ void store_write(store_t *store, char *key, size_t key_len, char *buf, size_t bu
         // Cannot resize when there is a opened transaction.
         //  Resize take effect on the next commit.
         pthread_rwlock_wrlock(&store->lock);
-        store->size += 1024 * 1024 * 50;
+        store->size += 1024 * 1024 * 5;
         mdb_env_set_mapsize(store->env, store->size);
         mdb_txn_begin(store->env, NULL, 0, &txn);
         put_ret = mdb_put(txn, store->dbi, &mdb_key, &mdb_value, 0);

src/io/walk.c

@@ -1,36 +1,28 @@
 #include "walk.h"
 #include "src/ctx.h"
 
-__always_inline
-parse_job_t *create_fs_parse_job(const char *filepath, const struct stat *info, int base) {
+parse_job_t *create_parse_job(const char *filepath, const struct stat *info, int base) {
     int len = (int) strlen(filepath);
+
     parse_job_t *job = malloc(sizeof(parse_job_t) + len);
 
-    strcpy(job->filepath, filepath);
+    memcpy(&(job->filepath), filepath, len + 1);
     job->base = base;
     char *p = strrchr(filepath + base, '.');
     if (p != NULL) {
-        job->ext = (int) (p - filepath + 1);
+        job->ext = (int)(p - filepath + 1);
     } else {
         job->ext = len;
     }
 
-    job->info = *info;
-
-    memset(job->parent, 0, 16);
-
-    job->vfile.filepath = job->filepath;
-    job->vfile.read = fs_read;
-    job->vfile.close = fs_close;
-    job->vfile.fd = -1;
-    job->vfile.is_fs_file = TRUE;
+    memcpy(&(job->info), info, sizeof(struct stat));
 
     return job;
 }
 
 int handle_entry(const char *filepath, const struct stat *info, int typeflag, struct FTW *ftw) {
-    if (ftw->level <= ScanCtx.depth && typeflag == FTW_F && S_ISREG(info->st_mode)) {
-        parse_job_t *job = create_fs_parse_job(filepath, info, ftw->base);
+    if (typeflag == FTW_F && S_ISREG(info->st_mode)) {
+        parse_job_t *job = create_parse_job(filepath, info, ftw->base);
         tpool_add_work(ScanCtx.pool, parse, job);
     }
 

src/main.c

@@ -1,16 +1,11 @@
 #include "sist.h"
 #include "ctx.h"
 
-#ifndef SIST_SCAN_ONLY
 #define DESCRIPTION "Lightning-fast file system indexer and search tool."
-#else
-#define DESCRIPTION "Lightning-fast file system indexer and search tool. (SCAN ONLY)"
-#endif
-
 #define EPILOG "Made by simon987 <me@simon987.net>. Released under GPL-3.0"
 
 
-static const char *const Version = "1.1.10";
+static const char *const Version = "1.0.0";
 static const char *const usage[] = {
         "sist2 scan [OPTION]... PATH",
         "sist2 index [OPTION]... INDEX",
@@ -19,9 +14,7 @@ static const char *const usage[] = {
 };
 
 void global_init() {
-#ifndef SIST_SCAN_ONLY
     curl_global_init(CURL_GLOBAL_NOTHING);
-#endif
     av_log_set_level(AV_LOG_QUIET);
 }
 
@@ -30,7 +23,7 @@ void init_dir(const char *dirpath) {
     snprintf(path, PATH_MAX, "%sdescriptor.json", dirpath);
 
     uuid_t uuid;
-    uuid_generate(uuid);
+    uuid_generate_time_safe(uuid);
     uuid_unparse(uuid, ScanCtx.index.desc.uuid);
     time(&ScanCtx.index.desc.timestamp);
     strcpy(ScanCtx.index.desc.version, Version);
@@ -41,22 +34,10 @@ void init_dir(const char *dirpath) {
 void scan_print_header() {
     printf("sist2 V%s\n", Version);
     printf("---------------------\n");
-    printf("threads\t\t\t%d\n", ScanCtx.threads);
-    printf("tn_qscale\t\t%.1f/31.0\n", ScanCtx.tn_qscale);
-
-    if (ScanCtx.tn_size > 0) {
-        printf("tn_size\t\t\t%dpx\n", ScanCtx.tn_size);
-    } else {
-        printf("tn_size\t\t\tdisabled\n");
-    }
-
-    if (ScanCtx.content_size > 0) {
-        printf("content_size\t\t%d B\n", ScanCtx.content_size);
-    } else {
-        printf("content_size\t\t\tdisabled\n");
-    }
-
-    printf("output\t\t\t%s\n", ScanCtx.index.path);
+    printf("threads\t\t%d\n", ScanCtx.threads);
+    printf("tn_qscale\t%.1f/31.0\n", ScanCtx.tn_qscale);
+    printf("tn_size\t\t%dpx\n", ScanCtx.tn_size);
+    printf("output\t\t%s\n", ScanCtx.index.path);
 }
 
 void sist2_scan(scan_args_t *args) {
@@ -64,12 +45,11 @@ void sist2_scan(scan_args_t *args) {
     ScanCtx.tn_qscale = args->quality;
     ScanCtx.tn_size = args->size;
     ScanCtx.content_size = args->content_size;
+    ScanCtx.pool = tpool_create(args->threads, serializer_cleanup);
     ScanCtx.threads = args->threads;
-    ScanCtx.depth = args->depth;
-    ScanCtx.archive_mode = args->archive_mode;
     strncpy(ScanCtx.index.path, args->output, sizeof(ScanCtx.index.path));
     strncpy(ScanCtx.index.desc.name, args->name, sizeof(ScanCtx.index.desc.name));
-    strncpy(ScanCtx.index.desc.root, args->path, sizeof(ScanCtx.index.desc.root));
+    strcpy(ScanCtx.index.desc.root, args->path);
     ScanCtx.index.desc.root_len = (short) strlen(ScanCtx.index.desc.root);
 
     init_dir(ScanCtx.index.path);
@@ -106,8 +86,6 @@ void sist2_scan(scan_args_t *args) {
         printf("Loaded %d items in to mtime table.", g_hash_table_size(ScanCtx.original_table));
     }
 
-    ScanCtx.pool = tpool_create(args->threads, thread_cleanup);
-    tpool_start(ScanCtx.pool);
     walk_directory_tree(ScanCtx.index.desc.root);
     tpool_wait(ScanCtx.pool);
     tpool_destroy(ScanCtx.pool);
@@ -138,12 +116,9 @@ void sist2_scan(scan_args_t *args) {
     store_destroy(ScanCtx.index.store);
 }
 
-#ifndef SIST_SCAN_ONLY
-
 void sist2_index(index_args_t *args) {
 
     IndexCtx.es_url = args->es_url;
-    IndexCtx.batch_size = args->batch_size;
 
     if (!args->print) {
         elastic_init(args->force_reset);
@@ -179,11 +154,10 @@ void sist2_index(index_args_t *args) {
             read_index(file_path, desc.uuid, f);
         }
     }
-    closedir(dir);
 
     if (!args->print) {
         elastic_flush();
-        destroy_indexer(args->script, desc.uuid);
+        destroy_indexer();
     }
 }
 
@@ -191,7 +165,6 @@ void sist2_web(web_args_t *args) {
 
     WebCtx.es_url = args->es_url;
     WebCtx.index_count = args->index_count;
-    WebCtx.b64credentials = args->b64credentials;
 
     for (int i = 0; i < args->index_count; i++) {
         char *abs_path = abspath(args->indices[i]);
@@ -214,53 +187,36 @@ void sist2_web(web_args_t *args) {
     serve(args->bind, args->port);
 }
 
-#endif
-
 
 int main(int argc, const char *argv[]) {
 
     global_init();
 
     scan_args_t *scan_args = scan_args_create();
-#ifndef SIST_SCAN_ONLY
     index_args_t *index_args = index_args_create();
     web_args_t *web_args = web_args_create();
-#endif
 
-    int arg_version = 0;
-
-    char *common_es_url = NULL;
+    char * common_es_url;
 
     struct argparse_option options[] = {
             OPT_HELP(),
 
-            OPT_BOOLEAN('v', "version", &arg_version, "Show version and exit"),
-
             OPT_GROUP("Scan options"),
             OPT_INTEGER('t', "threads", &scan_args->threads, "Number of threads. DEFAULT=1"),
             OPT_FLOAT('q', "quality", &scan_args->quality,
-                      "Thumbnail quality, on a scale of 1.0 to 31.0, 1.0 being the best. DEFAULT=5"),
-            OPT_INTEGER(0, "size", &scan_args->size,
-                        "Thumbnail size, in pixels. Use negative value to disable. DEFAULT=500"),
+                      "Thumbnail quality, on a scale of 1.0 to 31.0, 1.0 being the best. DEFAULT=15"),
+            OPT_INTEGER(0, "size", &scan_args->size, "Thumbnail size, in pixels. DEFAULT=200"),
             OPT_INTEGER(0, "content-size", &scan_args->content_size,
-                        "Number of bytes to be extracted from text documents. Use negative value to disable. DEFAULT=32768"),
+                        "Number of bytes to be extracted from text documents. DEFAULT=4096"),
             OPT_STRING(0, "incremental", &scan_args->incremental,
                        "Reuse an existing index and only scan modified files."),
             OPT_STRING('o', "output", &scan_args->output, "Output directory. DEFAULT=index.sist2/"),
             OPT_STRING(0, "rewrite-url", &scan_args->rewrite_url, "Serve files from this url instead of from disk."),
             OPT_STRING(0, "name", &scan_args->name, "Index display name. DEFAULT: (name of the directory)"),
-            OPT_INTEGER(0, "depth", &scan_args->depth, "Scan up to DEPTH subdirectories deep. "
-                                                       "Use 0 to only scan files in PATH. DEFAULT: -1"),
-            OPT_STRING(0, "archive", &scan_args->archive, "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"),
 
-#ifndef SIST_SCAN_ONLY
             OPT_GROUP("Index options"),
             OPT_STRING(0, "es-url", &common_es_url, "Elasticsearch url. DEFAULT=http://localhost:9200"),
             OPT_BOOLEAN('p', "print", &index_args->print, "Just print JSON documents to stdout."),
-            OPT_STRING(0, "script-file", &index_args->script_path, "Path to user script."),
-            OPT_INTEGER(0, "batch-size", &index_args->batch_size, "Index batch size. DEFAULT: 100"),
             OPT_BOOLEAN('f', "force-reset", &index_args->force_reset, "Reset Elasticsearch mappings and settings. "
                                                               "(You must use this option the first time you use the index command)"),
 
@@ -268,8 +224,6 @@ int main(int argc, const char *argv[]) {
             OPT_STRING(0, "es-url", &common_es_url, "Elasticsearch url. DEFAULT=http://localhost:9200"),
             OPT_STRING(0, "bind", &web_args->bind, "Listen on this address. DEFAULT=localhost"),
             OPT_STRING(0, "port", &web_args->port, "Listen on this port. DEFAULT=4090"),
-            OPT_STRING(0, "auth", &web_args->credentials, "Basic auth in user:password format"),
-#endif
 
             OPT_END(),
     };
@@ -279,15 +233,8 @@ int main(int argc, const char *argv[]) {
     argparse_describe(&argparse, DESCRIPTION, EPILOG);
     argc = argparse_parse(&argparse, argc, argv);
 
-    if (arg_version) {
-        printf(Version);
-        exit(0);
-    }
-
-#ifndef SIST_SCAN_ONLY
     web_args->es_url = common_es_url;
     index_args->es_url = common_es_url;
-#endif
 
     if (argc == 0) {
         argparse_usage(&argparse);
@@ -300,10 +247,7 @@ int main(int argc, const char *argv[]) {
         }
         sist2_scan(scan_args);
 
-    }
-
-#ifndef SIST_SCAN_ONLY
-    else if (strcmp(argv[0], "index") == 0) {
+    } else if (strcmp(argv[0], "index") == 0) {
 
         int err = index_args_validate(index_args, argc, argv);
         if (err != 0) {
@@ -319,21 +263,11 @@ int main(int argc, const char *argv[]) {
         }
         sist2_web(web_args);
 
-    }
-#endif
-    else {
+    } else {
         fprintf(stderr, "Invalid command: '%s'\n", argv[0]);
         argparse_usage(&argparse);
         return 1;
     }
     printf("\n");
-
-    scan_args_destroy(scan_args);
-
-#ifndef SIST_SCAN_ONLY
-    index_args_destroy(index_args);
-    web_args_destroy(web_args);
-#endif
-
     return 0;
 }

src/parsing/arc.c

@@ -1,152 +0,0 @@
-#include "arc.h"
-#include "src/ctx.h"
-
-#define ARC_BUF_SIZE 8192
-
-int should_parse_filtered_file(const char *filepath, int ext) {
-    char tmp[PATH_MAX * 2];
-
-    if (ext == 0) {
-        return FALSE;
-    }
-
-    memcpy(tmp, filepath, ext - 1);
-    *(tmp + ext - 1) = '\0';
-
-    char *idx = strrchr(tmp, '.');
-
-    if (idx == NULL) {
-        return FALSE;
-    }
-
-    if (strcmp(idx, ".tar") == 0) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-int arc_read(struct vfile *f, void *buf, size_t size) {
-    return archive_read_data(f->arc, buf, size);
-}
-
-typedef struct arc_data {
-    vfile_t *f;
-    char buf[ARC_BUF_SIZE];
-} arc_data_f;
-
-int vfile_open_callback(struct archive *a, void *user_data) {
-    arc_data_f *data = user_data;
-
-    if (data->f->is_fs_file && data->f->fd == -1) {
-        data->f->fd = open(data->f->filepath, O_RDONLY);
-    }
-
-    return ARCHIVE_OK;
-}
-
-long vfile_read_callback(struct archive *a, void *user_data, const void **buf) {
-    arc_data_f *data = user_data;
-
-    *buf = data->buf;
-    return data->f->read(data->f, data->buf, ARC_BUF_SIZE);
-}
-
-int vfile_close_callback(struct archive *a, void *user_data) {
-    arc_data_f *data = user_data;
-
-    if (data->f->close != NULL) {
-        data->f->close(data->f);
-    }
-
-    return ARCHIVE_OK;
-}
-
-void parse_archive(vfile_t *f, document_t *doc) {
-
-    struct archive *a;
-    struct archive_entry *entry;
-
-    a = archive_read_new();
-
-    archive_read_support_filter_all(a);
-    archive_read_support_format_all(a);
-
-    arc_data_f data;
-    data.f = f;
-
-    int ret = 0;
-    if (data.f->is_fs_file) {
-        ret = archive_read_open_filename(a, doc->filepath, ARC_BUF_SIZE);
-    } else if (ScanCtx.archive_mode == ARC_MODE_RECURSE) {
-        ret = archive_read_open(
-                a, &data,
-                vfile_open_callback,
-                vfile_read_callback,
-                vfile_close_callback
-        );
-    } else {
-        archive_read_free(a);
-        return;
-    }
-
-    if (ret != ARCHIVE_OK) {
-        fprintf(stderr, "OPEN[%d]:%s %s\n", ret, archive_error_string(a), doc->filepath);
-        archive_read_free(a);
-        return;
-    }
-
-    if (ScanCtx.archive_mode == ARC_MODE_LIST) {
-
-        dyn_buffer_t buf = dyn_buffer_create();
-
-        while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-            if (S_ISREG(archive_entry_stat(entry)->st_mode)) {
-
-                char *path = (char *) archive_entry_pathname(entry);
-
-                dyn_buffer_append_string(&buf, path);
-                dyn_buffer_write_char(&buf, '\n');
-            }
-        }
-        dyn_buffer_write_char(&buf, '\0');
-
-        meta_line_t *meta_list = malloc(sizeof(meta_line_t) + buf.cur);
-        meta_list->key = MetaContent;
-        strcpy(meta_list->strval, buf.buf);
-        APPEND_META(doc, meta_list);
-        dyn_buffer_destroy(&buf);
-
-    } else {
-
-        parse_job_t *sub_job = malloc(sizeof(parse_job_t) + PATH_MAX * 2);
-
-        sub_job->vfile.close = NULL;
-        sub_job->vfile.read = arc_read;
-        sub_job->vfile.arc = a;
-        sub_job->vfile.filepath = sub_job->filepath;
-        sub_job->vfile.is_fs_file = FALSE;
-        memcpy(sub_job->parent, doc->uuid, sizeof(uuid_t));
-
-        while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-            sub_job->info = *archive_entry_stat(entry);
-            if (S_ISREG(sub_job->info.st_mode)) {
-                sprintf(sub_job->filepath, "%s#/%s", f->filepath, archive_entry_pathname(entry));
-                sub_job->base = (int) (strrchr(sub_job->filepath, '/') - sub_job->filepath) + 1;
-
-                char *p = strrchr(sub_job->filepath, '.');
-                if (p != NULL) {
-                    sub_job->ext = (int) (p - sub_job->filepath + 1);
-                } else {
-                    sub_job->ext = (int) strlen(sub_job->filepath);
-                }
-
-                parse(sub_job);
-            }
-        }
-
-        free(sub_job);
-    }
-
-    archive_read_free(a);
-}

src/parsing/arc.h

@@ -1,12 +0,0 @@
-#ifndef SIST2_ARC_H
-#define SIST2_ARC_H
-
-#include "src/sist.h"
-
-int should_parse_filtered_file(const char *filepath, int ext);
-
-void parse_archive(vfile_t *f, document_t *doc);
-
-int arc_read(struct vfile * f, void *buf, size_t size);
-
-#endif

src/parsing/font.c

@@ -1,9 +1,11 @@
 #include "font.h"
 
+#include "ft2build.h"
+#include "freetype/freetype.h"
 
 #include "src/ctx.h"
 
-__thread FT_Library ft_lib = NULL;
+__thread FT_Library library = NULL;
 
 
 typedef struct text_dimensions {
@@ -13,12 +15,12 @@ typedef struct text_dimensions {
 } text_dimensions_t;
 
 typedef struct glyph {
-    int top;
-    int height;
-    int width;
-    int descent;
-    int ascent;
-    int advance_width;
+    unsigned int top;
+    unsigned int height;
+    unsigned int width;
+    unsigned int descent;
+    unsigned int ascent;
+    unsigned int advance_width;
     unsigned char *pixmap;
 } glyph_t;
 
@@ -37,10 +39,10 @@ glyph_t ft_glyph_to_glyph(FT_GlyphSlot slot) {
 
     glyph.pixmap = slot->bitmap.buffer;
 
-    glyph.width = (int) slot->bitmap.width;
-    glyph.height = (int) slot->bitmap.rows;
+    glyph.width = slot->bitmap.width;
+    glyph.height = slot->bitmap.rows;
     glyph.top = slot->bitmap_top;
-    glyph.advance_width = (int) slot->advance.x / 64;
+    glyph.advance_width = slot->advance.x / 64;
 
     glyph.descent = MAX(0, glyph.height - glyph.top);
     glyph.ascent = MAX(0, MAX(glyph.top, glyph.height) - glyph.descent);
@@ -48,6 +50,10 @@ glyph_t ft_glyph_to_glyph(FT_GlyphSlot slot) {
     return glyph;
 }
 
+__always_inline
+glyph_t get_glyph(char character, FT_Face face) {
+}
+
 text_dimensions_t text_dimension(char *text, FT_Face face) {
     text_dimensions_t dimensions;
 
@@ -56,7 +62,7 @@ text_dimensions_t text_dimension(char *text, FT_Face face) {
     int num_chars = (int) strlen(text);
 
     unsigned int max_ascent = 0;
-    int max_descent = 0;
+    unsigned int max_descent = 0;
 
     char pc = 0;
     for (int i = 0; i < num_chars; i++) {
@@ -66,7 +72,7 @@ text_dimensions_t text_dimension(char *text, FT_Face face) {
         glyph_t glyph = ft_glyph_to_glyph(face->glyph);
 
         max_descent = MAX(max_descent, glyph.descent);
-        max_ascent = MAX(max_ascent, MAX(glyph.height, glyph.ascent));
+        max_ascent = MAX(max_ascent, glyph.ascent);
 
         int kerning_x = kerning_offset(c, pc, face);
         dimensions.width += MAX(glyph.advance_width, glyph.width) + kerning_x;
@@ -137,15 +143,12 @@ void bmp_format(dyn_buffer_t *buf, text_dimensions_t dimensions, const unsigned
 }
 
 void parse_font(const char *buf, size_t buf_len, document_t *doc) {
-    if (ft_lib == NULL) {
-        FT_Init_FreeType(&ft_lib);
-    }
-    if (buf == NULL) {
-        return;
+    if (library == NULL) {
+        FT_Init_FreeType(&library);
     }
 
     FT_Face face;
-    FT_Error err = FT_New_Memory_Face(ft_lib, (unsigned char *) buf, buf_len, 0, &face);
+    FT_Error err = FT_New_Memory_Face(library, (unsigned char *) buf, buf_len, 0, &face);
     if (err != 0) {
         return;
     }
@@ -153,11 +156,7 @@ void parse_font(const char *buf, size_t buf_len, document_t *doc) {
     char font_name[1024];
 
     if (face->style_name == NULL || *(face->style_name) == '?') {
-        if (face->family_name == NULL) {
-            strcpy(font_name, "(null)");
-        } else {
         strcpy(font_name, face->family_name);
-        }
     } else {
         snprintf(font_name, sizeof(font_name), "%s %s", face->family_name, face->style_name);
     }
@@ -167,10 +166,6 @@ void parse_font(const char *buf, size_t buf_len, document_t *doc) {
     strcpy(meta_name->strval, font_name);
     APPEND_META(doc, meta_name)
 
-    if (ScanCtx.tn_size <= 0) {
-        return;
-    }
-
     int pixel = 64;
     int num_chars = (int) strlen(font_name);
 
@@ -189,20 +184,13 @@ void parse_font(const char *buf, size_t buf_len, document_t *doc) {
     for (int i = 0; i < num_chars; i++) {
         char c = font_name[i];
 
-        err = FT_Load_Char(face, c, FT_LOAD_NO_HINTING | FT_LOAD_RENDER);
-        if (err != 0) {
-            c = c >= 'a' && c <= 'z' ? c - 32 : c + 32;
         err = FT_Load_Char(face, c, FT_LOAD_NO_HINTING | FT_LOAD_RENDER);
         if (err != 0) {
             continue;
         }
-        }
         glyph_t glyph = ft_glyph_to_glyph(face->glyph);
 
         pen.x += kerning_offset(c, pc, face);
-        if (pen.x <= 0) {
-            pen.x = ABS(glyph.advance_width - glyph.width);
-        }
         pen.y = dimensions.height - glyph.ascent - dimensions.baseline;
 
         draw_glyph(&glyph, pen.x, pen.y, dimensions, bitmap);

src/parsing/media.c

@@ -1,10 +1,6 @@
 #include "src/sist.h"
 #include "src/ctx.h"
 
-#define MIN_SIZE 32
-#define AVIO_BUF_SIZE 8192
-
-__always_inline
 AVCodecContext *alloc_jpeg_encoder(int dstW, int dstH, float qscale) {
 
     AVCodec *jpeg_codec = avcodec_find_encoder(AV_CODEC_ID_MJPEG);
@@ -26,8 +22,8 @@ AVCodecContext *alloc_jpeg_encoder(int dstW, int dstH, float qscale) {
     return jpeg;
 }
 
-__always_inline
 AVFrame *scale_frame(const AVCodecContext *decoder, const AVFrame *frame, int size) {
+    AVFrame *scaled_frame = av_frame_alloc();
 
     int dstW;
     int dstH;
@@ -45,22 +41,16 @@ AVFrame *scale_frame(const AVCodecContext *decoder, const AVFrame *frame, int si
         }
     }
 
-    if (dstW <= MIN_SIZE || dstH <= MIN_SIZE) {
-        return NULL;
-    }
-
-    AVFrame *scaled_frame = av_frame_alloc();
-
     struct SwsContext *ctx = sws_getContext(
             decoder->width, decoder->height, decoder->pix_fmt,
             dstW, dstH, AV_PIX_FMT_YUVJ420P,
             SWS_FAST_BILINEAR, 0, 0, 0
     );
 
-    int dst_buf_len = av_image_get_buffer_size(AV_PIX_FMT_YUV420P, dstW, dstH, 1);
+    int dst_buf_len = avpicture_get_size(AV_PIX_FMT_YUVJ420P, dstW, dstH);
     uint8_t *dst_buf = (uint8_t *) av_malloc(dst_buf_len);
 
-    av_image_fill_arrays(scaled_frame->data, scaled_frame->linesize, dst_buf, AV_PIX_FMT_YUV420P, dstW, dstH, 1);
+    avpicture_fill((AVPicture *) scaled_frame, dst_buf, AV_PIX_FMT_YUVJ420P, dstW, dstH);
 
     sws_scale(ctx,
               (const uint8_t *const *) frame->data, frame->linesize,
@@ -90,9 +80,9 @@ AVFrame *read_frame(AVFormatContext *pFormatCtx, AVCodecContext *decoder, int st
             int read_frame_ret = av_read_frame(pFormatCtx, &avPacket);
 
             if (read_frame_ret != 0) {
-//                if (read_frame_ret != AVERROR_EOF) {
-//                    fprintf(stderr, "Error reading frame: %d\n", read_frame_ret);
-//                }
+                if (read_frame_ret != AVERROR_EOF) {
+                    fprintf(stderr, "Error reading frame: %s\n", av_err2str(read_frame_ret));
+                }
                 av_frame_free(&frame);
                 av_packet_unref(&avPacket);
                 return NULL;
@@ -117,82 +107,61 @@ AVFrame *read_frame(AVFormatContext *pFormatCtx, AVCodecContext *decoder, int st
     return frame;
 }
 
-#define APPEND_TAG_META(doc, tag_, keyname) \
-    text_buffer_t tex = text_buffer_create(-1); \
-    text_buffer_append_string0(&tex, tag_->value); \
-    meta_line_t *meta_tag = malloc(sizeof(meta_line_t) + tex.dyn_buffer.cur); \
-    meta_tag->key = keyname; \
-    strcpy(meta_tag->strval, tex.dyn_buffer.buf); \
-    APPEND_META(doc, meta_tag) \
-    text_buffer_destroy(&tex);
-
-__always_inline
 void append_audio_meta(AVFormatContext *pFormatCtx, document_t *doc) {
 
     AVDictionaryEntry *tag = NULL;
     while ((tag = av_dict_get(pFormatCtx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
-        char key[32];
-        strncpy(key, tag->key, sizeof(key));
+        char *key = tag->key;
+        for (; *key; ++key) *key = (char) tolower(*key);
 
-        char *ptr = key;
-        for (; *ptr; ++ptr) *ptr = (char) tolower(*ptr);
-
-        if (strcmp(key, "artist") == 0) {
-            APPEND_TAG_META(doc, tag, MetaArtist)
-        } else if (strcmp(key, "genre") == 0) {
-            APPEND_TAG_META(doc, tag, MetaGenre)
-        } else if (strcmp(key, "title") == 0) {
-            APPEND_TAG_META(doc, tag, MetaTitle)
-        } else if (strcmp(key, "album_artist") == 0) {
-            APPEND_TAG_META(doc, tag, MetaAlbumArtist)
-        } else if (strcmp(key, "album") == 0) {
-            APPEND_TAG_META(doc, tag, MetaAlbum)
+        if (strcmp(tag->key, "artist") == 0) {
+            size_t len = strlen(tag->value);
+            meta_line_t *meta_tag = malloc(sizeof(meta_line_t) + len);
+            meta_tag->key = MetaArtist;
+            memcpy(meta_tag->strval, tag->value, len);
+            APPEND_META(doc, meta_tag)
+        } else if (strcmp(tag->key, "genre") == 0) {
+            size_t len = strlen(tag->value);
+            meta_line_t *meta_tag = malloc(sizeof(meta_line_t) + len);
+            meta_tag->key = MetaGenre;
+            memcpy(meta_tag->strval, tag->value, len);
+            APPEND_META(doc, meta_tag)
+        } else if (strcmp(tag->key, "title") == 0) {
+            size_t len = strlen(tag->value);
+            meta_line_t *meta_tag = malloc(sizeof(meta_line_t) + len);
+            meta_tag->key = MetaTitle;
+            memcpy(meta_tag->strval, tag->value, len);
+            APPEND_META(doc, meta_tag)
+        } else if (strcmp(tag->key, "album_artist") == 0) {
+            size_t len = strlen(tag->value);
+            meta_line_t *meta_tag = malloc(sizeof(meta_line_t) + len);
+            meta_tag->key = MetaAlbumArtist;
+            memcpy(meta_tag->strval, tag->value, len);
+            APPEND_META(doc, meta_tag)
+        } else if (strcmp(tag->key, "album") == 0) {
+            size_t len = strlen(tag->value);
+            meta_line_t *meta_tag = malloc(sizeof(meta_line_t) + len);
+            meta_tag->key = MetaAlbum;
+            memcpy(meta_tag->strval, tag->value, len);
+            APPEND_META(doc, meta_tag)
         }
     }
 }
 
-__always_inline
-void append_video_meta(AVFormatContext *pFormatCtx, AVFrame *frame, document_t *doc, int include_audio_tags, int is_video) {
-
-    if (is_video) {
-        meta_line_t *meta_duration = malloc(sizeof(meta_line_t));
-        meta_duration->key = MetaMediaDuration;
-        meta_duration->longval = pFormatCtx->duration / AV_TIME_BASE;
-        APPEND_META(doc, meta_duration)
-
-        meta_line_t *meta_bitrate = malloc(sizeof(meta_line_t));
-        meta_bitrate->key = MetaMediaBitrate;
-        meta_bitrate->longval = pFormatCtx->bit_rate;
-        APPEND_META(doc, meta_bitrate)
-    }
-
-    AVDictionaryEntry *tag = NULL;
-    if (is_video) {
-        while ((tag = av_dict_get(pFormatCtx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
-            if (include_audio_tags && strcmp(tag->key, "title") == 0) {
-                APPEND_TAG_META(doc, tag, MetaTitle)
-            } else if (strcmp(tag->key, "comment") == 0) {
-                APPEND_TAG_META(doc, tag, MetaContent)
-            } else if (include_audio_tags && strcmp(tag->key, "artist") == 0) {
-                APPEND_TAG_META(doc, tag, MetaArtist)
-            }
-        }
-    } else {
-        // EXIF metadata
-        while ((tag = av_dict_get(frame->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
-            if (include_audio_tags && strcmp(tag->key, "Artist") == 0) {
-                APPEND_TAG_META(doc, tag, MetaArtist)
-            } else if (strcmp(tag->key, "ImageDescription") == 0) {
-                APPEND_TAG_META(doc, tag, MetaContent)
-            }
-        }
-    }
-}
-
-void parse_media(AVFormatContext *pFormatCtx, document_t *doc) {
+void parse_media(const char *filepath, document_t *doc) {
 
     int video_stream = -1;
-    int audio_stream = -1;
+
+    AVFormatContext *pFormatCtx = avformat_alloc_context();
+    if (pFormatCtx == NULL) {
+        fprintf(stderr, "Could not allocate AVFormatContext! %s \n", filepath);
+        return;
+    }
+    int res = avformat_open_input(&pFormatCtx, filepath, NULL, NULL);
+    if (res < 0) {
+        printf("ERR%s %s\n", filepath, av_err2str(res));
+        return;
+    }
 
     avformat_find_stream_info(pFormatCtx, NULL);
 
@@ -200,18 +169,15 @@ void parse_media(AVFormatContext *pFormatCtx, document_t *doc) {
         AVStream *stream = pFormatCtx->streams[i];
 
         if (stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
-            if (audio_stream == -1) {
             meta_line_t *meta_audio = malloc(sizeof(meta_line_t));
             meta_audio->key = MetaMediaAudioCodec;
             meta_audio->intval = stream->codecpar->codec_id;
             APPEND_META(doc, meta_audio)
 
             append_audio_meta(pFormatCtx, doc);
-                audio_stream = i;
-            }
+
         } else if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
 
-            if (video_stream == -1) {
             meta_line_t *meta_vid = malloc(sizeof(meta_line_t));
             meta_vid->key = MetaMediaVideoCodec;
             meta_vid->intval = stream->codecpar->codec_id;
@@ -230,12 +196,24 @@ void parse_media(AVFormatContext *pFormatCtx, document_t *doc) {
             video_stream = i;
         }
     }
-    }
 
-    if (video_stream != -1 && ScanCtx.tn_size > 0) {
+    if (video_stream != -1) {
         AVStream *stream = pFormatCtx->streams[video_stream];
 
-        if (stream->codecpar->width <= MIN_SIZE || stream->codecpar->height <= MIN_SIZE) {
+        if (stream->nb_frames > 1) {
+            //This is a video (not a still image)
+            meta_line_t *meta_duration = malloc(sizeof(meta_line_t));
+            meta_duration->key = MetaMediaDuration;
+            meta_duration->longval = pFormatCtx->duration / AV_TIME_BASE;
+            APPEND_META(doc, meta_duration)
+
+            meta_line_t *meta_bitrate = malloc(sizeof(meta_line_t));
+            meta_bitrate->key = MetaMediaBitrate;
+            meta_bitrate->intval = pFormatCtx->bit_rate;
+            APPEND_META(doc, meta_bitrate)
+        }
+
+        if (stream->codecpar->width <= 20 || stream->codecpar->height <= 20) {
             avformat_close_input(&pFormatCtx);
             avformat_free_context(pFormatCtx);
             return;
@@ -267,19 +245,9 @@ void parse_media(AVFormatContext *pFormatCtx, document_t *doc) {
             return;
         }
 
-        append_video_meta(pFormatCtx, frame, doc, audio_stream == -1, stream->nb_frames > 1);
-
         // Scale frame
         AVFrame *scaled_frame = scale_frame(decoder, frame, ScanCtx.tn_size);
 
-        if (scaled_frame == NULL) {
-            av_frame_free(&frame);
-            avcodec_free_context(&decoder);
-            avformat_close_input(&pFormatCtx);
-            avformat_free_context(pFormatCtx);
-            return;
-        }
-
         // Encode frame to jpeg
         AVCodecContext *jpeg_encoder = alloc_jpeg_encoder(scaled_frame->width, scaled_frame->height, ScanCtx.tn_qscale);
         avcodec_send_frame(jpeg_encoder, scaled_frame);
@@ -289,8 +257,7 @@ void parse_media(AVFormatContext *pFormatCtx, document_t *doc) {
         avcodec_receive_packet(jpeg_encoder, &jpeg_packet);
 
         // Save thumbnail
-        store_write(ScanCtx.index.store, (char *) doc->uuid, sizeof(doc->uuid), (char *) jpeg_packet.data,
-                    jpeg_packet.size);
+        store_write(ScanCtx.index.store, (char *) doc->uuid, sizeof(doc->uuid), (char *) jpeg_packet.data, jpeg_packet.size);
 
         av_packet_unref(&jpeg_packet);
         av_frame_free(&frame);
@@ -304,58 +271,3 @@ void parse_media(AVFormatContext *pFormatCtx, document_t *doc) {
     avformat_free_context(pFormatCtx);
 }
 
-void parse_media_filename(const char *filepath, document_t *doc) {
-
-    AVFormatContext *pFormatCtx = avformat_alloc_context();
-    if (pFormatCtx == NULL) {
-        fprintf(stderr, "Could not allocate AVFormatContext! %s \n", filepath);
-        return;
-    }
-    int res = avformat_open_input(&pFormatCtx, filepath, NULL, NULL);
-    if (res < 0) {
-        fprintf(stderr, "media error: %s %s\n", filepath, av_err2str(res));
-        return;
-    }
-
-    parse_media(pFormatCtx, doc);
-}
-
-
-int vfile_read(void *ptr, uint8_t *buf, int buf_size) {
-    struct vfile *f = ptr;
-
-    int ret = f->read(f, buf, buf_size);
-
-    if (ret == 0) {
-        return AVERROR_EOF;
-    }
-    return ret;
-}
-
-void parse_media_vfile(struct vfile *f, document_t *doc) {
-
-    AVFormatContext *pFormatCtx = avformat_alloc_context();
-    if (pFormatCtx == NULL) {
-        fprintf(stderr, "Could not allocate AVFormatContext! %s \n", f->filepath);
-        return;
-    }
-
-    unsigned char *buffer = (unsigned char *) av_malloc(AVIO_BUF_SIZE);
-    AVIOContext *io_ctx = avio_alloc_context(buffer, AVIO_BUF_SIZE, 0, f, vfile_read, NULL, NULL);
-
-    pFormatCtx->pb = io_ctx;
-    pFormatCtx->flags |= AVFMT_FLAG_CUSTOM_IO;
-
-    int res = avformat_open_input(&pFormatCtx, "", NULL, NULL);
-    if (res == -5) {
-        // Tried to parse media that requires seek
-        return;
-    } else if(res < 0) {
-        fprintf(stderr, "media error: %s %s\n", f->filepath, av_err2str(res));
-        return;
-    }
-
-    parse_media(pFormatCtx, doc);
-    av_free(io_ctx);
-}
-

src/parsing/media.h

@@ -5,10 +5,7 @@
 #include "src/sist.h"
 
 #define MIN_VIDEO_SIZE 1024 * 64
-#define MIN_IMAGE_SIZE 1024 * 2
 
-void parse_media_filename(const char * filepath, document_t *doc);
-
-void parse_media_vfile(struct vfile *f, document_t *doc);
+void parse_media(const char * filepath, document_t *doc);
 
 #endif

src/parsing/mime.c

@@ -1,12 +1,10 @@
 #include "mime.h"
 
 unsigned int mime_get_mime_by_ext(GHashTable *ext_table, const char * ext) {
-    char lower[8];
+    char lower[64];
     char *p = lower;
-    int cnt = 0;
-    while ((*ext) != '\0' && cnt + 1 < sizeof(lower)) {
+    while ((*ext)) {
         *p++ = (char)tolower(*ext++);
-        cnt++;
     }
     *p = '\0';
     return (size_t) g_hash_table_lookup(ext_table, lower);

src/parsing/mime.h

@@ -8,7 +8,7 @@
 #define MIME_EMPTY 1
 
 #define DONT_PARSE 0x80000000
-#define SHOULD_PARSE(mime_id) (mime_id & DONT_PARSE) != DONT_PARSE && mime_id != 0
+#define SHOULD_PARSE(mime_id) (mime_id & DONT_PARSE) != DONT_PARSE
 
 #define PDF_MASK 0x40000000
 #define IS_PDF(mime_id) (mime_id & PDF_MASK) == PDF_MASK
@@ -16,12 +16,6 @@
 #define FONT_MASK 0x20000000
 #define IS_FONT(mime_id) (mime_id & FONT_MASK) == FONT_MASK
 
-#define ARC_MASK 0x10000000
-#define IS_ARC(mime_id) (mime_id & ARC_MASK) == ARC_MASK
-
-#define ARC_FILTER_MASK 0x08000000
-#define IS_ARC_FILTER(mime_id) (mime_id & ARC_FILTER_MASK) == ARC_FILTER_MASK
-
 enum major_mime {
     MimeInvalid = 0,
     MimeModel = 1,

src/parsing/mime_generated.c

@@ -6,422 +6,364 @@
 #include <stdlib.h>
 
 enum mime {
-    application_CDFV2=655361,
-    application_CDFV2_corrupt=655362,
-    application_arj=655363,
-    application_base64=655364,
-    application_binhex=655365,
-    application_book=655366,
-    application_clariscad=655367,
-    application_commonground=655368,
-    application_dicom=655369,
-    application_drafting=655370,
-    application_epub_zip=655371 | 0x40000000,
-    application_freeloader=655372,
-    application_futuresplash=655373,
-    application_groupwise=655374,
-    application_gzip=655375 | 0x08000000,
-    application_hta=655376,
-    application_i_deas=655377,
-    application_iges=655378,
-    application_inf=655379,
-    application_java=655380,
-    application_java_archive=655381,
-    application_javascript=655382,
-    application_json=655383,
-    application_marc=655384,
-    application_mbedlet=655385,
-    application_mime=655386,
-    application_mspowerpoint=655387,
-    application_msword=655388,
-    application_netmc=655389,
-    application_octet_stream=655390,
-    application_oda=655391,
-    application_ogg=655392,
-    application_pdf=655393 | 0x40000000,
-    application_pgp_keys=655394,
-    application_pgp_signature=655395,
-    application_pkcs7_signature=655396,
-    application_pkix_cert=655397,
-    application_postscript=655398,
-    application_pro_eng=655399,
-    application_ringing_tones=655400,
-    application_smil=655401,
-    application_solids=655402,
-    application_sounder=655403,
-    application_step=655404,
-    application_streamingmedia=655405,
-    application_vda=655406,
-    application_vnd_fdf=655407,
-    application_vnd_font_fontforge_sfd=655408,
-    application_vnd_hp_hpgl=655409,
-    application_vnd_iccprofile=655410,
-    application_vnd_lotus_1_2_3=655411,
-    application_vnd_ms_cab_compressed=655412,
-    application_vnd_ms_excel=655413,
-    application_vnd_ms_fontobject=655414,
-    application_vnd_ms_opentype=655415 | 0x20000000,
-    application_vnd_ms_pki_certstore=655416,
-    application_vnd_ms_pki_pko=655417,
-    application_vnd_ms_pki_seccat=655418,
-    application_vnd_ms_powerpoint=655419,
-    application_vnd_ms_project=655420,
-    application_vnd_oasis_opendocument_base=655421,
-    application_vnd_oasis_opendocument_formula=655422,
-    application_vnd_oasis_opendocument_graphics=655423,
-    application_vnd_oasis_opendocument_presentation=655424,
-    application_vnd_oasis_opendocument_spreadsheet=655425,
-    application_vnd_oasis_opendocument_text=655426,
-    application_vnd_openxmlformats_officedocument_presentationml_presentation=655427,
-    application_vnd_openxmlformats_officedocument_spreadsheetml_sheet=655428,
-    application_vnd_openxmlformats_officedocument_wordprocessingml_document=655429,
-    application_vnd_symbian_install=655430,
-    application_vnd_tcpdump_pcap=655431,
-    application_vnd_wap_wmlc=655432,
-    application_vnd_wap_wmlscriptc=655433,
-    application_vnd_xara=655434,
-    application_vocaltec_media_desc=655435,
-    application_vocaltec_media_file=655436,
-    application_warc=655437,
-    application_winhelp=655438,
-    application_wordperfect=655439,
-    application_wordperfect6_0=655440,
-    application_wordperfect6_1=655441,
-    application_x_123=655442,
-    application_x_7z_compressed=655443 | 0x10000000,
-    application_x_aim=655444,
-    application_x_apple_diskimage=655445,
-    application_x_arc=655446 | 0x10000000,
-    application_x_archive=655447,
-    application_x_atari_7800_rom=655448,
-    application_x_authorware_bin=655449,
-    application_x_authorware_map=655450,
-    application_x_authorware_seg=655451,
-    application_x_avira_qua=655452,
-    application_x_bcpio=655453,
-    application_x_bittorrent=655454,
-    application_x_bsh=655455,
-    application_x_bytecode_python=655456,
-    application_x_bzip=655457,
-    application_x_bzip2=655458 | 0x08000000,
-    application_x_cbr=655459,
-    application_x_cbz=655460 | 0x40000000,
-    application_x_cdlink=655461,
-    application_x_chat=655462,
-    application_x_chrome_extension=655463,
-    application_x_cocoa=655464,
-    application_x_conference=655465,
-    application_x_coredump=655466,
-    application_x_cpio=655467,
-    application_x_dbf=655468,
-    application_x_dbt=655469,
-    application_x_debian_package=655470,
-    application_x_deepv=655471,
-    application_x_director=655472,
-    application_x_dmp=655473,
-    application_x_dosdriver=655474,
-    application_x_dosexec=655475,
-    application_x_dvi=655476,
-    application_x_elc=655477,
+    application_arj=655361,
+    application_base64=655362,
+    application_binhex=655363,
+    application_book=655364,
+    application_CDFV2=655365,
+    application_clariscad=655366,
+    application_commonground=655367,
+    application_drafting=655368,
+    application_freeloader=655369,
+    application_futuresplash=655370,
+    application_groupwise=655371,
+    application_gzip=655372,
+    application_hta=655373,
+    application_i_deas=655374,
+    application_iges=655375,
+    application_inf=655376,
+    application_java_archive=655377,
+    application_java=655378,
+    application_javascript=655379,
+    application_x_archive=655380,
+    application_json=655381,
+    application_marc=655382,
+    application_mbedlet=655383,
+    application_mime=655384,
+    application_mspowerpoint=655385,
+    application_msword=655386,
+    application_netmc=655387,
+    application_octet_stream=655388,
+    application_oda=655389,
+    application_pdf=655390 | 0x40000000,
+    application_pgp_signature=655391,
+    application_pkcs7_signature=655392,
+    application_pkix_cert=655393,
+    application_postscript=655394,
+    application_pro_eng=655395,
+    application_ringing_tones=655396,
+    application_smil=655397,
+    application_solids=655398,
+    application_sounder=655399,
+    application_step=655400,
+    application_streamingmedia=655401,
+    application_vda=655402,
+    application_vnd_fdf=655403,
+    application_vnd_font_fontforge_sfd=655404,
+    application_vnd_hp_hpgl=655405,
+    application_vnd_ms_excel=655406,
+    application_vnd_ms_fontobject=655407,
+    application_vnd_ms_opentype=655408 | 0x20000000,
+    application_vnd_ms_pki_certstore=655409,
+    application_vnd_ms_pki_pko=655410,
+    application_vnd_ms_pki_seccat=655411,
+    application_vnd_ms_powerpoint=655412,
+    application_vnd_ms_project=655413,
+    application_vnd_oasis_opendocument_base=655414,
+    application_vnd_oasis_opendocument_formula=655415,
+    application_vnd_oasis_opendocument_graphics=655416,
+    application_vnd_oasis_opendocument_text=655417,
+    application_vnd_wap_wmlc=655418,
+    application_vnd_wap_wmlscriptc=655419,
+    application_vnd_xara=655420,
+    application_vocaltec_media_desc=655421,
+    application_vocaltec_media_file=655422,
+    application_wordperfect6_0=655423,
+    application_wordperfect6_1=655424,
+    application_wordperfect=655425,
+    application_x_123=655426,
+    application_x_aim=655427,
+    application_x_authorware_bin=655428,
+    application_x_authorware_map=655429,
+    application_x_authorware_seg=655430,
+    application_x_bcpio=655431,
+    application_x_bittorrent=655432,
+    application_x_bsh=655433,
+    application_x_bytecode_python=655434,
+    application_x_bzip2=655435,
+    application_x_bzip=655436,
+    application_x_cdlink=655437,
+    application_x_chat=655438,
+    application_x_cocoa=655439,
+    application_x_conference=655440,
+    application_x_cpio=655441,
+    application_x_dbf=655442,
+    application_x_dbt=655443,
+    application_x_deepv=655444,
+    application_x_director=655445,
+    application_x_dosexec=655446,
+    application_x_dvi=655447,
+    application_x_elc=655448,
+    application_x_envoy=655449,
+    application_x_esrehber=655450,
+    application_x_excel=655451,
+    application_x_executable=655452,
+    application_x_font_sfn=655453 | 0x20000000,
+    application_x_font_ttf=655454 | 0x20000000,
+    application_x_freelance=655455,
+    application_x_git=655456,
+    application_x_gsp=655457,
+    application_x_gss=655458,
+    application_x_gtar=655459,
+    application_x_gzip=655460,
+    application_x_hdf=655461,
+    application_x_helpfile=655462,
+    application_x_httpd_imap=655463,
+    application_x_ima=655464,
+    application_x_internett_signup=655465,
+    application_x_inventor=655466,
+    application_x_ip2=655467,
+    application_x_java_applet=655468,
+    application_x_java_commerce=655469,
+    application_x_java_image=655470,
+    application_x_java_keystore=655471,
+    application_x_koan=655472,
+    application_x_latex=655473,
+    application_x_livescreen=655474,
+    application_x_lotus=655475,
+    application_x_lzh=655476,
+    application_x_lzx=655477,
+    application_x_mach_binary=655478,
+    application_x_mach_executable=655479,
+    application_x_magic_cap_package_1_0=655480,
+    application_x_mathcad=655481,
+    application_x_meme=655482,
+    application_x_midi=655483,
+    application_x_mif=655484,
+    application_x_mix_transfer=655485,
+    application_xml=655486,
+    application_x_ms_pdb=655487,
+    application_x_navi_animation=655488,
+    application_x_navidoc=655489,
+    application_x_navimap=655490,
+    application_x_navistyle=655491,
+    application_x_netcdf=655492,
+    application_x_newton_compatible_pkg=655493,
+    application_x_object=655494,
+    application_x_omcdatamaker=655495,
+    application_x_omc=655496,
+    application_x_omcregerator=655497,
+    application_x_pagemaker=655498,
+    application_x_pcl=655499,
+    application_x_pixclscript=655500,
+    application_x_pkcs7_certreqresp=655501,
+    application_x_pkcs7_signature=655502,
+    application_x_project=655503,
+    application_x_qpro=655504,
+    application_x_sdp=655505,
+    application_x_sea=655506,
+    application_x_seelogo=655507,
+    application_x_setupscript=655508,
+    application_x_sharedlib=655509,
+    application_x_shar=655510,
+    application_x_shockwave_flash=655511,
+    application_x_sprite=655512,
+    application_x_sqlite3=655513,
+    application_x_sv4cpio=655514,
+    application_x_sv4crc=655515,
+    application_x_tar=655516,
+    application_x_tbook=655517,
+    application_x_texinfo=655518,
+    application_x_tex_tfm=655519,
+    application_x_ustar=655520,
+    application_x_visio=655521,
+    application_x_vnd_audioexplosion_mzz=655522,
+    application_x_vnd_ls_xpix=655523,
+    application_x_vrml=655524,
+    application_x_wais_source=655525,
+    application_x_wintalk=655526,
+    application_x_world=655527,
+    application_x_wri=655528,
+    application_x_x509_ca_cert=655529,
+    application_x_xz=655530,
+    application_zip=655531,
+    audio_it=458924,
+    audio_make=458925,
+    audio_midi=458926,
+    audio_mid=458927,
+    audio_mpeg=458928,
+    audio_ogg=458929,
+    audio_s3m=458930,
+    audio_tsp_audio=458931,
+    audio_tsplayer=458932,
+    audio_vnd_qcelp=458933,
+    audio_voxware=458934,
+    audio_x_gsm=458935,
+    audio_x_jam=458936,
+    audio_x_liveaudio=458937,
+    audio_x_m4a=458938,
+    audio_x_midi=458939,
+    audio_x_mod=458940,
+    audio_x_mp4a_latm=458941,
+    audio_x_mpeg_3=458942,
+    audio_x_mpequrl=458943,
+    audio_xm=458944,
+    audio_x_nspaudio=458945,
+    audio_x_pn_realaudio=458946,
+    audio_x_psid=458947,
+    audio_x_realaudio=458948,
+    audio_x_twinvq_plugin=458949,
+    audio_x_twinvq=458950,
+    audio_x_voc=458951,
+    audio_x_wav=458952,
+    font_otf=327881 | 0x20000000,
+    font_sfnt=327882 | 0x20000000,
+    image_cmu_raster=524491,
+    image_fif=524492,
+    image_florian=524493,
+    image_g3fax=524494,
+    image_gif=524495,
+    image_ief=524496,
+    image_jpeg=524497,
+    image_jutvision=524498,
+    image_naplps=524499,
+    image_pict=524500,
+    image_png=524501,
+    image_svg=524502 | 0x80000000,
+    image_svg_xml=524503 | 0x80000000,
+    image_vnd_fpx=524504,
+    image_vnd_microsoft_icon=524505,
+    image_vnd_rn_realflash=524506,
+    image_vnd_rn_realpix=524507,
+    image_vnd_wap_wbmp=524508,
+    image_vnd_xiff=524509,
+    image_webp=524510,
+    image_x_cmu_raster=524511,
+    image_x_dwg=524512,
+    image_x_eps=524513,
+    image_x_icns=524514,
+    image_x_icon=524515 | 0x80000000,
+    image_x_jg=524516,
+    image_x_jps=524517,
+    image_x_ms_bmp=524518,
+    image_x_niff=524519,
+    image_x_pcx=524520,
+    image_x_pict=524521,
+    image_x_portable_bitmap=524522,
+    image_x_portable_graymap=524523,
+    image_x_portable_pixmap=524524,
+    image_x_quicktime=524525,
+    image_x_rgb=524526,
+    image_x_tiff=524527,
+    image_tiff=524528,
+    image_x_xcf=524529 | 0x80000000,
+    image_x_xpixmap=524530 | 0x80000000,
+    message_rfc822=196851,
+    model_vnd_dwf=65780,
+    model_vrml=65781,
+    model_x_pov=65782,
+    text_asp=590071,
+    text_css=590072,
+    text_x_sass=590073,
+    text_x_scss=590074,
+    text_html=590075,
+    text_javascript=590076,
+    text_mcf=590077,
+    text_pascal=590078,
+    text_plain=590079,
+    text_richtext=590080,
+    text_scriplet=590081,
+    text_x_awk=590082,
+    video_x_jng=393475 | 0x80000000,
+    video_x_mng=393476,
+    image_x_cur=524549,
+    image_x_xwindowdump=524550,
+    image_vnd_adobe_photoshop=524551 | 0x80000000,
+    text_tab_separated_values=590088,
+    text_troff=590089,
+    text_uri_list=590090,
+    text_vnd_abc=590091,
+    text_vnd_fmi_flexstor=590092,
+    text_vnd_wap_wmlscript=590093,
+    text_vnd_wap_wml=590094,
+    text_webviewhtml=590095,
+    text_x_Algol68=590096,
+    text_x_asm=590097,
+    text_x_audiosoft_intra=590098,
+    text_x_bcpl=590099,
+    text_x_c=590100,
+    text_x_c__=590101,
+    text_x_component=590102,
+    text_x_diff=590103,
+    text_x_fortran=590104,
+    text_x_java=590105,
+    text_x_la_asf=590106,
+    text_x_lisp=590107,
+    text_x_m4=590108,
+    text_x_makefile=590109,
+    text_xml=590110,
+    text_x_m=590111,
+    text_x_msdos_batch=590112,
+    text_x_pascal=590113,
+    text_x_perl=590114,
+    text_x_php=590115,
+    text_x_python=590116,
+    text_x_ruby=590117,
+    text_x_server_parsed_html=590118,
+    text_x_setext=590119,
+    text_x_sgml=590120,
+    text_x_shellscript=590121,
+    text_x_speech=590122,
+    text_x_tex=590123,
+    text_x_uil=590124,
+    text_x_uuencode=590125,
+    text_x_vcalendar=590126,
+    video_animaflex=393519,
+    video_avi=393520,
+    video_avs_video=393521,
+    video_mp4=393522,
+    video_mpeg=393523,
+    video_quicktime=393524,
+    video_vdo=393525,
+    video_vivo=393526,
+    video_vnd_rn_realvideo=393527,
+    video_vosaic=393528,
+    video_webm=393529,
+    video_x_amt_demorun=393530,
+    video_x_amt_showrun=393531,
+    video_x_atomic3d_feature=393532,
+    video_x_dl=393533,
+    video_x_dv=393534,
+    video_x_fli=393535,
+    video_x_isvideo=393536,
+    video_x_motion_jpeg=393537,
+    video_x_ms_asf=393538,
+    video_x_qtc=393539,
+    video_x_sgi_movie=393540,
+    application_x_7z_compressed=655685,
+    application_vnd_openxmlformats_officedocument_wordprocessingml_document=655686,
+    text_x_po=590151,
+    application_x_rpm=655688,
+    application_x_debian_package=655689,
+    application_vnd_iccprofile=655690,
+    application_dicom=655691,
+    image_x_exr=524620,
+    video_x_matroska=393549,
     application_x_empty=1,
-    application_x_envoy=655479,
-    application_x_esrehber=655480,
-    application_x_excel=655481,
-    application_x_executable=655482,
-    application_x_font_gdos=655483,
-    application_x_font_pf2=655484,
-    application_x_font_pfm=655485,
-    application_x_font_sfn=655486,
-    application_x_font_ttf=655487 | 0x20000000,
-    application_x_freelance=655488,
-    application_x_gamecube_rom=655489,
-    application_x_gdbm=655490,
-    application_x_gettext_translation=655491,
-    application_x_git=655492,
-    application_x_gsp=655493,
-    application_x_gss=655494,
-    application_x_gtar=655495,
-    application_x_gzip=655496,
-    application_x_hdf=655497,
-    application_x_helpfile=655498,
-    application_x_httpd_imap=655499,
-    application_x_ima=655500,
-    application_x_innosetup=655501,
-    application_x_internett_signup=655502,
-    application_x_inventor=655503,
-    application_x_ip2=655504,
-    application_x_java_applet=655505,
-    application_x_java_commerce=655506,
-    application_x_java_image=655507,
-    application_x_java_jmod=655508,
-    application_x_java_keystore=655509,
-    application_x_kdelnk=655510,
-    application_x_koan=655511,
-    application_x_latex=655512,
-    application_x_livescreen=655513,
-    application_x_lotus=655514,
-    application_x_lz4=655515 | 0x08000000,
-    application_x_lz4_json=655516,
-    application_x_lzh=655517,
-    application_x_lzh_compressed=655518,
-    application_x_lzip=655519 | 0x08000000,
-    application_x_lzma=655520 | 0x08000000,
-    application_x_lzop=655521 | 0x08000000,
-    application_x_lzx=655522,
-    application_x_mach_binary=655523,
-    application_x_mach_executable=655524,
-    application_x_magic_cap_package_1_0=655525,
-    application_x_mathcad=655526,
-    application_x_maxis_dbpf=655527,
-    application_x_meme=655528,
-    application_x_midi=655529,
-    application_x_mif=655530,
-    application_x_mix_transfer=655531,
-    application_x_mobipocket_ebook=655532,
-    application_x_ms_compress_szdd=655533,
-    application_x_ms_pdb=655534,
-    application_x_ms_reader=655535,
-    application_x_msaccess=655536,
-    application_x_navi_animation=655537,
-    application_x_navidoc=655538,
-    application_x_navimap=655539,
-    application_x_navistyle=655540,
-    application_x_nes_rom=655541,
-    application_x_netcdf=655542,
-    application_x_newton_compatible_pkg=655543,
-    application_x_nintendo_ds_rom=655544,
-    application_x_object=655545,
-    application_x_omc=655546,
-    application_x_omcdatamaker=655547,
-    application_x_omcregerator=655548,
-    application_x_pagemaker=655549,
-    application_x_pcl=655550,
-    application_x_pgp_keyring=655551,
-    application_x_pixclscript=655552,
-    application_x_pkcs7_certreqresp=655553,
-    application_x_pkcs7_signature=655554,
-    application_x_project=655555,
-    application_x_qpro=655556,
-    application_x_rar=655557 | 0x10000000,
-    application_x_rpm=655558,
-    application_x_sdp=655559,
-    application_x_sea=655560,
-    application_x_seelogo=655561,
-    application_x_setupscript=655562,
-    application_x_shar=655563,
-    application_x_sharedlib=655564,
-    application_x_shockwave_flash=655565,
-    application_x_snappy_framed=655566,
-    application_x_sprite=655567,
-    application_x_sqlite3=655568,
-    application_x_sv4cpio=655569,
-    application_x_sv4crc=655570,
-    application_x_tar=655571 | 0x10000000,
-    application_x_tbook=655572,
-    application_x_terminfo=655573,
-    application_x_terminfo2=655574,
-    application_x_tex_tfm=655575,
-    application_x_texinfo=655576,
-    application_x_ustar=655577,
-    application_x_visio=655578,
-    application_x_vnd_audioexplosion_mzz=655579,
-    application_x_vnd_ls_xpix=655580,
-    application_x_vrml=655581,
-    application_x_wais_source=655582,
-    application_x_wine_extension_ini=655583,
-    application_x_wintalk=655584,
-    application_x_world=655585,
-    application_x_wri=655586,
-    application_x_x509_ca_cert=655587,
-    application_x_xz=655588 | 0x08000000,
-    application_x_zip=655589,
-    application_x_zstd=655590 | 0x08000000,
-    application_xml=655591,
-    application_zip=655592 | 0x10000000,
-    application_zlib=655593,
-    audio_it=458986,
-    audio_make=458987,
-    audio_mid=458988,
-    audio_midi=458989,
-    audio_mp4=458990,
-    audio_mpeg=458991,
-    audio_ogg=458992,
-    audio_s3m=458993,
-    audio_tsp_audio=458994,
-    audio_tsplayer=458995,
-    audio_vnd_qcelp=458996,
-    audio_voxware=458997,
-    audio_x_aiff=458998,
-    audio_x_flac=458999,
-    audio_x_gsm=459000,
-    audio_x_hx_aac_adts=459001,
-    audio_x_jam=459002,
-    audio_x_liveaudio=459003,
-    audio_x_m4a=459004,
-    audio_x_midi=459005,
-    audio_x_mod=459006,
-    audio_x_mp4a_latm=459007,
-    audio_x_mpeg_3=459008,
-    audio_x_mpequrl=459009,
-    audio_x_nspaudio=459010,
-    audio_x_pn_realaudio=459011,
-    audio_x_psid=459012,
-    audio_x_realaudio=459013,
-    audio_x_twinvq=459014,
-    audio_x_twinvq_plugin=459015,
-    audio_x_voc=459016,
-    audio_x_wav=459017,
-    audio_xm=459018,
-    font_otf=327947 | 0x20000000,
-    font_sfnt=327948 | 0x20000000,
-    font_woff=327949 | 0x20000000,
-    font_woff2=327950 | 0x20000000,
-    image_cmu_raster=524559,
-    image_fif=524560,
-    image_florian=524561,
-    image_g3fax=524562,
-    image_gif=524563,
-    image_heic=524564,
-    image_ief=524565,
-    image_jpeg=524566,
-    image_jutvision=524567,
-    image_naplps=524568,
-    image_pict=524569,
-    image_png=524570,
-    image_svg=524571 | 0x80000000,
-    image_svg_xml=524572 | 0x80000000,
-    image_tiff=524573,
-    image_vnd_adobe_photoshop=524574 | 0x80000000,
-    image_vnd_djvu=524575 | 0x80000000,
-    image_vnd_fpx=524576,
-    image_vnd_microsoft_icon=524577,
-    image_vnd_rn_realflash=524578,
-    image_vnd_rn_realpix=524579,
-    image_vnd_wap_wbmp=524580,
-    image_vnd_xiff=524581,
-    image_webp=524582,
-    image_wmf=524583,
-    image_x_3ds=524584,
-    image_x_cmu_raster=524585,
-    image_x_cur=524586,
-    image_x_dwg=524587,
-    image_x_eps=524588,
-    image_x_exr=524589,
-    image_x_gem=524590,
-    image_x_icns=524591,
-    image_x_icon=524592 | 0x80000000,
-    image_x_jg=524593,
-    image_x_jps=524594,
-    image_x_ms_bmp=524595,
-    image_x_niff=524596,
-    image_x_pcx=524597,
-    image_x_pict=524598,
-    image_x_portable_bitmap=524599,
-    image_x_portable_graymap=524600,
-    image_x_portable_pixmap=524601,
-    image_x_quicktime=524602,
-    image_x_rgb=524603,
-    image_x_tga=524604,
-    image_x_tiff=524605,
-    image_x_win_bitmap=524606,
-    image_x_xcf=524607 | 0x80000000,
-    image_x_xpixmap=524608 | 0x80000000,
-    image_x_xwindowdump=524609,
-    message_news=196930,
-    message_rfc822=196931,
-    model_vnd_dwf=65860,
-    model_vnd_gdl=65861,
-    model_vnd_gs_gdl=65862,
-    model_vrml=65863,
-    model_x_pov=65864,
-    text_PGP=590153,
-    text_asp=590154,
-    text_css=590155,
-    text_html=590156,
-    text_javascript=590157,
-    text_mcf=590158,
-    text_pascal=590159,
-    text_plain=590160,
-    text_richtext=590161,
-    text_rtf=590162,
-    text_scriplet=590163,
-    text_tab_separated_values=590164,
-    text_troff=590165,
-    text_uri_list=590166,
-    text_vnd_abc=590167,
-    text_vnd_fmi_flexstor=590168,
-    text_vnd_wap_wml=590169,
-    text_vnd_wap_wmlscript=590170,
-    text_webviewhtml=590171,
-    text_x_Algol68=590172,
-    text_x_asm=590173,
-    text_x_audiosoft_intra=590174,
-    text_x_awk=590175,
-    text_x_bcpl=590176,
-    text_x_c=590177,
-    text_x_c__=590178,
-    text_x_component=590179,
-    text_x_diff=590180,
-    text_x_fortran=590181,
-    text_x_java=590182,
-    text_x_la_asf=590183,
-    text_x_lisp=590184,
-    text_x_m=590185,
-    text_x_m4=590186,
-    text_x_makefile=590187,
-    text_x_ms_regedit=590188,
-    text_x_msdos_batch=590189,
-    text_x_objective_c=590190,
-    text_x_pascal=590191,
-    text_x_perl=590192,
-    text_x_php=590193,
-    text_x_po=590194,
-    text_x_python=590195,
-    text_x_ruby=590196,
-    text_x_sass=590197,
-    text_x_scss=590198,
-    text_x_server_parsed_html=590199,
-    text_x_setext=590200,
-    text_x_sgml=590201,
-    text_x_shellscript=590202,
-    text_x_speech=590203,
-    text_x_tcl=590204,
-    text_x_tex=590205,
-    text_x_uil=590206,
-    text_x_uuencode=590207,
-    text_x_vcalendar=590208,
-    text_x_vcard=590209,
-    text_xml=590210,
-    video_MP2T=393603,
-    video_animaflex=393604,
-    video_avi=393605,
-    video_avs_video=393606,
-    video_mp4=393607,
-    video_mpeg=393608,
-    video_quicktime=393609,
-    video_vdo=393610,
-    video_vivo=393611,
-    video_vnd_rn_realvideo=393612,
-    video_vosaic=393613,
-    video_webm=393614,
-    video_x_amt_demorun=393615,
-    video_x_amt_showrun=393616,
-    video_x_atomic3d_feature=393617,
-    video_x_dl=393618,
-    video_x_dv=393619,
-    video_x_fli=393620,
-    video_x_flv=393621,
-    video_x_isvideo=393622,
-    video_x_jng=393623 | 0x80000000,
-    video_x_m4v=393624,
-    video_x_matroska=393625,
-    video_x_mng=393626,
-    video_x_motion_jpeg=393627,
-    video_x_ms_asf=393628,
-    video_x_msvideo=393629,
-    video_x_qtc=393630,
-    video_x_sgi_movie=393631,
-    x_epoc_x_sisx_app=721312,
+    model_vnd_gdl=65871,
+    model_vnd_gs_gdl=65872,
+    font_woff=328017 | 0x20000000,
+    font_woff2=328018 | 0x20000000,
+    application_epub_zip=655699,
+    application_x_mobipocket_ebook=655700,
+    audio_x_flac=459093,
+    application_x_rar=655702,
+    video_x_msvideo=393559,
+    video_x_flv=393560,
+    application_x_kdelnk=655705,
+    text_x_tcl=590170,
+    application_ogg=655707,
+    application_vnd_openxmlformats_officedocument_spreadsheetml_sheet=655708,
+    application_vnd_ms_cab_compressed=655709,
+    audio_mp4=459102,
+    image_vnd_djvu=524639 | 0x80000000,
+    application_x_ms_reader=655712,
+    application_CDFV2_corrupt=655713,
+    text_x_vcard=590178,
+    application_x_innosetup=655715,
+    application_winhelp=655716,
+    image_x_tga=524645,
+    application_x_wine_extension_ini=655718,
 };
 char *mime_get_mime_text(unsigned int mime_id) {switch (mime_id) {
 case application_arj: return "application/arj";
@@ -680,7 +622,6 @@ case text_mcf: return "text/mcf";
 case text_pascal: return "text/pascal";
 case text_plain: return "text/plain";
 case text_richtext: return "text/richtext";
-case text_rtf: return "text/rtf";
 case text_scriplet: return "text/scriplet";
 case text_x_awk: return "text/x-awk";
 case video_x_jng: return "video/x-jng";
@@ -783,63 +724,6 @@ case application_x_innosetup: return "application/x-innosetup";
 case application_winhelp: return "application/winhelp";
 case image_x_tga: return "image/x-tga";
 case application_x_wine_extension_ini: return "application/x-wine-extension-ini";
-case application_x_cbz: return "application/x-cbz";
-case application_x_cbr: return "application/x-cbr";
-case application_x_ms_compress_szdd: return "application/x-ms-compress-szdd";
-case application_x_atari_7800_rom: return "application/x-atari-7800-rom";
-case application_x_nes_rom: return "application/x-nes-rom";
-case application_x_font_pfm: return "application/x-font-pfm";
-case application_x_gettext_translation: return "application/x-gettext-translation";
-case image_wmf: return "image/wmf";
-case application_pgp_keys: return "application/pgp-keys";
-case image_x_3ds: return "image/x-3ds";
-case application_x_lz4: return "application/x-lz4";
-case application_vnd_openxmlformats_officedocument_presentationml_presentation: return "application/vnd.openxmlformats-officedocument.presentationml.presentation";
-case application_vnd_oasis_opendocument_presentation: return "application/vnd.oasis.opendocument.presentation";
-case application_x_msaccess: return "application/x-msaccess";
-case application_vnd_oasis_opendocument_spreadsheet: return "application/vnd.oasis.opendocument.spreadsheet";
-case audio_x_aiff: return "audio/x-aiff";
-case text_x_ms_regedit: return "text/x-ms-regedit";
-case application_x_gamecube_rom: return "application/x-gamecube-rom";
-case application_x_nintendo_ds_rom: return "application/x-nintendo-ds-rom";
-case text_x_objective_c: return "text/x-objective-c";
-case application_x_font_gdos: return "application/x-font-gdos";
-case application_x_apple_diskimage: return "application/x-apple-diskimage";
-case application_x_zstd: return "application/x-zstd";
-case video_x_m4v: return "video/x-m4v";
-case message_news: return "message/news";
-case application_vnd_symbian_install: return "application/vnd.symbian.install";
-case application_x_lzh_compressed: return "application/x-lzh-compressed";
-case application_x_dosdriver: return "application/x-dosdriver";
-case application_vnd_tcpdump_pcap: return "application/vnd.tcpdump.pcap";
-case x_epoc_x_sisx_app: return "x-epoc/x-sisx-app";
-case application_x_avira_qua: return "application/x-avira-qua";
-case video_MP2T: return "video/MP2T";
-case application_x_snappy_framed: return "application/x-snappy-framed";
-case application_x_lz4_json: return "application/x-lz4+json";
-case application_x_dmp: return "application/x-dmp";
-case application_zlib: return "application/zlib";
-case application_x_pgp_keyring: return "application/x-pgp-keyring";
-case application_x_gdbm: return "application/x-gdbm";
-case application_x_font_pf2: return "application/x-font-pf2";
-case application_x_zip: return "application/x-zip";
-case application_x_coredump: return "application/x-coredump";
-case application_x_java_jmod: return "application/x-java-jmod";
-case application_x_terminfo: return "application/x-terminfo";
-case application_x_terminfo2: return "application/x-terminfo2";
-case application_x_arc: return "application/x-arc";
-case application_vnd_lotus_1_2_3: return "application/vnd.lotus-1-2-3";
-case image_x_win_bitmap: return "image/x-win-bitmap";
-case application_x_maxis_dbpf: return "application/x-maxis-dbpf";
-case text_PGP: return "text/PGP";
-case audio_x_hx_aac_adts: return "audio/x-hx-aac-adts";
-case application_x_chrome_extension: return "application/x-chrome-extension";
-case image_heic: return "image/heic";
-case image_x_gem: return "image/x-gem";
-case application_x_lzma: return "application/x-lzma";
-case application_warc: return "application/warc";
-case application_x_lzip: return "application/x-lzip";
-case application_x_lzop: return "application/x-lzop";
 default: return NULL;}}
 GHashTable *mime_get_ext_table() {GHashTable *ext_table = g_hash_table_new(g_str_hash, g_str_equal);
 g_hash_table_insert(ext_table, "arj", (gpointer)application_arj);
@@ -969,7 +853,6 @@ g_hash_table_insert(ext_table, "xlt", (gpointer)application_x_excel);
 g_hash_table_insert(ext_table, "xlv", (gpointer)application_x_excel);
 g_hash_table_insert(ext_table, "exe", (gpointer)application_x_executable);
 g_hash_table_insert(ext_table, "ttf", (gpointer)application_x_font_ttf);
-g_hash_table_insert(ext_table, "ttc", (gpointer)application_x_font_ttf);
 g_hash_table_insert(ext_table, "pre", (gpointer)application_x_freelance);
 g_hash_table_insert(ext_table, "gsp", (gpointer)application_x_gsp);
 g_hash_table_insert(ext_table, "gss", (gpointer)application_x_gss);
@@ -1190,9 +1073,6 @@ g_hash_table_insert(ext_table, "d", (gpointer)text_plain);
 g_hash_table_insert(ext_table, "cs", (gpointer)text_plain);
 g_hash_table_insert(ext_table, "hpp", (gpointer)text_plain);
 g_hash_table_insert(ext_table, "srt", (gpointer)text_plain);
-g_hash_table_insert(ext_table, "nfo", (gpointer)text_plain);
-g_hash_table_insert(ext_table, "sfv", (gpointer)text_plain);
-g_hash_table_insert(ext_table, "m3u", (gpointer)text_plain);
 g_hash_table_insert(ext_table, "rt", (gpointer)text_richtext);
 g_hash_table_insert(ext_table, "rtf", (gpointer)text_richtext);
 g_hash_table_insert(ext_table, "rtx", (gpointer)text_richtext);
@@ -1210,7 +1090,7 @@ g_hash_table_insert(ext_table, "ms", (gpointer)text_troff);
 g_hash_table_insert(ext_table, "roff", (gpointer)text_troff);
 g_hash_table_insert(ext_table, "t", (gpointer)text_troff);
 g_hash_table_insert(ext_table, "tr", (gpointer)text_troff);
-g_hash_table_insert(ext_table, "uji", (gpointer)text_uri_list);
+g_hash_table_insert(ext_table, "uni", (gpointer)text_uri_list);
 g_hash_table_insert(ext_table, "unis", (gpointer)text_uri_list);
 g_hash_table_insert(ext_table, "uri", (gpointer)text_uri_list);
 g_hash_table_insert(ext_table, "uris", (gpointer)text_uri_list);
@@ -1321,34 +1201,6 @@ g_hash_table_insert(ext_table, "djvu", (gpointer)image_vnd_djvu);
 g_hash_table_insert(ext_table, "lit", (gpointer)application_x_ms_reader);
 g_hash_table_insert(ext_table, "vcf", (gpointer)text_x_vcard);
 g_hash_table_insert(ext_table, "hlp", (gpointer)application_winhelp);
-g_hash_table_insert(ext_table, "cbz", (gpointer)application_x_cbz);
-g_hash_table_insert(ext_table, "cbr", (gpointer)application_x_cbr);
-g_hash_table_insert(ext_table, "fon", (gpointer)application_x_ms_compress_szdd);
-g_hash_table_insert(ext_table, "a78", (gpointer)application_x_atari_7800_rom);
-g_hash_table_insert(ext_table, "nes", (gpointer)application_x_nes_rom);
-g_hash_table_insert(ext_table, "pfm", (gpointer)application_x_font_pfm);
-g_hash_table_insert(ext_table, "3ds", (gpointer)image_x_3ds);
-g_hash_table_insert(ext_table, "lz4", (gpointer)application_x_lz4);
-g_hash_table_insert(ext_table, "pptx", (gpointer)application_vnd_openxmlformats_officedocument_presentationml_presentation);
-g_hash_table_insert(ext_table, "odp", (gpointer)application_vnd_oasis_opendocument_presentation);
-g_hash_table_insert(ext_table, "accdb", (gpointer)application_x_msaccess);
-g_hash_table_insert(ext_table, "ods", (gpointer)application_vnd_oasis_opendocument_spreadsheet);
-g_hash_table_insert(ext_table, "aiff", (gpointer)audio_x_aiff);
-g_hash_table_insert(ext_table, "aif", (gpointer)audio_x_aiff);
-g_hash_table_insert(ext_table, "reg", (gpointer)text_x_ms_regedit);
-g_hash_table_insert(ext_table, "zst", (gpointer)application_x_zstd);
-g_hash_table_insert(ext_table, "m4v", (gpointer)video_x_m4v);
-g_hash_table_insert(ext_table, "pcap", (gpointer)application_vnd_tcpdump_pcap);
-g_hash_table_insert(ext_table, "jsonlz4", (gpointer)application_x_lz4_json);
-g_hash_table_insert(ext_table, "dmp", (gpointer)application_x_dmp);
-g_hash_table_insert(ext_table, "z", (gpointer)application_zlib);
-g_hash_table_insert(ext_table, "pf2", (gpointer)application_x_font_pf2);
-g_hash_table_insert(ext_table, "jmod", (gpointer)application_x_java_jmod);
-g_hash_table_insert(ext_table, "heic", (gpointer)image_heic);
-g_hash_table_insert(ext_table, "lzma", (gpointer)application_x_lzma);
-g_hash_table_insert(ext_table, "warc", (gpointer)application_warc);
-g_hash_table_insert(ext_table, "lz", (gpointer)application_x_lzip);
-g_hash_table_insert(ext_table, "lzo", (gpointer)application_x_lzop);
 return ext_table;}
 GHashTable *mime_get_mime_table() {GHashTable *mime_table = g_hash_table_new(g_str_hash, g_str_equal);
 g_hash_table_insert(mime_table, "application/arj", (gpointer)application_arj);
@@ -1607,7 +1459,6 @@ g_hash_table_insert(mime_table, "text/mcf", (gpointer)text_mcf);
 g_hash_table_insert(mime_table, "text/pascal", (gpointer)text_pascal);
 g_hash_table_insert(mime_table, "text/plain", (gpointer)text_plain);
 g_hash_table_insert(mime_table, "text/richtext", (gpointer)text_richtext);
-g_hash_table_insert(mime_table, "text/rtf", (gpointer)text_rtf);
 g_hash_table_insert(mime_table, "text/scriplet", (gpointer)text_scriplet);
 g_hash_table_insert(mime_table, "text/x-awk", (gpointer)text_x_awk);
 g_hash_table_insert(mime_table, "video/x-jng", (gpointer)video_x_jng);
@@ -1710,62 +1561,5 @@ g_hash_table_insert(mime_table, "application/x-innosetup", (gpointer)application
 g_hash_table_insert(mime_table, "application/winhelp", (gpointer)application_winhelp);
 g_hash_table_insert(mime_table, "image/x-tga", (gpointer)image_x_tga);
 g_hash_table_insert(mime_table, "application/x-wine-extension-ini", (gpointer)application_x_wine_extension_ini);
-g_hash_table_insert(mime_table, "application/x-cbz", (gpointer)application_x_cbz);
-g_hash_table_insert(mime_table, "application/x-cbr", (gpointer)application_x_cbr);
-g_hash_table_insert(mime_table, "application/x-ms-compress-szdd", (gpointer)application_x_ms_compress_szdd);
-g_hash_table_insert(mime_table, "application/x-atari-7800-rom", (gpointer)application_x_atari_7800_rom);
-g_hash_table_insert(mime_table, "application/x-nes-rom", (gpointer)application_x_nes_rom);
-g_hash_table_insert(mime_table, "application/x-font-pfm", (gpointer)application_x_font_pfm);
-g_hash_table_insert(mime_table, "application/x-gettext-translation", (gpointer)application_x_gettext_translation);
-g_hash_table_insert(mime_table, "image/wmf", (gpointer)image_wmf);
-g_hash_table_insert(mime_table, "application/pgp-keys", (gpointer)application_pgp_keys);
-g_hash_table_insert(mime_table, "image/x-3ds", (gpointer)image_x_3ds);
-g_hash_table_insert(mime_table, "application/x-lz4", (gpointer)application_x_lz4);
-g_hash_table_insert(mime_table, "application/vnd.openxmlformats-officedocument.presentationml.presentation", (gpointer)application_vnd_openxmlformats_officedocument_presentationml_presentation);
-g_hash_table_insert(mime_table, "application/vnd.oasis.opendocument.presentation", (gpointer)application_vnd_oasis_opendocument_presentation);
-g_hash_table_insert(mime_table, "application/x-msaccess", (gpointer)application_x_msaccess);
-g_hash_table_insert(mime_table, "application/vnd.oasis.opendocument.spreadsheet", (gpointer)application_vnd_oasis_opendocument_spreadsheet);
-g_hash_table_insert(mime_table, "audio/x-aiff", (gpointer)audio_x_aiff);
-g_hash_table_insert(mime_table, "text/x-ms-regedit", (gpointer)text_x_ms_regedit);
-g_hash_table_insert(mime_table, "application/x-gamecube-rom", (gpointer)application_x_gamecube_rom);
-g_hash_table_insert(mime_table, "application/x-nintendo-ds-rom", (gpointer)application_x_nintendo_ds_rom);
-g_hash_table_insert(mime_table, "text/x-objective-c", (gpointer)text_x_objective_c);
-g_hash_table_insert(mime_table, "application/x-font-gdos", (gpointer)application_x_font_gdos);
-g_hash_table_insert(mime_table, "application/x-apple-diskimage", (gpointer)application_x_apple_diskimage);
-g_hash_table_insert(mime_table, "application/x-zstd", (gpointer)application_x_zstd);
-g_hash_table_insert(mime_table, "video/x-m4v", (gpointer)video_x_m4v);
-g_hash_table_insert(mime_table, "message/news", (gpointer)message_news);
-g_hash_table_insert(mime_table, "application/vnd.symbian.install", (gpointer)application_vnd_symbian_install);
-g_hash_table_insert(mime_table, "application/x-lzh-compressed", (gpointer)application_x_lzh_compressed);
-g_hash_table_insert(mime_table, "application/x-dosdriver", (gpointer)application_x_dosdriver);
-g_hash_table_insert(mime_table, "application/vnd.tcpdump.pcap", (gpointer)application_vnd_tcpdump_pcap);
-g_hash_table_insert(mime_table, "x-epoc/x-sisx-app", (gpointer)x_epoc_x_sisx_app);
-g_hash_table_insert(mime_table, "application/x-avira-qua", (gpointer)application_x_avira_qua);
-g_hash_table_insert(mime_table, "video/MP2T", (gpointer)video_MP2T);
-g_hash_table_insert(mime_table, "application/x-snappy-framed", (gpointer)application_x_snappy_framed);
-g_hash_table_insert(mime_table, "application/x-lz4+json", (gpointer)application_x_lz4_json);
-g_hash_table_insert(mime_table, "application/x-dmp", (gpointer)application_x_dmp);
-g_hash_table_insert(mime_table, "application/zlib", (gpointer)application_zlib);
-g_hash_table_insert(mime_table, "application/x-pgp-keyring", (gpointer)application_x_pgp_keyring);
-g_hash_table_insert(mime_table, "application/x-gdbm", (gpointer)application_x_gdbm);
-g_hash_table_insert(mime_table, "application/x-font-pf2", (gpointer)application_x_font_pf2);
-g_hash_table_insert(mime_table, "application/x-zip", (gpointer)application_x_zip);
-g_hash_table_insert(mime_table, "application/x-coredump", (gpointer)application_x_coredump);
-g_hash_table_insert(mime_table, "application/x-java-jmod", (gpointer)application_x_java_jmod);
-g_hash_table_insert(mime_table, "application/x-terminfo", (gpointer)application_x_terminfo);
-g_hash_table_insert(mime_table, "application/x-terminfo2", (gpointer)application_x_terminfo2);
-g_hash_table_insert(mime_table, "application/x-arc", (gpointer)application_x_arc);
-g_hash_table_insert(mime_table, "application/vnd.lotus-1-2-3", (gpointer)application_vnd_lotus_1_2_3);
-g_hash_table_insert(mime_table, "image/x-win-bitmap", (gpointer)image_x_win_bitmap);
-g_hash_table_insert(mime_table, "application/x-maxis-dbpf", (gpointer)application_x_maxis_dbpf);
-g_hash_table_insert(mime_table, "text/PGP", (gpointer)text_PGP);
-g_hash_table_insert(mime_table, "audio/x-hx-aac-adts", (gpointer)audio_x_hx_aac_adts);
-g_hash_table_insert(mime_table, "application/x-chrome-extension", (gpointer)application_x_chrome_extension);
-g_hash_table_insert(mime_table, "image/heic", (gpointer)image_heic);
-g_hash_table_insert(mime_table, "image/x-gem", (gpointer)image_x_gem);
-g_hash_table_insert(mime_table, "application/x-lzma", (gpointer)application_x_lzma);
-g_hash_table_insert(mime_table, "application/warc", (gpointer)application_warc);
-g_hash_table_insert(mime_table, "application/x-lzip", (gpointer)application_x_lzip);
-g_hash_table_insert(mime_table, "application/x-lzop", (gpointer)application_x_lzop);
 return mime_table;}
 #endif

src/parsing/parse.c

@@ -1,32 +1,9 @@
-#include <src/ctx.h>
 #include "src/sist.h"
 #include "src/ctx.h"
 
-__thread magic_t Magic = NULL;
+__thread magic_t Magic;
 
-int fs_read(struct vfile *f, void *buf, size_t size) {
-
-    if (f->fd == -1) {
-        f->fd = open(f->filepath, O_RDONLY);
-        if (f->fd == -1) {
-            perror("open");
-            printf("%s\n", f->filepath);
-            return -1;
-        }
-    }
-
-    return read(f->fd, buf, size);
-}
-
-#define CLOSE_FILE(f) if (f.close != NULL) {f.close(&f);};
-
-void fs_close(struct vfile *f) {
-    if (f->fd != -1) {
-        close(f->fd);
-    }
-}
-
-void *read_all(parse_job_t *job, const char *buf, int bytes_read) {
+void *read_all(parse_job_t *job, const char *buf, int bytes_read, int *fd) {
 
     void *full_buf;
 
@@ -34,13 +11,20 @@ void *read_all(parse_job_t *job, const char *buf, int bytes_read) {
         full_buf = malloc(job->info.st_size);
         memcpy(full_buf, buf, job->info.st_size);
     } else {
+        if (*fd == -1) {
+            *fd = open(job->filepath, O_RDONLY);
+            if (*fd == -1) {
+                perror("open");
+                printf("%s\n", job->filepath);
+                free(job);
+                return NULL;
+            }
+        }
         full_buf = malloc(job->info.st_size);
         memcpy(full_buf, buf, bytes_read);
-
-        int ret = job->vfile.read(&job->vfile, full_buf + bytes_read, job->info.st_size - bytes_read);
+        int ret = read(*fd, full_buf + bytes_read, job->info.st_size - bytes_read);
         if (ret == -1) {
             perror("read");
-            return NULL;
         }
     }
 
@@ -52,14 +36,15 @@ void parse(void *arg) {
     parse_job_t *job = arg;
     document_t doc;
 
-    int inc_ts = incremental_get(ScanCtx.original_table, job->info.st_ino);
-    if (inc_ts != 0 && inc_ts == job->info.st_mtim.tv_sec) {
+    if (incremental_get(ScanCtx.original_table, job->info.st_ino) == job->info.st_mtim.tv_sec) {
         incremental_mark_file_for_copy(ScanCtx.copy_table, job->info.st_ino);
+        free(job);
         return;
     }
 
     if (Magic == NULL) {
         Magic = magic_open(MAGIC_MIME_TYPE);
+        magic_load(Magic, NULL);
     }
 
     doc.filepath = job->filepath;
@@ -72,30 +57,34 @@ void parse(void *arg) {
     doc.ino = job->info.st_ino;
     doc.mtime = job->info.st_mtim.tv_sec;
 
-    uuid_generate(doc.uuid);
+    uuid_generate_time_safe(doc.uuid);
     char *buf[PARSE_BUF_SIZE];
 
     if (job->info.st_size == 0) {
         doc.mime = MIME_EMPTY;
-    } else if (*(job->filepath + job->ext) != '\0' && (job->ext - job->base != 1)) {
+    } else if (*(job->filepath + job->ext) != '\0') {
         doc.mime = mime_get_mime_by_ext(ScanCtx.ext_table, job->filepath + job->ext);
     }
 
+    int fd = -1;
     int bytes_read = 0;
 
     if (doc.mime == 0) {
         // Get mime type with libmagic
-        bytes_read = job->vfile.read(&job->vfile, buf, PARSE_BUF_SIZE);
-        if (bytes_read == -1) {
-            CLOSE_FILE(job->vfile)
+        fd = open(job->filepath, O_RDONLY);
+        if (fd == -1) {
+            perror("open");
+            free(job);
             return;
         }
 
+        bytes_read = read(fd, buf, PARSE_BUF_SIZE);
+
         const char *magic_mime_str = magic_buffer(Magic, buf, bytes_read);
         if (magic_mime_str != NULL) {
             doc.mime = mime_get_mime_by_string(ScanCtx.mime_table, magic_mime_str);
             if (doc.mime == 0) {
-                fprintf(stderr, "Couldn't find mime %s, %s\n", magic_mime_str, job->filepath + job->base);
+                fprintf(stderr, "Couldn't find mime %s, %s!\n", magic_mime_str, job->filepath + job->base);
             }
         }
     }
@@ -104,53 +93,34 @@ void parse(void *arg) {
 
     if (!(SHOULD_PARSE(doc.mime))) {
 
-    } else if ((mmime == MimeVideo && doc.size >= MIN_VIDEO_SIZE) ||
-               (mmime == MimeImage && doc.size >= MIN_IMAGE_SIZE) || mmime == MimeAudio) {
-
-        if (job->vfile.is_fs_file) {
-            parse_media_filename(job->filepath, &doc);
-        } else {
-            parse_media_vfile(&job->vfile, &doc);
-        }
+    } else if ((mmime == MimeVideo && doc.size >= MIN_VIDEO_SIZE) || mmime == MimeAudio || mmime == MimeImage) {
+        parse_media(job->filepath, &doc);
 
     } else if (IS_PDF(doc.mime)) {
-        void *pdf_buf = read_all(job, (char *) buf, bytes_read);
+        void *pdf_buf = read_all(job, (char *) buf, bytes_read, &fd);
         parse_pdf(pdf_buf, doc.size, &doc);
 
-        if (pdf_buf != buf && pdf_buf != NULL) {
+        if (pdf_buf != buf) {
             free(pdf_buf);
         }
 
     } else if (mmime == MimeText && ScanCtx.content_size > 0) {
-        parse_text(bytes_read, &job->vfile, (char *) buf, &doc);
+        parse_text(bytes_read, &fd, (char *) buf, &doc);
 
     } else if (IS_FONT(doc.mime)) {
-        void *font_buf = read_all(job, (char *) buf, bytes_read);
+        void *font_buf = read_all(job, (char *) buf, bytes_read, &fd);
         parse_font(font_buf, doc.size, &doc);
 
-        if (font_buf != buf && font_buf != NULL) {
+        if (font_buf != buf) {
             free(font_buf);
         }
-    } else if (
-            ScanCtx.archive_mode != ARC_MODE_SKIP && (
-                    IS_ARC(doc.mime) ||
-                    (IS_ARC_FILTER(doc.mime) && should_parse_filtered_file(doc.filepath, doc.ext))
-            )) {
-        parse_archive(&job->vfile, &doc);
-    }
-
-    //Parent meta
-    if (!uuid_is_null(job->parent)) {
-        char tmp[UUID_STR_LEN];
-        uuid_unparse(job->parent, tmp);
-
-        meta_line_t *meta_parent = malloc(sizeof(meta_line_t) + UUID_STR_LEN + 1);
-        meta_parent->key = MetaParent;
-        strcpy(meta_parent->strval, tmp);
-        APPEND_META((&doc), meta_parent)
     }
 
     write_document(&doc);
 
-    CLOSE_FILE(job->vfile)
+    if (fd != -1) {
+        close(fd);
+    }
+
+    free(job);
 }

src/parsing/parse.h

@@ -5,9 +5,6 @@
 
 #define PARSE_BUF_SIZE 4096
 
-int fs_read(struct vfile *f, void *buf, size_t size);
-void fs_close(struct vfile *f);
-
 void parse(void *arg);
 
 #endif

src/parsing/pdf.c

@@ -1,22 +1,10 @@
+#include <src/ctx.h>
 #include "pdf.h"
 #include "src/ctx.h"
 
 fz_page *render_cover(fz_context *ctx, document_t *doc, fz_document *fzdoc) {
 
-    int err = 0;
-    fz_page *cover = NULL;
-
-    fz_var(cover);
-    fz_try(ctx)
-        cover = fz_load_page(ctx, fzdoc, 0);
-    fz_catch(ctx)
-        err = 1;
-
-    if (err != 0) {
-        fz_drop_page(ctx, cover);
-        return NULL;
-    }
-
+    fz_page *cover = fz_load_page(ctx, fzdoc, 0);
     fz_rect bounds = fz_bound_page(ctx, cover);
 
     float scale;
@@ -36,49 +24,24 @@ fz_page *render_cover(fz_context *ctx, document_t *doc, fz_document *fzdoc) {
     fz_clear_pixmap_with_value(ctx, pixmap, 0xFF);
     fz_device *dev = fz_new_draw_device(ctx, m, pixmap);
 
-    fz_var(err);
-    fz_try(ctx)
-    {
     pthread_mutex_lock(&ScanCtx.mupdf_mu);
-        fz_run_page(ctx, cover, dev, fz_identity, NULL);
-    }
-    fz_always(ctx)
-    {
-        fz_close_device(ctx, dev);
-        fz_drop_device(ctx, dev);
-        pthread_mutex_unlock(&ScanCtx.mupdf_mu);
-    }
-    fz_catch(ctx)
-        err = ctx->error.errcode;
-
-    if (err != 0) {
-        fz_drop_page(ctx, cover);
-        fz_drop_pixmap(ctx, pixmap);
-        return NULL;
-    }
-
-    fz_buffer *fzbuf = NULL;
-    fz_var(fzbuf);
-    fz_var(err);
-
     fz_try(ctx)
-        fzbuf = fz_new_buffer_from_pixmap_as_png(ctx, pixmap, fz_default_color_params);
+        fz_run_page(ctx, cover, dev, fz_identity, NULL);
+    fz_always(ctx)
+            pthread_mutex_unlock(&ScanCtx.mupdf_mu);
     fz_catch(ctx)
-        err = ctx->error.errcode;
+        fz_rethrow(ctx);
 
-    if (err == 0) {
+    fz_drop_device(ctx, dev);
+
+    fz_buffer *fzbuf = fz_new_buffer_from_pixmap_as_png(ctx, pixmap, fz_default_color_params);
     unsigned char *tn_buf;
     size_t tn_len = fz_buffer_storage(ctx, fzbuf, &tn_buf);
+
     store_write(ScanCtx.index.store, (char *) doc->uuid, sizeof(doc->uuid), (char *) tn_buf, tn_len);
-    }
 
-    fz_drop_buffer(ctx, fzbuf);
     fz_drop_pixmap(ctx, pixmap);
-
-    if (err != 0) {
-        fz_drop_page(ctx, cover);
-        return NULL;
-    }
+    fz_drop_buffer(ctx, fzbuf);
 
     return cover;
 }
@@ -86,190 +49,103 @@ fz_page *render_cover(fz_context *ctx, document_t *doc, fz_document *fzdoc) {
 void fz_noop_callback(__attribute__((unused)) void *user, __attribute__((unused)) const char *message) {}
 
 
-void init_ctx(fz_context *ctx) {
-    fz_disable_icc(ctx);
-    fz_register_document_handlers(ctx);
-    ctx->warn.print = fz_noop_callback;
-    ctx->error.print = fz_noop_callback;
-}
-
-int read_stext_block(fz_stext_block *block, text_buffer_t *tex) {
-    if (block->type != FZ_STEXT_BLOCK_TEXT) {
-        return 0;
-    }
-
-    fz_stext_line *line = block->u.t.first_line;
-    while (line != NULL) {
-        fz_stext_char *c = line->first_char;
-        while (c != NULL) {
-            if (text_buffer_append_char(tex, c->c) == TEXT_BUF_FULL) {
-                return TEXT_BUF_FULL;
-            }
-            c = c->next;
-        }
-        line = line->next;
-    }
-    return 0;
-}
-
 void parse_pdf(void *buf, size_t buf_len, document_t *doc) {
 
-    if (buf == NULL) {
-        return;
-    }
-
     static int mu_is_initialized = 0;
     if (!mu_is_initialized) {
         pthread_mutex_init(&ScanCtx.mupdf_mu, NULL);
         mu_is_initialized = 1;
     }
     fz_context *ctx = fz_new_context(NULL, NULL, FZ_STORE_UNLIMITED);
-
-    init_ctx(ctx);
-
-    int err = 0;
-
-    fz_document *fzdoc = NULL;
     fz_stream *stream = NULL;
-    fz_var(fzdoc);
+    fz_document *fzdoc = NULL;
+
     fz_var(stream);
-    fz_var(err);
+    fz_var(fzdoc);
 
     fz_try(ctx)
     {
+        fz_disable_icc(ctx);
+        fz_register_document_handlers(ctx);
+
+        //disable warnings
+        ctx->warn.print = fz_noop_callback;
+        ctx->error.print = fz_noop_callback;
+
         stream = fz_open_memory(ctx, buf, buf_len);
         fzdoc = fz_open_document_with_stream(ctx, mime_get_mime_text(doc->mime), stream);
-    }
-    fz_catch(ctx)
-        err = ctx->error.errcode;
 
-    if (err) {
-        fz_drop_stream(ctx, stream);
-        fz_drop_document(ctx, fzdoc);
-        fz_drop_context(ctx);
-        return;
-    }
+        int page_count = fz_count_pages(ctx, fzdoc);
 
-    char title[4096] = {'\0',};
-    fz_try(ctx)
-        fz_lookup_metadata(ctx, fzdoc, FZ_META_INFO_TITLE, title, sizeof(title));
-    fz_catch(ctx)
-        ;
+        fz_page *cover = render_cover(ctx, doc, fzdoc);
 
-    if (strlen(title) > 0) {
-        meta_line_t *meta_content = malloc(sizeof(meta_line_t) + strlen(title));
-        meta_content->key = MetaTitle;
-        strcpy(meta_content->strval, title);
-        APPEND_META(doc, meta_content)
-    }
+        fz_stext_options opts;
 
-    int page_count = -1;
-    fz_var(err);
-    fz_try(ctx)
-        page_count = fz_count_pages(ctx, fzdoc);
-    fz_catch(ctx)
-        err = ctx->error.errcode;
-
-    if (err) {
-        fz_drop_stream(ctx, stream);
-        fz_drop_document(ctx, fzdoc);
-        fz_drop_context(ctx);
-        return;
-    }
-
-    fz_page *cover = NULL;
-    if (ScanCtx.tn_size > 0) {
-        cover = render_cover(ctx, doc, fzdoc);
-    } else {
-        fz_var(cover);
-        fz_try(ctx)
-            cover = fz_load_page(ctx, fzdoc, 0);
-        fz_catch(ctx)
-            cover = NULL;
-    }
-
-    if (cover == NULL) {
-        fz_drop_stream(ctx, stream);
-        fz_drop_document(ctx, fzdoc);
-        fz_drop_context(ctx);
-        return;
-    }
-
-    if (ScanCtx.content_size > 0) {
-        fz_stext_options opts = {0};
         text_buffer_t text_buf = text_buffer_create(ScanCtx.content_size);
 
         for (int current_page = 0; current_page < page_count; current_page++) {
-            fz_page *page = NULL;
+            fz_page *page;
             if (current_page == 0) {
                 page = cover;
             } else {
-                fz_var(err);
-                fz_try(ctx)
                 page = fz_load_page(ctx, fzdoc, current_page);
-                fz_catch(ctx)
-                    err = ctx->error.errcode;
-                if (err != 0) {
-                    text_buffer_destroy(&text_buf);
-                    fz_drop_page(ctx, page);
-                    fz_drop_stream(ctx, stream);
-                    fz_drop_document(ctx, fzdoc);
-                    fz_drop_context(ctx);
-                    return;
-                }
             }
 
             fz_stext_page *stext = fz_new_stext_page(ctx, fz_bound_page(ctx, page));
             fz_device *dev = fz_new_stext_device(ctx, stext, &opts);
 
-            fz_var(err);
+            pthread_mutex_lock(&ScanCtx.mupdf_mu);
             fz_try(ctx)
-                        fz_run_page(ctx, page, dev, fz_identity, NULL);
+                fz_run_page_contents(ctx, page, dev, fz_identity, NULL);
             fz_always(ctx)
-                {
-                    fz_close_device(ctx, dev);
-                    fz_drop_device(ctx, dev);
-                }
+                pthread_mutex_unlock(&ScanCtx.mupdf_mu);
             fz_catch(ctx)
-                err = ctx->error.errcode;
+                fz_rethrow(ctx);
 
-            if (err != 0) {
-                text_buffer_destroy(&text_buf);
-                fz_drop_page(ctx, page);
-                fz_drop_stext_page(ctx, stext);
-                fz_drop_stream(ctx, stream);
-                fz_drop_document(ctx, fzdoc);
-                fz_drop_context(ctx);
-                return;
-            }
+            fz_drop_device(ctx, dev);
 
             fz_stext_block *block = stext->first_block;
             while (block != NULL) {
-                int ret = read_stext_block(block, &text_buf);
-                if (ret == TEXT_BUF_FULL) {
-                    break;
+
+                if (block->type != FZ_STEXT_BLOCK_TEXT) {
+                    block = block->next;
+                    continue;
+                }
+
+                fz_stext_line *line = block->u.t.first_line;
+                while (line != NULL) {
+                    fz_stext_char *c = line->first_char;
+                    while (c != NULL) {
+                        if (text_buffer_append_char(&text_buf, c->c) == TEXT_BUF_FULL) {
+                            fz_drop_page(ctx, page);
+                            fz_drop_stext_page(ctx, stext);
+                            goto write_loop_end;
+                        }
+                        c = c->next;
+                    }
+                    line = line->next;
                 }
                 block = block->next;
             }
-            fz_drop_stext_page(ctx, stext);
             fz_drop_page(ctx, page);
-
-            if (text_buf.dyn_buffer.cur >= text_buf.dyn_buffer.size) {
-                break;
-            }
+            fz_drop_stext_page(ctx, stext);
         }
+        write_loop_end:;
         text_buffer_terminate_string(&text_buf);
 
         meta_line_t *meta_content = malloc(sizeof(meta_line_t) + text_buf.dyn_buffer.cur);
         meta_content->key = MetaContent;
         memcpy(meta_content->strval, text_buf.dyn_buffer.buf, text_buf.dyn_buffer.cur);
-        APPEND_META(doc, meta_content)
-
         text_buffer_destroy(&text_buf);
+        APPEND_META(doc, meta_content)
     }
-
+    fz_always(ctx)
+    {
         fz_drop_stream(ctx, stream);
         fz_drop_document(ctx, fzdoc);
         fz_drop_context(ctx);
+    } fz_catch(ctx) {
+        fprintf(stderr, "Error %s %s\n", doc->filepath, ctx->error.message);
+    }
 }
 

src/parsing/text.c

@@ -1,7 +1,7 @@
 #include "text.h"
 #include "src/ctx.h"
 
-void parse_text(int bytes_read, struct vfile *f, char *buf, document_t *doc) {
+void parse_text(int bytes_read, int *fd, char *buf, document_t *doc) {
 
     char *intermediate_buf;
     int intermediate_buf_len;
@@ -13,6 +13,10 @@ void parse_text(int bytes_read, struct vfile *f, char *buf, document_t *doc) {
         memcpy(intermediate_buf, buf, to_copy);
 
     } else {
+        if (*fd == -1) {
+            *fd = open(doc->filepath, O_RDONLY);
+        }
+
         int to_read = MIN(ScanCtx.content_size, doc->size) - bytes_read;
 
         intermediate_buf = malloc(to_read + bytes_read);
@@ -21,16 +25,19 @@ void parse_text(int bytes_read, struct vfile *f, char *buf, document_t *doc) {
             memcpy(intermediate_buf, buf, bytes_read);
         }
 
-        f->read(f, intermediate_buf + bytes_read, to_read);
+        read(*fd, intermediate_buf + bytes_read, to_read);
     }
-    text_buffer_t tex = text_buffer_create(ScanCtx.content_size);
-    text_buffer_append_string(&tex, intermediate_buf, intermediate_buf_len);
 
-    meta_line_t *meta = malloc(sizeof(meta_line_t) + tex.dyn_buffer.cur);
+    text_buffer_t text_buf = text_buffer_create(ScanCtx.content_size);
+    for (int i = 0; i < intermediate_buf_len; i++) {
+        text_buffer_append_char(&text_buf, *(intermediate_buf + i));
+    }
+    text_buffer_terminate_string(&text_buf);
+
+    meta_line_t *meta = malloc(sizeof(meta_line_t) + text_buf.dyn_buffer.cur);
     meta->key = MetaContent;
-    strcpy(meta->strval, tex.dyn_buffer.buf);
-    APPEND_META(doc, meta)
-
+    strcpy(meta->strval, text_buf.dyn_buffer.buf);
+    text_buffer_destroy(&text_buf);
     free(intermediate_buf);
-    text_buffer_destroy(&tex);
+    APPEND_META(doc, meta)
 }

src/parsing/text.h

@@ -3,6 +3,6 @@
 
 #include "src/sist.h"
 
-void parse_text(int bytes_read, struct vfile *f, char *buf, document_t *doc);
+void parse_text(int bytes_read, int *fd, char *buf, document_t *doc);
 
 #endif

src/sist.h

@@ -16,7 +16,6 @@
 #include <libswscale/swscale.h>
 #include <libswresample/swresample.h>
 #include <libavcodec/avcodec.h>
-#include <libavutil/imgutils.h>
 #include <ctype.h>
 #include <mupdf/fitz.h>
 #include <mupdf/pdf.h>
@@ -26,25 +25,19 @@
 #include <pthread.h>
 #include <sys/stat.h>
 #include <wordexp.h>
-#include "ft2build.h"
-#include "freetype/freetype.h"
-#include <archive.h>
-#include <archive_entry.h>
-
-#ifndef SIST_SCAN_ONLY
 #include <onion/onion.h>
 #include <onion/handler.h>
 #include <onion/block.h>
 #include <onion/shortcuts.h>
-#include <onion/codecs.h>
 #include <curl/curl.h>
-#endif
+
 
 #include "cJSON/cJSON.h"
 
 #include "types.h"
 #include "tpool.h"
 #include "util.h"
+#include "src/index/elastic.h"
 #include "io/store.h"
 #include "io/serialize.h"
 #include "io/walk.h"
@@ -54,16 +47,9 @@
 #include "parsing/pdf.h"
 #include "parsing/media.h"
 #include "parsing/font.h"
-#include "parsing/arc.h"
-#include "cli.h"
-#include "utf8.h/utf8.h"
-
-#ifndef SIST_SCAN_ONLY
-#include "src/index/elastic.h"
 #include "index/web.h"
 #include "web/serve.h"
-#include "web/auth_basic.h"
-#endif
+#include "cli.h"
 
 ;
 

src/tpool.c

@@ -25,7 +25,6 @@ typedef struct tpool {
     int done_cnt;
 
     int stop;
-
     void (*cleanup_func)();
 } tpool_t;
 
@@ -101,7 +100,7 @@ static void *tpool_worker(void *arg) {
     tpool_t *pool = arg;
 
     while (1) {
-        pthread_mutex_lock(&pool->work_mutex);
+        pthread_mutex_lock(&(pool->work_mutex));
         if (pool->stop) {
             break;
         }
@@ -114,21 +113,14 @@ static void *tpool_worker(void *arg) {
         pthread_mutex_unlock(&(pool->work_mutex));
 
         if (work != NULL) {
-            if (pool->stop) {
-                break;
-            }
-
             work->func(work->arg);
-            free(work->arg);
             free(work);
         }
 
         pthread_mutex_lock(&(pool->work_mutex));
-        if (work != NULL) {
         pool->done_cnt++;
-        }
 
-        progress_bar_print((double) pool->done_cnt / pool->work_cnt, ScanCtx.stat_tn_size, ScanCtx.stat_index_size);
+        progress_bar_print((double)pool->done_cnt / pool->work_cnt, ScanCtx.stat_tn_size, ScanCtx.stat_index_size);
 
         if (pool->work_head == NULL) {
             pthread_cond_signal(&(pool->working_cond));
@@ -149,15 +141,11 @@ void tpool_wait(tpool_t *pool) {
         if (pool->done_cnt < pool->work_cnt) {
             pthread_cond_wait(&(pool->working_cond), &(pool->work_mutex));
         } else {
-            usleep(500000);
-            if (pool->done_cnt == pool->work_cnt) {
             pool->stop = 1;
-                usleep(1000000);
             break;
         }
+        progress_bar_print(100.0, ScanCtx.stat_tn_size, ScanCtx.stat_index_size);
     }
-    }
-    progress_bar_print(1.0, ScanCtx.stat_tn_size, ScanCtx.stat_index_size);
     pthread_mutex_unlock(&(pool->work_mutex));
 }
 
@@ -179,10 +167,7 @@ void tpool_destroy(tpool_t *pool) {
 
     for (size_t i = 0; i < pool->thread_cnt; i++) {
         pthread_t thread = pool->threads[i];
-        if (thread != 0) {
-            void *_;
-            pthread_join(thread, &_);
-        }
+        pthread_cancel(thread);
     }
 
     pthread_mutex_destroy(&(pool->work_mutex));
@@ -201,11 +186,11 @@ tpool_t *tpool_create(size_t thread_cnt, void cleanup_func()) {
 
     tpool_t *pool = malloc(sizeof(tpool_t));
     pool->thread_cnt = thread_cnt;
-    pool->work_cnt = 0;
-    pool->done_cnt = 0;
+    pool->work_cnt =0;
+    pool->done_cnt =0;
     pool->stop = 0;
     pool->cleanup_func = cleanup_func;
-    pool->threads = calloc(sizeof(pthread_t), thread_cnt);
+    pool->threads = malloc(sizeof(pthread_t) * thread_cnt);
 
     pthread_mutex_init(&(pool->work_mutex), NULL);
 
@@ -215,12 +200,11 @@ tpool_t *tpool_create(size_t thread_cnt, void cleanup_func()) {
     pool->work_head = NULL;
     pool->work_tail = NULL;
 
+    for (size_t i = 0; i < thread_cnt; i++) {
+        pthread_t thread = pool->threads[i];
+        pthread_create(&thread, NULL, tpool_worker, pool);
+        pthread_detach(thread);
+    }
+
     return pool;
 }
-
-void tpool_start(tpool_t *pool) {
-
-    for (size_t i = 0; i < pool->thread_cnt; i++) {
-        pthread_create(&pool->threads[i], NULL, tpool_worker, pool);
-    }
-}

src/tpool.h

@@ -9,7 +9,6 @@ typedef struct tpool tpool_t;
 typedef void (*thread_func_t)(void *arg);
 
 tpool_t *tpool_create(size_t num, void (*cleanup_func)());
-void tpool_start(tpool_t *pool);
 void tpool_destroy(tpool_t *tm);
 
 int tpool_add_work(tpool_t *pool, thread_func_t func, void *arg);

src/types.h

@@ -9,12 +9,6 @@
 #define IS_META_LONG(key) (key & META_LONG_MASK) == META_LONG_MASK
 #define IS_META_STR(meta) (meta->key & META_STR_MASK) == META_STR_MASK
 
-#define ARC_MODE_SKIP 0
-#define ARC_MODE_LIST 1
-#define ARC_MODE_SHALLOW 2
-#define ARC_MODE_RECURSE 3
-typedef int archive_mode_t;
-
 // This is written to file as a 8bit char!
 enum metakey {
     MetaContent = 1 | META_STR_MASK,
@@ -30,7 +24,6 @@ enum metakey {
     MetaGenre = 11 | META_STR_MASK,
     MetaTitle = 12 | META_STR_MASK,
     MetaFontName = 13 | META_STR_MASK,
-    MetaParent = 14 | META_STR_MASK,
 };
 
 typedef struct index_descriptor {
@@ -70,39 +63,13 @@ typedef struct document {
     short ext;
     meta_line_t *meta_head;
     meta_line_t *meta_tail;
-    struct document *child_head;
-    struct document *child_tail;
     char *filepath;
 } document_t;
 
-typedef struct vfile vfile_t;
-
-typedef int (*read_func_t)(struct vfile *, void *buf, size_t size);
-
-typedef int (*seek_func_t)(struct vfile *, size_t size, int whence);
-
-typedef void (*close_func_t)(struct vfile *);
-
-typedef struct vfile {
-
-    union {
-        int fd;
-        struct archive *arc;
-    };
-
-    int is_fs_file;
-    char *filepath;
-
-    read_func_t read;
-    close_func_t close;
-} vfile_t;
-
 typedef struct parse_job_t {
     int base;
     int ext;
     struct stat info;
-    struct vfile vfile;
-    uuid_t parent;
     char filepath[1];
 } parse_job_t;
 

src/util.c

@@ -1,259 +1,15 @@
+#define _GNU_SOURCE
 #include "util.h"
 
-dyn_buffer_t dyn_buffer_create() {
-    dyn_buffer_t buf;
-
-    buf.size = INITIAL_BUF_SIZE;
-    buf.cur = 0;
-    buf.buf = malloc(INITIAL_BUF_SIZE);
-
-    return buf;
-}
-
-void grow_buffer(dyn_buffer_t *buf, size_t size) {
-    if (buf->cur + size > buf->size) {
-        do {
-            buf->size *= 2;
-        } while (buf->cur + size > buf->size);
-
-        buf->buf = realloc(buf->buf, buf->size);
-    }
-}
-
-void grow_buffer_small(dyn_buffer_t *buf) {
-    if (buf->cur + sizeof(long) > buf->size) {
-        buf->size *= 2;
-        buf->buf = realloc(buf->buf, buf->size);
-    }
-}
-
-void dyn_buffer_write(dyn_buffer_t *buf, void *data, size_t size) {
-    grow_buffer(buf, size);
-
-    memcpy(buf->buf + buf->cur, data, size);
-    buf->cur += size;
-}
-
-void dyn_buffer_write_char(dyn_buffer_t *buf, char c) {
-    grow_buffer_small(buf);
-
-    *(buf->buf + buf->cur) = c;
-    buf->cur += sizeof(c);
-}
-
-void dyn_buffer_write_str(dyn_buffer_t *buf, char *str) {
-    dyn_buffer_write(buf, str, strlen(str));
-    dyn_buffer_write_char(buf, '\0');
-}
-
-void dyn_buffer_append_string(dyn_buffer_t *buf, char *str) {
-    dyn_buffer_write(buf, str, strlen(str));
-}
-
-void dyn_buffer_write_int(dyn_buffer_t *buf, int d) {
-    grow_buffer_small(buf);
-
-    *(int *) (buf->buf + buf->cur) = d;
-    buf->cur += sizeof(int);
-}
-
-void dyn_buffer_write_short(dyn_buffer_t *buf, short s) {
-    grow_buffer_small(buf);
-
-    *(short *) (buf->buf + buf->cur) = s;
-    buf->cur += sizeof(short);
-}
-
-void dyn_buffer_write_long(dyn_buffer_t *buf, unsigned long l) {
-    grow_buffer_small(buf);
-
-    *(unsigned long *) (buf->buf + buf->cur) = l;
-    buf->cur += sizeof(unsigned long);
-}
-
-void dyn_buffer_destroy(dyn_buffer_t *buf) {
-    free(buf->buf);
-}
-
-void text_buffer_destroy(text_buffer_t *buf) {
-    dyn_buffer_destroy(&buf->dyn_buffer);
-}
-
-text_buffer_t text_buffer_create(int max_size) {
-    text_buffer_t text_buf;
-
-    text_buf.dyn_buffer = dyn_buffer_create();
-    text_buf.max_size = max_size;
-    text_buf.last_char_was_whitespace = FALSE;
-
-    return text_buf;
-}
-
-void text_buffer_terminate_string(text_buffer_t *buf) {
-    dyn_buffer_write_char(&buf->dyn_buffer, '\0');
-}
-
-__always_inline
-int utf8_validchr(const char *s) {
-    if (0x00 == (0x80 & *s)) {
-        return TRUE;
-    } else if (0xf0 == (0xf8 & *s)) {
-        if ((0x80 != (0xc0 & s[1])) || (0x80 != (0xc0 & s[2])) ||
-            (0x80 != (0xc0 & s[3]))) {
-            return FALSE;
-        }
-
-        if (0x80 == (0xc0 & s[4])) {
-            return FALSE;
-        }
-
-        if ((0 == (0x07 & s[0])) && (0 == (0x30 & s[1]))) {
-            return FALSE;
-        }
-    } else if (0xe0 == (0xf0 & *s)) {
-        if ((0x80 != (0xc0 & s[1])) || (0x80 != (0xc0 & s[2]))) {
-            return FALSE;
-        }
-
-        if (0x80 == (0xc0 & s[3])) {
-            return FALSE;
-        }
-
-        if ((0 == (0x0f & s[0])) && (0 == (0x20 & s[1]))) {
-            return FALSE;
-        }
-    } else if (0xc0 == (0xe0 & *s)) {
-        if (0x80 != (0xc0 & s[1])) {
-            return FALSE;
-        }
-
-        if (0x80 == (0xc0 & s[2])) {
-            return FALSE;
-        }
-
-        if (0 == (0x1e & s[0])) {
-            return FALSE;
-        }
-    } else {
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-int text_buffer_append_string(text_buffer_t *buf, char *str, size_t len) {
-
-    utf8_int32_t c;
-    if (str == NULL || len < 1 ||
-        (0xf0 == (0xf8 & str[0]) && len < 4) ||
-        (0xe0 == (0xf0 & str[0]) && len < 3) ||
-        (0xc0 == (0xe0 & str[0]) && len == 1) ||
-        *(str) == 0) {
-        text_buffer_terminate_string(buf);
-        return 0;
-    }
-
-    for (void *v = utf8codepoint(str, &c); c != '\0' && ((char *) v - str + 4) < len; v = utf8codepoint(v, &c)) {
-        if (utf8_validchr(v)) {
-            text_buffer_append_char(buf, c);
-        }
-    }
-    text_buffer_terminate_string(buf);
-    return 0;
-}
-
-int text_buffer_append_string0(text_buffer_t *buf, char *str) {
-    utf8_int32_t c;
-    for (void *v = utf8codepoint(str, &c); c != '\0'; v = utf8codepoint(v, &c)) {
-        if (utf8_validchr(v)) {
-            text_buffer_append_char(buf, c);
-        }
-    }
-    text_buffer_terminate_string(buf);
-}
-
-int text_buffer_append_char(text_buffer_t *buf, int c) {
-
-    if (SHOULD_IGNORE_CHAR(c)) {
-        if (!buf->last_char_was_whitespace) {
-            dyn_buffer_write_char(&buf->dyn_buffer, ' ');
-            buf->last_char_was_whitespace = TRUE;
-
-            if (buf->max_size > 0 && buf->dyn_buffer.cur >= buf->max_size) {
-                return TEXT_BUF_FULL;
-            }
-        }
-    } else {
-        buf->last_char_was_whitespace = FALSE;
-        grow_buffer_small(&buf->dyn_buffer);
-
-        if (0 == ((utf8_int32_t) 0xffffff80 & c)) {
-            *(buf->dyn_buffer.buf + buf->dyn_buffer.cur++) = (char) c;
-        } else if (0 == ((utf8_int32_t) 0xfffff800 & c)) {
-            *(buf->dyn_buffer.buf + buf->dyn_buffer.cur++) = 0xc0 | (char) (c >> 6);
-            *(buf->dyn_buffer.buf + buf->dyn_buffer.cur++) = 0x80 | (char) (c & 0x3f);
-        } else if (0 == ((utf8_int32_t) 0xffff0000 & c)) {
-            *(buf->dyn_buffer.buf + buf->dyn_buffer.cur++) = 0xe0 | (char) (c >> 12);
-            *(buf->dyn_buffer.buf + buf->dyn_buffer.cur++) = 0x80 | (char) ((c >> 6) & 0x3f);
-            *(buf->dyn_buffer.buf + buf->dyn_buffer.cur++) = 0x80 | (char) (c & 0x3f);
-        } else {
-            *(buf->dyn_buffer.buf + buf->dyn_buffer.cur++) = 0xf0 | (char) (c >> 18);
-            *(buf->dyn_buffer.buf + buf->dyn_buffer.cur++) = 0x80 | (char) ((c >> 12) & 0x3f);
-            *(buf->dyn_buffer.buf + buf->dyn_buffer.cur++) = 0x80 | (char) ((c >> 6) & 0x3f);
-            *(buf->dyn_buffer.buf + buf->dyn_buffer.cur++) = 0x80 | (char) (c & 0x3f);
-        }
-
-        if (buf->max_size > 0 && buf->dyn_buffer.cur >= buf->max_size) {
-            return TEXT_BUF_FULL;
-        }
-    }
-
-    return 0;
-}
-
-void incremental_put(GHashTable *table, unsigned long inode_no, int mtime) {
-    g_hash_table_insert(table, (gpointer) inode_no, GINT_TO_POINTER(mtime));
-}
-
-int incremental_get(GHashTable *table, unsigned long inode_no) {
-    if (table != NULL) {
-        return GPOINTER_TO_INT(g_hash_table_lookup(table, (gpointer) inode_no));
-    } else {
-        return 0;
-    }
-}
-
-int incremental_mark_file_for_copy(GHashTable *table, unsigned long inode_no) {
-    g_hash_table_insert(table, GINT_TO_POINTER(inode_no), GINT_TO_POINTER(1));
-}
-
 
 #define PBSTR "========================================"
 #define PBWIDTH 40
 
-dyn_buffer_t url_escape(char *str) {
-
-    dyn_buffer_t text = dyn_buffer_create();
-
-    char *ptr = str;
-    while (*ptr) {
-        if (*ptr == '#') {
-            dyn_buffer_write(&text, "%23", 3);
-            ptr++;
-        }
-
-        dyn_buffer_write_char(&text, *ptr++);
-    }
-    dyn_buffer_write_char(&text, '\0');
-
-    return text;
-}
-
 char *abspath(const char *path) {
     wordexp_t w;
     wordexp(path, &w, 0);
 
-    char *abs = realpath(w.we_wordv[0], NULL);
+    char *abs = canonicalize_file_name(w.we_wordv[0]);
     if (abs == NULL) {
         return NULL;
     }
@@ -268,7 +24,7 @@ char *expandpath(const char *path) {
     wordexp_t w;
     wordexp(path, &w, 0);
 
-    char *expanded = malloc(strlen(w.we_wordv[0]) + 2);
+    char * expanded = malloc(strlen(w.we_wordv[0]) + 2);
     strcpy(expanded, w.we_wordv[0]);
     strcat(expanded, "/");
 

src/util.h

@@ -5,10 +5,7 @@
 
 #define TEXT_BUF_FULL -1
 #define INITIAL_BUF_SIZE 1024 * 16
-
-#define SHOULD_IGNORE_CHAR(c) !(SHOULD_KEEP_CHAR(c))
-#define SHOULD_KEEP_CHAR(c) (c >= (int)'!')
-
+#define SHOULD_IGNORE_CHAR(c) c < '0' || c > 'z'
 
 typedef struct dyn_buffer {
     char *buf;
@@ -24,55 +21,159 @@ typedef struct text_buffer {
     dyn_buffer_t dyn_buffer;
 } text_buffer_t;
 
-char *abspath(const char *path);
+__always_inline
+dyn_buffer_t dyn_buffer_create() {
+    dyn_buffer_t buf;
 
+    buf.size = INITIAL_BUF_SIZE;
+    buf.cur = 0;
+    buf.buf = malloc(INITIAL_BUF_SIZE);
+
+    return buf;
+}
+
+__always_inline
+void grow_buffer(dyn_buffer_t *buf, size_t size) {
+    if (buf->cur + size > buf->size) {
+        do {
+            buf->size *= 2;
+        } while (buf->cur + size > buf->size);
+
+        buf->buf = realloc(buf->buf, buf->size);
+    }
+}
+
+__always_inline
+void grow_buffer_small(dyn_buffer_t *buf) {
+    if (buf->cur + sizeof(long) > buf->size) {
+        buf->size *= 2;
+        buf->buf = realloc(buf->buf, buf->size);
+    }
+}
+
+__always_inline
+void dyn_buffer_write(dyn_buffer_t *buf, void *data, size_t size) {
+    grow_buffer(buf, size);
+
+    memcpy(buf->buf + buf->cur, data, size);
+    buf->cur += size;
+}
+
+__always_inline
+void dyn_buffer_write_char(dyn_buffer_t *buf, char c) {
+    grow_buffer_small(buf);
+
+    *(buf->buf + buf->cur) = c;
+    buf->cur += sizeof(c);
+}
+
+__always_inline
+void dyn_buffer_write_str(dyn_buffer_t *buf, char *str) {
+    dyn_buffer_write(buf, str, strlen(str));
+    dyn_buffer_write_char(buf, '\0');
+}
+
+__always_inline
+void dyn_buffer_write_int(dyn_buffer_t *buf, int d) {
+    grow_buffer_small(buf);
+
+    *(int *) (buf->buf + buf->cur) = d;
+    buf->cur += sizeof(int);
+}
+
+__always_inline
+void dyn_buffer_write_short(dyn_buffer_t *buf, short s) {
+    grow_buffer_small(buf);
+
+    *(short *) (buf->buf + buf->cur) = s;
+    buf->cur += sizeof(short);
+}
+
+__always_inline
+void dyn_buffer_write_long(dyn_buffer_t *buf, unsigned long l) {
+    grow_buffer_small(buf);
+
+    *(unsigned long *) (buf->buf + buf->cur) = l;
+    buf->cur += sizeof(unsigned long);
+}
+
+__always_inline
+void dyn_buffer_destroy(dyn_buffer_t *buf) {
+    free(buf->buf);
+}
+
+__always_inline
+void text_buffer_destroy(text_buffer_t *buf) {
+    dyn_buffer_destroy(&buf->dyn_buffer);
+}
+
+__always_inline
+text_buffer_t text_buffer_create(int max_size) {
+    text_buffer_t text_buf;
+
+    text_buf.dyn_buffer = dyn_buffer_create();
+    text_buf.max_size = max_size;
+    text_buf.last_char_was_whitespace = FALSE;
+
+    return text_buf;
+}
+
+__always_inline
+void text_buffer_terminate_string(text_buffer_t *buf) {
+    dyn_buffer_write_char(&buf->dyn_buffer, '\0');
+}
+
+__always_inline
+int text_buffer_append_char(text_buffer_t *buf, int c) {
+
+    if (SHOULD_IGNORE_CHAR(c)) {
+        if (!buf->last_char_was_whitespace) {
+            dyn_buffer_write_char(&buf->dyn_buffer, ' ');
+            buf->last_char_was_whitespace = TRUE;
+
+            if (buf->dyn_buffer.cur >= buf->max_size) {
+                return TEXT_BUF_FULL;
+            }
+        }
+    } else {
+        buf->last_char_was_whitespace = FALSE;
+        dyn_buffer_write_char(&buf->dyn_buffer, (char) c);
+
+        if (buf->dyn_buffer.cur >= buf->max_size) {
+            return TEXT_BUF_FULL;
+        }
+    }
+
+    return 0;
+}
+
+char *abspath(const char * path);
 char *expandpath(const char *path);
 
-dyn_buffer_t url_escape(char *str);
-
 void progress_bar_print(double percentage, size_t tn_size, size_t index_size);
 
 
+__always_inline
+void incremental_put(GHashTable *table, unsigned long inode_no, int mtime) {
+    g_hash_table_insert(table, (gpointer) inode_no, GINT_TO_POINTER(mtime));
+}
+
+__always_inline
+int incremental_get(GHashTable *table, unsigned long inode_no) {
+    if (table != NULL) {
+        return GPOINTER_TO_INT(g_hash_table_lookup(table, (gpointer) inode_no));
+    } else {
+        return 0;
+    }
+}
+
+__always_inline
+int incremental_mark_file_for_copy(GHashTable *table, unsigned long inode_no) {
+    g_hash_table_insert(table, GINT_TO_POINTER(inode_no), GINT_TO_POINTER(1));
+}
+
 GHashTable *incremental_get_table();
 
-dyn_buffer_t dyn_buffer_create();
-
-void grow_buffer(dyn_buffer_t *buf, size_t size);
-
-void grow_buffer_small(dyn_buffer_t *buf);
-
-void dyn_buffer_write(dyn_buffer_t *buf, void *data, size_t size);
-
-void dyn_buffer_write_char(dyn_buffer_t *buf, char c);
-
-void dyn_buffer_write_str(dyn_buffer_t *buf, char *str);
-
-void dyn_buffer_append_string(dyn_buffer_t *buf, char *str);
-
-void dyn_buffer_write_int(dyn_buffer_t *buf, int d);
-
-void dyn_buffer_write_short(dyn_buffer_t *buf, short s);
-
-void dyn_buffer_write_long(dyn_buffer_t *buf, unsigned long l);
-
-void dyn_buffer_destroy(dyn_buffer_t *buf);
-
-void text_buffer_destroy(text_buffer_t *buf);
-
-text_buffer_t text_buffer_create(int max_size);
-
-void text_buffer_terminate_string(text_buffer_t *buf);
-
-int text_buffer_append_string(text_buffer_t *buf, char *str, size_t len);
-int text_buffer_append_string0(text_buffer_t *buf, char *str);
-
-int text_buffer_append_char(text_buffer_t *buf, int c);
-
-void incremental_put(GHashTable *table, unsigned long inode_no, int mtime);
-
-int incremental_get(GHashTable *table, unsigned long inode_no);
-
-int incremental_mark_file_for_copy(GHashTable *table, unsigned long inode_no);
 
 
 #endif

src/web/auth_basic.c

@@ -1,59 +0,0 @@
-#include "auth_basic.h"
-
-#define UNAUTHORIZED_TEXT "Unauthorized"
-
-typedef struct auth_basic_data {
-    onion_handler *inside;
-    const char *b64credentials;
-} auth_basic_data_t;
-
-
-int authenticate(const char *expected, const char *credentials) {
-
-    if (expected == NULL) {
-        return TRUE;
-    }
-
-    if (credentials && strncmp(credentials, "Basic ", 6) == 0) {
-        if (strcmp((credentials + 6), expected) == 0) {
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-
-int auth_basic_handler(auth_basic_data_t *d,
-                       onion_request *req,
-                       onion_response *res) {
-
-    const char *credentials = onion_request_get_header(req, "Authorization");
-
-    if (authenticate(d->b64credentials, credentials)) {
-        return onion_handler_handle(d->inside, req, res);
-    }
-
-    onion_response_set_header(res, "WWW-Authenticate", "Basic realm=\"sist2\"");
-    onion_response_set_code(res, HTTP_UNAUTHORIZED);
-    onion_response_write(res, UNAUTHORIZED_TEXT, sizeof(UNAUTHORIZED_TEXT));
-    onion_response_set_length(res, sizeof(UNAUTHORIZED_TEXT));
-
-    return OCS_PROCESSED;
-}
-
-void auth_basic_free(auth_basic_data_t *data) {
-    onion_handler_free(data->inside);
-    free(data);
-}
-
-onion_handler *auth_basic(const char *b64credentials, onion_handler *inside_level) {
-
-    auth_basic_data_t *privdata = malloc(sizeof(auth_basic_data_t));
-
-    privdata->b64credentials = b64credentials;
-    privdata->inside = inside_level;
-
-    return onion_handler_new((onion_handler_handler) auth_basic_handler, privdata,
-                             (onion_handler_private_data_free) auth_basic_free);
-}
-

src/web/auth_basic.h

@@ -1,4 +0,0 @@
-#include "src/sist.h"
-
-
-onion_handler *auth_basic(const char *b64credentials, onion_handler *inside_level);

src/web/serve.c

@@ -43,40 +43,27 @@ int javascript(void *p, onion_request *req, onion_response *res) {
     return OCS_PROCESSED;
 }
 
-int client_requested_dark_theme(onion_request *req) {
-    const char *cookie = onion_request_get_cookie(req, "sist");
-    if (cookie == NULL) {
-        return FALSE;
-    }
-
-    return strcmp(cookie, "dark") == 0;
-}
-
 int style(void *p, onion_request *req, onion_response *res) {
     set_default_headers(res);
-
     onion_response_set_header(res, "Content-Type", "text/css");
-
-    if (client_requested_dark_theme(req)) {
-        onion_response_set_length(res, sizeof(bundle_dark_css));
-        onion_response_write(res, bundle_dark_css, sizeof(bundle_dark_css));
-    } else {
     onion_response_set_length(res, sizeof(bundle_css));
     onion_response_write(res, bundle_css, sizeof(bundle_css));
-    }
+    return OCS_PROCESSED;
+}
+
+int bg_bars(void *p, onion_request *req, onion_response *res) {
+    set_default_headers(res);
+    onion_response_set_header(res, "Content-Type", "image/png");
+    onion_response_set_length(res, sizeof(bg_bars_png));
+    onion_response_write(res, bg_bars_png, sizeof(bg_bars_png));
     return OCS_PROCESSED;
 }
 
 int img_sprite_skin_flag(void *p, onion_request *req, onion_response *res) {
     set_default_headers(res);
     onion_response_set_header(res, "Content-Type", "image/png");
-    if (client_requested_dark_theme(req)) {
-        onion_response_set_length(res, sizeof(sprite_skin_flat_dark_png));
-        onion_response_write(res, sprite_skin_flat_dark_png, sizeof(sprite_skin_flat_dark_png));
-    } else {
     onion_response_set_length(res, sizeof(sprite_skin_flat_png));
     onion_response_write(res, sprite_skin_flat_png, sizeof(sprite_skin_flat_png));
-    }
     return OCS_PROCESSED;
 }
 
@@ -245,8 +232,6 @@ int search(void *p, onion_request *req, onion_response *res) {
 
     if (r->status_code == 200) {
         onion_response_write(res, r->body, r->size);
-    } else {
-        onion_response_set_code(res, HTTP_INTERNAL_ERROR);
     }
 
     free_response(r);
@@ -302,10 +287,7 @@ int serve_file_from_url(cJSON *json, index_t *idx, onion_request *req, onion_res
              "%s%s/%s%s%s",
              idx->desc.rewrite_url, path, name, strlen(ext) == 0 ? "" : ".", ext);
 
-    dyn_buffer_t encoded = url_escape(url);
-    int ret = onion_shortcut_redirect(encoded.buf, req, res);
-    dyn_buffer_destroy(&encoded);
-    return ret;
+    return onion_shortcut_redirect(url, req, res);
 }
 
 int serve_file_from_disk(cJSON *json, index_t *idx, onion_request *req, onion_response *res) {
@@ -319,11 +301,6 @@ int serve_file_from_disk(cJSON *json, index_t *idx, onion_request *req, onion_re
     snprintf(full_path, PATH_MAX, "%s%s/%s%s%s",
              idx->desc.root, path, name, strlen(ext) == 0 ? "" : ".", ext);
 
-    char disposition[8196];
-    snprintf(disposition, sizeof(disposition), "inline; filename=\"%s%s%s\"",
-             name, strlen(ext) == 0 ? "" : ".", ext);
-    onion_response_set_header(res, "Content-Disposition", disposition);
-
     return chunked_response_file(full_path, mime, 1, req, res);
 }
 
@@ -341,7 +318,7 @@ int index_info(void *p, onion_request *req, onion_response *res) {
         cJSON_AddStringToObject(idx_json, "name", idx->desc.name);
         cJSON_AddStringToObject(idx_json, "version", idx->desc.version);
         cJSON_AddStringToObject(idx_json, "id", idx->desc.uuid);
-        cJSON_AddNumberToObject(idx_json, "timestamp", (double) idx->desc.timestamp);
+        cJSON_AddNumberToObject(idx_json, "timestamp", (double)idx->desc.timestamp);
         cJSON_AddItemToArray(arr, idx_json);
     }
 
@@ -360,42 +337,28 @@ int file(void *p, onion_request *req, onion_response *res) {
         return OCS_PROCESSED;
     }
 
-    char *next = arg_uuid;
-    cJSON *doc = NULL;
-    cJSON *index_id = NULL;
-    cJSON *source = NULL;
+    cJSON *source = elastic_get_document(arg_uuid);
 
-    while (true) {
-        doc = elastic_get_document(next);
-        source = cJSON_GetObjectItem(doc, "_source");
-        index_id = cJSON_GetObjectItem(source, "index");
-        if (index_id == NULL) {
-            cJSON_Delete(doc);
-            return OCS_NOT_PROCESSED;
-        }
-        cJSON *parent = cJSON_GetObjectItem(source, "parent");
-        if (parent == NULL) {
-            break;
-        }
-        next = parent->valuestring;
-    }
+    const char *index_id = cJSON_GetObjectItem(source, "index")->valuestring;
 
-    index_t *idx = get_index_by_id(index_id->valuestring);
+    index_t *idx = get_index_by_id(index_id);
 
     if (idx == NULL) {
-        cJSON_Delete(doc);
         return OCS_NOT_PROCESSED;
     }
 
-    int ret;
-    if (strlen(idx->desc.rewrite_url) == 0) {
-        ret = serve_file_from_disk(source, idx, req, res);
-    } else {
-        ret = serve_file_from_url(source, idx, req, res);
-    }
-    cJSON_Delete(doc);
+    const char *name = cJSON_GetObjectItem(source, "name")->valuestring;
+    const char *ext = cJSON_GetObjectItem(source, "extension")->valuestring;
+    char disposition[8196];
+    snprintf(disposition, sizeof(disposition), "inline; filename=\"%s%s%s\"",
+             name, strlen(ext) == 0 ? "" : ".", ext);
+    onion_response_set_header(res, "Content-Disposition", disposition);
 
-    return ret;
+    if (strlen(idx->desc.rewrite_url) == 0) {
+        return serve_file_from_disk(source, idx, req, res);
+    } else {
+        return serve_file_from_url(source, idx, req, res);
+    }
 }
 
 void serve(const char *hostname, const char *port) {
@@ -405,14 +368,13 @@ void serve(const char *hostname, const char *port) {
     onion_set_hostname(o, hostname);
     onion_set_port(o, port);
 
-    onion_url *urls = onion_url_new();
+    onion_url *urls = onion_root_url(o);
 
     // Static paths
-    onion_set_root_handler(o, auth_basic(WebCtx.b64credentials, onion_url_to_handler(urls)));
-
     onion_url_add(urls, "", search_index);
     onion_url_add(urls, "css", style);
     onion_url_add(urls, "js", javascript);
+    onion_url_add(urls, "img/bg-bars.png", bg_bars);
     onion_url_add(urls, "img/sprite-skin-flat.png", img_sprite_skin_flag);
 
     onion_url_add(urls, "es", search);
@@ -426,7 +388,6 @@ void serve(const char *hostname, const char *port) {
     onion_url_add(urls, "^f/([a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12})$", file);
     onion_url_add(urls, "i", index_info);
 
-
     printf("Starting web server @ http://%s:%s\n", hostname, port);
 
     onion_listen(o);

web/css/dark.css

@@ -1,360 +0,0 @@
-*:focus {
-    outline: 0;
-}
-
-a {
-    color: #00BCD4;
-}
-
-body {
-    overflow-y: scroll;
-    background: black;
-}
-
-.progress {
-    margin-top: 1em;
-}
-
-.card {
-    margin-top: 1em;
-    background: #212121;
-    color: #e0e0e0;
-    border-radius: 1px;
-    border: none;
-}
-
-.sub-document {
-    background: #37474F;
-}
-
-.sub-document .text-muted {
-    color: #8a949c !important;
-}
-
-
-.list-group-item {
-    background: #212121;
-    color: #e0e0e0;
-
-    border-top: 1px solid #424242;
-    border-bottom: none;
-    border-left: none;
-    border-right: none;
-}
-
-.list-group-item:first-child {
-    border-top: none;
-}
-
-.navbar-brand {
-    font-size: 1.75rem;
-    padding: 0;
-    color: #f5f5f5;
-}
-
-.navbar {
-    background: #546b7a;
-}
-
-.navbar a:hover {
-    color: #fff;
-}
-
-.navbar span {
-    color: #eee;
-}
-
-.document {
-    padding: 0.5rem;
-}
-
-.document p {
-    margin-bottom: 0;
-}
-
-.document:hover p {
-    text-decoration: underline;
-}
-
-.badge-video {
-    color: #FFFFFF;
-    background-color: #F27761;
-}
-
-.badge-image {
-    color: #FFFFFF;
-    background-color: #AA99C9;
-}
-
-.badge-audio {
-    color: #FFFFFF;
-    background-color: #00ADEF;
-}
-
-.badge-resolution {
-    color: #212529;
-    background-color: #B0BEC5;
-}
-
-.badge-text {
-    color: #FFFFFF;
-    background-color: #FAAB3C;
-}
-
-.card-img-overlay {
-    pointer-events: none;
-    padding: 0.75rem;
-
-    bottom: unset;
-    top: 0;
-    left: unset;
-    right: unset;
-}
-
-.file-title {
-    font-size: 10pt;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    color: #00BCD4;
-}
-
-.badge {
-    margin-right: 3px;
-}
-
-.badge-user {
-    color: #212529;
-    background-color: #e0e0e0;
-}
-
-.fit {
-    display: block;
-    min-width: 64px;
-    max-width: 100%;
-    max-height: 175px;
-    margin: 0 auto 0;
-    padding: 3px 3px 0 3px;
-    width: auto;
-    height: auto;
-}
-
-.fit-sm {
-    display: block;
-    max-width: 64px;
-    max-height: 64px;
-    margin: 0 auto 0;
-    width: auto;
-    height: auto;
-}
-
-.audio-fit {
-    height: 39px;
-    vertical-align: bottom;
-    display: inline;
-    width: 100%;
-}
-
-@media (min-width: 1200px) {
-    .card-columns {
-        column-count: 4;
-    }
-}
-
-@media (min-width: 1500px) {
-    .container {
-        max-width: 1440px;
-    }
-
-    .card-columns {
-        column-count: 5;
-    }
-}
-
-@media (min-width: 1800px) {
-    .container {
-        max-width: 1550px;
-    }
-}
-
-mark {
-    background: #fff217;
-    border-radius: 0;
-    padding: 1px 0;
-}
-
-.content-div {
-    font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-    font-size: 13px;
-    padding: 1em;
-    background-color: #37474F;
-    border: 1px solid #616161;
-    border-radius: 4px;
-    margin: 3px;
-    white-space: normal;
-    color: rgb(224, 224, 224);
-}
-
-.irs-single, .irs-from, .irs-to {
-    font-size: 13px;
-    background-color: #00BCD4;
-}
-
-.irs-slider {
-    cursor: col-resize;
-}
-
-.irs {
-    margin-top: 1em;
-    margin-bottom: 1em;
-}
-
-.custom-select {
-    overflow: auto;
-    background-color: #37474F;
-    border: 1px solid #616161;
-    color: #bdbdbd;
-}
-
-.custom-select:focus {
-    border-color: #757575;
-    outline: 0;
-    box-shadow: 0 0 0 .2rem rgba(0, 123, 255, .25);
-}
-
-option {
-    outline: none;
-}
-
-.form-control {
-    background-color: #37474F;
-    border: 1px solid #616161;
-    color: #fff;
-}
-
-.form-control:focus {
-    background-color: #546E7A;
-    color: #fff;
-}
-
-.input-group-text {
-    background: #263238;
-    border: 1px solid #616161;
-    color: #dbdbdb;
-}
-
-::placeholder {
-    color: #BDBDBD !important;
-    opacity: 1;
-}
-
-
-.inspire-tree .selected > .wholerow, .inspire-tree .selected > .title-wrap:hover + .wholerow {
-    background: none;
-}
-
-.inspire-tree .icon-expand::before, .inspire-tree .icon-collapse::before {
-    background-color: black;
-}
-
-.inspire-tree .title {
-    color: #eee;
-}
-
-.inspire-tree {
-    font-weight: 400;
-    font-size: 14px;
-    font-family: Helvetica, Nueue, Verdana, sans-serif;
-    max-height: 350px;
-    overflow: auto;
-}
-
-.page-indicator {
-    line-height: 1rem;
-    padding: 0.5rem;
-    background: #212121;
-    color: #eee;
-    margin-top: 1em;
-}
-
-.btn-xs {
-    padding: .1rem .3rem;
-    font-size: .875rem;
-    border-radius: .2rem;
-}
-
-.btn {
-    color: #eee;
-}
-
-.nav-tabs .nav-link {
-    color: #e0e0e0;
-}
-
-.nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active {
-    background-color: #212121;
-    border-color: #616161 #616161 #212121;
-    color: #e0e0e0;
-}
-
-.nav-tabs .nav-link:focus, .nav-tabs .nav-link:focus {
-    border-color: #616161 #616161 #212121;
-    color: #e0e0e0;
-}
-
-.nav-tabs .nav-link:focus, .nav-tabs .nav-link:hover {
-    border-color: #e0e0e0 #e0e0e0 #212121;
-    color: #e0e0e0;
-}
-
-.nav-tabs {
-    border-bottom: #616161;
-}
-
-.nav {
-    margin-top: 0.5rem;
-}
-
-@media (max-width: 800px) {
-    #treeTabs {
-        flex-basis: inherit;
-        flex-grow: inherit;
-    }
-}
-
-.list-group {
-    margin-top: 1em;
-}
-
-.list-group-item {
-    padding: .25rem 0.5rem;
-}
-
-.wrapper-sm {
-    min-width: 64px;
-}
-
-.media-expanded {
-    display: inherit;
-}
-
-.media-expanded .fit {
-    max-height: 250px;
-}
-
-@media (max-width: 600px) {
-    .media-expanded .fit {
-        max-height: none;
-    }
-
-    .tagline {
-        display: none;
-    }
-}
-
-.version {
-    color: #00BCD4;
-    margin-left: -18px;
-    margin-top: -14px;
-    font-size: 11px;
-}

web/css/main.css

@@ -1,34 +1,14 @@
-*:focus {
-    outline: 0;
-}
-
-body {
-    overflow-y: scroll;
-}
-
-.progress {
-    margin-top: 1em;
-}
-
+body {overflow-y:scroll;}
 .card {
     margin-top: 1em;
-    box-shadow: 0 .125rem .25rem rgba(0, 0, 0, .075) !important;
 }
-
-.sub-document {
-    background: #AB47BC1F;
-}
-
 .navbar-brand {
     font-size: 1.75rem;
     padding: 0;
 }
-
 .navbar {
-    background: #F7F7F7;
-    border-bottom: solid 1px #dfdfdf;
+    background: #F7F7F7; border-bottom: solid 1px #dfdfdf;
 }
-
 .document {
     padding: 0.5rem;
 }
@@ -61,11 +41,6 @@ body {
     background-color: #FFC107;
 }
 
-.badge-user {
-    color: #212529;
-    background-color: #e0e0e0;
-}
-
 .badge-text {
     color: #FFFFFF;
     background-color: #FAAB3C;
@@ -103,20 +78,10 @@ body {
     height: auto;
 }
 
-.fit-sm {
-    display: block;
-    max-width: 64px;
-    max-height: 64px;
-    margin: 0 auto 0;
-    width: auto;
-    height: auto;
-}
-
 .audio-fit {
     height: 39px;
     vertical-align: bottom;
     display: inline;
-    width: 100%;
 }
 
 @media (min-width: 1200px) {
@@ -129,7 +94,6 @@ body {
     .container  {
         max-width: 1440px;
     }
-
     .card-columns {
         column-count: 5;
     }
@@ -148,15 +112,13 @@ mark {
 }
 
 .content-div {
-    font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+    font-family: SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;
     font-size: 13px;
     padding: 1em;
     background-color: #f5f5f5;
     border: 1px solid #ccc;
     border-radius: 4px;
     margin: 3px;
-    white-space: normal;
-    color: #000;
 }
 
 .irs-single, .irs-from, .irs-to {
@@ -176,7 +138,8 @@ mark {
     margin-bottom: 1em;
 }
 
-.inspire-tree .selected > .wholerow, .inspire-tree .selected > .title-wrap:hover + .wholerow {
+.inspire-tree .selected > .wholerow, .inspire-tree .selected > .title-wrap:hover + .wholerow
+{
     background: none;
 }
 
@@ -191,8 +154,6 @@ mark {
 .page-indicator {
     line-height: 1rem;
     padding: 0.5rem;
-    background: #f8f9fa;
-    margin-top: 1em;
 }
 
 .btn-xs {
@@ -200,51 +161,3 @@ mark {
     font-size: .875rem;
     border-radius: .2rem;
 }
-
-.nav {
-    margin-top: 0.5rem;
-}
-
-@media (max-width: 800px) {
-    #treeTabs {
-        flex-basis: inherit;
-        flex-grow: inherit;
-    }
-}
-
-.list-group {
-    margin-top: 1em;
-}
-
-.list-group-item {
-    padding: .25rem 0.5rem;
-}
-
-.wrapper-sm {
-    min-width: 64px;
-}
-
-.media-expanded {
-    display: inherit;
-}
-
-.media-expanded .fit {
-    max-height: 250px;
-}
-
-@media (max-width: 600px) {
-    .media-expanded .fit {
-        max-height: none;
-    }
-
-    .tagline {
-        display: none;
-    }
-}
-
-.version {
-    color: #007bff;
-    margin-left: -18px;
-    margin-top: -14px;
-    font-size: 11px;
-}

web/js/dom.js

@@ -75,84 +75,6 @@ function shouldPlayVideo(hit) {
     return videoc !== "hevc" && videoc !== "mpeg2video" && videoc !== "wmv3";
 }
 
-function makePlaceholder(w, h, small) {
-    let calc;
-    if (small) {
-        calc = w > h
-            ? (64 / w / h) >= 100
-                ? (64 * w / h)
-                : 64
-            : 64;
-    } else {
-        calc = w > h
-            ? (175 / w / h) >= 272
-                ? (175 * w / h)
-                : 175
-            : 175;
-    }
-
-    const el = document.createElement("div");
-    el.setAttribute("style", `height: ${calc}px`);
-    return el;
-}
-
-function makeTitle(hit) {
-    let title = document.createElement("div");
-    title.setAttribute("class", "file-title");
-    let extension = hit["_source"].hasOwnProperty("extension") && hit["_source"]["extension"] !== "" ? "." + hit["_source"]["extension"] : "";
-
-    applyNameToTitle(hit, title, extension);
-
-    title.setAttribute("title", hit["_source"]["path"] + "/" + hit["_source"]["name"] + extension);
-    return title;
-}
-
-function getTags(hit, mimeCategory) {
-
-    let tags = [];
-    switch (mimeCategory) {
-        case "video":
-        case "image":
-            if (hit["_source"].hasOwnProperty("videoc")) {
-                const formatTag = document.createElement("span");
-                formatTag.setAttribute("class", "badge badge-pill badge-video");
-                formatTag.appendChild(document.createTextNode(hit["_source"]["videoc"].replace(" ", "")));
-                tags.push(formatTag);
-            }
-            break;
-        case "audio": {
-            if (hit["_source"].hasOwnProperty("audioc")) {
-                let formatTag = document.createElement("span");
-                formatTag.setAttribute("class", "badge badge-pill badge-audio");
-                formatTag.appendChild(document.createTextNode(hit["_source"]["audioc"]));
-                tags.push(formatTag);
-            }
-        }
-            break;
-    }
-    // User tags
-    if (hit["_source"].hasOwnProperty("tag")) {
-        hit["_source"]["tag"].forEach(tag => {
-            const userTag = document.createElement("span");
-            userTag.setAttribute("class", "badge badge-pill badge-user");
-
-            const tokens = tag.split("#");
-
-            if (tokens.length > 1) {
-                const bg = "#" + tokens[1];
-                const fg = lum(tokens[1]) > 40 ? "#000" : "#fff";
-                userTag.setAttribute("style", `background-color: ${bg}; color: ${fg}`);
-            }
-
-            const name = tokens[0].split(".")[tokens[0].split(".").length - 1];
-            userTag.appendChild(document.createTextNode(name));
-            tags.push(userTag);
-        })
-    }
-
-    return tags
-}
-
 /**
  *
  * @param hit
@@ -160,30 +82,32 @@ function getTags(hit, mimeCategory) {
  */
 function createDocCard(hit) {
     let docCard = document.createElement("div");
-    docCard.setAttribute("class", "card");
+    docCard.setAttribute("class", "card shadow-sm");
 
     let docCardBody = document.createElement("div");
     docCardBody.setAttribute("class", "card-body document");
 
-    //Title
-    let title = makeTitle(hit);
-    let isSubDocument = false;
-
     let link = document.createElement("a");
     link.setAttribute("href", "f/" + hit["_id"]);
     link.setAttribute("target", "_blank");
-    link.appendChild(title);
 
-    if (hit["_source"].hasOwnProperty("parent")) {
-        docCard.classList.add("sub-document");
-        isSubDocument = true;
-    }
+    //Title
+    let title = document.createElement("p");
+    title.setAttribute("class", "file-title");
+    let extension = hit["_source"].hasOwnProperty("extension") && hit["_source"]["extension"] !== "" ? "." + hit["_source"]["extension"] : "";
+
+    applyNameToTitle(hit, title, extension);
+
+    title.setAttribute("title", hit["_source"]["path"] + "/" + hit["_source"]["name"] + extension);
+    docCard.appendChild(title);
 
     let tagContainer = document.createElement("div");
     tagContainer.setAttribute("class", "card-text");
 
     if (hit["_source"].hasOwnProperty("mime") && hit["_source"]["mime"] !== null) {
 
+        let tags = [];
+        let thumbnail = null;
         let thumbnailOverlay = null;
         let imgWrapper = document.createElement("div");
         imgWrapper.setAttribute("style", "position: relative");
@@ -191,7 +115,26 @@ function createDocCard(hit) {
         let mimeCategory = hit["_source"]["mime"].split("/")[0];
 
         //Thumbnail
-        let thumbnail = makeThumbnail(mimeCategory, hit, imgWrapper, false);
+        if (mimeCategory === "video" && shouldPlayVideo(hit)) {
+            thumbnail = document.createElement("video");
+            addVidSrc("f/" + hit["_id"], hit["_source"]["mime"], thumbnail);
+
+            thumbnail.setAttribute("class", "fit");
+            thumbnail.setAttribute("loop", "");
+            thumbnail.setAttribute("controls", "");
+            thumbnail.setAttribute("preload", "none");
+            thumbnail.setAttribute("poster", `t/${hit["_source"]["index"]}/${hit["_id"]}`);
+            thumbnail.addEventListener("dblclick", function () {
+                thumbnail.webkitRequestFullScreen();
+            });
+        } else if ((hit["_source"].hasOwnProperty("width") && hit["_source"]["width"] > 20 && hit["_source"]["height"] > 20)
+            || hit["_source"]["mime"] === "application/pdf"
+            || hit["_source"].hasOwnProperty("font_name")
+        ) {
+            thumbnail = document.createElement("img");
+            thumbnail.setAttribute("class", "card-img-top fit");
+            thumbnail.setAttribute("src", `t/${hit["_source"]["index"]}/${hit["_id"]}`);
+        }
 
         //Thumbnail overlay
         switch (mimeCategory) {
@@ -201,17 +144,15 @@ function createDocCard(hit) {
                 thumbnailOverlay.setAttribute("class", "card-img-overlay");
 
                 //Resolution
-                if (hit["_source"].hasOwnProperty("width") && hit["_source"]["width"] > 32 && hit["_source"]["height"] > 32) {
                 let resolutionBadge = document.createElement("span");
                 resolutionBadge.setAttribute("class", "badge badge-resolution");
                 if (hit["_source"].hasOwnProperty("width")) {
                     resolutionBadge.appendChild(document.createTextNode(hit["_source"]["width"] + "x" + hit["_source"]["height"]));
                 }
                 thumbnailOverlay.appendChild(resolutionBadge);
-                }
 
                 // Hover
-                if (thumbnail && hit["_source"]["videoc"] === "gif" && !isSubDocument) {
+                if (thumbnail && hit["_source"]["videoc"] === "gif") {
                     gifOver(thumbnail, hit);
                 }
                 break;
@@ -221,34 +162,52 @@ function createDocCard(hit) {
                 if (hit["_source"].hasOwnProperty("duration")) {
                     thumbnailOverlay = document.createElement("div");
                     thumbnailOverlay.setAttribute("class", "card-img-overlay");
-                    const durationBadge = document.createElement("span");
+                    let durationBadge = document.createElement("span");
                     durationBadge.setAttribute("class", "badge badge-resolution");
                     durationBadge.appendChild(document.createTextNode(humanTime(hit["_source"]["duration"])));
                     thumbnailOverlay.appendChild(durationBadge);
                 }
         }
 
-        // Tags
-        let tags = getTags(hit, mimeCategory);
-        for (let i = 0; i < tags.length; i++) {
-            tagContainer.appendChild(tags[i]);
+        //Tags
+        //todo: handle new tags
+        switch (mimeCategory) {
+            case "video":
+            case "image":
+                if (hit.hasOwnProperty("videoc")) {
+                    let formatTag = document.createElement("span");
+                    formatTag.setAttribute("class", "badge badge-pill badge-video");
+                    formatTag.appendChild(document.createTextNode(hit["_source"]["videoc"].replace(" ", "")));
+                    tags.push(formatTag);
+                }
+                break;
+            case "audio": {
+                if (hit.hasOwnProperty("audioc")) {
+                    let formatTag = document.createElement("span");
+                    formatTag.setAttribute("class", "badge badge-pill badge-audio");
+                    formatTag.appendChild(document.createTextNode(hit["_source"]["audioc"]));
+                    tags.push(formatTag);
+                }
+            }
+                break;
         }
 
         //Content
         let contentHl = getContentHighlight(hit);
         if (contentHl !== undefined) {
-            const contentDiv = document.createElement("div");
-            contentDiv.setAttribute("class", "content-div");
+            let contentDiv = document.createElement("div");
+            contentDiv.setAttribute("class", "content-div bg-light");
             contentDiv.insertAdjacentHTML('afterbegin', contentHl);
             docCard.appendChild(contentDiv);
         }
 
         if (thumbnail !== null) {
+            imgWrapper.appendChild(thumbnail);
             docCard.appendChild(imgWrapper);
         }
 
         //Audio
-        if (mimeCategory === "audio" && hit["_source"].hasOwnProperty("audioc") && !isSubDocument) {
+        if (mimeCategory === "audio" && hit["_source"].hasOwnProperty("audioc")) {
 
             let audio = document.createElement("audio");
             audio.setAttribute("preload", "none");
@@ -263,6 +222,10 @@ function createDocCard(hit) {
         if (thumbnailOverlay !== null) {
             imgWrapper.appendChild(thumbnailOverlay);
         }
+
+        for (let i = 0; i < tags.length; i++) {
+            tagContainer.appendChild(tags[i]);
+        }
     }
 
     //Size tag
@@ -274,160 +237,15 @@ function createDocCard(hit) {
     docCardBody.appendChild(link);
     docCard.appendChild(docCardBody);
 
+    link.appendChild(title);
     docCardBody.appendChild(tagContainer);
 
     return docCard;
 }
 
-function makeThumbnail(mimeCategory, hit, imgWrapper, small) {
-    let thumbnail;
-    let isSubDocument = hit["_source"].hasOwnProperty("parent");
-
-    if (mimeCategory === "video" && shouldPlayVideo(hit) && !isSubDocument) {
-        thumbnail = document.createElement("video");
-        addVidSrc("f/" + hit["_id"], hit["_source"]["mime"], thumbnail);
-
-        const placeholder = makePlaceholder(hit["_source"]["width"], hit["_source"]["height"], small);
-        imgWrapper.appendChild(placeholder);
-
-        if (small) {
-            thumbnail.setAttribute("class", "fit-sm");
-        } else {
-            thumbnail.setAttribute("class", "fit");
-        }
-        if (small) {
-            thumbnail.style.cursor = "pointer";
-            thumbnail.title = "Enlarge";
-            thumbnail.addEventListener("click", function () {
-                imgWrapper.classList.remove("wrapper-sm", "mr-1");
-                imgWrapper.parentElement.classList.add("media-expanded");
-                thumbnail.setAttribute("class", "fit");
-                thumbnail.setAttribute("controls", "");
-            });
-        } else {
-            thumbnail.setAttribute("controls", "");
-        }
-        thumbnail.setAttribute("preload", "none");
-        thumbnail.setAttribute("poster", `t/${hit["_source"]["index"]}/${hit["_id"]}`);
-        thumbnail.addEventListener("dblclick", function () {
-            thumbnail.setAttribute("controls", "");
-            if (thumbnail.webkitRequestFullScreen) {
-                thumbnail.webkitRequestFullScreen();
-            } else {
-                thumbnail.requestFullscreen();
-            }
-        });
-        const poster = new Image();
-        poster.src = thumbnail.getAttribute('poster');
-        poster.addEventListener("load", function () {
-            placeholder.remove();
-            imgWrapper.appendChild(thumbnail);
-        });
-    } else if ((hit["_source"].hasOwnProperty("width") && hit["_source"]["width"] > 32 && hit["_source"]["height"] > 32)
-        || hit["_source"]["mime"] === "application/pdf"
-        || hit["_source"]["mime"] === "application/epub+zip"
-        || hit["_source"]["mime"] === "application/x-cbz"
-        || hit["_source"].hasOwnProperty("font_name")
-    ) {
-        thumbnail = document.createElement("img");
-        if (small) {
-            thumbnail.setAttribute("class", "fit-sm");
-        } else {
-            thumbnail.setAttribute("class", "card-img-top fit");
-        }
-        thumbnail.setAttribute("src", `t/${hit["_source"]["index"]}/${hit["_id"]}`);
-
-        const placeholder = makePlaceholder(hit["_source"]["width"], hit["_source"]["height"], small);
-        imgWrapper.appendChild(placeholder);
-
-        thumbnail.addEventListener("error", () => {
-            imgWrapper.remove();
-        });
-        thumbnail.addEventListener("load", () => {
-            placeholder.remove();
-            imgWrapper.appendChild(thumbnail);
-        });
-    }
-
-    return thumbnail;
-}
-
-function createDocLine(hit) {
-
-    const mime = hit["_source"]["mime"];
-    let mimeCategory = mime ? mime.split("/")[0] : null;
-    let tags = getTags(hit, mimeCategory);
-
-    let imgWrapper = document.createElement("div");
-    imgWrapper.setAttribute("class", "align-self-start mr-1 wrapper-sm");
-
-    let media = document.createElement("div");
-    media.setAttribute("class", "media");
-
-    const line = document.createElement("div");
-    line.setAttribute("class", "list-group-item flex-column align-items-start");
-
-
-    const title = makeTitle(hit);
-
-    let link = document.createElement("a");
-    link.setAttribute("href", "f/" + hit["_id"]);
-    link.setAttribute("target", "_blank");
-    link.appendChild(title);
-
-    const titleDiv = document.createElement("div");
-    titleDiv.setAttribute("class", "file-title");
-    titleDiv.appendChild(link);
-
-    line.appendChild(media);
-
-    let thumbnail = makeThumbnail(mimeCategory, hit, imgWrapper, true);
-    if (thumbnail) {
-        media.appendChild(imgWrapper);
-    }
-    media.appendChild(titleDiv);
-
-    // Content
-    let contentHl = getContentHighlight(hit);
-    if (contentHl !== undefined) {
-        const contentDiv = document.createElement("div");
-        contentDiv.setAttribute("class", "content-div");
-        contentDiv.insertAdjacentHTML('afterbegin', contentHl);
-        titleDiv.appendChild(contentDiv);
-    }
-
-    let tagContainer = document.createElement("div");
-    tagContainer.setAttribute("class", "");
-
-    for (let i = 0; i < tags.length; i++) {
-        tagContainer.appendChild(tags[i]);
-    }
-
-    //Size tag
-    let sizeTag = document.createElement("small");
-    sizeTag.appendChild(document.createTextNode(humanFileSize(hit["_source"]["size"])));
-    sizeTag.setAttribute("class", "text-muted");
-    tagContainer.appendChild(sizeTag);
-
-    titleDiv.appendChild(tagContainer);
-
-    return line;
-}
-
-function makePreloader() {
-    const elem = document.createElement("div");
-    elem.setAttribute("class", "progress");
-    const bar = document.createElement("div");
-    bar.setAttribute("class", "progress-bar progress-bar-striped progress-bar-animated");
-    bar.setAttribute("style", "width: 100%");
-    elem.appendChild(bar);
-
-    return elem;
-}
-
 function makePageIndicator(searchResult) {
     let pageIndicator = document.createElement("div");
-    pageIndicator.setAttribute("class", "page-indicator font-weight-light");
+    pageIndicator.setAttribute("class", "page-indicator shadow-sm bg-light font-weight-light");
     const totalHits = searchResult["hits"]["total"].hasOwnProperty("value")
         ? searchResult["hits"]["total"]["value"] : searchResult["hits"]["total"];
     pageIndicator.appendChild(document.createTextNode(docCount + " / " + totalHits));
@@ -438,53 +256,18 @@ function makePageIndicator(searchResult) {
 function makeStatsCard(searchResult) {
 
     let statsCard = document.createElement("div");
-    statsCard.setAttribute("class", "card stat");
+    statsCard.setAttribute("class", "card");
     let statsCardBody = document.createElement("div");
     statsCardBody.setAttribute("class", "card-body");
 
-    const resultMode = document.createElement("div");
-    resultMode.setAttribute("class", "btn-group btn-group-toggle");
-    resultMode.setAttribute("data-toggle", "buttons");
-    resultMode.style.cssFloat = "right";
-
-    const listMode = document.createElement("label");
-    listMode.setAttribute("class", "btn btn-primary");
-    listMode.appendChild(document.createTextNode("List"));
-
-    const gridMode = document.createElement("label");
-    gridMode.setAttribute("class", "btn btn-primary");
-    gridMode.appendChild(document.createTextNode("Grid"));
-
-    resultMode.appendChild(gridMode);
-    resultMode.appendChild(listMode);
-
-    if (mode === "grid") {
-        gridMode.classList.add("active")
-    } else {
-        listMode.classList.add("active")
-    }
-
-    gridMode.addEventListener("click", () => {
-        mode = "grid";
-        localStorage.setItem("mode", mode);
-        searchDebounced();
-    });
-    listMode.addEventListener("click", () => {
-        mode = "list";
-        localStorage.setItem("mode", mode);
-        searchDebounced();
-    });
-
-    let stat = document.createElement("span");
+    let stat = document.createElement("p");
     const totalHits = searchResult["hits"]["total"].hasOwnProperty("value")
         ? searchResult["hits"]["total"]["value"] : searchResult["hits"]["total"];
     stat.appendChild(document.createTextNode(totalHits + " results in " + searchResult["took"] + "ms"));
-
     statsCardBody.appendChild(stat);
-    statsCardBody.appendChild(resultMode);
 
     if (totalHits !== 0) {
-        let sizeStat = document.createElement("div");
+        let sizeStat = document.createElement("span");
         sizeStat.appendChild(document.createTextNode(humanFileSize(searchResult["aggregations"]["total_size"]["value"])));
         statsCardBody.appendChild(sizeStat);
     }
@@ -496,11 +279,7 @@ function makeStatsCard(searchResult) {
 
 function makeResultContainer() {
     let resultContainer = document.createElement("div");
-
-    if (mode === "grid") {
     resultContainer.setAttribute("class", "card-columns");
-    } else {
-        resultContainer.setAttribute("class", "list-group");
-    }
+
     return resultContainer;
 }

web/js/search.js

@@ -1,8 +1,6 @@
-const SIZE = 40;
+const SIZE = 20;
 let mimeMap = [];
-let tagMap = [];
-let mimeTree;
-let tagTree;
+let tree;
 
 let searchBar = document.getElementById("searchBar");
 let pathBar = document.getElementById("pathBar");
@@ -12,13 +10,6 @@ let coolingDown = false;
 let searchBusy = true;
 let selectedIndices = [];
 
-let mode;
-if (localStorage.getItem("mode") === null) {
-    mode = "grid";
-} else {
-    mode = localStorage.getItem("mode")
-}
-
 jQuery["jsonPost"] = function (url, data) {
     return jQuery.ajax({
         url: url,
@@ -30,51 +21,21 @@ jQuery["jsonPost"] = function (url, data) {
     });
 };
 
-window.onload = () => {
-    $("#theme").on("click", () => {
-        if (!document.cookie.includes("sist")) {
-            document.cookie = "sist=dark";
-        } else {
-            document.cookie = "sist=; Max-Age=-99999999;";
-        }
-        window.location.reload();
-    })
-};
-
-function toggleFuzzy() {
+function toggleSearchBar() {
     searchDebounced();
 }
 
 $.jsonPost("i").then(resp => {
     resp["indices"].forEach(idx => {
-        const opt = $("<option>")
+        $("#indices").append($("<option>")
             .attr("value", idx.id)
-            .append(idx.name);
-        if (!idx.name.includes("(nsfw)")) {
-            opt.attr("selected", !idx.name.includes("(nsfw)"));
+            .attr("selected", true)
+            .append(idx.name)
+        );
         selectedIndices.push(idx.id);
-        }
-        $("#indices").append(opt);
     });
 });
 
-function handleTreeClick (tree) {
-    return (event, node, handler) => {
-        event.preventTreeDefault();
-
-        if (node.id === "any") {
-            if (!node.itree.state.checked) {
-                tree.deselect();
-            }
-        } else {
-            tree.node("any").deselect();
-        }
-
-        handler();
-        searchDebounced();
-    }
-}
-
 $.jsonPost("es", {
     aggs: {
         mimeTypes: {
@@ -111,90 +72,38 @@ $.jsonPost("es", {
     });
     mimeMap.push({"text": "All", "id": "any"});
 
-    mimeTree = new InspireTree({
+    tree = new InspireTree({
         selection: {
             mode: 'checkbox'
         },
         data: mimeMap
     });
-    new InspireTreeDOM(mimeTree, {
-        target: '#mimeTree'
+    new InspireTreeDOM(tree, {
+        target: '.tree'
     });
-    mimeTree.on("node.click", handleTreeClick(mimeTree));
-    mimeTree.select();
-    mimeTree.node("any").deselect();
-});
+    tree.on("node.click", function (event, node, handler) {
+        event.preventTreeDefault();
 
-function leafTag(tag) {
-    const tokens = tag.split(".");
-    return tokens[tokens.length-1]
-}
-
-// Tags tree
-$.jsonPost("es", {
-    aggs: {
-        tags: {
-            terms: {
-                field: "tag",
-                size: 10000
+        if (node.id === "any") {
+            if (!node.itree.state.checked) {
+                tree.deselect();
             }
+        } else {
+            tree.node("any").deselect();
         }
-    },
-    size: 0,
-}).then(resp => {
-    resp["aggregations"]["tags"]["buckets"]
-        .sort((a, b) => a["key"].localeCompare(b["key"]))
-        .forEach(bucket => {
-        addTag(tagMap, bucket["key"], bucket["key"], bucket["doc_count"])
-    });
 
-    tagMap.push({"text": "All", "id": "any"});
-    tagTree = new InspireTree({
-        selection: {
-            mode: 'checkbox'
-        },
-        data: tagMap
+        handler();
+        searchDebounced();
     });
-    new InspireTreeDOM(tagTree, {
-        target: '#tagTree'
-    });
-    tagTree.on("node.click", handleTreeClick(tagTree));
-    tagTree.node("any").select();
+    tree.select();
+    tree.node("any").deselect();
     searchBusy = false;
 });
 
-function addTag(map, tag, id, count) {
-    let tags = tag.split("#")[0].split(".");
-
-    let child = {
-        id: id,
-        text: tags.length !== 1 ? tags[0] : `${tags[0]} (${count})`,
-        children: []
-    };
-
-    let found = false;
-    map.forEach(node => {
-        if (node.text === child.text) {
-            found = true;
-            if (tags.length !== 1) {
-                addTag(node.children, tags.slice(1).join("."), id, count);
-            }
-        }
-    });
-    if (!found) {
-        if (tags.length !== 1) {
-            addTag(child.children, tags.slice(1).join("."), id, count);
-            map.push(child);
-        } else {
-            map.push(child);
-        }
-    }
-}
-
 new autoComplete({
     selector: '#pathBar',
     minChars: 1,
-    delay: 400,
+    delay: 75,
     renderItem: function (item) {
         return '<div class="autocomplete-suggestion" data-val="' + item + '">' + item + '</div>';
     },
@@ -218,12 +127,7 @@ new autoComplete({
 
 function insertHits(resultContainer, hits) {
     for (let i = 0; i < hits.length; i++) {
-
-        if (mode === "grid") {
         resultContainer.appendChild(createDocCard(hits[i]));
-        } else {
-            resultContainer.appendChild(createDocLine(hits[i]));
-        }
         docCount++;
     }
 }
@@ -264,8 +168,8 @@ function doScroll() {
         })
 }
 
-function getSelectedNodes(tree) {
-    let selectedNodes = [];
+function getSelectedMimeTypes() {
+    let mimeTypes = [];
 
     let selected = tree.selected();
 
@@ -277,11 +181,11 @@ function getSelectedNodes(tree) {
 
         //Only get children
         if (selected[i].text.indexOf("(") !== -1) {
-            selectedNodes.push(selected[i].id);
+            mimeTypes.push(selected[i].id);
         }
     }
 
-    return selectedNodes
+    return mimeTypes
 }
 
 function search() {
@@ -289,49 +193,28 @@ function search() {
         return;
     }
     searchBusy = true;
-
     //Clear old search results
     let searchResults = document.getElementById("searchResults");
     while (searchResults.firstChild) {
         searchResults.removeChild(searchResults.firstChild);
     }
 
-    const preload = makePreloader();
-    searchResults.appendChild(preload);
-
     let query = searchBar.value;
-    let empty = query === "";
-    let condition = empty ? "should" : "must";
+    let condition = $("#barToggle").prop("checked") ? "must" : "should";
     let filters = [
         {range: {size: {gte: size_min, lte: size_max}}},
         {terms: {index: selectedIndices}}
     ];
-    let fields = [
-        "name^8",
-        "content^3",
-        "album^8", "artist^8", "title^8", "genre^2", "album_artist^8",
-        "font_name^6"
-    ];
-
-    if ($("#fuzzyToggle").prop("checked")) {
-        fields.push("content.nGram");
-        fields.push("name.nGram^3");
-    }
 
     let path = pathBar.value.replace(/\/$/, "").toLowerCase(); //remove trailing slashes
     if (path !== "") {
         filters.push([{term: {path: path}}])
     }
-    let mimeTypes = getSelectedNodes(mimeTree);
+    let mimeTypes = getSelectedMimeTypes();
     if (!mimeTypes.includes("any")) {
         filters.push([{terms: {"mime": mimeTypes}}]);
     }
 
-    let tags = getSelectedNodes(tagTree);
-    if (!tags.includes("any")) {
-        filters.push([{terms: {"tag": tags}}]);
-    }
-
     $.jsonPost("es?scroll=1", {
         "_source": {
             excludes: ["content"]
@@ -342,7 +225,12 @@ function search() {
                     multi_match: {
                         query: query,
                         type: "most_fields",
-                        fields: fields,
+                        fields: [
+                            "name^8", "name.nGram^3", "content^3",
+                            "content.nGram",
+                            "album^8", "artist^8", "title^8", "genre^2", "album_artist^8",
+                            "font_name^6"
+                        ],
                         operator: "and"
                     }
                 },
@@ -357,10 +245,9 @@ function search() {
             post_tags: ["</mark>"],
             fields: {
                 content: {},
-                // "content.nGram": {},
                 name: {},
                 "name.nGram": {},
-                font_name: {},
+                // font_name: {},
             }
         },
         aggs: {
@@ -370,10 +257,17 @@ function search() {
     }).then(searchResult => {
         scroll_id = searchResult["_scroll_id"];
 
-        preload.remove();
         //Search stats
         searchResults.appendChild(makeStatsCard(searchResult));
 
+        //Autocomplete
+        if (searchResult.hasOwnProperty("suggest") && searchResult["suggest"].hasOwnProperty("path")) {
+            pathAutoComplete = [];
+            for (let i = 0; i < searchResult["suggest"]["path"][0]["options"].length; i++) {
+                pathAutoComplete.push(searchResult["suggest"]["path"][0]["options"][i].text)
+            }
+        }
+
         //Setup page
         let resultContainer = makeResultContainer();
         searchResults.appendChild(resultContainer);
@@ -385,6 +279,7 @@ function search() {
     });
 }
 
+let pathAutoComplete = [];
 let size_min = 0;
 let size_max = 10000000000000;
 
@@ -392,8 +287,8 @@ let searchDebounced = _.debounce(function () {
     coolingDown = false;
     search()
 }, 500);
-
 searchBar.addEventListener("keyup", searchDebounced);
+document.getElementById("pathBar").addEventListener("keyup", searchDebounced);
 
 //Size slider
 $("#sizeSlider").ionRangeSlider({
@@ -444,18 +339,15 @@ updateIndices();
 //Suggest
 function getPathChoices() {
     return new Promise(getPaths => {
-        $.jsonPost("es", {
-            suggest: {
-                path: {
-                    prefix: pathBar.value,
-                    completion: {
-                        field: "suggest-path",
-                        skip_duplicates: true,
-                        size: 10000
+
+        let xhttp = new XMLHttpRequest();
+        xhttp.onreadystatechange = function () {
+            if (this.readyState === 4 && this.status === 200) {
+                getPaths(JSON.parse(xhttp.responseText))
             }
-                }
-            }
-        }).then(resp => getPaths(resp["suggest"]["path"][0]["options"].map(opt => opt["_source"]["path"])));
-    })
+        };
+        xhttp.open("GET", "suggest?prefix=" + pathBar.value, true);
+        xhttp.send();
+    });
 }
 

web/js/util.js

@@ -3,7 +3,7 @@
  */
 function humanFileSize(bytes) {
     if (bytes === 0) {
-        return "0 B"
+        return "? B"
     }
 
     let thresh = 1000;
@@ -43,9 +43,9 @@ function humanTime(sec_num) {
 
 function debounce(func, wait) {
     let timeout;
-    return function () {
+    return function() {
         let context = this, args = arguments;
-        let later = function () {
+        let later = function() {
             timeout = null;
             func.apply(context, args);
         };
@@ -54,13 +54,3 @@ function debounce(func, wait) {
         func.apply(context, args);
     };
 }
-
-function lum(c) {
-    c = c.substring(1);
-    let rgb = parseInt(c, 16);
-    let r = (rgb >> 16) & 0xff;
-    let g = (rgb >> 8) & 0xff;
-    let b = (rgb >> 0) & 0xff;
-
-    return 0.2126 * r + 0.7152 * g + 0.0722 * b;
-}

web/search.html

@@ -9,11 +9,9 @@
 </head>
 <body>
 
-<nav class="navbar navbar-expand-lg">
+<nav class="navbar navbar-expand-lg navbar-light">
     <a class="navbar-brand" href="/">sist2</a>
-    <span class="badge badge-pill version">v1.1.10</span>
     <span class="tagline">Lightning-fast file system indexer and search tool </span>
-    <a style="margin-left: auto" id="theme" class="btn" title="Toggle theme" href="/">Theme</a>
 </nav>
 
 <div class="container">
@@ -25,9 +23,9 @@
             <div class="input-group">
                 <div class="input-group-prepend">
                     <div class="input-group-text">
-                        <span title="Toggle fuzzy searching"  onclick="document.getElementById('fuzzyToggle').click()">Fuzzy&nbsp</span>
-                        <input title="Toggle fuzzy searching" type="checkbox" id="fuzzyToggle"
-                               onclick="toggleFuzzy()" checked>
+                        <span onclick="document.getElementById('barToggle').click()">Must match&nbsp</span>
+                        <input title="Toggle between 'Should' and 'Must' match mode" type="checkbox" id="barToggle"
+                               onclick="toggleSearchBar()" checked>
                     </div>
                 </div>
                 <input id="searchBar" type="search" class="form-control" placeholder="Search">
@@ -42,25 +40,11 @@
                     <select class="custom-select" id="indices" multiple size="6"></select>
                 </div>
 
-                <div class="col" id="treeTabs">
-                    <ul class="nav nav-tabs" role="tablist">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="tab" href="#mime" role="tab" aria-controls="home" aria-selected="true">Mime Types</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="tab" href="#tag" role="tab" aria-controls="profile" aria-selected="false" title="User-defined tags">Tags</a>
-                        </li>
-                    </ul>
-                    <div class="tab-content" id="myTabContent">
-                        <div class="tab-pane fade show active" id="mime" role="tabpanel" aria-labelledby="home-tab">
-                            <div id="mimeTree" class="tree"></div>
-                        </div>
-                        <div class="tab-pane fade" id="tag" role="tabpanel" aria-labelledby="profile-tab">
-                            <div id="tagTree" class="tree"></div>
-                        </div>
-                    </div>
-                </div>
+                <div class="col">
+                    <label>Mime types</label>
 
+                    <div class="tree"></div>
+                </div>
             </div>
         </div>
     </div>