兼容自建webDav

pull/2063/head
821938089 2 years ago
parent a929e55cc6
commit 2a5325ee51
  1. 33
      app/src/main/java/io/legado/app/lib/webdav/WebDav.kt

@ -58,6 +58,17 @@ open class WebDav(val path: String, val authorization: Authorization) {
.replace("%2F".toRegex(), "/") .replace("%2F".toRegex(), "/")
}.getOrNull() }.getOrNull()
} }
private val webDavClient by lazy {
val clientBuilder = okHttpClient.newBuilder()
clientBuilder.addNetworkInterceptor { chain ->
val request = chain.request()
.newBuilder()
.addHeader(authorization.name, authorization.data)
.build()
chain.proceed(request)
}
clientBuilder.build()
}
val host: String? get() = url.host val host: String? get() = url.host
/** /**
@ -103,9 +114,8 @@ open class WebDav(val path: String, val authorization: Authorization) {
String.format(DIR, requestProps.toString() + "\n") String.format(DIR, requestProps.toString() + "\n")
} }
val url = httpUrl ?: return null val url = httpUrl ?: return null
return okHttpClient.newCallResponse { return webDavClient.newCallResponse {
url(url) url(url)
addHeader(authorization.name, authorization.data)
addHeader("Depth", depth.toString()) addHeader("Depth", depth.toString())
// 添加RequestBody对象,可以只返回的属性。如果设为null,则会返回全部属性 // 添加RequestBody对象,可以只返回的属性。如果设为null,则会返回全部属性
// 注意:尽量手动指定需要返回的属性。若返回全部属性,可能后由于Prop.java里没有该属性名,而崩溃。 // 注意:尽量手动指定需要返回的属性。若返回全部属性,可能后由于Prop.java里没有该属性名,而崩溃。
@ -183,9 +193,9 @@ open class WebDav(val path: String, val authorization: Authorization) {
//使用坚果云的WebDav则不会,这里做一个简单的替换来解决这个问题 //使用坚果云的WebDav则不会,这里做一个简单的替换来解决这个问题
val testUrl = url.removeSuffix("/") + "/" val testUrl = url.removeSuffix("/") + "/"
return kotlin.runCatching { return kotlin.runCatching {
return okHttpClient.newCallResponse { return webDavClient.newCallResponse {
url(testUrl) url(testUrl)
addHeader(authorization.name, authorization.data) head()
//某些自建的WebDav服务,请求数据时返回码不一定为 200,如 caddy 为207,所以改为在200-300区间 //某些自建的WebDav服务,请求数据时返回码不一定为 200,如 caddy 为207,所以改为在200-300区间
}.isSuccessful }.isSuccessful
}.getOrDefault(false) }.getOrDefault(false)
@ -200,10 +210,9 @@ open class WebDav(val path: String, val authorization: Authorization) {
//防止报错 //防止报错
return kotlin.runCatching { return kotlin.runCatching {
if (!exists()) { if (!exists()) {
okHttpClient.newCallResponse { webDavClient.newCallResponse {
url(url) url(url)
method("MKCOL", null) method("MKCOL", null)
addHeader(authorization.name, authorization.data)
}.let { }.let {
checkResult(it) checkResult(it)
} }
@ -256,10 +265,9 @@ open class WebDav(val path: String, val authorization: Authorization) {
// 务必注意RequestBody不要嵌套,不然上传时内容可能会被追加多余的文件信息 // 务必注意RequestBody不要嵌套,不然上传时内容可能会被追加多余的文件信息
val fileBody = file.asRequestBody(contentType.toMediaType()) val fileBody = file.asRequestBody(contentType.toMediaType())
val url = httpUrl ?: throw WebDavException("url不能为空") val url = httpUrl ?: throw WebDavException("url不能为空")
okHttpClient.newCallResponse { webDavClient.newCallResponse {
url(url) url(url)
put(fileBody) put(fileBody)
addHeader(authorization.name, authorization.data)
}.let { }.let {
checkResult(it) checkResult(it)
} }
@ -274,10 +282,9 @@ open class WebDav(val path: String, val authorization: Authorization) {
kotlin.runCatching { kotlin.runCatching {
val fileBody = byteArray.toRequestBody(contentType.toMediaType()) val fileBody = byteArray.toRequestBody(contentType.toMediaType())
val url = httpUrl ?: throw NoStackTraceException("url不能为空") val url = httpUrl ?: throw NoStackTraceException("url不能为空")
okHttpClient.newCallResponse { webDavClient.newCallResponse {
url(url) url(url)
put(fileBody) put(fileBody)
addHeader(authorization.name, authorization.data)
}.let { }.let {
checkResult(it) checkResult(it)
} }
@ -289,9 +296,8 @@ open class WebDav(val path: String, val authorization: Authorization) {
@Throws(WebDavException::class) @Throws(WebDavException::class)
private suspend fun downloadInputStream(): InputStream { private suspend fun downloadInputStream(): InputStream {
val url = httpUrl ?: throw WebDavException("WebDav下载出错\nurl为空") val url = httpUrl ?: throw WebDavException("WebDav下载出错\nurl为空")
val byteStream = okHttpClient.newCallResponse { val byteStream = webDavClient.newCallResponse {
url(url) url(url)
addHeader(authorization.name, authorization.data)
}.apply { }.apply {
checkResult(this) checkResult(this)
}.body?.byteStream() }.body?.byteStream()
@ -305,10 +311,9 @@ open class WebDav(val path: String, val authorization: Authorization) {
val url = httpUrl ?: return false val url = httpUrl ?: return false
//防止报错 //防止报错
return kotlin.runCatching { return kotlin.runCatching {
okHttpClient.newCallResponse { webDavClient.newCallResponse {
url(url) url(url)
method("DELETE", null) method("DELETE", null)
addHeader(authorization.name, authorization.data)
}.let { }.let {
checkResult(it) checkResult(it)
} }

Loading…
Cancel
Save