Merge remote-tracking branch 'origin/master'

app/src/main/assets/updateLog.md

@@ -11,6 +11,17 @@
 * 正文出现缺字漏字、内容缺失、排版错乱等情况，有可能是净化规则或简繁转换出现问题。
 * 漫画源看书显示乱码，**阅读与其他软件的源并不通用**，请导入阅读的支持的漫画源！
 
+**2023/03/10**
+* 远程书籍添加webDav多配置
+* 更新文件类书源详情页界面逻辑
+* 尝试修复语音朗读
+* 修复特定情况下书籍导入界面计数错误
+* 修复阅读界面导航栏更新不及时
+* 修复某些以空白开头的链接的拼接
+* 导入某些不规范的本地书源文件提示空
+* 修复某些空白备份恢复的错误弹窗
+* 修复章节都在一个xhtml里面的epub的内容解析
+
 **2023/03/03**
 
 * 朗读速度添加数值显示

app/src/main/java/io/legado/app/constant/AppConst.kt

@@ -25,6 +25,8 @@ object AppConst {
 
     const val MAX_THREAD = 9
 
+    const val DEFAULT_WEBDAV_ID = -1L
+
     val SCRIPT_ENGINE: RhinoScriptEngine by lazy {
         RhinoScriptEngine()
     }

app/src/main/java/io/legado/app/lib/webdav/Authorization.kt

@@ -1,6 +1,7 @@
 package io.legado.app.lib.webdav
 
 import io.legado.app.data.appDb
+import io.legado.app.data.entities.Server.WebDavConfig
 import io.legado.app.exception.NoStackTraceException
 import okhttp3.Credentials
 import java.nio.charset.Charset
@@ -29,4 +30,6 @@ data class Authorization(
         } ?: throw WebDavException("Unexpected WebDav Authorization")
     }
 
+    constructor(webDavConfig: WebDavConfig): this(webDavConfig.username, webDavConfig.password)
+
 }

app/src/main/java/io/legado/app/model/localBook/EpubFile.kt

