mirror of
https://github.com/gotson/komga.git
synced 2025-12-20 07:23:34 +01:00
feat(api): get duplicate books by filehash
This commit is contained in:
Gauthier Roebroeck
parent
ba5072a731
commit
3c97c20481
4 changed files with 105 additions and 48 deletions
|
|
@ -64,6 +64,7 @@ class BookDtoDao(
|
|||
"lastModifiedDate" to b.LAST_MODIFIED_DATE,
|
||||
"fileSize" to b.FILE_SIZE,
|
||||
"size" to b.FILE_SIZE,
|
||||
"fileHash" to b.FILE_HASH,
|
||||
"url" to b.URL.noCase(),
|
||||
"media.status" to m.STATUS.noCase(),
|
||||
"media.comment" to m.COMMENT.noCase(),
|
||||
|
|
@ -87,7 +88,7 @@ class BookDtoDao(
|
|||
userId: String,
|
||||
filterOnLibraryIds: Collection<String>?,
|
||||
search: BookSearchWithReadProgress,
|
||||
pageable: Pageable
|
||||
pageable: Pageable,
|
||||
): Page<BookDto> {
|
||||
val conditions = rlb.READLIST_ID.eq(readListId).and(search.toCondition())
|
||||
|
||||
|
|
@ -139,7 +140,7 @@ class BookDtoDao(
|
|||
dtos,
|
||||
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)
|
||||
else PageRequest.of(0, maxOf(count, 20), pageSort),
|
||||
count.toLong()
|
||||
count.toLong(),
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -159,7 +160,7 @@ class BookDtoDao(
|
|||
readListId: String,
|
||||
bookId: String,
|
||||
userId: String,
|
||||
filterOnLibraryIds: Collection<String>?
|
||||
filterOnLibraryIds: Collection<String>?,
|
||||
): BookDto? =
|
||||
findSiblingReadList(readListId, bookId, userId, filterOnLibraryIds, next = false)
|
||||
|
||||
|
|
@ -167,7 +168,7 @@ class BookDtoDao(
|
|||
readListId: String,
|
||||
bookId: String,
|
||||
userId: String,
|
||||
filterOnLibraryIds: Collection<String>?
|
||||
filterOnLibraryIds: Collection<String>?,
|
||||
): BookDto? =
|
||||
findSiblingReadList(readListId, bookId, userId, filterOnLibraryIds, next = true)
|
||||
|
||||
|
|
@ -200,7 +201,34 @@ class BookDtoDao(
|
|||
return PageImpl(
|
||||
dtos,
|
||||
PageRequest.of(pageable.pageNumber, pageable.pageSize, pageable.sort),
|
||||
seriesIds.size.toLong()
|
||||
seriesIds.size.toLong(),
|
||||
)
|
||||
}
|
||||
|
||||
override fun findAllDuplicates(userId: String, pageable: Pageable): Page<BookDto> {
|
||||
val hashes = dsl.select(b.FILE_HASH, DSL.count(b.FILE_HASH))
|
||||
.from(b)
|
||||
.where(b.FILE_HASH.ne(""))
|
||||
.groupBy(b.FILE_HASH)
|
||||
.having(DSL.count(b.FILE_HASH).gt(1))
|
||||
.fetch()
|
||||
.associate { it.value1() to it.value2() }
|
||||
|
||||
val count = hashes.values.sum()
|
||||
|
||||
val orderBy = pageable.sort.toOrderBy(sorts)
|
||||
val dtos = selectBase(userId)
|
||||
.where(b.FILE_HASH.`in`(hashes.keys))
|
||||
.orderBy(orderBy)
|
||||
.apply { if (pageable.isPaged) limit(pageable.pageSize).offset(pageable.offset) }
|
||||
.fetchAndMap()
|
||||
|
||||
val pageSort = if (orderBy.isNotEmpty()) pageable.sort else Sort.unsorted()
|
||||
return PageImpl(
|
||||
dtos,
|
||||
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)
|
||||
else PageRequest.of(0, maxOf(count, 20), pageSort),
|
||||
count.toLong(),
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -229,7 +257,7 @@ class BookDtoDao(
|
|||
bookId: String,
|
||||
userId: String,
|
||||
filterOnLibraryIds: Collection<String>?,
|
||||
next: Boolean
|
||||
next: Boolean,
|
||||
): BookDto? {
|
||||
val numberSort = dsl.select(rlb.NUMBER)
|
||||
.from(b)
|
||||
|
|
@ -254,7 +282,7 @@ class BookDtoDao(
|
|||
*b.fields(),
|
||||
*m.fields(),
|
||||
*d.fields(),
|
||||
*r.fields()
|
||||
*r.fields(),
|
||||
).apply { if (joinConditions.selectReadListNumber) select(rlb.NUMBER) }
|
||||
.from(b)
|
||||
.leftJoin(m).on(b.ID.eq(m.BOOK_ID))
|
||||
|
|
@ -354,6 +382,7 @@ class BookDtoDao(
|
|||
metadata = metadata,
|
||||
readProgress = readProgress,
|
||||
deleted = deletedDate != null,
|
||||
fileHash = fileHash,
|
||||
)
|
||||
|
||||
private fun MediaRecord.toDto() =
|
||||
|
|
@ -361,7 +390,7 @@ class BookDtoDao(
|
|||
status = status,
|
||||
mediaType = mediaType ?: "",
|
||||
pagesCount = pageCount.toInt(),
|
||||
comment = comment ?: ""
|
||||
comment = comment ?: "",
|
||||
)
|
||||
|
||||
private fun BookMetadataRecord.toDto(authors: List<AuthorDto>, tags: Set<String>, links: List<WebLinkDto>) =
|
||||
|
|
@ -385,7 +414,7 @@ class BookDtoDao(
|
|||
links = links,
|
||||
linksLock = linksLock,
|
||||
created = createdDate,
|
||||
lastModified = lastModifiedDate
|
||||
lastModified = lastModifiedDate,
|
||||
)
|
||||
|
||||
private fun ReadProgressRecord.toDto() =
|
||||
|
|
@ -394,6 +423,6 @@ class BookDtoDao(
|
|||
completed = completed,
|
||||
readDate = readDate,
|
||||
created = createdDate,
|
||||
lastModified = lastModifiedDate
|
||||
lastModified = lastModifiedDate,
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,4 +39,6 @@ interface BookDtoRepository {
|
|||
): BookDto?
|
||||
|
||||
fun findAllOnDeck(userId: String, filterOnLibraryIds: Collection<String>?, pageable: Pageable): Page<BookDto>
|
||||
|
||||
fun findAllDuplicates(userId: String, pageable: Pageable): Page<BookDto>
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ class BookController(
|
|||
private val readListRepository: ReadListRepository,
|
||||
private val contentDetector: ContentDetector,
|
||||
private val eventPublisher: EventPublisher,
|
||||
private val thumbnailBookRepository: ThumbnailBookRepository
|
||||
private val thumbnailBookRepository: ThumbnailBookRepository,
|
||||
) {
|
||||
|
||||
@PageableAsQueryParam
|
||||
|
|
@ -112,7 +112,7 @@ class BookController(
|
|||
@RequestParam(name = "released_after", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) releasedAfter: LocalDate?,
|
||||
@RequestParam(name = "tag", required = false) tags: List<String>?,
|
||||
@RequestParam(name = "unpaged", required = false) unpaged: Boolean = false,
|
||||
@Parameter(hidden = true) page: Pageable
|
||||
@Parameter(hidden = true) page: Pageable,
|
||||
): Page<BookDto> {
|
||||
val sort =
|
||||
when {
|
||||
|
|
@ -126,7 +126,7 @@ class BookController(
|
|||
else PageRequest.of(
|
||||
page.pageNumber,
|
||||
page.pageSize,
|
||||
sort
|
||||
sort,
|
||||
)
|
||||
|
||||
val bookSearch = BookSearchWithReadProgress(
|
||||
|
|
@ -135,7 +135,7 @@ class BookController(
|
|||
mediaStatus = mediaStatus,
|
||||
readStatus = readStatus,
|
||||
releasedAfter = releasedAfter,
|
||||
tags = tags
|
||||
tags = tags,
|
||||
)
|
||||
|
||||
return bookDtoRepository.findAll(bookSearch, principal.user.id, pageRequest)
|
||||
|
|
@ -148,7 +148,7 @@ class BookController(
|
|||
fun getLatestBooks(
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
@RequestParam(name = "unpaged", required = false) unpaged: Boolean = false,
|
||||
@Parameter(hidden = true) page: Pageable
|
||||
@Parameter(hidden = true) page: Pageable,
|
||||
): Page<BookDto> {
|
||||
val sort = Sort.by(Sort.Order.desc("lastModifiedDate"))
|
||||
|
||||
|
|
@ -157,15 +157,15 @@ class BookController(
|
|||
else PageRequest.of(
|
||||
page.pageNumber,
|
||||
page.pageSize,
|
||||
sort
|
||||
sort,
|
||||
)
|
||||
|
||||
return bookDtoRepository.findAll(
|
||||
BookSearchWithReadProgress(
|
||||
libraryIds = principal.user.getAuthorizedLibraryIds(null)
|
||||
libraryIds = principal.user.getAuthorizedLibraryIds(null),
|
||||
),
|
||||
principal.user.id,
|
||||
pageRequest
|
||||
pageRequest,
|
||||
).map { it.restrictUrl(!principal.user.roleAdmin) }
|
||||
}
|
||||
|
||||
|
|
@ -175,18 +175,43 @@ class BookController(
|
|||
fun getBooksOnDeck(
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
@RequestParam(name = "library_id", required = false) libraryIds: List<String>?,
|
||||
@Parameter(hidden = true) page: Pageable
|
||||
@Parameter(hidden = true) page: Pageable,
|
||||
): Page<BookDto> =
|
||||
bookDtoRepository.findAllOnDeck(
|
||||
principal.user.id,
|
||||
principal.user.getAuthorizedLibraryIds(libraryIds),
|
||||
page
|
||||
page,
|
||||
).map { it.restrictUrl(!principal.user.roleAdmin) }
|
||||
|
||||
@PageableWithoutSortAsQueryParam
|
||||
@GetMapping("api/v1/books/duplicates")
|
||||
@PreAuthorize("hasRole('$ROLE_ADMIN')")
|
||||
fun getDuplicateBooks(
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
@RequestParam(name = "unpaged", required = false) unpaged: Boolean = false,
|
||||
@Parameter(hidden = true) page: Pageable,
|
||||
): Page<BookDto> {
|
||||
val sort =
|
||||
when {
|
||||
page.sort.isSorted -> page.sort
|
||||
else -> Sort.by(Sort.Order.asc("fileHash"))
|
||||
}
|
||||
|
||||
val pageRequest =
|
||||
if (unpaged) Pageable.unpaged()
|
||||
else PageRequest.of(
|
||||
page.pageNumber,
|
||||
page.pageSize,
|
||||
sort,
|
||||
)
|
||||
|
||||
return bookDtoRepository.findAllDuplicates(principal.user.id, pageRequest)
|
||||
}
|
||||
|
||||
@GetMapping("api/v1/books/{bookId}")
|
||||
fun getOneBook(
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
@PathVariable bookId: String
|
||||
@PathVariable bookId: String,
|
||||
): BookDto =
|
||||
bookDtoRepository.findByIdOrNull(bookId, principal.user.id)?.let {
|
||||
if (!principal.user.canAccessLibrary(it.libraryId)) throw ResponseStatusException(HttpStatus.FORBIDDEN)
|
||||
|
|
@ -196,7 +221,7 @@ class BookController(
|
|||
@GetMapping("api/v1/books/{bookId}/previous")
|
||||
fun getBookSiblingPrevious(
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
@PathVariable bookId: String
|
||||
@PathVariable bookId: String,
|
||||
): BookDto {
|
||||
bookRepository.getLibraryIdOrNull(bookId)?.let {
|
||||
if (!principal.user.canAccessLibrary(it)) throw ResponseStatusException(HttpStatus.FORBIDDEN)
|
||||
|
|
@ -210,7 +235,7 @@ class BookController(
|
|||
@GetMapping("api/v1/books/{bookId}/next")
|
||||
fun getBookSiblingNext(
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
@PathVariable bookId: String
|
||||
@PathVariable bookId: String,
|
||||
): BookDto {
|
||||
bookRepository.getLibraryIdOrNull(bookId)?.let {
|
||||
if (!principal.user.canAccessLibrary(it)) throw ResponseStatusException(HttpStatus.FORBIDDEN)
|
||||
|
|
@ -224,7 +249,7 @@ class BookController(
|
|||
@GetMapping("api/v1/books/{bookId}/readlists")
|
||||
fun getAllReadListsByBook(
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
@PathVariable(name = "bookId") bookId: String
|
||||
@PathVariable(name = "bookId") bookId: String,
|
||||
): List<ReadListDto> {
|
||||
bookRepository.getLibraryIdOrNull(bookId)?.let {
|
||||
if (!principal.user.canAccessLibrary(it)) throw ResponseStatusException(HttpStatus.FORBIDDEN)
|
||||
|
|
@ -238,13 +263,13 @@ class BookController(
|
|||
@GetMapping(
|
||||
value = [
|
||||
"api/v1/books/{bookId}/thumbnail",
|
||||
"opds/v1.2/books/{bookId}/thumbnail"
|
||||
"opds/v1.2/books/{bookId}/thumbnail",
|
||||
],
|
||||
produces = [MediaType.IMAGE_JPEG_VALUE]
|
||||
produces = [MediaType.IMAGE_JPEG_VALUE],
|
||||
)
|
||||
fun getBookThumbnail(
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
@PathVariable bookId: String
|
||||
@PathVariable bookId: String,
|
||||
): ByteArray {
|
||||
bookRepository.getLibraryIdOrNull(bookId)?.let {
|
||||
if (!principal.user.canAccessLibrary(it)) throw ResponseStatusException(HttpStatus.FORBIDDEN)
|
||||
|
|
@ -258,7 +283,7 @@ class BookController(
|
|||
fun getBookThumbnailById(
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
@PathVariable(name = "bookId") bookId: String,
|
||||
@PathVariable(name = "thumbnailId") thumbnailId: String
|
||||
@PathVariable(name = "thumbnailId") thumbnailId: String,
|
||||
): ByteArray {
|
||||
bookRepository.getLibraryIdOrNull(bookId)?.let {
|
||||
if (!principal.user.canAccessLibrary(it)) throw ResponseStatusException(HttpStatus.FORBIDDEN)
|
||||
|
|
@ -301,9 +326,9 @@ class BookController(
|
|||
bookId = book.id,
|
||||
thumbnail = file.bytes,
|
||||
type = ThumbnailBook.Type.USER_UPLOADED,
|
||||
selected = selected
|
||||
selected = selected,
|
||||
),
|
||||
if (selected) MarkSelectedPreference.YES else MarkSelectedPreference.NO
|
||||
if (selected) MarkSelectedPreference.YES else MarkSelectedPreference.NO,
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -351,14 +376,14 @@ class BookController(
|
|||
value = [
|
||||
"api/v1/books/{bookId}/file",
|
||||
"api/v1/books/{bookId}/file/*",
|
||||
"opds/v1.2/books/{bookId}/file/*"
|
||||
"opds/v1.2/books/{bookId}/file/*",
|
||||
],
|
||||
produces = [MediaType.APPLICATION_OCTET_STREAM_VALUE]
|
||||
produces = [MediaType.APPLICATION_OCTET_STREAM_VALUE],
|
||||
)
|
||||
@PreAuthorize("hasRole('$ROLE_FILE_DOWNLOAD')")
|
||||
fun getBookFile(
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
@PathVariable bookId: String
|
||||
@PathVariable bookId: String,
|
||||
): ResponseEntity<StreamingResponseBody> =
|
||||
bookRepository.findByIdOrNull(bookId)?.let { book ->
|
||||
if (!principal.user.canAccessBook(book)) throw ResponseStatusException(HttpStatus.FORBIDDEN)
|
||||
|
|
@ -378,7 +403,7 @@ class BookController(
|
|||
contentDisposition = ContentDisposition.builder("attachment")
|
||||
.filename(book.path.name)
|
||||
.build()
|
||||
}
|
||||
},
|
||||
)
|
||||
.contentType(getMediaTypeOrDefault(media.mediaType))
|
||||
.contentLength(this.contentLength())
|
||||
|
|
@ -393,7 +418,7 @@ class BookController(
|
|||
@GetMapping("api/v1/books/{bookId}/pages")
|
||||
fun getBookPages(
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
@PathVariable bookId: String
|
||||
@PathVariable bookId: String,
|
||||
): List<PageDto> =
|
||||
bookRepository.findByIdOrNull(bookId)?.let { book ->
|
||||
if (!principal.user.canAccessBook(book)) throw ResponseStatusException(HttpStatus.FORBIDDEN)
|
||||
|
|
@ -403,7 +428,7 @@ class BookController(
|
|||
Media.Status.UNKNOWN -> throw ResponseStatusException(HttpStatus.NOT_FOUND, "Book has not been analyzed yet")
|
||||
Media.Status.OUTDATED -> throw ResponseStatusException(
|
||||
HttpStatus.NOT_FOUND,
|
||||
"Book is outdated and must be re-analyzed"
|
||||
"Book is outdated and must be re-analyzed",
|
||||
)
|
||||
Media.Status.ERROR -> throw ResponseStatusException(HttpStatus.NOT_FOUND, "Book analysis failed")
|
||||
Media.Status.UNSUPPORTED -> throw ResponseStatusException(HttpStatus.NOT_FOUND, "Book format is not supported")
|
||||
|
|
@ -417,16 +442,16 @@ class BookController(
|
|||
content = [
|
||||
Content(
|
||||
mediaType = "image/*",
|
||||
schema = Schema(type = "string", format = "binary")
|
||||
)
|
||||
]
|
||||
schema = Schema(type = "string", format = "binary"),
|
||||
),
|
||||
],
|
||||
)
|
||||
@GetMapping(
|
||||
value = [
|
||||
"api/v1/books/{bookId}/pages/{pageNumber}",
|
||||
"opds/v1.2/books/{bookId}/pages/{pageNumber}"
|
||||
"opds/v1.2/books/{bookId}/pages/{pageNumber}",
|
||||
],
|
||||
produces = [MediaType.ALL_VALUE]
|
||||
produces = [MediaType.ALL_VALUE],
|
||||
)
|
||||
@PreAuthorize("hasRole('$ROLE_PAGE_STREAMING')")
|
||||
fun getBookPage(
|
||||
|
|
@ -436,7 +461,7 @@ class BookController(
|
|||
@PathVariable pageNumber: Int,
|
||||
@Parameter(
|
||||
description = "Convert the image to the provided format.",
|
||||
schema = Schema(allowableValues = ["jpeg", "png"])
|
||||
schema = Schema(allowableValues = ["jpeg", "png"]),
|
||||
)
|
||||
@RequestParam(value = "convert", required = false) convertTo: String?,
|
||||
@Parameter(description = "If set to true, pages will start at index 0. If set to false, pages will start at index 1.")
|
||||
|
|
@ -471,7 +496,7 @@ class BookController(
|
|||
contentDisposition = ContentDisposition.builder("inline")
|
||||
.filename(imageFileName)
|
||||
.build()
|
||||
}
|
||||
},
|
||||
)
|
||||
.contentType(getMediaTypeOrDefault(pageContent.mediaType))
|
||||
.setNotModified(media)
|
||||
|
|
@ -491,13 +516,13 @@ class BookController(
|
|||
@ApiResponse(content = [Content(schema = Schema(type = "string", format = "binary"))])
|
||||
@GetMapping(
|
||||
value = ["api/v1/books/{bookId}/pages/{pageNumber}/thumbnail"],
|
||||
produces = [MediaType.IMAGE_JPEG_VALUE]
|
||||
produces = [MediaType.IMAGE_JPEG_VALUE],
|
||||
)
|
||||
fun getBookPageThumbnail(
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
request: WebRequest,
|
||||
@PathVariable bookId: String,
|
||||
@PathVariable pageNumber: Int
|
||||
@PathVariable pageNumber: Int,
|
||||
): ResponseEntity<ByteArray> =
|
||||
bookRepository.findByIdOrNull(bookId)?.let { book ->
|
||||
val media = mediaRepository.findById(bookId)
|
||||
|
|
@ -591,7 +616,7 @@ class BookController(
|
|||
@PathVariable bookId: String,
|
||||
@Parameter(description = "page can be omitted if completed is set to true. completed can be omitted, and will be set accordingly depending on the page passed and the total number of pages in the book.")
|
||||
@Valid @RequestBody readProgress: ReadProgressUpdateDto,
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
) {
|
||||
bookRepository.findByIdOrNull(bookId)?.let { book ->
|
||||
if (!principal.user.canAccessBook(book)) throw ResponseStatusException(HttpStatus.FORBIDDEN)
|
||||
|
|
@ -612,7 +637,7 @@ class BookController(
|
|||
@ResponseStatus(HttpStatus.NO_CONTENT)
|
||||
fun deleteReadProgress(
|
||||
@PathVariable bookId: String,
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal
|
||||
@AuthenticationPrincipal principal: KomgaPrincipal,
|
||||
) {
|
||||
bookRepository.findByIdOrNull(bookId)?.let { book ->
|
||||
if (!principal.user.canAccessBook(book)) throw ResponseStatusException(HttpStatus.FORBIDDEN)
|
||||
|
|
@ -647,7 +672,7 @@ class BookController(
|
|||
@PreAuthorize("hasRole('$ROLE_ADMIN')")
|
||||
@ResponseStatus(HttpStatus.ACCEPTED)
|
||||
fun deleteBook(
|
||||
@PathVariable bookId: String
|
||||
@PathVariable bookId: String,
|
||||
) {
|
||||
taskReceiver.deleteBook(
|
||||
bookId = bookId,
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ data class BookDto(
|
|||
val metadata: BookMetadataDto,
|
||||
val readProgress: ReadProgressDto? = null,
|
||||
val deleted: Boolean,
|
||||
val fileHash: String,
|
||||
)
|
||||
|
||||
fun BookDto.restrictUrl(restrict: Boolean) =
|
||||
|
|
|
|||
Loading…
Reference in a new issue