diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt index d2224a584..4c8759c31 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -47,6 +47,7 @@ object PreferKey { const val webDavPassword = "web_dav_password" const val webDavCreateDir = "webDavCreateDir" const val exportToWebDav = "webDavCacheBackup" + const val exportNoChapterName = "exportNoChapterName" const val exportType = "exportType" const val changeSourceCheckAuthor = "changeSourceCheckAuthor" const val changeSourceLoadToc = "changeSourceLoadToc" diff --git a/app/src/main/java/io/legado/app/help/AppConfig.kt b/app/src/main/java/io/legado/app/help/AppConfig.kt index 5a381cf73..16ebb95e1 100644 --- a/app/src/main/java/io/legado/app/help/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/AppConfig.kt @@ -205,7 +205,11 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { set(value) { appCtx.putPrefBoolean(PreferKey.exportToWebDav, value) } - + var exportNoChapterName: Boolean + get() = appCtx.getPrefBoolean(PreferKey.exportNoChapterName) + set(value) { + appCtx.putPrefBoolean(PreferKey.exportNoChapterName, value) + } var exportType: Int get() = appCtx.getPrefInt(PreferKey.exportType) set(value) { diff --git a/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt index 038a6c8b0..04209e346 100644 --- a/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt @@ -92,6 +92,7 @@ class CacheActivity : VMBaseActivity() override fun onMenuOpened(featureId: Int, menu: Menu): Boolean { menu.findItem(R.id.menu_enable_replace)?.isChecked = AppConfig.exportUseReplace + menu.findItem(R.id.menu_export_no_chapter_name)?.isChecked = AppConfig.exportNoChapterName menu.findItem(R.id.menu_export_web_dav)?.isChecked = AppConfig.exportToWebDav menu.findItem(R.id.menu_export_type)?.title = "${getString(R.string.export_type)}(${getTypeName()})" @@ -127,6 +128,7 @@ class CacheActivity : VMBaseActivity() } R.id.menu_export_all -> exportAll() R.id.menu_enable_replace -> AppConfig.exportUseReplace = !item.isChecked + R.id.menu_export_no_chapter_name -> AppConfig.exportNoChapterName = !item.isChecked R.id.menu_export_web_dav -> AppConfig.exportToWebDav = !item.isChecked R.id.menu_export_folder -> { exportPosition = -1 diff --git a/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt index 4965fa0b7..64fd14c36 100644 --- a/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt @@ -139,7 +139,7 @@ class CacheViewModel(application: Application) : BaseViewModel(application) { ) appDb.bookChapterDao.getChapterList(book.bookUrl).forEach { chapter -> BookHelp.getContent(book, chapter).let { content -> - val content1 = contentProcessor + var content1 = contentProcessor .getContent( book, chapter.title.replace("\\r?\\n".toRegex(), " "), @@ -148,6 +148,9 @@ class CacheViewModel(application: Application) : BaseViewModel(application) { useReplace ) .joinToString("\n") + if(AppConfig.exportNoChapterName){ + content1 = content.toString() + } append.invoke("\n\n$content1") } } diff --git a/app/src/main/res/menu/book_cache.xml b/app/src/main/res/menu/book_cache.xml index 0f58daf7a..f76ab76f8 100644 --- a/app/src/main/res/menu/book_cache.xml +++ b/app/src/main/res/menu/book_cache.xml @@ -36,6 +36,11 @@ android:title="@string/export_to_web_dav" android:checkable="true" app:showAsAction="never" /> + url为空 字典 未知错误 + No export chapter names end 关闭替换分组/开启添加分组 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 0a80ee0d5..8e2980d5b 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -847,6 +847,8 @@ 重置 url為空 字典 + 未知错误 + TXT不導出章節名 未知錯誤 end 关闭替换分组/开启添加分组 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 3b17b9cef..3c0f17670 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -848,6 +848,8 @@ 重設 url為空 字典 + 未知错误 + TXT不匯出章節名 未知錯誤 end 关闭替换分组/开启添加分组 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 3e1ffb84c..78323bbeb 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -812,6 +812,7 @@ 0为停用,启用范围1~25\n半径数值越大,虚化效果越高 导出文件夹 导出编码 + TXT不导出章节名 导出到WebDav 反转内容 调试 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fa3f75759..70aa39e1a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -851,6 +851,7 @@ Null url 字典 未知错误 + No export chapter names Autobackup failed end 关闭替换分组/开启添加分组