@@ -137,38 +137,35 @@ class EpubFile(var book: Book) {
         }
         /*获取当前章节文本*/
         epubBook?.let { epubBook ->
-            val nextUrl = chapter.getVariable("nextUrl")
+            val nextChapterFirstResourceHref = chapter.getVariable("nextUrl")?.substringBeforeLast("#")
+            val currentChapterFirstResourceHref = chapter.url.substringBeforeLast("#")
             val startFragmentId = chapter.startFragmentId
             val endFragmentId = chapter.endFragmentId
             val elements = Elements()
-            var hasMoreResources = false
+            var findChapterFirstSource = false
             val includeNextChapterResource = !endFragmentId.isNullOrBlank()
             /*一些书籍依靠href索引的resource会包含多个章节，需要依靠fragmentId来截取到当前章节的内容*/
             /*注:这里较大增加了内容加载的时间，所以首次获取内容后可存储到本地cache，减少重复加载*/
             for (res in epubBook.contents) {
-                val isFirstResource = chapter.url.substringBeforeLast("#") == res.href
-                val isNextChapterResource = res.href == nextUrl?.substringBeforeLast("#")
-                if (isFirstResource) {
-                    // add first resource to elements
+                if (!findChapterFirstSource) {
+                    if (currentChapterFirstResourceHref == res.href) findChapterFirstSource = true
+                    // 第一个xhtml文件
                     elements.add(
-                        /* pass endFragmentId if only has one resource */
                         getBody(res, startFragmentId, endFragmentId)
                     )
-                    // check current resource 
-                    if (isNextChapterResource) {
-                        /* FragmentId should not be same in same resource */
-                        if (!endFragmentId.isNullOrBlank() && endFragmentId == startFragmentId)
-                            AppLog.putDebug("Epub: Resource (${res.href}) has same FragmentId, check the file: ${book.bookUrl}")
-                        break
-                    }
-                    hasMoreResources = true
-                } else if (hasMoreResources) {
-                    if (isNextChapterResource) {
-                        if (includeNextChapterResource) elements.add(getBody(res, null/* FragmentId may be same in different resources, pass null */, endFragmentId))
-                        break
-                    }
-                    // rest resource should not have fragmentId, pass null 
+                    if (currentChapterFirstResourceHref == nextChapterFirstResourceHref) break
+                    continue
+                }
+                if (nextChapterFirstResourceHref != res.href) {
+                    // 其余部分
                     elements.add(getBody(res, null, null))
+                } else {
+                    // 下一章节的第一个xhtml
+                    if (includeNextChapterResource) {
+                        //有Fragment 则添加到上一章节
+                        elements.add(getBody(res, null, endFragmentId))
+                    }
+                    break
                 }
             }
             //title标签中的内容不需要显示在正文中，去除

app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt

@@ -30,7 +30,7 @@ import java.io.File
 class RemoteBookActivity : BaseImportBookActivity<ActivityImportBookBinding, RemoteBookViewModel>(),
     RemoteBookAdapter.CallBack,
     SelectActionBar.CallBack,
-    ServerConfigDialog.Callback {
+    ServersDialog.Callback {
     override val binding by viewBinding(ActivityImportBookBinding::inflate)
     override val viewModel by viewModels<RemoteBookViewModel>()
     private val adapter by lazy { RemoteBookAdapter(this, this) }

app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookViewModel.kt

@@ -80,17 +80,10 @@ class RemoteBookViewModel(application: Application) : BaseViewModel(application)
 
     fun initData(onSuccess: () -> Unit) {
         execute {
-            val server = appDb.serverDao.get(AppConfig.remoteServerId)
-            val serverConfig = server?.getConfigJsonObject()
-            if (serverConfig != null && serverConfig.has("url")) {
-                val url = serverConfig.getString("url")
-                if (url.isNotBlank()) {
-                    val user = serverConfig.getString("user")
-                    val password = serverConfig.getString("password")
-                    val authorization = Authorization(user, password)
-                    remoteBookWebDav = RemoteBookWebDav(url, authorization, 10001)
-                    return@execute
-                }
+            appDb.serverDao.get(AppConfig.remoteServerId)?.getWebDavConfig()?.let {
+                val authorization = Authorization(it)
+                remoteBookWebDav = RemoteBookWebDav(it.url, authorization, AppConfig.remoteServerId)
+                return@execute
             }
             remoteBookWebDav = AppWebDav.defaultBookWebDav
                 ?: throw NoStackTraceException("webDav没有配置")

app/src/main/java/io/legado/app/ui/book/import/remote/ServerConfigDialog.kt

@@ -67,7 +67,6 @@ class ServerConfigDialog() : BaseDialogFragment(R.layout.dialog_webdav_server, t
     }
 
     private fun upConfigView(server: Server?) {
-        binding.etId.setText(server?.id?.toString())
         binding.etName.setText(server?.name)
         binding.spType.setSelection(
             when (server?.type) {
@@ -109,14 +108,7 @@ class ServerConfigDialog() : BaseDialogFragment(R.layout.dialog_webdav_server, t
     }
 
     private fun getServer(): Server? {
-        val id = kotlin.runCatching {
-            binding.etId.text.toString().toLong()
-        }.getOrNull()
-        if (id == null) {
-            toastOnUi("id不能为空")
-            return null
-        }
-        val server = viewModel.mServer?.copy(id = id) ?: Server(id = id)
+        val server = viewModel.mServer?.copy() ?: Server()
         server.name = binding.etName.text.toString()
         server.type = when (binding.spType.selectedItemPosition) {
             else -> Server.TYPE.WEBDAV
@@ -139,15 +131,15 @@ class ServerConfigDialog() : BaseDialogFragment(R.layout.dialog_webdav_server, t
     }
 
 
-    override fun onDismiss(dialog: DialogInterface) {
-        super.onDismiss(dialog)
-        ((parentFragment as? Callback) ?: (activity as? Callback))
-            ?.onDialogDismiss("serverConfig")
-    }
+    // override fun onDismiss(dialog: DialogInterface) {
+        // super.onDismiss(dialog)
+       // ((parentFragment as? Callback) ?: (activity as? Callback))
+           // ?.onDialogDismiss("serverConfig")
+    // }
 
-    interface Callback {
+    // interface Callback {
 
-        fun onDialogDismiss(tag: String)
+        // fun onDialogDismiss(tag: String)
 
-    }
+    // }
 }

app/src/main/java/io/legado/app/ui/book/import/remote/ServersDialog.kt

@@ -10,6 +10,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.legado.app.R
+import io.legado.app.constant.AppConst.DEFAULT_WEBDAV_ID
 import io.legado.app.base.BaseDialogFragment
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.base.adapter.RecyclerAdapter
@@ -61,7 +62,7 @@ class ServersDialog : BaseDialogFragment(R.layout.dialog_recycler_view),
         binding.tvFooterLeft.text = getString(R.string.text_default)
         binding.tvFooterLeft.visible()
         binding.tvFooterLeft.setOnClickListener {
-            AppConfig.remoteServerId = 0
+            AppConfig.remoteServerId = DEFAULT_WEBDAV_ID
             dismissAllowingStateLoss()
         }
         binding.tvCancel.visible()

app/src/main/res/layout/dialog_webdav_server.xml

@@ -28,21 +28,6 @@
             app:popupTheme="@style/AppTheme.PopupOverlay"
             app:titleTextAppearance="@style/ToolbarTitle" />
 
-        <io.legado.app.ui.widget.text.TextInputLayout
-            android:id="@+id/til_id"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="ID"
-            tools:ignore="HardcodedText">
-
-            <io.legado.app.lib.theme.view.ThemeEditText
-                android:id="@+id/et_id"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:numeric="integer"
-                tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
-        </io.legado.app.ui.widget.text.TextInputLayout>
-
         <io.legado.app.ui.widget.text.TextInputLayout
             android:id="@+id/til_name"
             android:layout_width="match_parent"