mirror of
https://github.com/Suwayomi/TachideskJUI.git
synced 2025-12-20 19:42:35 +01:00
Add support for empty search terms
This commit is contained in:
@@ -24,7 +24,7 @@ These are the versions of [Tachidesk-Server][tachidesk-server] that JUI supports
|
||||
#### [Release build][release]
|
||||
- [Tachidesk-Server][tachidesk-server] v0.4.5, works up to v0.4.9
|
||||
#### [Preview build][preview]
|
||||
- [Tachidesk-Server Preview][tachidesk-server-preview] v0.5.4-r1045
|
||||
- [Tachidesk-Server Preview][tachidesk-server-preview] v0.5.4-r1046
|
||||
|
||||
## Downloading and Running the app
|
||||
### All Operating Systems (x64, Java Not Included)
|
||||
|
||||
@@ -3,9 +3,9 @@ import org.gradle.api.JavaVersion
|
||||
object Config {
|
||||
const val tachideskVersion = "v0.5.4"
|
||||
// Match this to the Tachidesk-Server commit count
|
||||
const val serverCode = 1045
|
||||
const val serverCode = 1046
|
||||
const val preview = true
|
||||
const val previewCommit = "2478aa77cd4a71b0ae7c895fce0358ad7c30614b"
|
||||
const val previewCommit = "3b73a0fd72430fcbb4f45ee2ccca0ca64f9ffb83"
|
||||
|
||||
val jvmTarget = JavaVersion.VERSION_15
|
||||
}
|
||||
@@ -79,14 +79,27 @@ class SourceInteractionHandler @Inject constructor(
|
||||
// TODO: 2021-03-14
|
||||
suspend fun getGlobalSearchResults(searchTerm: String) = withIOContext {
|
||||
client.get<HttpResponse>(
|
||||
serverUrl + globalSearchQuery(searchTerm)
|
||||
)
|
||||
serverUrl + globalSearchQuery()
|
||||
) {
|
||||
url {
|
||||
if (searchTerm.isNotBlank()) {
|
||||
parameter("searchTerm", searchTerm)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun getSearchResults(sourceId: Long, searchTerm: String, pageNum: Int) = withIOContext {
|
||||
client.get<MangaPage>(
|
||||
serverUrl + sourceSearchQuery(sourceId, searchTerm, pageNum)
|
||||
)
|
||||
serverUrl + sourceSearchQuery(sourceId)
|
||||
) {
|
||||
url {
|
||||
parameter("pageNum", pageNum)
|
||||
if (searchTerm.isNotBlank()) {
|
||||
parameter("searchTerm", searchTerm)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun getSearchResults(source: Source, searchTerm: String, pageNum: Int) = getSearchResults(
|
||||
|
||||
@@ -23,12 +23,12 @@ fun sourceLatestQuery(sourceId: Long, pageNum: Int) =
|
||||
"/api/v1/source/$sourceId/latest/$pageNum"
|
||||
|
||||
@Get
|
||||
fun globalSearchQuery(searchTerm: String) =
|
||||
"/api/v1/search/$searchTerm"
|
||||
fun globalSearchQuery() =
|
||||
"/api/v1/source/all/search"
|
||||
|
||||
@Get
|
||||
fun sourceSearchQuery(sourceId: Long, searchTerm: String, pageNum: Int) =
|
||||
"/api/v1/source/$sourceId/search/$searchTerm/$pageNum"
|
||||
fun sourceSearchQuery(sourceId: Long) =
|
||||
"/api/v1/source/$sourceId/search"
|
||||
|
||||
@Get
|
||||
fun getFilterListQuery(sourceId: Long) =
|
||||
|
||||
Reference in New Issue
Block a user