From c9ccda2ca7916ce1b2444a9db59535876bacf31e Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Mon, 20 Jun 2022 22:05:27 +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

---
 .../main/java/io/legado/app/ui/book/remote/RemoteBook.kt  | 2 +-
 .../io/legado/app/ui/book/remote/RemoteBookActivity.kt    | 4 ++++
 .../io/legado/app/ui/book/remote/RemoteBookAdapter.kt     | 3 ++-
 .../legado/app/ui/book/remote/manager/RemoteBookWebDav.kt | 8 +++-----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBook.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBook.kt
index 65de6ac2d..1b3a2d003 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBook.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBook.kt
@@ -2,7 +2,7 @@ package io.legado.app.ui.book.remote
 
 data class RemoteBook(
     val filename: String,
-    val urlName: String,
+    val path: String,
     val size: Long,
     val contentType: String,
     val lastModify: Long,
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
index c6f109962..e27401a3e 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookActivity.kt
@@ -67,6 +67,10 @@ class RemoteBookActivity : VMBaseActivity<ActivityRemoteBookBinding, RemoteBookV
         return super.onCompatOptionsItemSelected(item)
     }
 
+    override fun openDir(url: String) {
+
+    }
+
     @SuppressLint("NotifyDataSetChanged")
     override fun addToBookshelf(remoteBook: RemoteBook) {
         waitDialog.show()
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
index b31f56bec..a7bd8cf74 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/RemoteBookAdapter.kt
@@ -51,7 +51,7 @@ class RemoteBookAdapter (context: Context, val callBack: CallBack) :
         binding.btnDownload.setOnClickListener {
                 getItem(holder.layoutPosition)?.let {
                     if (it.isDir) {
-
+                        callBack.openDir(it.path)
                     } else {
                         callBack.addToBookshelf(it)
                     }
@@ -61,6 +61,7 @@ class RemoteBookAdapter (context: Context, val callBack: CallBack) :
     }
 
     interface CallBack {
+        fun openDir(url: String)
         fun addToBookshelf(remoteBook: RemoteBook)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt b/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt
index 0a512b76f..a85b2a3b7 100644
--- a/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt
+++ b/app/src/main/java/io/legado/app/ui/book/remote/manager/RemoteBookWebDav.kt
@@ -45,14 +45,12 @@ object RemoteBookWebDav : RemoteBookManager() {
             //转化远程文件信息到本地对象
             remoteWebDavFileList.forEach { webDavFile ->
                 var webDavFileName = webDavFile.displayName
-                var webDavUrlName = "${remoteBookUrl}${File.separator}${webDavFile.displayName}"
                 webDavFileName = URLDecoder.decode(webDavFileName, "utf-8")
-                webDavUrlName = URLDecoder.decode(webDavUrlName, "utf-8")
 
                 if (webDavFile.isDir) {
                     remoteBooks.add(
                         RemoteBook(
-                            webDavFileName, webDavUrlName, webDavFile.size,
+                            webDavFileName, webDavFile.path, webDavFile.size,
                             "folder", webDavFile.lastModify, false
                         )
                     )
@@ -65,7 +63,7 @@ object RemoteBookWebDav : RemoteBookManager() {
                         val isOnBookShelf = LocalBook.isOnBookShelf(webDavFileName)
                         remoteBooks.add(
                             RemoteBook(
-                                webDavFileName, webDavUrlName, webDavFile.size,
+                                webDavFileName, webDavFile.path, webDavFile.size,
                                 fileExtension, webDavFile.lastModify, isOnBookShelf
                             )
                         )
@@ -81,7 +79,7 @@ object RemoteBookWebDav : RemoteBookManager() {
      */
     override suspend fun getRemoteBook(remoteBook: RemoteBook): Uri? {
         return AppWebDav.authorization?.let {
-            val webdav = WebDav(remoteBook.urlName, it)
+            val webdav = WebDav(remoteBook.path, it)
             webdav.download().let { bytes ->
                 LocalBook.saveBookFile(bytes, remoteBook.filename)
             }