Merge branch 'release/1.5.3'

1.5.2

.gitignore

@@ -1,5 +1,4 @@
 /node_modules
 /server/.inpx-web*
-/server/inpx-web-filter.json
 /dist
 dev*.sh

CHANGELOG.md

@@ -1,5 +1,32 @@
+1.5.3 / 2023-03-02
+
+- OPDS: исправление проблемы поиска для koreader
+- OPDS: улучшено скачивание для не-fb2 форматов файлов (djvu, pdf и пр.)
+- Добавлена полоска уведомления о выходе новой версии (отключается в настройках веб-интерфейса).
+  Проверка новой версии настраивается параметром checkReleaseLink в конфиге сервера (#15)
+
+1.5.2 / 2023-02-05
+
+- Исправление проблемы чтения каталога opds для koreader
+
+1.5.1 / 2023-01-28
+------------------
+
+- Настройки веб-интерфейса и опции командной строки "--lib-dir", "--inpx" вынесены в конфиг (#6)
+- Уменьшена длина имени файла при скачивании (#7)
+- OPDS: добавлен раздел "Жанры", в поиск добавлен раздел "Поиск книг в жанре" (#9)
+- Исправление проблем скроллинга панели инструментов (#12)
+- Улучшено отображение веб-интерфейса на мобильных устройствах
+
+1.4.1 / 2022-12-21
+------------------
+
+- Добавлена возможность поиска по регулярному выражению (префикс "~")
+- Заплатка для исправления (#10)
+
 1.4.0 / 2022-12-07
 ------------------
+
 - Добавлена возможность расширенного поиска (раздел "</>"). Поиск не оптимизирован и может сильно нагружать сервер.
 Отключить можно в конфиге, параметр extendedSearch
 - Улучшение поддержки reverse-proxy, в конфиг добавлены параметры server.root и opds.root для встраивания inpx-web в уже существующий веб-сервер

README.md

@@ -80,6 +80,14 @@ Options:
 При первом запуске в рабочей директории будет создан конфигурационный файл `config.json`:
 ```js
 {
+    // директория библиотеки (с zip-архивами), аналог параметра командной строки --lib-dir
+    // пустая строка: использовать значение по умолчанию - директорию файла приложения
+    "libDir": "",
+
+    // путь к файлу .inpx, аналог параметра командной строки --inpx
+    // пустая строка: использовать значение по умолчанию - inpx-файл, что найдется в директории библиотеки
+    "inpx": "",
+
     // пароль для ограничения доступа к веб-интерфейсу сервера
     // пустое значение - доступ без ограничений
     "accessPassword": "",
@@ -164,6 +172,31 @@ Options:
         "user": "",
         "password": "",
         "root": "/opds"
+    },
+
+    // страница для скачивания свежего релиза
+    "latestReleaseLink": "https://github.com/bookpauk/inpx-web/releases/latest",
+
+    // api для проверки новой версии, 
+    // пустая строка - отключить проверку выхода новых версий
+    "checkReleaseLink": "https://api.github.com/repos/bookpauk/inpx-web/releases/latest",
+
+    // настройки по умолчанию для веб-интерфейса
+    // устанавливаются при первой загрузке страницы в браузере
+    // дальнейшие изменения настроек с помощью веб-интерфейса уже сохраняются в самом браузере
+    "uiDefaults": {
+        "limit": 20, // результатов на странице
+        "downloadAsZip": false, // скачивать книги в виде zip-архива
+        "showCounts": true, // показывать количество
+        "showRates": true, // показывать оценки
+        "showInfo": true, // показывать кнопку (инфо)
+        "showGenres": true, // показывать жанры
+        "showDates": false, // показывать даты поступления
+        "showDeleted": false, // показывать удаленные
+        "abCacheEnabled": true, // кешировать запросы
+        "langDefault": "", // язык по умолчанию (например "ru,en")
+        "showJson": false, // показывать JSON (в расширенном поиске)
+        "showNewReleaseAvailable": true // уведомлять о выходе новой версии
     }
 }
 ```

client/components/Search/AuthorList/AuthorList.vue

@@ -197,8 +197,12 @@ class AuthorList extends BaseList {
         result = `${count}`;
         if (item.seriesLoaded) {
             const rec = item.seriesLoaded[book.series];
-            const totalCount = (this.showDeleted ? rec.bookCount + rec.bookDelCount : rec.bookCount);
-            result += `/${totalCount}`;
+            // заплатка для исправления https://github.com/bookpauk/inpx-web/issues/10
+            // по невыясненным причинам rec иногда равен undefined
+            if (rec) {
+                const totalCount = (this.showDeleted ? rec.bookCount + rec.bookDelCount : rec.bookCount);
+                result += `/${totalCount}`;
+            }
         }
 
         return `(${result})`;

client/components/Search/BaseList.js

@@ -385,7 +385,14 @@ export default class BaseList {
             } else if (searchValue[0] == '#') {
 
                 searchValue = searchValue.substring(1);
-                return !bookValue || (bookValue !== emptyFieldValue && !enru.has(bookValue[0]) && bookValue.indexOf(searchValue) >= 0);
+                if (!bookValue)
+                    return false;
+                return bookValue !== emptyFieldValue && !enru.has(bookValue[0]) && bookValue.indexOf(searchValue) >= 0;
+            } else if (searchValue[0] == '~') {//RegExp
+
+                searchValue = searchValue.substring(1);
+                const re = new RegExp(searchValue, 'i');
+                return re.test(bookValue);
             } else {
                 //where = `@dirtyIndexLR('value', ${db.esc(a)}, ${db.esc(a + maxUtf8Char)})`;
                 return bookValue.localeCompare(searchValue) >= 0 && bookValue.localeCompare(searchValue + maxUtf8Char) <= 0;

client/components/Search/BookInfoDialog/BookInfoDialog.vue

@@ -18,7 +18,7 @@
 
             <div class="row q-mt-sm no-wrap">
                 <div class="poster-size">
-                    <div class="poster-size column justify-center items-center" :class="{poster: coverSrc}" @click.stop.prevent="posterClick">
+                    <div class="column justify-center items-center" :class="{'poster': coverSrc, 'no-poster': !coverSrc}" @click.stop.prevent="posterClick">
                         <img v-if="coverSrc" :src="coverSrc" class="fit row justify-center items-center" style="object-fit: contain" @error="coverSrc = ''" />
                         <div v-if="!coverSrc" class="fit row justify-center items-center text-grey-5" style="border: 1px solid #ccc; font-size: 300%">
                             <i>{{ book.ext }}</i>
@@ -317,7 +317,7 @@ export default vueComponent(BookInfoDialog);
     min-width: 100px;
 }
 
-.poster {
+.poster, .no-poster {
     width: 100%;
     height: 100%;
 }

client/components/Search/Search.vue

@@ -1,64 +1,286 @@
 <template>
     <div class="root column fit" style="position: relative">
         <div ref="scroller" class="col fit column no-wrap" style="overflow: auto; position: relative" @scroll="onScroll">
-            <div ref="toolPanel" class="tool-panel q-pb-xs column bg-cyan-2" style="position: sticky; top: 0; z-index: 10;">
-                <div class="header q-mx-md q-mb-xs q-mt-sm row items-center">
-                    <a :href="newSearchLink" style="height: 33px; width: 34px">
-                        <img src="./assets/logo.png" />
-                        <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                            Новый поиск
-                        </q-tooltip>
-                    </a>
-
-                    <q-btn-toggle
-                        v-model="selectedList"
-                        class="q-ml-sm"
-                        toggle-color="primary"
-                        :options="listOptions"
-                        push
-                        no-caps
-                        rounded
-                    />
-
-                    <div class="row items-center q-ml-sm" style="font-size: 150%;">
-                        <div class="q-mr-xs">
-                            Коллекция
-                        </div>
-                        <div class="clickable" @click.stop.prevent="showCollectionInfo">
-                            {{ collection }}
-                        </div>
+            <!-- Tool Panel begin -->
+            <div ref="toolPanel" class="tool-panel column bg-cyan-2" style="position: sticky; top: 0; z-index: 10;">
+                <!-- Обновление -->
+                <div v-show="showNewReleaseAvailable && newReleaseAvailable" class="row q-py-sm bg-green-4 items-center">
+                    <div class="q-ml-sm" style="font-size: 120%">
+                        Доступна новая версия <b>{{ config.name }} v{{ config.latestVersion }}</b>
                     </div>
-
-                    <div class="col"></div>
-
-                    <DivBtn class="q-ml-md text-white bg-secondary" :size="30" :icon-size="24" icon="la la-question" round @click.stop.prevent="showSearchHelp">
-                        <template #tooltip>
-                            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                                Памятка
-                            </q-tooltip>
-                        </template>
+                    <DivBtn class="q-ml-sm q-px-sm bg-white" :size="20" @click.stop.prevent="openReleasePage">
+                        Скачать
                     </DivBtn>
-
-                    <DivBtn class="q-ml-sm text-white bg-secondary" :size="30" :icon-size="24" :imt="1" icon="la la-cog" round @click.stop.prevent="settingsDialogVisible = true">
-                        <template #tooltip>
-                            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                                Настройки
-                            </q-tooltip>
-                        </template>
-                    </DivBtn>
-
-                    <DivBtn v-if="!config.freeAccess" class="q-ml-sm text-white bg-secondary" :size="30" :icon-size="24" :imt="1" icon="la la-sign-out-alt" round @click.stop.prevent="logout">
-                        <template #tooltip>
-                            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                                Выход
-                            </q-tooltip>
-                        </template>
+                    <DivBtn class="q-ml-sm q-px-sm bg-white" :size="20" @click.stop.prevent="settingsDialogVisible = true">
+                        Отключить уведомление
                     </DivBtn>
                 </div>
-                <div v-show="!isExtendedSearch" class="row q-mx-md q-mb-xs items-center">
+
+                <!-- 1 -->
+                <div class="row">
+                    <!-- 1-1 -->
+                    <div class="column col">
+                        <div class="header q-mb-xs q-ml-sm q-mt-sm row items-center">
+                            <div class="row no-wrap items-center">
+                                <a :href="newSearchLink" style="height: 33px; width: 34px">
+                                    <img src="./assets/logo.png" />
+                                    <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                        Новый поиск
+                                    </q-tooltip>
+                                </a>
+
+                                <q-btn-toggle
+                                    v-model="selectedList"
+                                    class="q-ml-sm"
+                                    toggle-color="primary"
+                                    :options="listOptions"
+                                    push
+                                    no-caps
+                                    rounded
+                                />
+                            </div>
+
+                            <div class="row items-center q-ml-sm" style="font-size: 150%;">
+                                <div class="q-mr-xs">
+                                    Коллекция
+                                </div>
+                                <div class="clickable" @click.stop.prevent="showCollectionInfo">
+                                    {{ collection }}
+                                </div>
+
+                                <DivBtn class="q-ml-sm text-grey-5 bg-yellow-1" :size="28" :icon-size="24" icon="la la-question" round @click.stop.prevent="showSearchHelp">
+                                    <template #tooltip>
+                                        <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                            Памятка
+                                        </q-tooltip>
+                                    </template>
+                                </DivBtn>
+                            </div>
+                        </div>
+                        <div v-show="!isExtendedSearch" class="row q-mx-sm q-mb-xs items-center" style="max-width: 1024px">
+                            <q-input
+                                ref="authorInput" v-model="search.author" :maxlength="5000" :debounce="inputDebounce"
+                                class="q-mt-xs col-3" :bg-color="inputBgColor('author')" style="min-width: 140px" label="Автор" stack-label outlined dense clearable
+                            >
+                                <q-tooltip v-if="search.author" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                    {{ search.author }}
+                                </q-tooltip>
+                            </q-input>
+                            <div class="q-mx-xs" />
+                            <q-input
+                                v-model="search.series" :maxlength="inputMaxLength" :debounce="inputDebounce"
+                                class="q-mt-xs col-3" :bg-color="inputBgColor('series')" style="min-width: 140px" label="Серия" stack-label outlined dense clearable
+                            >
+                                <q-tooltip v-if="search.series" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                    {{ search.series }}
+                                </q-tooltip>
+                            </q-input>
+                            <div class="q-mx-xs" />
+                            <q-input
+                                v-model="search.title" :maxlength="inputMaxLength" :debounce="inputDebounce"
+                                class="q-mt-xs col-3" :bg-color="inputBgColor('title')" style="min-width: 140px;" label="Название" stack-label outlined dense clearable
+                            >
+                                <q-tooltip v-if="search.title" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                    {{ search.title }}
+                                </q-tooltip>
+                            </q-input>
+                            <div class="q-mx-xs" />
+                            <q-input
+                                v-model="search.lang" :maxlength="inputMaxLength" :debounce="inputDebounce"
+                                class="q-mt-xs col-1" :bg-color="inputBgColor()" input-style="cursor: pointer" style="min-width: 90px;" label="Язык" stack-label outlined dense clearable readonly
+                                @click.stop.prevent="selectLang"
+                            >
+                                <template v-if="search.lang" #append>
+                                    <q-icon name="la la-times-circle" class="q-field__focusable-action" @click.stop.prevent="search.lang = ''" />
+                                </template>
+
+                                <q-tooltip v-if="search.lang && showTooltips" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                    {{ search.lang }}
+                                </q-tooltip>
+                            </q-input>
+                            <div class="q-mx-xs" />
+                            <DivBtn
+                                class="text-grey-8 bg-yellow-1 q-mt-xs" :size="30" :icon-size="24" round
+                                icon="la la-level-up-alt"
+                                @click.stop.prevent="cloneSearch"
+                            >
+                                <template #tooltip>
+                                    <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                        Клонировать поиск
+                                    </q-tooltip>
+                                </template>
+                            </DivBtn>
+                        </div>
+                        <div v-show="!isExtendedSearch && extendedParams" class="row q-mx-sm q-mb-xs items-center" style="max-width: 1024px">
+                            <q-input
+                                v-model="genreNames" :maxlength="inputMaxLength" :debounce="inputDebounce"
+                                class="q-mt-xs col-3" :bg-color="inputBgColor()" input-style="cursor: pointer" style="min-width: 140px;" label="Жанр" stack-label outlined dense clearable readonly
+                                @click.stop.prevent="selectGenre"
+                            >
+                                <template v-if="genreNames" #append>
+                                    <q-icon name="la la-times-circle" class="q-field__focusable-action" @click.stop.prevent="search.genre = ''" />
+                                </template>
+
+                                <q-tooltip v-if="genreNames && showTooltips" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                    {{ genreNames }}
+                                </q-tooltip>
+                            </q-input>
+
+                            <div class="q-mx-xs" />
+                            <q-select 
+                                v-model="searchDate"
+                                class="q-mt-xs col-3"
+                                :options="searchDateOptions"
+                                dropdown-icon="la la-angle-down la-sm"
+                                :bg-color="inputBgColor()"
+                                style="min-width: 140px;"
+                                label="Дата поступления" stack-label
+                                outlined dense emit-value map-options clearable
+                            >
+                                <template #selected-item="scope">
+                                    <div v-if="scope.opt.value == 'manual'">
+                                        <div v-html="formatSearchDate" />
+                                    </div>
+                                    <div v-else>
+                                        {{ scope.opt.label }}
+                                    </div>
+                                </template>
+
+                                <template #option="scope">
+                                    <q-item v-bind="scope.itemProps" @click.stop.prevent="dateSelectItemClick(scope.opt.value)">
+                                        <q-item-section>
+                                            <q-item-label>
+                                                {{ scope.opt.label }}
+                                            </q-item-label>
+                                        </q-item-section>
+                                    </q-item>
+                                </template>
+                            </q-select>
+
+                            <div class="q-mx-xs" />
+                            <q-input
+                                v-model="librateNames" :maxlength="inputMaxLength" :debounce="inputDebounce"
+                                class="q-mt-xs col-1" :bg-color="inputBgColor()" input-style="cursor: pointer" style="min-width: 90px;" label="Оценка" stack-label outlined dense clearable readonly
+                                @click.stop.prevent="selectLibRate"
+                            >
+                                <template v-if="librateNames" #append>
+                                    <q-icon name="la la-times-circle" class="q-field__focusable-action" @click.stop.prevent="search.librate = ''" />
+                                </template>
+
+                                <q-tooltip v-if="librateNames && showTooltips" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                    {{ librateNames }}
+                                </q-tooltip>
+                            </q-input>
+                        </div>
+                        <div v-show="!isExtendedSearch && !extendedParams && extendedParamsMessage" class="row q-mx-sm items-center clickable" @click.stop.prevent="extendedParams = true">
+                            +{{ extendedParamsMessage }}
+                        </div>
+
+                        <div v-show="isExtendedSearch" class="row q-mx-md q-mb-xs items-center">
+                            <q-input
+                                v-model="extSearchNames"
+                                class="col q-mt-xs" :bg-color="inputBgColor('extended')" input-style="cursor: pointer"
+                                style="min-width: 140px; max-width: 638px;" label="Расширенный поиск" stack-label outlined dense clearable readonly
+                                @click.stop.prevent="selectExtSearch"
+                            >
+                                <template v-if="extSearchNames" #append>
+                                    <q-icon name="la la-times-circle" class="q-field__focusable-action" @click.stop.prevent="clearExtSearch" />
+                                </template>
+
+                                <q-tooltip v-if="extSearchNames && showTooltips" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                    {{ extSearchNames }}
+                                </q-tooltip>
+                            </q-input>
+
+                            <div class="q-mx-xs" />
+                            <DivBtn
+                                class="text-grey-8 bg-yellow-1 q-mt-xs" :size="30" round
+                                :disabled="!extSearch.author"
+                                @me-click="extToList('author')"
+                            >
+                                <div style="font-size: 130%">
+                                    <b>А</b>
+                                </div>
+                                <template #tooltip>
+                                    <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                        В раздел "Авторы" с переносом значения author={{ extSearch.author }}
+                                    </q-tooltip>
+                                </template>
+                            </DivBtn>
+
+                            <div class="q-mx-xs" />
+                            <DivBtn
+                                class="text-grey-8 bg-yellow-1 q-mt-xs" :size="30" round
+                                :disabled="!extSearch.series"
+                                @me-click="extToList('series')"
+                            >
+                                <div style="font-size: 130%">
+                                    <b>С</b>
+                                </div>
+                                <template #tooltip>
+                                    <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                        В раздел "Серии" с переносом значения series={{ extSearch.series }}
+                                    </q-tooltip>
+                                </template>
+                            </DivBtn>
+
+                            <div class="q-mx-xs" />
+                            <DivBtn
+                                class="text-grey-8 bg-yellow-1 q-mt-xs" :size="30" round
+                                :disabled="!extSearch.title"
+                                @me-click="extToList('title')"
+                            >
+                                <div style="font-size: 130%">
+                                    <b>К</b>
+                                </div>
+                                <template #tooltip>
+                                    <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                        В раздел "Книги" с переносом значения title={{ extSearch.title }}
+                                    </q-tooltip>
+                                </template>
+                            </DivBtn>
+
+                            <div class="q-mx-xs" />
+                            <DivBtn
+                                class="text-grey-8 bg-yellow-1 q-mt-xs" :size="30" :icon-size="24" round
+                                icon="la la-level-up-alt"
+                                @click.stop.prevent="cloneSearch"
+                            >
+                                <template #tooltip>
+                                    <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                        Клонировать поиск
+                                    </q-tooltip>
+                                </template>
+                            </DivBtn>
+                        </div>
+                    </div><!-- 1-1 -->
+                    <!-- 1-2 -->
+                    <div class="column q-mx-sm">
+                        <div style="height: 3px" />
+                        <DivBtn class="q-mt-sm text-white bg-secondary" :size="28" :icon-size="24" :imt="1" icon="la la-cog" round @click.stop.prevent="settingsDialogVisible = true">
+                            <template #tooltip>
+                                <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                    Настройки
+                                </q-tooltip>
+                            </template>
+                        </DivBtn>
+
+                        <DivBtn v-if="!config.freeAccess" class="q-mt-sm text-white bg-secondary" :size="28" :icon-size="24" :imt="1" icon="la la-sign-out-alt" round @click.stop.prevent="logout">
+                            <template #tooltip>
+                                <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                                    Выход
+                                </q-tooltip>
+                            </template>
+                        </DivBtn>
+                    </div><!-- 1-2 -->
+                </div><!-- 1 -->
+                <!-- 2 -->
+                <div class="column">
                     <DivBtn
-                        class="text-grey-5 bg-yellow-1 q-mt-xs" :size="30" :icon-size="24" round
+                        v-show="!isExtendedSearch && (extendedParams || !extendedParamsMessage)"
+                        class="text-grey-6" :size="16" :icon-size="14"
                         :icon="(extendedParams ? 'la la-angle-double-up' : 'la la-angle-double-down')"
+                        no-shadow
                         @click.stop.prevent="extendedParams = !extendedParams"
                     >
                         <template #tooltip>
@@ -67,208 +289,12 @@
                             </q-tooltip>
                         </template>
                     </DivBtn>
-                    <div class="q-mx-xs" />
-                    <q-input
-                        ref="authorInput" v-model="search.author" :maxlength="5000" :debounce="inputDebounce"
-                        class="q-mt-xs" :bg-color="inputBgColor('author')" style="width: 200px;" label="Автор" stack-label outlined dense clearable
-                    >
-                        <q-tooltip v-if="search.author" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                            {{ search.author }}
-                        </q-tooltip>
-                    </q-input>
-                    <div class="q-mx-xs" />
-                    <q-input
-                        v-model="search.series" :maxlength="inputMaxLength" :debounce="inputDebounce"
-                        class="q-mt-xs" :bg-color="inputBgColor('series')" style="width: 200px;" label="Серия" stack-label outlined dense clearable
-                    >
-                        <q-tooltip v-if="search.series" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                            {{ search.series }}
-                        </q-tooltip>
-                    </q-input>
-                    <div class="q-mx-xs" />
-                    <q-input
-                        v-model="search.title" :maxlength="inputMaxLength" :debounce="inputDebounce"
-                        class="q-mt-xs" :bg-color="inputBgColor('title')" style="width: 200px;" label="Название" stack-label outlined dense clearable
-                    >
-                        <q-tooltip v-if="search.title" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                            {{ search.title }}
-                        </q-tooltip>
-                    </q-input>
-                    <div class="q-mx-xs" />
-                    <q-input
-                        v-model="search.lang" :maxlength="inputMaxLength" :debounce="inputDebounce"
-                        class="q-mt-xs" :bg-color="inputBgColor()" input-style="cursor: pointer" style="width: 90px;" label="Язык" stack-label outlined dense clearable readonly
-                        @click.stop.prevent="selectLang"
-                    >
-                        <template v-if="search.lang" #append>
-                            <q-icon name="la la-times-circle" class="q-field__focusable-action" @click.stop.prevent="search.lang = ''" />
-                        </template>
-
-                        <q-tooltip v-if="search.lang && showTooltips" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                            {{ search.lang }}
-                        </q-tooltip>
-                    </q-input>
-                    <div class="q-mx-xs" />
-                    <DivBtn
-                        class="text-grey-8 bg-yellow-1 q-mt-xs" :size="30" :icon-size="24" round
-                        icon="la la-level-up-alt"
-                        @click.stop.prevent="cloneSearch"
-                    >
-                        <template #tooltip>
-                            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                                Клонировать поиск
-                            </q-tooltip>
-                        </template>
-                    </DivBtn>
-                </div>
-                <div v-show="!isExtendedSearch && extendedParams" class="row q-mx-md q-mb-xs items-center">
-                    <div style="width: 30px" />
-                    <div class="q-mx-xs" />
-                    <q-input
-                        v-model="genreNames" :maxlength="inputMaxLength" :debounce="inputDebounce"
-                        class="q-mt-xs" :bg-color="inputBgColor()" input-style="cursor: pointer" style="width: 200px;" label="Жанр" stack-label outlined dense clearable readonly
-                        @click.stop.prevent="selectGenre"
-                    >
-                        <template v-if="genreNames" #append>
-                            <q-icon name="la la-times-circle" class="q-field__focusable-action" @click.stop.prevent="search.genre = ''" />
-                        </template>
-
-                        <q-tooltip v-if="genreNames && showTooltips" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                            {{ genreNames }}
-                        </q-tooltip>
-                    </q-input>
-
-                    <div class="q-mx-xs" />
-                    <q-select 
-                        v-model="searchDate"
-                        class="q-mt-xs"
-                        :options="searchDateOptions"
-                        dropdown-icon="la la-angle-down la-sm"
-                        :bg-color="inputBgColor()"
-                        style="width: 200px;"
-                        label="Дата поступления" stack-label
-                        outlined dense emit-value map-options clearable
-                    >
-                        <template #selected-item="scope">
-                            <div v-if="scope.opt.value == 'manual'">
-                                <div v-html="formatSearchDate" />
-                            </div>
-                            <div v-else>
-                                {{ scope.opt.label }}
-                            </div>
-                        </template>
-
-                        <template #option="scope">
-                            <q-item v-bind="scope.itemProps" @click.stop.prevent="dateSelectItemClick(scope.opt.value)">
-                                <q-item-section>
-                                    <q-item-label>
-                                        {{ scope.opt.label }}
-                                    </q-item-label>
-                                </q-item-section>
-                            </q-item>
-                        </template>
-                    </q-select>
-
-                    <div class="q-mx-xs" />
-                    <q-input
-                        v-model="librateNames" :maxlength="inputMaxLength" :debounce="inputDebounce"
-                        class="q-mt-xs" :bg-color="inputBgColor()" input-style="cursor: pointer" style="width: 90px;" label="Оценка" stack-label outlined dense clearable readonly
-                        @click.stop.prevent="selectLibRate"
-                    >
-                        <template v-if="librateNames" #append>
-                            <q-icon name="la la-times-circle" class="q-field__focusable-action" @click.stop.prevent="search.librate = ''" />
-                        </template>
-
-                        <q-tooltip v-if="librateNames && showTooltips" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                            {{ librateNames }}
-                        </q-tooltip>
-                    </q-input>
-                </div>
-                <div v-show="!isExtendedSearch && !extendedParams && extendedParamsMessage" class="row q-mx-md items-center clickable" @click.stop.prevent="extendedParams = true">
-                    +{{ extendedParamsMessage }}
-                </div>
-
-                <div v-show="isExtendedSearch" class="row q-mx-md q-mb-xs items-center">
-                    <q-input
-                        v-model="extSearchNames"
-                        class="col q-mt-xs" :bg-color="inputBgColor('extended')" input-style="cursor: pointer"
-                        style="min-width: 200px; max-width: 638px;" label="Расширенный поиск" stack-label outlined dense clearable readonly
-                        @click.stop.prevent="selectExtSearch"
-                    >
-                        <template v-if="extSearchNames" #append>
-                            <q-icon name="la la-times-circle" class="q-field__focusable-action" @click.stop.prevent="clearExtSearch" />
-                        </template>
-
-                        <q-tooltip v-if="extSearchNames && showTooltips" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                            {{ extSearchNames }}
-                        </q-tooltip>
-                    </q-input>
-
-                    <div class="q-mx-xs" />
-                    <DivBtn
-                        class="text-grey-8 bg-yellow-1 q-mt-xs" :size="30" round
-                        :disabled="!extSearch.author"
-                        @me-click="extToList('author')"
-                    >
-                        <div style="font-size: 130%">
-                            <b>А</b>
-                        </div>
-                        <template #tooltip>
-                            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                                В раздел "Авторы" с переносом значения author={{ extSearch.author }}
-                            </q-tooltip>
-                        </template>
-                    </DivBtn>
-
-                    <div class="q-mx-xs" />
-                    <DivBtn
-                        class="text-grey-8 bg-yellow-1 q-mt-xs" :size="30" round
-                        :disabled="!extSearch.series"
-                        @me-click="extToList('series')"
-                    >
-                        <div style="font-size: 130%">
-                            <b>С</b>
-                        </div>
-                        <template #tooltip>
-                            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                                В раздел "Серии" с переносом значения series={{ extSearch.series }}
-                            </q-tooltip>
-                        </template>
-                    </DivBtn>
-
-                    <div class="q-mx-xs" />
-                    <DivBtn
-                        class="text-grey-8 bg-yellow-1 q-mt-xs" :size="30" round
-                        :disabled="!extSearch.title"
-                        @me-click="extToList('title')"
-                    >
-                        <div style="font-size: 130%">
-                            <b>К</b>
-                        </div>
-                        <template #tooltip>
-                            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                                В раздел "Книги" с переносом значения title={{ extSearch.title }}
-                            </q-tooltip>
-                        </template>
-                    </DivBtn>
-
-                    <div class="q-mx-xs" />
-                    <DivBtn
-                        class="text-grey-8 bg-yellow-1 q-mt-xs" :size="30" :icon-size="24" round
-                        icon="la la-level-up-alt"
-                        @click.stop.prevent="cloneSearch"
-                    >
-                        <template #tooltip>
-                            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
-                                Клонировать поиск
-                            </q-tooltip>
-                        </template>
-                    </DivBtn>
-                </div>
+                </div><!-- 2 -->
             </div>
+            <!-- Tool Panel end -->
 
             <div class="row items-center q-ml-lg q-mt-sm">
-                <div style="width: 400px; height: 50px">
+                <div style="width: 400px;">
                     <PageScroller v-show="pageCount > 1" ref="pageScroller1" v-model="search.page" :page-count="pageCount" />
                 </div>
 
@@ -491,6 +517,7 @@ class Search {
     limit = 20;
     extendedParams = false;
     showJson = false;
+    showNewReleaseAvailable = true;
 
     //stuff
     prevList = {};
@@ -542,8 +569,16 @@ class Search {
 
     mounted() {
         (async() => {
+            //для срабатывания watch.config
             await this.api.updateConfig();
 
+            //устанавливаем uiDefaults от сервера, если это необходимо
+            if (!this.settings.defaultsSet) {
+                const uiDefaults = _.cloneDeep(this.config.uiDefaults);
+                uiDefaults.defaultsSet = true;
+                this.commit('setSettings', uiDefaults);
+            }
+
             this.generateDefaults(this.extSearch, this.recStruct.map(f => f.field));
             this.extSearch.setDefaults(this.extSearch);
             this.search.lang = this.langDefault;
@@ -584,6 +619,7 @@ class Search {
         this.abCacheEnabled = settings.abCacheEnabled;
         this.langDefault = settings.langDefault;
         this.showJson = settings.showJson;
+        this.showNewReleaseAvailable = settings.showNewReleaseAvailable;
     }
 
     recvMessage(d) {
@@ -593,6 +629,7 @@ class Search {
                     this.list.liberamaReady = true;
                     this.sendMessage({type: 'mes', data: 'ready'});
                     this.sendCurrentUrl();
+                    this.makeTitle();
                     break;
             }
         }
@@ -610,6 +647,10 @@ class Search {
         return this.$store.state.config;
     }
 
+    get newReleaseAvailable() {
+        return (this.config.latestVersion && this.config.version != this.config.latestVersion);
+    }
+
     get recStruct() {
         if (this.config.dbConfig && this.config.dbConfig.inpxInfo.recStruct)
             return this.config.dbConfig.inpxInfo.recStruct;
@@ -707,14 +748,19 @@ class Search {
     }
 
     openReleasePage() {
-        window.open('https://github.com/bookpauk/inpx-web/releases', '_blank');
+        if (this.config.latestReleaseLink)
+            window.open(this.config.latestReleaseLink, '_blank');
     }
 
     makeProjectName() {
         const collection = this.config.dbConfig.inpxInfo.collection.split('\n');
         this.collection = collection[0].trim();
 
-        this.projectName = `${this.config.name} v${this.config.webAppVersion}`;
+        let projectName = `${this.config.name} v${this.config.webAppVersion}`;
+        if (this.newReleaseAvailable)
+            projectName += `, доступно обновление: v${this.config.latestVersion}`;
+
+        this.projectName = projectName;
         this.makeTitle();
     }
 
@@ -789,6 +835,11 @@ class Search {
             Указание простого "#" в поиске по названию означает: найти всех авторов, названия книг которых начинаются не с русской или латинской буквы
         </li>
         <br>
+        <li>
+            "~" поиск по регулярному выражению. Например, для "~^\\s" в поле названия, будут найдены
+            все книги, названия которых начинаются с пробельного символа
+        </li>
+        <br>
         <li>
             "?" поиск пустых значений или тех, что начинаются с этого символа. Например, "?" в поле серии означает: найти всех авторов, у которых есть книги без серий
             или название серии начинается с "?".
@@ -902,6 +953,7 @@ class Search {
     
     onScroll() {
         const curScrollTop = this.$refs.scroller.scrollTop;
+        const toolPanelOffset = this.$refs.toolPanel.getBoundingClientRect().top;
 
         if (this.ignoreScrolling) {
             this.lastScrollTop = curScrollTop;
@@ -910,21 +962,27 @@ class Search {
             return;
         }
 
+        if (this.lastScrollTop === curScrollTop)
+            return; //если событие вызвано более 1 раза на 1 скролл
+
         if (!this.lastScrollTop)
             this.lastScrollTop = 0;
-        if (!this.lastScrollTop2)
-            this.lastScrollTop2 = 0;
 
-        if (curScrollTop - this.lastScrollTop > 0) {
+        if (curScrollTop - this.lastScrollTop > 0) { //страницу крутят вверх
+            if (this.$refs.toolPanel.style.position == 'sticky') //если блок приклеен к окну
+                this.$refs.toolPanel.style.top = `${this.lastScrollTop}px`;//приклеиваем его к позиции в родителе
+
             this.$refs.toolPanel.style.position = 'relative';
-            if (this.lastScrollTop2 <= curScrollTop - this.$refs.toolPanel.clientHeight)
-                this.lastScrollTop2 = 0;
+            (async() => {//"отложенная" коректировка, из-за артефактов в firefox
+                if (toolPanelOffset < -this.$refs.toolPanel.offsetHeight) { //не даём блоку оказаться дальше своей высоты за экраном
+                    await utils.sleep(10);
+                    this.$refs.toolPanel.style.top = `${curScrollTop - this.$refs.toolPanel.offsetHeight}px`;
+                }
+            })();
 
-            this.$refs.toolPanel.style.top = `${this.lastScrollTop2}px`;
-        } else {
+        } else if (toolPanelOffset >= 0) {
+            this.$refs.toolPanel.style.top = '0px';
             this.$refs.toolPanel.style.position = 'sticky';
-            this.$refs.toolPanel.style.top = 0;
-            this.lastScrollTop2 = curScrollTop;
         }
 
         this.lastScrollTop = curScrollTop;
@@ -934,14 +992,14 @@ class Search {
         this.ignoreScrolling = true;
         await utils.sleep(ms);
         await this.$nextTick();
-        await this.$nextTick();
-        await this.$nextTick();
         this.ignoreScrolling = false;
     }
 
     scrollToTop() {
         this.$refs.scroller.scrollTop = 0;
         this.lastScrollTop = 0;
+        this.$refs.toolPanel.style.top = '0px';
+        this.$refs.toolPanel.style.position = 'sticky';
     }
 
     updatePageCount() {

client/components/Search/SelectExtSearchDialog/SelectExtSearchDialog.vue

@@ -6,7 +6,7 @@
                     Расширенный поиск
                 </div>
 
-                <DivBtn class="q-ml-md text-white bg-secondary" :size="30" :icon-size="24" icon="la la-question" round @click.stop.prevent="showSearchHelp">
+                <DivBtn class="q-ml-sm text-grey-5 bg-yellow-1" :size="28" :icon-size="24" icon="la la-question" round @click.stop.prevent="showSearchHelp">
                     <template #tooltip>
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
                             Памятка
@@ -160,6 +160,9 @@ class SelectExtSearchDialog {
         <li>
             префикс "#": поиск подстроки в строке, но только среди начинающихся не с латинского или кириллического символа
         </li>
+        <li>
+            префикс "~": поиск по регулярному выражению
+        </li>
         <li>
             префикс "?": поиск пустых значений или тех, что начинаются с этого символа
         </li>

client/components/Search/SettingsDialog/SettingsDialog.vue

@@ -19,6 +19,7 @@
                 />
             </div>
 
+            <q-checkbox v-show="config.latestVersion" v-model="showNewReleaseAvailable" size="36px" label="Уведомлять о выходе новой версии" />
             <q-checkbox v-model="downloadAsZip" size="36px" label="Скачивать книги в виде zip-архива" />
             <q-checkbox v-model="showCounts" size="36px" label="Показывать количество" />
             <q-checkbox v-model="showRates" size="36px" label="Показывать оценки" />
@@ -85,6 +86,9 @@ const componentOptions = {
         abCacheEnabled(newValue) {
             this.commit('setSettings', {'abCacheEnabled': newValue});
         },
+        showNewReleaseAvailable(newValue) {
+            this.commit('setSettings', {'showNewReleaseAvailable': newValue});
+        },
     }
 };
 class SettingsDialog {
@@ -105,6 +109,7 @@ class SettingsDialog {
     showDates = true;
     showDeleted = false;
     abCacheEnabled = true;
+    showNewReleaseAvailable = true;
 
     limitOptions = [
         {label: '10', value: 10},
@@ -125,6 +130,10 @@ class SettingsDialog {
     mounted() {
     }
 
+    get config() {
+        return this.$store.state.config;
+    }
+
     get settings() {
         return this.$store.state.settings;
     }
@@ -142,6 +151,7 @@ class SettingsDialog {
         this.showDates = settings.showDates;
         this.showDeleted = settings.showDeleted;
         this.abCacheEnabled = settings.abCacheEnabled;
+        this.showNewReleaseAvailable = settings.showNewReleaseAvailable;
     }
 
     okClick() {

client/components/share/DivBtn.vue

@@ -32,6 +32,7 @@ class DivBtn {
         round: Boolean,
         imt:  { type: Number, default: 0 },// icon margin top
         disabled: Boolean,
+        noShadow: Boolean,
     };
 
     pressed = false;
@@ -56,6 +57,9 @@ class DivBtn {
             style.borderRadius = `${this.size}px`;
         else
             style.borderRadius = `${this.size/10}px`;
+
+        if (!this.noShadow)
+            style.boxShadow = '0.5px 1px 3px #333333';
     }
 
     async clickEffect(event) {
@@ -77,7 +81,6 @@ export default vueComponent(DivBtn);
 <style scoped>
 .button {
     position: relative;
-    box-shadow: 0.5px 1px 3px #333333;
 }
 
 .button:hover {
@@ -86,8 +89,10 @@ export default vueComponent(DivBtn);
 }
 
 .button-pressed {
-    margin-left: 2px;
-    margin-top: 2px;
+    margin-left: 1px;
+    margin-top: 1px;
+    margin-right: -1px;
+    margin-bottom: -1px;
 }
 
 .clickable {

client/store/root.js

@@ -4,9 +4,13 @@ const state = {
     settings: {
         accessToken: '',
         extendedParams: false,
-        limit: 20,
         expandedAuthor: [],
         expandedSeries: [],
+
+        defaultsSet: false,
+        
+        //uiDefaults
+        limit: 20,
         downloadAsZip: false,
         showCounts: true,
         showRates: true,
@@ -17,6 +21,7 @@ const state = {
         abCacheEnabled: true,
         langDefault: '',
         showJson: false,
+        showNewReleaseAvailable: true,
     },    
 };
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "inpx-web",
-  "version": "1.4.0",
+  "version": "1.5.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "inpx-web",
-      "version": "1.4.0",
+      "version": "1.5.3",
       "hasInstallScript": true,
       "license": "CC0-1.0",
       "dependencies": {
@@ -19,7 +19,7 @@
         "fs-extra": "^10.1.0",
         "he": "^1.2.0",
         "iconv-lite": "^0.6.3",
-        "jembadb": "^5.1.5",
+        "jembadb": "^5.1.7",
         "localforage": "^1.10.0",
         "lodash": "^4.17.21",
         "minimist": "^1.2.7",
@@ -5071,9 +5071,9 @@
       }
     },
     "node_modules/jembadb": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/jembadb/-/jembadb-5.1.5.tgz",
-      "integrity": "sha512-Vb+TkTg3JVXLPTG5BiqboZjJ2wvZRONnLd2+qU4gTuaqt2JSniigbniKSl3kACAEFfuRXEjfs9dLlKWjBX2Aiw==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/jembadb/-/jembadb-5.1.7.tgz",
+      "integrity": "sha512-TNZjiKQ7Zfh89Q1x25PKKtsbkxiC5uOnx953dxJEP6RqfcdR6uVpr4cf+kmyq6IQ1GhwhXTELnoTIdvLWrpEvw==",
       "engines": {
         "node": ">=16.16.0"
       }
@@ -12617,9 +12617,9 @@
       "dev": true
     },
     "jembadb": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/jembadb/-/jembadb-5.1.5.tgz",
-      "integrity": "sha512-Vb+TkTg3JVXLPTG5BiqboZjJ2wvZRONnLd2+qU4gTuaqt2JSniigbniKSl3kACAEFfuRXEjfs9dLlKWjBX2Aiw=="
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/jembadb/-/jembadb-5.1.7.tgz",
+      "integrity": "sha512-TNZjiKQ7Zfh89Q1x25PKKtsbkxiC5uOnx953dxJEP6RqfcdR6uVpr4cf+kmyq6IQ1GhwhXTELnoTIdvLWrpEvw=="
     },
     "jest-util": {
       "version": "29.3.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inpx-web",
-  "version": "1.4.0",
+  "version": "1.5.3",
   "author": "Book Pauk <bookpauk@gmail.com>",
   "license": "CC0-1.0",
   "repository": "bookpauk/inpx-web",
@@ -61,7 +61,7 @@
     "fs-extra": "^10.1.0",
     "he": "^1.2.0",
     "iconv-lite": "^0.6.3",
-    "jembadb": "^5.1.5",
+    "jembadb": "^5.1.7",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.7",

server/config/base.js

@@ -6,9 +6,12 @@ const execDir = path.resolve(__dirname, '..');
 module.exports = {
     branch: 'unknown',
     version: pckg.version,
+    latestVersion: '',
     name: pckg.name,
 
     execDir,
+    libDir: '',
+    inpx: '',
 
     accessPassword: '',
     accessTimeout: 0,
@@ -17,8 +20,8 @@ module.exports = {
     loggingEnabled: true,
 
     //поправить в случае, если были критические изменения в DbCreator или InpxParser
-    //иначе будет рассинхронизация между сервером и клиентом на уровне БД
-    dbVersion: '10',
+    //иначе будет рассинхронизация по кешу между сервером и клиентом на уровне БД
+    dbVersion: '11',
     dbCacheSize: 5,
 
     maxPayloadSize: 500,//in MB
@@ -31,7 +34,7 @@ module.exports = {
     lowMemoryMode: false,
     fullOptimization: false,
 
-    webConfigParams: ['name', 'version', 'branch', 'bookReadLink', 'dbVersion', 'extendedSearch'],
+    webConfigParams: ['name', 'version', 'latestVersion', 'branch', 'bookReadLink', 'dbVersion', 'extendedSearch', 'latestReleaseLink', 'uiDefaults'],
 
     allowRemoteLib: false,
     remoteLib: false,
@@ -55,5 +58,23 @@ module.exports = {
         password: '',
         root: '/opds',
     },
+
+    latestReleaseLink: 'https://github.com/bookpauk/inpx-web/releases/latest',
+    checkReleaseLink: 'https://api.github.com/repos/bookpauk/inpx-web/releases/latest',
+
+    uiDefaults: {
+        limit: 20,
+        downloadAsZip: false,
+        showCounts: true,
+        showRates: true,
+        showInfo: true,
+        showGenres: true,
+        showDates: false,
+        showDeleted: false,
+        abCacheEnabled: true,
+        langDefault: '',
+        showJson: false,
+        showNewReleaseAvailable: true,
+    },
 };
 

server/config/index.js

@@ -5,6 +5,8 @@ const fs = require('fs-extra');
 const branchFilename = __dirname + '/application_env';
 
 const propsToSave = [
+    'libDir',
+    'inpx',
     'accessPassword',
     'accessTimeout',
     'extendedSearch',
@@ -23,6 +25,9 @@ const propsToSave = [
     'remoteLib',
     'server',
     'opds',
+    'latestReleaseLink',
+    'checkReleaseLink',
+    'uiDefaults',
 ];
 
 let instance = null;

server/core/DbCreator.js

@@ -337,7 +337,7 @@ class DbCreator {
         //сохраним поисковые таблицы
         const chunkSize = 10000;
 
-        const saveTable = async(table, arr, nullArr, indexType = 'string') => {
+        const saveTable = async(table, arr, nullArr, indexType = 'string', delEmpty = false) => {
             
             if (indexType == 'string')
                 arr.sort((a, b) => a.value.localeCompare(b.value));
@@ -366,6 +366,13 @@ class DbCreator {
                 callback({progress: i/arr.length});                
             }
 
+            if (delEmpty) {
+                const delResult = await db.delete({table, where: `@@indexLR('value', '?', '?')`});
+                const statField = `${table}Count`;
+                if (stats[statField])
+                    stats[statField] -= delResult.deleted;
+            }
+
             nullArr();
             await db.close({table});
             utils.freeMemory();
@@ -378,7 +385,7 @@ class DbCreator {
 
         //series
         callback({job: 'series save', jobMessage: 'Сохранение индекса серий', jobStep: 4, progress: 0});
-        await saveTable('series', seriesArr, () => {seriesArr = null});
+        await saveTable('series', seriesArr, () => {seriesArr = null}, 'string', true);
 
         //title
         callback({job: 'title save', jobMessage: 'Сохранение индекса названий', jobStep: 5, progress: 0});

server/core/DbSearcher.js

@@ -63,8 +63,18 @@ class DbSearcher {
             a = a.substring(1);
             where = `@indexIter('value', (v) => {
                 const enru = new Set(${db.esc(enruArr)});
-                return !v || (v !== ${db.esc(emptyFieldValue)} && !enru.has(v[0]) && v.indexOf(${db.esc(a)}) >= 0);
+                if (!v)
+                    return false;
+                return v !== ${db.esc(emptyFieldValue)} && !enru.has(v[0]) && v.indexOf(${db.esc(a)}) >= 0;
             })`;
+        } else if (a[0] == '~') {//RegExp
+            a = a.substring(1);
+            where = `
+                await (async() => {
+                    const re = new RegExp(${db.esc(a)}, 'i');
+                    @@indexIter('value', (v) => re.test(v) );
+                })()
+            `;
         } else {
             where = `@dirtyIndexLR('value', ${db.esc(a)}, ${db.esc(a + maxUtf8Char)})`;
         }
@@ -99,7 +109,7 @@ class DbSearcher {
         };
 
         //авторы
-        if (query.author && query.author !== '*') {
+        if (query.author) {
             const key = `book-ids-author-${query.author}`;
             let ids = await this.getCached(key);
 
@@ -113,7 +123,7 @@ class DbSearcher {
         }
 
         //серии
-        if (query.series && query.series !== '*') {
+        if (query.series) {
             const key = `book-ids-series-${query.series}`;
             let ids = await this.getCached(key);
 
@@ -127,7 +137,7 @@ class DbSearcher {
         }
 
         //названия
-        if (query.title && query.title !== '*') {
+        if (query.title) {
             const key = `book-ids-title-${query.title}`;
             let ids = await this.getCached(key);
 
@@ -337,7 +347,7 @@ class DbSearcher {
         //то в выборку по bookId могут попасть авторы, которые отсутствуют в критерии query.author,
         //поэтому дополнительно фильтруем
         let result = null;
-        if (from == 'author' && query.author && query.author !== '*') {
+        if (from == 'author' && query.author) {
             const key = `filter-ids-author-${query.author}`;
             let authorIds = await this.getCached(key);
 
@@ -562,6 +572,15 @@ class DbSearcher {
 
                     searchValue = searchValue.substring(1);
                     return `(row.${bookField} === '' || (!enru.has(row.${bookField}.toLowerCase()[0]) && row.${bookField}.toLowerCase().indexOf(${db.esc(searchValue)}) >= 0))`;
+                } else if (searchValue[0] == '~') {//RegExp
+                    searchValue = searchValue.substring(1);
+
+                    return `
+                        (() => {
+                            const re = new RegExp(${db.esc(searchValue)}, 'i');
+                            return re.test(row.${bookField});
+                        })()
+                    `;
                 } else {
 
                     return `(row.${bookField}.toLowerCase().localeCompare(${db.esc(searchValue)}) >= 0 ` +

server/core/WebWorker.js

@@ -10,6 +10,7 @@ const DbCreator = require('./DbCreator');
 const DbSearcher = require('./DbSearcher');
 const InpxHashCreator = require('./InpxHashCreator');
 const RemoteLib = require('./RemoteLib');//singleton
+const FileDownloader = require('./FileDownloader');
 
 const asyncExit = new (require('./AsyncExit'))();
 const log = new (require('./AppLogger'))().log;//singleton
@@ -28,7 +29,8 @@ const stateToText = {
     [ssDbCreating]: 'Создание поисковой базы',
 };
 
-const cleanDirPeriod = 60*60*1000;//каждый час
+const cleanDirInterval = 60*60*1000;//каждый час
+const checkReleaseInterval = 2*60*60*1000;//каждые 2 часа
 
 //singleton
 let instance = null;
@@ -67,6 +69,7 @@ class WebWorker {
 
             this.periodicCleanDir(dirConfig);//no await
             this.periodicCheckInpx();//no await
+            this.periodicCheckNewRelease();//no await
 
             instance = this;
         }
@@ -433,20 +436,28 @@ class WebWorker {
             const db = this.db;
             let link = '';
 
-            //найдем bookPath и downFileName
+            //найдем downFileName и bookPath
             let rows = await db.select({table: 'book', where: `@@hash('_uid', ${db.esc(bookUid)})`});
             if (!rows.length)
                 throw new Error('404 Файл не найден');
 
             const book = rows[0];
             let downFileName = book.file;
-            const author = book.author.split(',');
-            const at = [author[0], book.title];
-            downFileName = utils.makeValidFileNameOrEmpty(at.filter(r => r).join(' - '))
+            const authors = book.author.split(',');
+            let author = authors[0];
+            author = author.split(' ').filter(r => r.trim());
+            for (let i = 1; i < author.length; i++)
+                author[i] = `${(i === 1 ? ' ' : '')}${author[i][0]}.`;
+            if (authors.length > 1)
+                author.push(' и др.');
+
+            const at = [author.join(''), (book.title ? `_${book.title}` : '')];
+            downFileName = utils.makeValidFileNameOrEmpty(at.filter(r => r).join(''))
                 || utils.makeValidFileNameOrEmpty(at[0])
                 || utils.makeValidFileNameOrEmpty(at[1])
                 || downFileName;
-            downFileName = downFileName.substring(0, 100);
+            if (downFileName.length > 50)
+                downFileName = `${downFileName.substring(0, 50)}_`;
 
             const ext = `.${book.ext}`;
             if (downFileName.substring(downFileName.length - ext.length) != ext)
@@ -630,7 +641,7 @@ class WebWorker {
             let lastCleanDirTime = 0;
             while (1) {// eslint-disable-line no-constant-condition
                 //чистка папок
-                if (Date.now() - lastCleanDirTime >= cleanDirPeriod) {
+                if (Date.now() - lastCleanDirTime >= cleanDirInterval) {
                     for (const config of dirConfig) {
                         try {
                             await this.cleanDir(config);
@@ -682,6 +693,27 @@ class WebWorker {
             await utils.sleep(inpxCheckInterval*60*1000);
         }
     }
+
+    async periodicCheckNewRelease() {
+        const checkReleaseLink = this.config.checkReleaseLink;
+        if (!checkReleaseLink)
+            return;
+        const down = new FileDownloader(1024*1024);
+
+        while (1) {// eslint-disable-line no-constant-condition
+            try {
+                let release = await down.load(checkReleaseLink);
+                release = JSON.parse(release.toString());
+
+                if (release.tag_name)
+                    this.config.latestVersion = release.tag_name;
+            } catch(e) {
+                log(LM_ERR, `periodicCheckNewRelease: ${e.message}`);
+            }
+
+            await utils.sleep(checkReleaseInterval);
+        }
+    }
 }
 
 module.exports = WebWorker;

server/core/ZipReader.js

@@ -1,4 +1,4 @@
-const StreamZip = require('node-stream-zip');
+const StreamUnzip = require('node-stream-zip');
 
 class ZipReader {
     constructor() {
@@ -14,7 +14,7 @@ class ZipReader {
         if (this.zip)
             throw new Error('Zip file is already open');
 
-         const zip = new StreamZip.async({file: zipFile, skipEntryNameValidation: true});
+         const zip = new StreamUnzip.async({file: zipFile, skipEntryNameValidation: true});
          
         if (zipEntries)
             this.zipEntries = await zip.entries();

server/core/opds/AuthorPage.js

@@ -66,7 +66,7 @@ class AuthorPage extends BasePage {
             author: req.query.author || '',
             series: req.query.series || '',
             genre: req.query.genre || '',
-            del: 0,
+            del: '0',
             
             all: req.query.all || '',
             depth: 0,
@@ -86,7 +86,7 @@ class AuthorPage extends BasePage {
 
             if (bookList.books) {
                 let books = bookList.books;
-                const booksAll = this.filterBooks(books, {del: 0});
+                const booksAll = this.filterBooks(books);
                 const filtered = (query.all ? booksAll : this.filterBooks(books, query));
                 const sorted = this.sortSeriesBooks(filtered);
 

server/core/opds/BasePage.js

@@ -20,6 +20,13 @@ class BasePage {
         this.webWorker = new WebWorker(config);
         this.rootTag = 'feed';
         this.opdsRoot = config.opdsRoot;
+
+        this.showDeleted = false;
+    }
+
+    escape(s) {
+        //костыль для koreader, не понимает hex-экранирование вида '
+        return he.escape(s).replace(/'/g, ''').replace(/`/g, '`');
     }
 
     makeEntry(entry = {}) {
@@ -28,7 +35,7 @@ class BasePage {
         if (!entry.title)
             throw new Error('makeEntry: no title');
 
-        entry.title = he.escape(entry.title);
+        entry.title = this.escape(entry.title);
 
         const result = {
             updated: (new Date()).toISOString().substring(0, 19) + 'Z',
@@ -46,7 +53,7 @@ class BasePage {
     }
 
     makeLink(attrs) {
-        attrs.href = he.escape(attrs.href);
+        attrs.href = this.escape(attrs.href);
         return {'*ATTRS': attrs};
     }
 
@@ -213,7 +220,7 @@ class BasePage {
     }
 
     //скопировано из BaseList.js, часть функционала не используется
-    filterBooks(books, query) {
+    filterBooks(books, query = {}) {
         const s = query;
 
         const splitAuthor = (author) => {
@@ -250,7 +257,14 @@ class BasePage {
             } else if (searchValue[0] == '#') {
 
                 searchValue = searchValue.substring(1);
-                return !bookValue || (bookValue !== emptyFieldValue && !enru.has(bookValue[0]) && bookValue.indexOf(searchValue) >= 0);
+                if (!bookValue)
+                    return false;
+                return bookValue !== emptyFieldValue && !enru.has(bookValue[0]) && bookValue.indexOf(searchValue) >= 0;
+            } else if (searchValue[0] == '~') {//RegExp
+
+                searchValue = searchValue.substring(1);
+                const re = new RegExp(searchValue, 'i');
+                return re.test(bookValue);
             } else {
                 //where = `@dirtyIndexLR('value', ${db.esc(a)}, ${db.esc(a + maxUtf8Char)})`;
                 return bookValue.localeCompare(searchValue) >= 0 && bookValue.localeCompare(searchValue + maxUtf8Char) <= 0;

server/core/opds/BookPage.js

@@ -1,6 +1,5 @@
 const path = require('path');
 const _ = require('lodash');
-const he = require('he');
 const dayjs = require('dayjs');
 
 const BasePage = require('./BasePage');
@@ -131,15 +130,15 @@ class BookPage extends BasePage {
 
                 //format
                 const ext = bookInfo.book.ext;
-                let fileFormat = `${ext}+zip`;
-                let downHref = bookInfo.link;
+                const formats = {
+                    [`${ext}+zip`]: `${bookInfo.link}/zip`,
+                    [ext]: bookInfo.link,
+                };
 
                 if (ext === 'mobi') {
-                    fileFormat = 'x-mobipocket-ebook';
+                    formats['x-mobipocket-ebook'] = bookInfo.link;
                 } else if (ext == 'epub') {
-                    //
-                } else {
-                    downHref = `${bookInfo.link}/zip`;
+                    formats[`${ext}+zip`] = bookInfo.link;
                 }
 
                 //entry
@@ -148,8 +147,13 @@ class BookPage extends BasePage {
                     title: bookInfo.book.title || 'Без названия',
                 });
 
+                //author bookInfo
+                if (bookInfo.book.author) {
+                    e.author = bookInfo.book.author.split(',').map(a => ({name: a}));
+                }
+
                 e['dc:language'] = bookInfo.book.lang;
-                e['dc:format'] = fileFormat;
+                e['dc:format'] = ext;
 
                 //genre
                 const genre = bookInfo.book.genre.split(',');
@@ -173,7 +177,8 @@ class BookPage extends BasePage {
                     const infoObj = parser.bookInfo();
 
                     if (infoObj.titleInfo) {
-                        if (infoObj.titleInfo.author.length) {
+                        //author fb2Info
+                        if (!e.author && infoObj.titleInfo.author.length) {
                             e.author = infoObj.titleInfo.author.map(a => ({name: a}));
                         }
 
@@ -190,12 +195,15 @@ class BookPage extends BasePage {
                 if (content) {
                     e.content = {
                         '*ATTRS': {type: 'text/html'},
-                        '*TEXT': he.escape(content),
+                        '*TEXT': this.escape(content),
                     };
                 }
 
                 //links
-                e.link = [ this.downLink({href: downHref, type: `application/${fileFormat}`}) ];
+                e.link = [];
+                for (const [fileFormat, downHref] of Object.entries(formats))
+                    e.link.push(this.downLink({href: downHref, type: `application/${fileFormat}`}));
+
                 if (bookInfo.cover) {
                     let coverType = 'image/jpeg';
                     if (path.extname(bookInfo.cover) == '.png')

server/core/opds/GenrePage.js

@@ -13,13 +13,17 @@ class GenrePage extends BasePage {
         const result = {};
 
         const query = {
-            from: req.query.from || '',
+            from: req.query.from || 'search',
+            term: req.query.term || '',
             section: req.query.section || '',
         };
 
+        let searchQuery = '';
+        if (query.from == 'search')
+            searchQuery = `&type=title&term=${encodeURIComponent(query.term)}`;
+
         const entry = [];
         if (query.from) {
-
             if (query.section) {
                 //выбираем подразделы
                 const {genreSection} = await this.getGenres();
@@ -34,7 +38,7 @@ class GenrePage extends BasePage {
                             this.makeEntry({
                                 id: ++id,
                                 title: g.name,
-                                link: this.navLink({href: `/${encodeURIComponent(query.from)}?genre=${encodeURIComponent(g.value)}`}),
+                                link: this.navLink({href: `/${encodeURIComponent(query.from)}?genre=${encodeURIComponent(g.value)}${searchQuery}`}),
                             })
                         );
                     }
@@ -43,7 +47,7 @@ class GenrePage extends BasePage {
                         this.makeEntry({
                             id: 'whole_section',
                             title: '[Весь раздел]',
-                            link: this.navLink({href: `/${encodeURIComponent(query.from)}?genre=${encodeURIComponent(all.join(','))}`}),
+                            link: this.navLink({href: `/${encodeURIComponent(query.from)}?genre=${encodeURIComponent(all.join(','))}${searchQuery}`}),
                         })
                     );
                 }
@@ -56,7 +60,7 @@ class GenrePage extends BasePage {
                         this.makeEntry({
                             id: ++id,
                             title: section.name,
-                            link: this.navLink({href: `/genre?from=${encodeURIComponent(query.from)}&section=${encodeURIComponent(section.name)}`}),
+                            link: this.navLink({href: `/genre?from=${encodeURIComponent(query.from)}&section=${encodeURIComponent(section.name)}${searchQuery}`}),
                         })
                     );
                 }

server/core/opds/RootPage.js

@@ -2,6 +2,7 @@ const BasePage = require('./BasePage');
 const AuthorPage = require('./AuthorPage');
 const SeriesPage = require('./SeriesPage');
 const TitlePage = require('./TitlePage');
+const GenrePage = require('./GenrePage');
 
 class RootPage extends BasePage {
     constructor(config) {
@@ -13,6 +14,7 @@ class RootPage extends BasePage {
         this.authorPage = new AuthorPage(config);
         this.seriesPage = new SeriesPage(config);
         this.titlePage = new TitlePage(config);
+        this.genrePage = new GenrePage(config);
     }
 
     async body(req) {
@@ -30,6 +32,7 @@ class RootPage extends BasePage {
             this.authorPage.myEntry(),
             this.seriesPage.myEntry(),
             this.titlePage.myEntry(),
+            this.genrePage.myEntry(),
         ];
 
         return this.makeBody(result, req);

server/core/opds/SearchHelpPage.js

@@ -1,5 +1,3 @@
-const he = require('he');
-
 const BasePage = require('./BasePage');
 
 class SearchHelpPage extends BasePage {
@@ -31,6 +29,9 @@ class SearchHelpPage extends BasePage {
     <li>
         префикс "#": поиск подстроки в строке, но только среди значений, начинающихся не с латинского или кириллического символа
     </li>
+    <li>
+        префикс "~": поиск по регулярному выражению
+    </li>
     <li>
         префикс "?": поиск пустых значений или тех, что начинаются с этого символа
     </li>
@@ -42,7 +43,7 @@ class SearchHelpPage extends BasePage {
                 title: this.title,
                 content: {
                     '*ATTRS': {type: 'text/html'},
-                    '*TEXT': he.escape(content),
+                    '*TEXT': this.escape(content),
                 },
                 link: [
                     this.downLink({href: '/book/fake-link', type: `application/fb2+zip`})

server/core/opds/SearchPage.js

@@ -1,5 +1,6 @@
 const BasePage = require('./BasePage');
 const utils = require('../utils');
+const iconv = require('iconv-lite');
 
 class SearchPage extends BasePage {
     constructor(config) {
@@ -15,46 +16,64 @@ class SearchPage extends BasePage {
         const query = {
             type: req.query.type || '',
             term: req.query.term || '',
+            genre: req.query.genre || '',
             page: parseInt(req.query.page, 10) || 1,
         };
 
         let entry = [];
         if (query.type) {
             if (['author', 'series', 'title'].includes(query.type)) {
-                const from = query.type;
-                const page = query.page;
+                try {
+                    const from = query.type;
+                    const page = query.page;
 
-                const limit = 100;
-                const offset = (page - 1)*limit;
-                const queryRes = await this.webWorker.search(from, {[from]: query.term, del: 0, offset, limit});
+                    const limit = 100;
+                    const offset = (page - 1)*limit;
 
-                const found = queryRes.found;
+                    const searchQuery = {[from]: query.term, genre: query.genre, del: '0', offset, limit};
+                    let queryRes = await this.webWorker.search(from, searchQuery);
+                    
+                    if (queryRes.totalFound === 0) { // не нашли ничего, проверим, может term в кодировке ISO-8859-1 (баг koreader)
+                        searchQuery[from] = iconv.encode(query.term, 'ISO-8859-1').toString();
+                        queryRes = await this.webWorker.search(from, searchQuery);
+                    }
 
-                for (let i = 0; i < found.length; i++) {
-                    const row = found[i];
-                    if (!row.bookCount)
-                        continue;
+                    const found = queryRes.found;
 
+                    for (let i = 0; i < found.length; i++) {
+                        const row = found[i];
+                        if (!row.bookCount)
+                            continue;
+
+                        entry.push(
+                            this.makeEntry({
+                                id: row.id,
+                                title: `${(from === 'series' ? 'Серия: ': '')}${from === 'author' ? this.bookAuthor(row[from]) : row[from]}`,
+                                link: this.navLink({href: `/${from}?${from}==${encodeURIComponent(row[from])}`}),
+                                content: {
+                                    '*ATTRS': {type: 'text'},
+                                    '*TEXT': `${row.bookCount} книг${utils.wordEnding(row.bookCount, 8)}`,
+                                },
+                            }),
+                        );
+                    }
+
+                    if (queryRes.totalFound > offset + found.length) {
+                        entry.push(
+                            this.makeEntry({
+                                id: 'next_page',
+                                title: '[Следующая страница]',
+                                link: this.navLink({href: `/${this.id}?type=${from}&term=${encodeURIComponent(query.term)}&genre=${encodeURIComponent(query.genre)}&page=${page + 1}`}),
+                            })
+                        );
+                    }
+                } catch(e) {
                     entry.push(
                         this.makeEntry({
-                            id: row.id,
-                            title: `${(from === 'series' ? 'Серия: ': '')}${from === 'author' ? this.bookAuthor(row[from]) : row[from]}`,
-                            link: this.navLink({href: `/${from}?${from}==${encodeURIComponent(row[from])}`}),
-                            content: {
-                                '*ATTRS': {type: 'text'},
-                                '*TEXT': `${row.bookCount} книг${utils.wordEnding(row.bookCount, 8)}`,
-                            },
-                        }),
-                    );
-                }
-
-                if (queryRes.totalFound > offset + found.length) {
-                    entry.push(
-                        this.makeEntry({
-                            id: 'next_page',
-                            title: '[Следующая страница]',
-                            link: this.navLink({href: `/${this.id}?type=${from}&term=${encodeURIComponent(query.term)}&page=${page + 1}`}),
-                        }),
+                            id: 'error',
+                            title: `Ошибка: ${e.message}`,
+                            link: this.navLink({href: `/fake-error-link`}),
+                        })
                     );
                 }
             }
@@ -88,6 +107,15 @@ class SearchPage extends BasePage {
                         '*TEXT': `Искать по названиям книг`,
                     },
                 }),
+                this.makeEntry({
+                    id: 'search_genre',
+                    title: 'Поиск книг в жанре',
+                    link: this.navLink({href: `/genre?from=search&term=${encodeURIComponent(query.term)}`}),
+                    content: {
+                        '*ATTRS': {type: 'text'},
+                        '*TEXT': `Искать по названиям книг в выбранном жанре`,
+                    },
+                }),
                 this.makeEntry({
                     id: 'search_help',
                     title: '[Памятка по поиску]',

server/core/opds/SeriesPage.js

@@ -26,7 +26,7 @@ class SeriesPage extends BasePage {
         const query = {
             series: req.query.series || '',
             genre: req.query.genre || '',
-            del: 0,
+            del: '0',
             
             all: req.query.all || '',
             depth: 0,
@@ -46,7 +46,7 @@ class SeriesPage extends BasePage {
 
             if (bookList.books) {
                 let books = bookList.books;
-                const booksAll = this.filterBooks(books, {del: 0});
+                const booksAll = this.filterBooks(books);
                 const filtered = (query.all ? booksAll : this.filterBooks(books, query));
                 const sorted = this.sortSeriesBooks(filtered);
 

server/core/opds/TitlePage.js

@@ -15,7 +15,7 @@ class TitlePage extends BasePage {
         const query = {
             title: req.query.title || '',
             genre: req.query.genre || '',
-            del: 0,
+            del: '0',
             
             depth: 0,
         };

server/core/opds/index.js

@@ -11,6 +11,8 @@ const OpensearchPage = require('./OpensearchPage');
 const SearchPage = require('./SearchPage');
 const SearchHelpPage = require('./SearchHelpPage');
 
+const log = new (require('../AppLogger'))().log;//singleton
+
 module.exports = function(app, config) {
     if (!config.opds || !config.opds.enabled)
         return;
@@ -63,10 +65,8 @@ module.exports = function(app, config) {
                 next();
             }
         } catch (e) {
+            log(LM_ERR, `OPDS: ${e.message}, url: ${req.originalUrl}`);
             res.status(500).send({error: e.message});
-            if (config.branch == 'development') {
-                console.error({error: e.message, url: req.originalUrl});
-            }
         }
     };
 

server/index.js

@@ -16,16 +16,16 @@ let branch = '';
 const argvStrings = ['host', 'port', 'app-dir', 'lib-dir', 'inpx'];
 
 function showHelp(defaultConfig) {
-    console.log(utils.versionText(config));
+    console.log(utils.versionText(defaultConfig));
     console.log(
-`Usage: ${config.name} [options]
+`Usage: ${defaultConfig.name} [options]
 
 Options:
-  --help              Print ${config.name} command line options
+  --help              Print ${defaultConfig.name} command line options
   --host=<ip>         Set web server host, default: ${defaultConfig.server.host}
   --port=<port>       Set web server port, default: ${defaultConfig.server.port}
-  --app-dir=<dirpath> Set application working directory, default: <execDir>/.${config.name}
-  --lib-dir=<dirpath> Set library directory, default: the same as ${config.name} executable's
+  --app-dir=<dirpath> Set application working directory, default: <execDir>/.${defaultConfig.name}
+  --lib-dir=<dirpath> Set library directory, default: the same as ${defaultConfig.name} executable's
   --inpx=<filepath>   Set INPX collection file, default: the one that found in library dir
   --recreate          Force recreation of the search database on start
 `
@@ -84,7 +84,7 @@ async function init() {
     }
 
     if (!config.remoteLib) {
-        const libDir = argv['lib-dir'];
+        const libDir = argv['lib-dir'] || config.libDir;
         if (libDir) {
             if (await fs.pathExists(libDir)) {
                 config.libDir = libDir;
@@ -95,11 +95,12 @@ async function init() {
             config.libDir = config.execDir;
         }
 
-        if (argv.inpx) {
-            if (await fs.pathExists(argv.inpx)) {
-                config.inpxFile = argv.inpx;
+        const inpxFile = argv.inpx || config.inpx;
+        if (inpxFile) {
+            if (await fs.pathExists(inpxFile)) {
+                config.inpxFile = inpxFile;
             } else {
-                throw new Error(`File "${argv.inpx}" not found`);
+                throw new Error(`File "${inpxFile}" not found`);
             }
         } else {
             const inpxFiles = [];