From 79218aba28e81edcf892bba987eda6df039149a6 Mon Sep 17 00:00:00 2001 From: Horis <821938089@qq.com> Date: Sun, 4 Jun 2023 15:34:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=AE=E5=BD=95=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98=20#3149?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/ui/book/info/BookInfoViewModel.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt index 6178653ca..50ed3ad32 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt @@ -196,7 +196,8 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) { val oldBook = book.copy() WebBook.getChapterList(this, bookSource, book, true) .onSuccess(IO) { - if (inBookshelf) { + val dbBook = appDb.bookDao.getBook(book.name, book.author) + if (dbBook?.bookUrl == oldBook.bookUrl) { if (oldBook.bookUrl == book.bookUrl) { appDb.bookDao.update(book) } else { @@ -241,10 +242,12 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) { ) { execute(scope) { webFiles.clear() - val fileNameExcludeExtension = if (book.author.isBlank()) book.name else "${book.name} 作者:${book.author}" + val fileNameNoExtension = if (book.author.isBlank()) book.name + else "${book.name} 作者:${book.author}" book.downloadUrls!!.map { val analyzeUrl = AnalyzeUrl(it, source = bookSource) - val mFileName = UrlUtil.getFileName(analyzeUrl) ?: "${fileNameExcludeExtension}.${analyzeUrl.type}" + val mFileName = UrlUtil.getFileName(analyzeUrl) + ?: "${fileNameNoExtension}.${analyzeUrl.type}" WebFile(it, mFileName) } }.onError {