Merge pull request #394 from AndyBernie/master

换源时无最新章节时自动加载详情页

app/src/main/assets/updateLog.md

@@ -5,6 +5,7 @@
 
 **2020/09/21**
 * 修复规则解析bug
+* 换源时无最新章节信息时可加载详情页来获取(默认关闭)
 
 **2020/09/20**
 * 优化正文搜索

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

@@ -35,6 +35,7 @@ object PreferKey {
     const val webDavCreateDir = "webDavCreateDir"
     const val webDavCacheBackup = "webDavCacheBackup"
     const val changeSourceLoadToc = "changeSourceLoadToc"
+    const val changeSourceLoadInfo = "changeSourceLoadInfo"
     const val chineseConverterType = "chineseConverterType"
     const val launcherIcon = "launcherIcon"
     const val textSelectAble = "selectText"

app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt

@@ -88,6 +88,8 @@ class ChangeSourceDialog : BaseDialogFragment(),
         tool_bar.setOnMenuItemClickListener(this)
         tool_bar.menu.findItem(R.id.menu_load_toc)?.isChecked =
             getPrefBoolean(PreferKey.changeSourceLoadToc)
+        tool_bar.menu.findItem(R.id.menu_load_info)?.isChecked =
+            getPrefBoolean(PreferKey.changeSourceLoadInfo)
     }
 
     private fun initRecyclerView() {
@@ -159,6 +161,10 @@ class ChangeSourceDialog : BaseDialogFragment(),
                 putPrefBoolean(PreferKey.changeSourceLoadToc, !item.isChecked)
                 item.isChecked = !item.isChecked
             }
+            R.id.menu_load_info -> {
+                putPrefBoolean(PreferKey.changeSourceLoadInfo, !item.isChecked)
+                item.isChecked = !item.isChecked
+            }
             R.id.menu_stop -> viewModel.stopSearch()
         }
         return false

app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceViewModel.kt

@@ -120,11 +120,11 @@ class ChangeSourceViewModel(application: Application) : BaseViewModel(applicatio
                 .onSuccess(IO) {
                     it.forEach { searchBook ->
                         if (searchBook.name == name && searchBook.author == author) {
-                            if (context.getPrefBoolean(PreferKey.changeSourceLoadToc)) {
+                            if (searchBook.latestChapterTitle.isNullOrEmpty()) {
-                                if (searchBook.tocUrl.isEmpty()) {
+                                if (context.getPrefBoolean(PreferKey.changeSourceLoadInfo) || context.getPrefBoolean(PreferKey.changeSourceLoadToc)) {
                                     loadBookInfo(searchBook.toBook())
                                 } else {
-                                    loadChapter(searchBook.toBook())
+                                    searchFinish(searchBook)
                                 }
                             } else {
                                 searchFinish(searchBook)
@@ -156,7 +156,14 @@ class ChangeSourceViewModel(application: Application) : BaseViewModel(applicatio
             App.db.bookSourceDao().getBookSource(book.origin)?.let { bookSource ->
                 WebBook(bookSource).getBookInfo(book, this)
                     .onSuccess {
+                        if (context.getPrefBoolean(PreferKey.changeSourceLoadToc)) {
                             loadChapter(it)
+                        } else {
+                            //从详情页里获取最新章节
+                            book.latestChapterTitle = it.latestChapterTitle
+                            val searchBook = book.toSearchBook()
+                            searchFinish(searchBook)
+                        }
                     }.onError {
                         debug { context.getString(R.string.error_get_book_info) }
                     }

app/src/main/res/menu/change_source.xml

@@ -24,4 +24,10 @@
         android:checkable="true"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_load_info"
+        android:title="@string/load_info"
+        android:checkable="true"
+        app:showAsAction="never" />
+
 </menu>

app/src/main/res/values-zh-rHK/strings.xml

@@ -568,6 +568,7 @@
     <string name="export_selection">導出所選</string>
     <string name="export">導出</string>
     <string name="load_toc">加載目錄</string>
+    <string name="load_info">加載詳情頁</string>
     <string name="tts">TTS</string>
     <string name="web_dav_pw">WebDav 密碼</string>
     <string name="web_dav_pw_s">輸入你的 WebDav 授權密碼</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -569,6 +569,7 @@
     <string name="export_selection">匯出所選</string>
     <string name="export">匯出</string>
     <string name="load_toc">載入目錄</string>
+    <string name="load_info">載入詳情頁</string>
     <string name="tts">TTS</string>
     <string name="web_dav_pw">WebDav 密碼</string>
     <string name="web_dav_pw_s">輸入你的WebDav授權密碼</string>

app/src/main/res/values-zh/strings.xml

@@ -575,6 +575,7 @@
     <string name="export_selection">导出所选</string>
     <string name="export">导出</string>
     <string name="load_toc">加载目录</string>
+    <string name="load_info">加载详情页</string>
     <string name="tts">TTS</string>
     <string name="web_dav_pw">WebDav 密码</string>
     <string name="web_dav_pw_s">输入你的WebDav授权密码</string>

app/src/main/res/values/strings.xml

@@ -577,6 +577,7 @@
     <string name="export_selection">Export selected</string>
     <string name="export">Export</string>
     <string name="load_toc">Load chapters</string>
+    <string name="load_info">Load book detail</string>
     <string name="tts">TTS</string>
     <string name="web_dav_pw">WebDav password</string>
     <string name="web_dav_pw_s">Input you WebDav authorized password</string>