Skip to content

Repository navigation

Merge pull request #5 from GetLogBy/dev fix(sync): 修复增量同步云端目录路径重复及自动创建 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GetLogBy merged 6 commits into from
Aug 16, 2026
Merged

Merge pull request #5 from GetLogBy/dev fix(sync): 修复增量同步云端目录路径重复及自动创建 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ad4a58
Merge pull request #1 from GetLogBy/dev
GetLogBy Aug 14, 2026
a651f40
Merge pull request #2 from GetLogBy/dev
GetLogBy Aug 14, 2026
1aa8c64
Merge pull request #3 from GetLogBy/dev
GetLogBy Aug 15, 2026
5951ae8
Merge pull request #4 from GetLogBy/dev
GetLogBy Aug 15, 2026
4e72485
fix(sync): 修复增量同步云端目录路径重复及自动创建
GetLogBy Aug 16, 2026
4e6d3db
Merge pull request #5 from GetLogBy/dev
GetLogBy Aug 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/io/legado/app/help/AppWebDav.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ object AppWebDav {

val isJianGuoYun get() = rootWebDavUrl.startsWith(defaultWebDavUrl, true)

/** 增量同步根目录 */
/** 增量同步根目录, 位于备份目录(rootWebDavUrl)下的 sync/ */
val syncRootUrl: String
get() {
val root = if (rootWebDavUrl.endsWith("/")) rootWebDavUrl else "$rootWebDavUrl/"
return "${root}legado/sync/"
return "${root}sync/"
}

init {
Expand Down
13 changes: 13 additions & 0 deletions app/src/main/java/io/legado/app/help/sync/SyncClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ object SyncClient {

/** 确保所有云端目录存在 */
suspend fun ensureDirs() {
ensureDir(baseUrl)
DataSyncType.values().forEach { type ->
kotlin.runCatching {
webDav(dirUrl(type)).makeAsDir()
Expand All @@ -55,6 +56,17 @@ object SyncClient {
}
}

/** 逐级创建目录, 兼容不支持自动创建父目录的服务器 */
private suspend fun ensureDir(url: String) {
val dav = webDav(url)
if (dav.exists()) return
val parent = url.trimEnd('/').substringBeforeLast('/', url) + "/"
if (parent != url && parent.contains("://")) {
ensureDir(parent)
}
dav.makeAsDir()
}

// ============================ push ============================

suspend fun pushBooks() {
Expand Down Expand Up @@ -101,6 +113,7 @@ object SyncClient {

/** 推送全部启用的类型 */
suspend fun pushAll() {
ensureDirs()
SyncConfig.dataTypes.forEach { type ->
when (type) {
DataSyncType.BOOKS -> pushBooks()
Expand Down