Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2025-12-30 12:22:41 +01:00
Code Issues Projects Releases Wiki Activity

refactor: remove duplicate code

Browse source
This commit is contained in:
Gauthier Roebroeck 2021-06-07 20:24:14 +08:00
parent e0aa505908
commit c8b522d7e9
3 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskHandler.kt
View file

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

13
komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskReceiver.kt
View file

@ -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> = BookMetadataPatchCapability.values().toList(),
priority: Int = DEFAULT_PRIORITY,
) {
submitTask(Task.RefreshBookMetadata(book.id, capabilities, priority))
}
fun refreshSeriesMetadata(seriesId: String) {
submitTask(Task.RefreshSeriesMetadata(seriesId))
}

4
komga/src/main/kotlin/org/gotson/komga/interfaces/rest/BookController.kt
View file

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