Mikescher/kpsync
1
0
Fork 0
mirror of https://github.com/Mikescher/kpsync.git synced 2025-10-14 08:45:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow executing without local-fallback

Browse Source
This commit is contained in:
Mike Schwörer
2025-09-19 13:33:45 +02:00
parent 675cead3c6
commit 8c432bb834
3 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/application.go
View File

@@ -1,6 +1,7 @@
package app
import (
"errors"
"fmt"
"os"
"os/signal"
@@ -11,6 +12,7 @@ import (
"fyne.io/systray"
"git.blackforestbytes.com/BlackForestBytes/goext/dataext"
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
"git.blackforestbytes.com/BlackForestBytes/goext/syncext"
"git.blackforestbytes.com/BlackForestBytes/goext/termext"
"git.blackforestbytes.com/BlackForestBytes/goext/timeext"
@@ -89,7 +91,7 @@ func (app *Application) Run() {
app.LogDebug(fmt.Sprintf("WebDAVURL := '%s'", app.config.WebDAVURL))
app.LogDebug(fmt.Sprintf("WebDAVUser := '%s'", app.config.WebDAVUser))
app.LogDebug(fmt.Sprintf("WebDAVPass := '%s'", app.config.WebDAVPass))
app.LogDebug(fmt.Sprintf("LocalFallback := '%s'", app.config.LocalFallback))
app.LogDebug(fmt.Sprintf("LocalFallback := '%s'", langext.Coalesce(app.config.LocalFallback, "<null>")))
app.LogDebug(fmt.Sprintf("WorkDir := '%s'", app.config.WorkDir))
app.LogDebug(fmt.Sprintf("Debounce := %d ms", app.config.Debounce))
app.LogDebug(fmt.Sprintf("ForceColors := %v", app.config.ForceColors))
@@ -108,6 +110,16 @@ func (app *Application) Run() {
go func() { app.initTray() }()
if app.config.LocalFallback != nil {
if _, err := os.Stat(*app.config.LocalFallback); errors.Is(err, os.ErrNotExist) {
app.config.LocalFallback = nil
app.LogError(fmt.Sprintf("Configured local-fallback '%s' not found - disabling.", *app.config.LocalFallback), nil)
app.showErrorNotification("Local fallback database not found", fmt.Sprintf("Configured local-fallback '%s' not found - fallback option won't be available.", *app.config.LocalFallback))
}
}
go func() {
app.syncLoopRunning.Set(true)
defer app.syncLoopRunning.Set(false)
@@ -140,10 +152,10 @@ func (app *Application) Run() {
return
}
} else if isr == InitSyncResponseFallback {
} else if isr == InitSyncResponseFallback && app.config.LocalFallback != nil {
app.LogInfo(fmt.Sprintf("Starting KeepassXC with local fallback database (without sync loop!)"))
app.LogDebug(fmt.Sprintf("DB-Path := '%s'", app.config.LocalFallback))
app.LogDebug(fmt.Sprintf("DB-Path := '%s'", *app.config.LocalFallback))
go func() {
app.keepassRunning.Set(true)