From 32156d92b0090af3308122126adefcda40f52486 Mon Sep 17 00:00:00 2001 From: kunfei Date: Wed, 27 Apr 2022 22:21:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/help/storage/AppWebDav.kt | 10 ++-- .../java/io/legado/app/lib/webdav/WebDav.kt | 52 ++++++++++--------- .../legado/app/lib/webdav/WebDavException.kt | 9 ++++ .../app/ui/config/BackupConfigFragment.kt | 2 +- 4 files changed, 45 insertions(+), 28 deletions(-) create mode 100644 app/src/main/java/io/legado/app/lib/webdav/WebDavException.kt diff --git a/app/src/main/java/io/legado/app/help/storage/AppWebDav.kt b/app/src/main/java/io/legado/app/help/storage/AppWebDav.kt index 05ee9be0b..e747a9195 100644 --- a/app/src/main/java/io/legado/app/help/storage/AppWebDav.kt +++ b/app/src/main/java/io/legado/app/help/storage/AppWebDav.kt @@ -79,8 +79,12 @@ object AppWebDav { } @Throws(Exception::class) - private suspend fun getWebDavFileNames(): ArrayList { - val url = rootWebDavUrl + private suspend fun getWebDavFileNames(relativePath: String? = null): ArrayList { + val url = if (relativePath == null) { + rootWebDavUrl + } else { + NetworkUtils.getAbsoluteURL(rootWebDavUrl, relativePath) + } val names = arrayListOf() authorization?.let { var files = WebDav(url, it).listFiles() @@ -107,7 +111,7 @@ object AppWebDav { Coroutine.async { restoreWebDav(names[index]) }.onError { - appCtx.toastOnUi("WebDavError:${it.localizedMessage}") + appCtx.toastOnUi("WebDavError\n${it.localizedMessage}") } } } diff --git a/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt b/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt index 1849355aa..1ca422703 100644 --- a/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt +++ b/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt @@ -69,6 +69,7 @@ class WebDav(urlStr: String, val authorization: Authorization) { * * @return 文件列表 */ + @Throws(WebDavException::class) suspend fun listFiles(): List { propFindResponse()?.let { body -> return parseDir(body) @@ -79,6 +80,7 @@ class WebDav(urlStr: String, val authorization: Authorization) { /** * @param propsList 指定列出文件的哪些属性 */ + @Throws(WebDavException::class) private suspend fun propFindResponse(propsList: List = emptyList()): String? { val requestProps = StringBuilder() for (p in propsList) { @@ -90,19 +92,17 @@ class WebDav(urlStr: String, val authorization: Authorization) { String.format(DIR, requestProps.toString() + "\n") } val url = httpUrl ?: return null - return kotlin.runCatching { - okHttpClient.newCallResponseBody { - url(url) - addHeader(authorization.name, authorization.data) - addHeader("Depth", "1") - // 添加RequestBody对象，可以只返回的属性。如果设为null，则会返回全部属性 - // 注意：尽量手动指定需要返回的属性。若返回全部属性，可能后由于Prop.java里没有该属性名，而崩溃。 - val requestBody = requestPropsStr.toRequestBody("text/plain".toMediaType()) - method("PROPFIND", requestBody) - }.text() - }.onFailure { e -> - e.printOnDebug() - }.getOrNull() + return okHttpClient.newCallResponse { + url(url) + addHeader(authorization.name, authorization.data) + addHeader("Depth", "1") + // 添加RequestBody对象，可以只返回的属性。如果设为null，则会返回全部属性 + // 注意：尽量手动指定需要返回的属性。若返回全部属性，可能后由于Prop.java里没有该属性名，而崩溃。 + val requestBody = requestPropsStr.toRequestBody("text/plain".toMediaType()) + method("PROPFIND", requestBody) + }.apply { + checkResult(this) + }.body?.text() } private fun parseDir(s: String): List { @@ -143,10 +143,14 @@ class WebDav(urlStr: String, val authorization: Authorization) { * 文件是否存在 */ suspend fun exists(): Boolean { - val response = propFindResponse() ?: return false - val document = Jsoup.parse(response) - val elements = document.getElementsByTag("d:response") - return elements.isNotEmpty() + return kotlin.runCatching { + val response = propFindResponse() ?: return false + val document = Jsoup.parse(response) + val elements = document.getElementsByTag("d:response") + return elements.isNotEmpty() + }.onFailure { + AppLog.put("WebDav检测是否存在出错\n${it.localizedMessage}") + }.getOrDefault(false) } /** @@ -195,17 +199,17 @@ class WebDav(urlStr: String, val authorization: Authorization) { /** * 上传文件 */ - @Throws(Exception::class) + @Throws(WebDavException::class) suspend fun upload( localPath: String, contentType: String = "application/octet-stream" ) { kotlin.runCatching { val file = File(localPath) - if (!file.exists()) throw NoStackTraceException("文件不存在") + if (!file.exists()) throw WebDavException("文件不存在") // 务必注意RequestBody不要嵌套，不然上传时内容可能会被追加多余的文件信息 val fileBody = file.asRequestBody(contentType.toMediaType()) - val url = httpUrl ?: throw NoStackTraceException("url不能为空") + val url = httpUrl ?: throw WebDavException("url不能为空") okHttpClient.newCallResponse { url(url) put(fileBody) @@ -214,11 +218,11 @@ class WebDav(urlStr: String, val authorization: Authorization) { checkResult(it) } }.onFailure { - throw NoStackTraceException("WebDav上传失败\n${it.localizedMessage}") + throw WebDavException("WebDav上传失败\n${it.localizedMessage}") } } - @Throws(Exception::class) + @Throws(WebDavException::class) suspend fun upload(byteArray: ByteArray, contentType: String) { // 务必注意RequestBody不要嵌套，不然上传时内容可能会被追加多余的文件信息 kotlin.runCatching { @@ -232,7 +236,7 @@ class WebDav(urlStr: String, val authorization: Authorization) { checkResult(it) } }.onFailure { - throw NoStackTraceException("WebDav上传失败\n${it.localizedMessage}") + throw WebDavException("WebDav上传失败\n${it.localizedMessage}") } } @@ -248,7 +252,7 @@ class WebDav(urlStr: String, val authorization: Authorization) { private fun checkResult(response: Response) { if (!response.isSuccessful) { - throw NoStackTraceException("${url}\n${response.code}:${response.message}") + throw WebDavException("${url}\n${response.code}:${response.message}") } } diff --git a/app/src/main/java/io/legado/app/lib/webdav/WebDavException.kt b/app/src/main/java/io/legado/app/lib/webdav/WebDavException.kt new file mode 100644 index 000000000..08cb38132 --- /dev/null +++ b/app/src/main/java/io/legado/app/lib/webdav/WebDavException.kt @@ -0,0 +1,9 @@ +package io.legado.app.lib.webdav + +class WebDavException(msg: String) : Exception(msg) { + + override fun fillInStackTrace(): Throwable { + return this + } + +} \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt index a96f74599..425651827 100644 --- a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt @@ -292,7 +292,7 @@ class BackupConfigFragment : BasePreferenceFragment(), }.onError { alert { setTitle(R.string.restore) - setMessage("WebDavError:${it.localizedMessage}\n将从本地备份恢复。") + setMessage("WebDavError\n${it.localizedMessage}\n将从本地备份恢复。") okButton { restoreFromLocal() }