Skip to content

Commit 564935b

Browse files
gotsongotson
committed
chore: remove deprecated code
code deprecated in 0.9 and following Tachiyomi Komga 1.2.5 release
1 parent ab4ed25 commit 564935b

5 files changed

Lines changed: 9 additions & 92 deletions

File tree

‎komga-webui/src/services/komga-series.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export default class KomgaSeriesService {
7878
async getBooks (seriesId: number, pageRequest?: PageRequest): Promise<Page<BookDto>> {
7979
try {
8080
return (await this.http.get(`${API_SERIES}/${seriesId}/books`, {
81-
params: { ...pageRequest, ready_only: false },
81+
params: { ...pageRequest },
8282
paramsSerializer: params => qs.stringify(params, { indices: false })
8383
})).data
8484
} catch (e) {

‎komga/src/main/kotlin/org/gotson/komga/interfaces/web/rest/BookController.kt‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,6 @@ class BookController(
110110
}
111111

112112

113-
@Deprecated("since 0.9.0 the /books/{bookId} is preferred")
114-
@GetMapping("api/v1/series/{seriesId}/books/{bookId}")
115-
fun getOneBookFromSeries(
116-
@AuthenticationPrincipal principal: KomgaPrincipal,
117-
@PathVariable seriesId: Long,
118-
@PathVariable bookId: Long
119-
): BookDto = getOneBook(principal, bookId)
120-
121113
@GetMapping("api/v1/books/{bookId}")
122114
fun getOneBook(
123115
@AuthenticationPrincipal principal: KomgaPrincipal,
@@ -129,15 +121,6 @@ class BookController(
129121
} ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
130122

131123

132-
@Deprecated("since 0.9.0 the /books/{bookId}/thumbnail is preferred")
133-
@GetMapping(value = ["api/v1/series/{seriesId}/books/{bookId}/thumbnail"], produces = [MediaType.IMAGE_PNG_VALUE])
134-
fun getBookThumbnailFromSeries(
135-
@AuthenticationPrincipal principal: KomgaPrincipal,
136-
request: WebRequest,
137-
@PathVariable seriesId: Long,
138-
@PathVariable bookId: Long
139-
): ResponseEntity<ByteArray> = getBookThumbnail(principal, request, bookId)
140-
141124
@GetMapping(value = [
142125
"api/v1/books/{bookId}/thumbnail",
143126
"opds/v1.2/books/{bookId}/thumbnail"
@@ -162,18 +145,6 @@ class BookController(
162145
} else throw ResponseStatusException(HttpStatus.NOT_FOUND)
163146
} ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
164147

165-
166-
@Deprecated("since 0.9.0 the /books/{bookId}/file is preferred")
167-
@GetMapping(value = [
168-
"api/v1/series/{seriesId}/books/{bookId}/file",
169-
"api/v1/series/{seriesId}/books/{bookId}/file/*"
170-
])
171-
fun getBookFileFromSeries(
172-
@AuthenticationPrincipal principal: KomgaPrincipal,
173-
@PathVariable seriesId: Long,
174-
@PathVariable bookId: Long
175-
): ResponseEntity<ByteArray> = getBookFile(principal, bookId)
176-
177148
@GetMapping(value = [
178149
"api/v1/books/{bookId}/file",
179150
"api/v1/books/{bookId}/file/*",
@@ -201,14 +172,6 @@ class BookController(
201172
} ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
202173

203174

204-
@Deprecated("since 0.9.0 the /books/{bookId}/pages is preferred")
205-
@GetMapping("api/v1/series/{seriesId}/books/{bookId}/pages")
206-
fun getBookPagesFromSeries(
207-
@AuthenticationPrincipal principal: KomgaPrincipal,
208-
@PathVariable seriesId: Long,
209-
@PathVariable bookId: Long
210-
): List<PageDto> = getBookPages(principal, bookId)
211-
212175
@GetMapping("api/v1/books/{bookId}/pages")
213176
fun getBookPages(
214177
@AuthenticationPrincipal principal: KomgaPrincipal,
@@ -222,19 +185,6 @@ class BookController(
222185
it.media.pages.mapIndexed { index, s -> PageDto(index + 1, s.fileName, s.mediaType) }
223186
} ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
224187

225-
226-
@Deprecated("since 0.9.0 the /books/{bookId}/page/{pageNumber} is preferred")
227-
@GetMapping("api/v1/series/{seriesId}/books/{bookId}/pages/{pageNumber}")
228-
fun getBookPageFromSeries(
229-
@AuthenticationPrincipal principal: KomgaPrincipal,
230-
request: WebRequest,
231-
@PathVariable seriesId: Long,
232-
@PathVariable bookId: Long,
233-
@PathVariable pageNumber: Int,
234-
@RequestParam(value = "convert", required = false) convertTo: String?,
235-
@RequestParam(value = "zero_based", defaultValue = "false") zeroBasedIndex: Boolean
236-
): ResponseEntity<ByteArray> = getBookPage(principal, request, bookId, pageNumber, convertTo, zeroBasedIndex)
237-
238188
@GetMapping(value = [
239189
"api/v1/books/{bookId}/pages/{pageNumber}",
240190
"opds/v1.2/books/{bookId}/pages/{pageNumber}"

‎komga/src/main/kotlin/org/gotson/komga/interfaces/web/rest/SeriesController.kt‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ class SeriesController(
164164
fun getAllBooksBySeries(
165165
@AuthenticationPrincipal principal: KomgaPrincipal,
166166
@PathVariable(name = "seriesId") id: Long,
167-
// deprecated, to remove once Tachiyomi update has been published
168-
@RequestParam(name = "ready_only", defaultValue = "true") readyFilter: Boolean,
169167
@RequestParam(name = "media_status", required = false) mediaStatus: List<Media.Status>?,
170168
page: Pageable
171169
): Page<BookDto> {
@@ -180,10 +178,9 @@ class SeriesController(
180178
else Sort.by(Sort.Order.asc("number"))
181179
)
182180

183-
return when {
184-
!mediaStatus.isNullOrEmpty() -> bookRepository.findAllByMediaStatusInAndSeriesId(mediaStatus, id, pageRequest)
185-
readyFilter -> bookRepository.findAllByMediaStatusInAndSeriesId(listOf(Media.Status.READY), id, pageRequest)
186-
else -> bookRepository.findAllBySeriesId(id, pageRequest)
187-
}.map { it.toDto(includeFullUrl = principal.user.isAdmin()) }
181+
return (if (!mediaStatus.isNullOrEmpty())
182+
bookRepository.findAllByMediaStatusInAndSeriesId(mediaStatus, id, pageRequest)
183+
else
184+
bookRepository.findAllBySeriesId(id, pageRequest)).map { it.toDto(includeFullUrl = principal.user.isAdmin()) }
188185
}
189186
}

‎komga/src/test/kotlin/org/gotson/komga/interfaces/web/rest/BookControllerTest.kt‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@ class BookControllerTest(
109109
seriesRepository.save(series)
110110
val book = series.books.first()
111111

112-
mockMvc.get("/api/v1/series/${series.id}/books/${book.id}")
113-
.andExpect { status { isUnauthorized } }
114-
115112
mockMvc.get("/api/v1/books/${book.id}")
116113
.andExpect { status { isUnauthorized } }
117114
}
@@ -126,9 +123,6 @@ class BookControllerTest(
126123
seriesRepository.save(series)
127124
val book = series.books.first()
128125

129-
mockMvc.get("/api/v1/series/${series.id}/books/${book.id}/thumbnail")
130-
.andExpect { status { isUnauthorized } }
131-
132126
mockMvc.get("/api/v1/books/${book.id}/thumbnail")
133127
.andExpect { status { isUnauthorized } }
134128
}
@@ -143,9 +137,6 @@ class BookControllerTest(
143137
seriesRepository.save(series)
144138
val book = series.books.first()
145139

146-
mockMvc.get("/api/v1/series/${series.id}/books/${book.id}/file")
147-
.andExpect { status { isUnauthorized } }
148-
149140
mockMvc.get("/api/v1/books/${book.id}/file")
150141
.andExpect { status { isUnauthorized } }
151142
}
@@ -160,9 +151,6 @@ class BookControllerTest(
160151
seriesRepository.save(series)
161152
val book = series.books.first()
162153

163-
mockMvc.get("/api/v1/series/${series.id}/books/${book.id}/pages")
164-
.andExpect { status { isUnauthorized } }
165-
166154
mockMvc.get("/api/v1/books/${book.id}/pages")
167155
.andExpect { status { isUnauthorized } }
168156
}
@@ -177,9 +165,6 @@ class BookControllerTest(
177165
seriesRepository.save(series)
178166
val book = series.books.first()
179167

180-
mockMvc.get("/api/v1/series/${series.id}/books/${book.id}/pages/1")
181-
.andExpect { status { isUnauthorized } }
182-
183168
mockMvc.get("/api/v1/books/${book.id}/pages/1")
184169
.andExpect { status { isUnauthorized } }
185170
}
@@ -197,9 +182,6 @@ class BookControllerTest(
197182
seriesRepository.save(series)
198183
val book = series.books.first()
199184

200-
mockMvc.get("/api/v1/series/${series.id}/books/${book.id}/thumbnail")
201-
.andExpect { status { isNotFound } }
202-
203185
mockMvc.get("/api/v1/books/${book.id}/thumbnail")
204186
.andExpect { status { isNotFound } }
205187
}
@@ -214,9 +196,6 @@ class BookControllerTest(
214196
seriesRepository.save(series)
215197
val book = series.books.first()
216198

217-
mockMvc.get("/api/v1/series/${series.id}/books/${book.id}/file")
218-
.andExpect { status { isNotFound } }
219-
220199
mockMvc.get("/api/v1/books/${book.id}/file")
221200
.andExpect { status { isNotFound } }
222201
}
@@ -232,9 +211,6 @@ class BookControllerTest(
232211
seriesRepository.save(series)
233212
val book = series.books.first()
234213

235-
mockMvc.get("/api/v1/series/${series.id}/books/${book.id}/pages")
236-
.andExpect { status { isNotFound } }
237-
238214
mockMvc.get("/api/v1/books/${book.id}/pages")
239215
.andExpect { status { isNotFound } }
240216
}
@@ -250,9 +226,6 @@ class BookControllerTest(
250226
seriesRepository.save(series)
251227
val book = series.books.first()
252228

253-
mockMvc.get("/api/v1/series/${series.id}/books/${book.id}/pages/1")
254-
.andExpect { status { isNotFound } }
255-
256229
mockMvc.get("/api/v1/books/${book.id}/pages/1")
257230
.andExpect { status { isNotFound } }
258231
}
@@ -272,9 +245,6 @@ class BookControllerTest(
272245
seriesRepository.save(series)
273246
val book = series.books.first()
274247

275-
mockMvc.get("/api/v1/series/${series.id}/books/${book.id}/pages/$page")
276-
.andExpect { status { isBadRequest } }
277-
278248
mockMvc.get("/api/v1/books/${book.id}/pages/$page")
279249
.andExpect { status { isBadRequest } }
280250
}
@@ -301,7 +271,7 @@ class BookControllerTest(
301271
mockMvc.get("/api/v1/books/latest")
302272
.andExpect(validation)
303273

304-
mockMvc.get("/api/v1/series/${series.id}/books?media_status=UNKNOWN")
274+
mockMvc.get("/api/v1/series/${series.id}/books")
305275
.andExpect(validation)
306276

307277
mockMvc.get("/api/v1/books/${series.books.first().id}")
@@ -332,7 +302,7 @@ class BookControllerTest(
332302
mockMvc.get("/api/v1/books/latest")
333303
.andExpect(validation)
334304

335-
mockMvc.get("/api/v1/series/${series.id}/books?media_status=UNKNOWN")
305+
mockMvc.get("/api/v1/series/${series.id}/books")
336306
.andExpect(validation)
337307

338308
mockMvc.get("/api/v1/books/${series.books.first().id}")

‎komga/src/test/kotlin/org/gotson/komga/interfaces/web/rest/SeriesControllerTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class SeriesControllerTest(
7575
series.books = series.books.toMutableList().also { it.add(makeBook("2")) }
7676
seriesRepository.save(series)
7777

78-
mockMvc.get("/api/v1/series/${series.id}/books?media_status=UNKNOWN")
78+
mockMvc.get("/api/v1/series/${series.id}/books")
7979
.andExpect {
8080
status { isOk }
8181
jsonPath("$.content[0].name") { value("1") }
@@ -96,7 +96,7 @@ class SeriesControllerTest(
9696
series.books = series.books.toMutableList().also { it.add(makeBook("2")) }
9797
seriesRepository.save(series)
9898

99-
mockMvc.get("/api/v1/series/${series.id}/books?media_status=UNKNOWN")
99+
mockMvc.get("/api/v1/series/${series.id}/books")
100100
.andExpect {
101101
status { isOk }
102102
jsonPath("$.content[0].name") { value("1") }

0 commit comments

Comments
 (0)