Skip to content

Fix trailing slash for directory URLs in WebDavClient #1843 #1844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
onlymash wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix trailing slash for directory URLs in WebDavClient #1843 #1844

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...edia/src/main/java/dev/anilbeesetti/nextplayer/core/media/network/clients/WebDavClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,23 @@ class WebDavClient(private val connection: NetworkConnection) : NetworkClient {

private val scheme get() = if (connection.useHttps) "https" else "http"

private fun buildUrl(path: String): String {
private fun buildUrl(path: String, isDirectory: Boolean = false): String {
val base = connection.path.trim('/')
val clean = path.trim('/')
val authority = "$scheme://${connection.host}:${connection.effectivePort}"
return when {
val url = when {
clean.isEmpty() -> if (base.isEmpty()) "$authority/" else "$authority/$base"
base.isEmpty() -> "$authority/$clean"
else -> "$authority/$base/$clean"
}
return if (isDirectory && !url.endsWith("/")) "$url/" else url
}

override suspend fun connect(): Result<Unit> = withContext(Dispatchers.IO) {
runCatching {
val client = OkHttpSardine()
if (!connection.isAnonymous) client.setCredentials(connection.username, connection.password)
client.exists(buildUrl(""))
client.exists(buildUrl("", isDirectory = true))
sardine = client
}
}
Expand All @@ -54,7 +55,7 @@ class WebDavClient(private val connection: NetworkConnection) : NetworkClient {
override suspend fun listFiles(path: String): Result<List<NetworkFile>> = withContext(Dispatchers.IO) {
runCatching {
val client = sardine ?: error("Not connected")
client.list(buildUrl(path)).drop(1).map { resource ->
client.list(buildUrl(path, isDirectory = true)).drop(1).map { resource ->
val name = resource.name ?: ""
NetworkFile(
name = name,
Expand Down