From fbe0a15d438af979d553a5032b3a2578db3a88fe Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Mon, 6 Mar 2023 18:29:36 +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

---
 app/src/main/java/io/legado/app/lib/webdav/WebDav.kt  | 11 ++---------
 .../io/legado/app/model/remote/RemoteBookWebDav.kt    |  7 +++++--
 2 files changed, 7 insertions(+), 11 deletions(-)

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 f4e8e925c..e173d1d64 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
@@ -34,15 +34,14 @@ import java.time.format.DateTimeFormatter
 @Suppress("unused", "MemberVisibilityCanBePrivate")
 open class WebDav(
     val path: String,
-    val authorization: Authorization,
-    private val serverID: Long? = null
+    val authorization: Authorization
 ) {
     companion object {
 
         fun fromPath(path: String): WebDav {
             val id = AnalyzeUrl(path).serverID
             val authorization = Authorization(id)
-            return WebDav(path, authorization, id)
+            return WebDav(path, authorization)
         }
 
         @SuppressLint("DateTimeFormatter")
@@ -402,10 +401,4 @@ open class WebDav(
         }
     }
 
-    override fun toString(): String {
-        val url = httpUrl ?: return ""
-        serverID ?: return url
-        return  "$url,{serverID:$serverID}"
-    }
-
 }
diff --git a/app/src/main/java/io/legado/app/model/remote/RemoteBookWebDav.kt b/app/src/main/java/io/legado/app/model/remote/RemoteBookWebDav.kt
index aa95aac7f..e8d9eaba4 100644
--- a/app/src/main/java/io/legado/app/model/remote/RemoteBookWebDav.kt
+++ b/app/src/main/java/io/legado/app/model/remote/RemoteBookWebDav.kt
@@ -9,6 +9,7 @@ import io.legado.app.help.config.AppConfig
 import io.legado.app.lib.webdav.Authorization
 import io.legado.app.lib.webdav.WebDav
 import io.legado.app.lib.webdav.WebDavFile
+import io.legado.app.model.analyzeRule.CustomUrl
 import io.legado.app.model.localBook.LocalBook
 import io.legado.app.utils.NetworkUtils
 import io.legado.app.utils.isContentScheme
@@ -67,7 +68,7 @@ class RemoteBookWebDav(
         if (!NetworkUtils.isAvailable()) throw NoStackTraceException("网络不可用")
         val localBookUri = Uri.parse(book.bookUrl)
         val putUrl = "$rootBookUrl${File.separator}${book.originName}"
-        val webDav =  WebDav(putUrl, authorization, serverID)
+        val webDav =  WebDav(putUrl, authorization)
         if (localBookUri.isContentScheme()) {
             webDav.upload(
                 byteArray = localBookUri.readBytes(appCtx),
@@ -76,7 +77,9 @@ class RemoteBookWebDav(
         } else {
             webDav.upload(localBookUri.path!!)
         }
-        book.origin = BookType.webDavTag + webDav.toString()
+        book.origin = BookType.webDavTag + CustomUrl(putUrl)
+          .putAttribute("serverID", serverID)
+          .toString()
         book.save()
     }