Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2026-05-09 05:10:19 +02:00
Code Issues Projects Releases Wiki Activity

fix: series picker does not return any series in CBL import screen

Browse source 
Closes: #1186
This commit is contained in:
Gauthier Roebroeck 2023-08-07 14:04:28 +08:00
parent cfbbe2972f
commit f8e65b0740
6 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
komga-webui/src/components/SearchBox.vue
View file

@ -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

2
komga-webui/src/components/dialogs/SeriesPickerDialog.vue
View file

@ -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()

2
komga-webui/src/views/SearchView.vue
View file

@ -395,7 +395,7 @@ export default Vue.extend({
}, 500),
setupLoaders(search: string) {
if (search) {
this.loaderSeries = new PageLoader<SeriesDto>({size: this.pageSize}, (pageable: PageRequest) => this.$komgaSeries.getSeries(undefined, pageable, search))
this.loaderSeries = new PageLoader<SeriesDto>({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<BookDto>({size: this.pageSize}, (pageable: PageRequest) => this.$komgaBooks.getBooks(undefined, pageable, search))
this.loaderCollections = new PageLoader<CollectionDto>({size: this.pageSize}, (pageable: PageRequest) => this.$komgaCollections.getCollections(undefined, pageable, search))
this.loaderReadLists = new PageLoader<ReadListDto>({size: this.pageSize}, (pageable: PageRequest) => this.$komgaReadLists.getReadLists(undefined, pageable, search))

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneEntity.kt
View file

@ -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))

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/search/SearchIndexLifecycle.kt
View file

@ -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(

3
komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/SearchIndexController.kt
View file

@ -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))
}
}
}