diff --git a/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskHandler.kt b/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskHandler.kt index bfb912a7d..ee0634c7f 100644 --- a/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskHandler.kt +++ b/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskHandler.kt @@ -50,7 +50,7 @@ class TaskHandler( bookRepository.findByIdOrNull(task.bookId)?.let { book -> if (bookLifecycle.analyzeAndPersist(book)) { taskReceiver.generateBookThumbnail(book.id, priority = task.priority + 1) - taskReceiver.refreshBookMetadata(book, priority = task.priority + 1) + taskReceiver.refreshBookMetadata(book.id, priority = task.priority + 1) } } ?: logger.warn { "Cannot execute task $task: Book does not exist" } @@ -79,7 +79,7 @@ class TaskHandler( is Task.ImportBook -> seriesRepository.findByIdOrNull(task.seriesId)?.let { series -> val importedBook = bookImporter.importBook(Paths.get(task.sourceFile), series, task.copyMode, task.destinationName, task.upgradeBookId) - taskReceiver.analyzeBook(importedBook, priority = task.priority + 1) + taskReceiver.analyzeBook(importedBook.id, priority = task.priority + 1) } ?: logger.warn { "Cannot execute task $task: Series does not exist" } is Task.ConvertBook -> diff --git a/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskReceiver.kt b/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskReceiver.kt index e90db6683..f8507abb8 100644 --- a/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskReceiver.kt +++ b/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskReceiver.kt @@ -1,7 +1,6 @@ package org.gotson.komga.application.tasks import mu.KotlinLogging -import org.gotson.komga.domain.model.Book import org.gotson.komga.domain.model.BookMetadataPatchCapability import org.gotson.komga.domain.model.BookSearch import org.gotson.komga.domain.model.CopyMode @@ -72,10 +71,6 @@ class TaskReceiver( submitTask(Task.AnalyzeBook(bookId, priority)) } - fun analyzeBook(book: Book, priority: Int = DEFAULT_PRIORITY) { - submitTask(Task.AnalyzeBook(book.id, priority)) - } - fun generateBookThumbnail(bookId: String, priority: Int = DEFAULT_PRIORITY) { submitTask(Task.GenerateBookThumbnail(bookId, priority)) } @@ -88,14 +83,6 @@ class TaskReceiver( submitTask(Task.RefreshBookMetadata(bookId, capabilities, priority)) } - fun refreshBookMetadata( - book: Book, - capabilities: List = BookMetadataPatchCapability.values().toList(), - priority: Int = DEFAULT_PRIORITY, - ) { - submitTask(Task.RefreshBookMetadata(book.id, capabilities, priority)) - } - fun refreshSeriesMetadata(seriesId: String) { submitTask(Task.RefreshSeriesMetadata(seriesId)) } diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/BookController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/BookController.kt index 3f046ee13..8ffd17748 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/BookController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/BookController.kt @@ -421,7 +421,7 @@ class BookController( @ResponseStatus(HttpStatus.ACCEPTED) fun analyze(@PathVariable bookId: String) { bookRepository.findByIdOrNull(bookId)?.let { book -> - taskReceiver.analyzeBook(book, HIGH_PRIORITY) + taskReceiver.analyzeBook(book.id, HIGH_PRIORITY) } ?: throw ResponseStatusException(HttpStatus.NOT_FOUND) } @@ -430,7 +430,7 @@ class BookController( @ResponseStatus(HttpStatus.ACCEPTED) fun refreshMetadata(@PathVariable bookId: String) { bookRepository.findByIdOrNull(bookId)?.let { book -> - taskReceiver.refreshBookMetadata(book, priority = HIGH_PRIORITY) + taskReceiver.refreshBookMetadata(book.id, priority = HIGH_PRIORITY) } ?: throw ResponseStatusException(HttpStatus.NOT_FOUND) }