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 1 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2022-05-01 22:44:54 +08:00
parent fabb74990a
commit dfbeb3797b
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/io/legado/app/help/storage/AppWebDav.kt
View File

@@ -142,7 +142,7 @@ object AppWebDav {
return kotlin.runCatching {
authorization?.let {
var lastBackupFile: WebDavFile? = null
WebDav(rootWebDavUrl, it).listFiles().forEach { webDavFile ->
WebDav(rootWebDavUrl, it).listFiles().reversed().forEach { webDavFile ->
if (webDavFile.displayName.startsWith("backup")) {
if (lastBackupFile == null
|| webDavFile.lastModify > lastBackupFile!!.lastModify

5
app/src/main/java/io/legado/app/lib/webdav/WebDav.kt
View File

@@ -20,7 +20,6 @@ import java.net.MalformedURLException
import java.net.URL
import java.net.URLEncoder
import java.text.SimpleDateFormat
import java.util.*
@Suppress("unused", "MemberVisibilityCanBePrivate")
open class WebDav(urlStr: String, val authorization: Authorization) {
@@ -133,12 +132,12 @@ open class WebDav(urlStr: String, val authorization: Authorization) {
element.getElementsByTag("d:getcontentlength")
.firstOrNull()?.text()?.toLong() ?: 0
}.getOrDefault(0)
val lastModify: Date? = kotlin.runCatching {
val lastModify: Long = kotlin.runCatching {
element.getElementsByTag("d:getcontentlength")
.firstOrNull()?.text()?.let {
dateFormat.parse(it)
}
}.getOrNull()
}.getOrNull()?.time ?: 0
webDavFile = WebDavFile(
baseUrl + fileName,
authorization,

5
app/src/main/java/io/legado/app/lib/webdav/WebDavFile.kt
View File

@@ -1,10 +1,9 @@
package io.legado.app.lib.webdav
import java.util.*
/**
* webDavFile
*/
@Suppress("unused")
class WebDavFile(
urlStr: String,
authorization: Authorization,
@@ -12,5 +11,5 @@ class WebDavFile(
val urlName: String,
val size: Long,
val contentType: String,
val lastModify: Date?
val lastModify: Long
) : WebDav(urlStr, authorization)

2
app/src/main/java/io/legado/app/ui/main/MainActivity.kt
View File

@@ -97,7 +97,7 @@ class MainActivity : VMBaseActivity<ActivityMainBinding, MainViewModel>(),
launch {
val lastBackupFile = withContext(IO) { AppWebDav.lastBackUp().getOrNull() }
?: return@launch
if (lastBackupFile.lastModify?.time ?: 0 - LocalConfig.lastBackup > DateUtils.MINUTE_IN_MILLIS) {
if (lastBackupFile.lastModify - LocalConfig.lastBackup > DateUtils.MINUTE_IN_MILLIS) {
alert("恢复", "webDav书源比本地新,是否恢复") {
cancelButton()
okButton {