renun/legado
1
0
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2025-08-10 00:52:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
This commit is contained in:
kunfei
2022-10-05 19:08:52 +08:00
parent e5583dee0b bc357f7c48
commit c4d474f3d9
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
View File

@@ -18,6 +18,7 @@ import io.legado.app.help.AppWebDav
import io.legado.app.help.book.BookHelp
import io.legado.app.help.book.isEpub
import io.legado.app.help.book.isUmd
import io.legado.app.help.book.getRemoteUrl
import io.legado.app.help.config.AppConfig
import io.legado.app.lib.webdav.WebDav
import io.legado.app.model.analyzeRule.AnalyzeUrl
@@ -307,10 +308,8 @@ object LocalBook {
//下载book.remoteUrl对应的远程文件并更新bookUrl 返回inputStream
private fun downloadRemoteBook(localBook: Book): InputStream? {
//webDav::${http}
if (!localBook.origin.startsWith(BookType.webDavTag)) return null
val webDavUrl = localBook.origin.substring(8)
if (webDavUrl.isBlank()) return null
val webDavUrl = localBook.getRemoteUrl()
if (webDavUrl.isNullOrBlank()) return null
try {
val uri = AppWebDav.authorization?.let {
val webdav = WebDav(webDavUrl, it)

2
app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
View File

@@ -122,7 +122,7 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
book.origin = BookType.localTag
} else if (remoteBook.lastModify > book.lastCheckTime) {
val uri = RemoteBookWebDav.downloadRemoteBook(remoteBook)
book.origin = if (uri.isContentScheme()) uri.toString() else uri.path!!
book.bookUrl = if (uri.isContentScheme()) uri.toString() else uri.path!!
book.lastCheckTime = remoteBook.lastModify
}
}