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

logging and fixes

Browse Source
This commit is contained in:
Mike Schwörer
2025-08-20 13:29:12 +02:00
parent 52399acb42
commit 83d6aa10cb
7 changed files with 238 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/webdav.go
View File

@@ -10,6 +10,7 @@ import (
"time"
"git.blackforestbytes.com/BlackForestBytes/goext/cryptext"
"git.blackforestbytes.com/BlackForestBytes/goext/dataext"
"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
"git.blackforestbytes.com/BlackForestBytes/goext/timeext"
)
@@ -18,7 +19,7 @@ var ETagConflictError = errors.New("ETag conflict")
func (app *Application) downloadDatabase() (string, time.Time, string, int64, error) {
prevTT := app.currSysTrayTooltop
prevTT := app.currSysTrayTooltip
defer app.setTrayTooltip(prevTT)
client := http.Client{Timeout: 90 * time.Second}
@@ -67,6 +68,10 @@ func (app *Application) downloadDatabase() (string, time.Time, string, int64, er
sz := int64(len(bin))
app.masterLock.Lock()
app.fileWatcherIgnore = append(app.fileWatcherIgnore, dataext.NewTuple(time.Now(), sha))
app.masterLock.Unlock()
err = os.WriteFile(app.dbFile, bin, 0644)
if err != nil {
return "", time.Time{}, "", 0, exerr.Wrap(err, "Failed to write database file").Build()
@@ -75,7 +80,7 @@ func (app *Application) downloadDatabase() (string, time.Time, string, int64, er
return etag, lm, sha, sz, nil
}
func (app *Application) getRemoteETag() (string, time.Time, error) {
func (app *Application) getRemoteState() (string, time.Time, error) {
client := http.Client{Timeout: 90 * time.Second}
req, err := http.NewRequest("HEAD", app.config.WebDAVURL, nil)
@@ -109,7 +114,7 @@ func (app *Application) getRemoteETag() (string, time.Time, error) {
func (app *Application) uploadDatabase(etagIfMatch *string) (string, time.Time, string, int64, error) {
prevTT := app.currSysTrayTooltop
prevTT := app.currSysTrayTooltip
defer app.setTrayTooltip(prevTT)
client := http.Client{Timeout: 90 * time.Second}
@@ -176,7 +181,7 @@ func (app *Application) uploadDatabase(etagIfMatch *string) (string, time.Time,
func (app *Application) parseHeader(resp *http.Response) (string, time.Time, error) {
var err error
etag := resp.Header.Get("ETag")
if etag == "" {
return "", time.Time{}, exerr.New(exerr.TypeInternal, "ETag header is missing").Build()