From fb9189ac0ca48743823e24a0d922e30fa611b566 Mon Sep 17 00:00:00 2001 From: Horis <821938089@qq.com> Date: Sat, 14 Oct 2023 16:15:14 +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/ui/book/source/edit/BookSourceEditViewModel.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditViewModel.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditViewModel.kt index 92af5a825..9588e018d 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditViewModel.kt @@ -41,8 +41,8 @@ class BookSourceEditViewModel(application: Application) : BaseViewModel(applicat if (source.bookSourceUrl.isBlank() || source.bookSourceName.isBlank()) { throw NoStackTraceException(context.getString(R.string.non_null_name_url)) } - if (!source.equal(bookSource ?: BookSource())) { - source.lastUpdateTime = System.currentTimeMillis() + if (source.equal(bookSource ?: BookSource())) { + return@execute source } bookSource?.let { appDb.bookSourceDao.delete(it) @@ -91,6 +91,7 @@ class BookSourceEditViewModel(application: Application) : BaseViewModel(applicat val text1 = okHttpClient.newCallStrResponse { url(text) }.body importSource(text1!!) } + text.isJsonArray() -> { if (text.contains("ruleSearchUrl") || text.contains("ruleFindUrl")) { val items: List> = jsonPath.parse(text).read("$") @@ -100,6 +101,7 @@ class BookSourceEditViewModel(application: Application) : BaseViewModel(applicat GSON.fromJsonArray(text).getOrThrow()[0] } } + text.isJsonObject() -> { if (text.contains("ruleSearchUrl") || text.contains("ruleFindUrl")) { val jsonItem = jsonPath.parse(text) @@ -108,6 +110,7 @@ class BookSourceEditViewModel(application: Application) : BaseViewModel(applicat GSON.fromJsonObject(text).getOrThrow() } } + else -> throw NoStackTraceException("格式不对") } }