diff --git a/komga-webui/src/components/SearchBox.vue b/komga-webui/src/components/SearchBox.vue index 4e15e0de..2b16198c 100644 --- a/komga-webui/src/components/SearchBox.vue +++ b/komga-webui/src/components/SearchBox.vue @@ -202,7 +202,7 @@ export default Vue.extend({ searchItems: debounce(async function (this: any, query: string) { if (query) { this.loading = true - this.series = (await this.$komgaSeries.getSeries(undefined, {size: this.pageSize}, query)).content + this.series = (await this.$komgaSeries.getSeries(undefined, {size: this.pageSize}, query, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, false)).content this.books = (await this.$komgaBooks.getBooks(undefined, {size: this.pageSize}, query)).content this.collections = (await this.$komgaCollections.getCollections(undefined, {size: this.pageSize}, query)).content this.readLists = (await this.$komgaReadLists.getReadLists(undefined, {size: this.pageSize}, query)).content diff --git a/komga-webui/src/components/dialogs/SeriesPickerDialog.vue b/komga-webui/src/components/dialogs/SeriesPickerDialog.vue index 68c49d0a..cd7a66b5 100644 --- a/komga-webui/src/components/dialogs/SeriesPickerDialog.vue +++ b/komga-webui/src/components/dialogs/SeriesPickerDialog.vue @@ -123,7 +123,7 @@ export default Vue.extend({ searchItems: debounce(async function (this: any, query: string) { if (query) { this.showResults = false - this.results = (await this.$komgaSeries.getSeries(undefined, {unpaged: true}, query, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, this.includeOneshots)).content + this.results = (await this.$komgaSeries.getSeries(undefined, {unpaged: true}, query, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, this.includeOneshots ? undefined : false)).content this.showResults = true } else { this.clear() diff --git a/komga-webui/src/views/SearchView.vue b/komga-webui/src/views/SearchView.vue index 98bcf6e1..b95060b2 100644 --- a/komga-webui/src/views/SearchView.vue +++ b/komga-webui/src/views/SearchView.vue @@ -395,7 +395,7 @@ export default Vue.extend({ }, 500), setupLoaders(search: string) { if (search) { - this.loaderSeries = new PageLoader({size: this.pageSize}, (pageable: PageRequest) => this.$komgaSeries.getSeries(undefined, pageable, search)) + this.loaderSeries = new PageLoader({size: this.pageSize}, (pageable: PageRequest) => this.$komgaSeries.getSeries(undefined, pageable, search, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, false)) this.loaderBooks = new PageLoader({size: this.pageSize}, (pageable: PageRequest) => this.$komgaBooks.getBooks(undefined, pageable, search)) this.loaderCollections = new PageLoader({size: this.pageSize}, (pageable: PageRequest) => this.$komgaCollections.getCollections(undefined, pageable, search)) this.loaderReadLists = new PageLoader({size: this.pageSize}, (pageable: PageRequest) => this.$komgaReadLists.getReadLists(undefined, pageable, search)) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneEntity.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneEntity.kt index 18f8d679..a6c74779 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneEntity.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneEntity.kt @@ -44,8 +44,7 @@ fun BookDto.toDocument() = } fun SeriesDto.toDocument() = - if (oneshot) null - else Document().apply { + Document().apply { add(TextField("title", metadata.title, Field.Store.NO)) if (metadata.titleSort != metadata.title) add(TextField("title", metadata.titleSort, Field.Store.NO)) metadata.alternateTitles.forEach { add(TextField("title", it.title, Field.Store.NO)) } @@ -76,6 +75,7 @@ fun SeriesDto.toDocument() = } if (booksMetadata.releaseDate != null) add(TextField("release_date", DateTools.dateToString(booksMetadata.releaseDate.toDate(), DateTools.Resolution.YEAR), Field.Store.NO)) add(TextField("deleted", deleted.toString(), Field.Store.NO)) + add(TextField("oneshot", oneshot.toString(), Field.Store.NO)) if (metadata.totalBookCount != null) add(TextField("complete", (metadata.totalBookCount == booksCount).toString(), Field.Store.NO)) add(StringField(LuceneEntity.TYPE, LuceneEntity.Series.type, Field.Store.NO)) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/SearchIndexLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/SearchIndexLifecycle.kt index d909a3bc..21465b0f 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/SearchIndexLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/SearchIndexLifecycle.kt @@ -25,7 +25,7 @@ import kotlin.math.ceil import kotlin.time.measureTime private val logger = KotlinLogging.logger {} -private const val INDEX_VERSION = 7 +private const val INDEX_VERSION = 8 @Component class SearchIndexLifecycle( diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/SearchIndexController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/SearchIndexController.kt index d7cd33a5..6d88196f 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/SearchIndexController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/SearchIndexController.kt @@ -32,7 +32,8 @@ class SearchIndexController( taskEmitter.upgradeIndex(HIGHEST_PRIORITY) // upgrade index to Lucene 9.x taskEmitter.rebuildIndex(HIGHEST_PRIORITY, setOf(LuceneEntity.Series)) } - indexVersion < 7 -> taskEmitter.rebuildIndex(HIGHEST_PRIORITY, setOf(LuceneEntity.Series)) + + indexVersion < 8 -> taskEmitter.rebuildIndex(HIGHEST_PRIORITY, setOf(LuceneEntity.Series)) } } }