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

50
app/sync.go
View File

@@ -30,7 +30,18 @@ func (app *Application) initSync() (InitSyncResponse, error) {
return "", exerr.Wrap(err, "").Build()
}
app.dbFile = path.Join(app.config.WorkDir, path.Base(app.config.LocalFallback))
fn := ""
if app.config.LocalFallback != nil {
fn = path.Base(*app.config.LocalFallback)
}
if fn == "" || fn == "." || fn == "/" || fn == "\\" {
fn = path.Base(app.config.WebDAVURL)
}
if fn == "" || fn == "." || fn == "/" || fn == "\\" {
fn = "database.kdbx"
}
app.dbFile = path.Join(app.config.WorkDir, fn)
app.stateFile = path.Join(app.config.WorkDir, "kpsync.state")
if app.isKeepassRunning() {
@@ -102,18 +113,27 @@ func (app *Application) initSync() (InitSyncResponse, error) {
}()
if err != nil {
r, err := app.showChoiceNotification("KeePassSync", "Failed to download remote database.\nUse local fallback?", map[string]string{"y": "Yes", "n": "Abort"})
if err != nil {
app.LogError("Failed to show choice notification", err)
return "", exerr.Wrap(err, "Failed to show choice notification").Build()
}
if app.config.LocalFallback != nil {
r, err := app.showChoiceNotification("KeePassSync", "Failed to download remote database.\nUse local fallback?", map[string]string{"y": "Yes", "n": "Abort"})
if err != nil {
app.LogError("Failed to show choice notification", err)
return "", exerr.Wrap(err, "Failed to show choice notification").Build()
}
if r == "y" {
return InitSyncResponseFallback, nil
} else if r == "n" {
return InitSyncResponseAbort, nil
} else {
return "", exerr.Wrap(err, "").Build()
}
if r == "y" {
return InitSyncResponseFallback, nil
} else if r == "n" {
return InitSyncResponseAbort, nil
} else {
return "", exerr.Wrap(err, "").Build()
app.showErrorNotification("KeePassSync", "Failed to download remote database.")
return InitSyncResponseAbort, nil
}
}
@@ -133,7 +153,13 @@ func (app *Application) runKeepass(fallback bool) {
filePath := app.dbFile
if fallback {
filePath = app.config.LocalFallback
if app.config.LocalFallback == nil {
app.LogError("No local fallback database configured", nil)
app.sigErrChan <- exerr.New(exerr.TypeInternal, "No local fallback database configured").Build()
return
}
filePath = *app.config.LocalFallback
}
cmd := exec.Command("keepassxc", filePath)