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

kinda works, upload, download etc

Browse Source
This commit is contained in:
Mike Schwörer
2025-08-20 11:33:26 +02:00
parent 1f6fb583ee
commit 52399acb42
9 changed files with 267 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
app/webdav.go
View File

@@ -1,8 +1,9 @@
package app
import (
"bytes"
"errors"
"io"
"fmt"
"net/http"
"os"
"strings"
@@ -17,6 +18,9 @@ var ETagConflictError = errors.New("ETag conflict")
func (app *Application) downloadDatabase() (string, time.Time, string, int64, error) {
prevTT := app.currSysTrayTooltop
defer app.setTrayTooltip(prevTT)
client := http.Client{Timeout: 90 * time.Second}
req, err := http.NewRequest("GET", app.config.WebDAVURL, nil)
@@ -26,6 +30,9 @@ func (app *Application) downloadDatabase() (string, time.Time, string, int64, er
req.SetBasicAuth(app.config.WebDAVUser, app.config.WebDAVPass)
t0 := time.Now()
app.LogDebug(fmt.Sprintf("{HTTP} Starting WebDAV download..."))
resp, err := client.Do(req)
if err != nil {
return "", time.Time{}, "", 0, exerr.Wrap(err, "Failed to download remote database").Build()
@@ -35,23 +42,26 @@ func (app *Application) downloadDatabase() (string, time.Time, string, int64, er
return "", time.Time{}, "", 0, exerr.New(exerr.TypeInternal, "Failed to download remote database").Int("sc", resp.StatusCode).Build()
}
bin, err := io.ReadAll(resp.Body)
currTT := ""
progressCallback := func(current int64, total int64) {
newTT := fmt.Sprintf("Downloading (%.0f%%)", float64(current)/float64(total)*100)
if currTT != newTT {
app.setTrayTooltip(newTT)
currTT = newTT
}
}
bin, err := ReadAllWithProgress(resp.Body, resp.ContentLength, progressCallback)
if err != nil {
return "", time.Time{}, "", 0, exerr.Wrap(err, "Failed to read response body").Build()
}
etag := resp.Header.Get("ETag")
if etag == "" {
return "", time.Time{}, "", 0, exerr.New(exerr.TypeInternal, "ETag header is missing").Build()
}
etag = strings.Trim(etag, "\"\r\n ")
app.LogDebug(fmt.Sprintf("{HTTP} Finished WebDAV download in %s", time.Since(t0)))
lmStr := resp.Header.Get("Last-Modified")
lm, err := time.Parse("Mon, 02 Jan 2006 15:04:05 MST", lmStr)
etag, lm, err := app.parseHeader(resp)
if err != nil {
return "", time.Time{}, "", 0, exerr.Wrap(err, "Failed to parse Last-Modified header").Build()
return "", time.Time{}, "", 0, exerr.Wrap(err, "").Build()
}
lm = lm.In(timeext.TimezoneBerlin)
sha := cryptext.BytesSha256(bin)
@@ -75,35 +85,33 @@ func (app *Application) getRemoteETag() (string, time.Time, error) {
req.SetBasicAuth(app.config.WebDAVUser, app.config.WebDAVPass)
t0 := time.Now()
app.LogDebug(fmt.Sprintf("{HTTP} Starting WebDAV HEAD-request..."))
resp, err := client.Do(req)
if err != nil {
return "", time.Time{}, exerr.Wrap(err, "Failed to download remote database").Build()
}
app.LogDebug(fmt.Sprintf("{HTTP} Finished WebDAV request in %s", time.Since(t0)))
if resp.StatusCode != http.StatusOK {
return "", time.Time{}, exerr.New(exerr.TypeInternal, "Failed to download remote database").Int("sc", resp.StatusCode).Build()
}
etag := resp.Header.Get("ETag")
if etag == "" {
return "", time.Time{}, exerr.New(exerr.TypeInternal, "ETag header is missing").Build()
}
etag = strings.Trim(etag, "\"\r\n ")
lmStr := resp.Header.Get("Last-Modified")
lm, err := time.Parse("Mon, 02 Jan 2006 15:04:05 MST", lmStr)
etag, lm, err := app.parseHeader(resp)
if err != nil {
return "", time.Time{}, exerr.Wrap(err, "Failed to parse Last-Modified header").Build()
return "", time.Time{}, exerr.Wrap(err, "").Build()
}
lm = lm.In(timeext.TimezoneBerlin)
return etag, lm, nil
}
func (app *Application) uploadDatabase(etagIfMatch *string) (string, time.Time, string, int64, error) {
prevTT := app.currSysTrayTooltop
defer app.setTrayTooltip(prevTT)
client := http.Client{Timeout: 90 * time.Second}
req, err := http.NewRequest("PUT", app.config.WebDAVURL, nil)
@@ -111,6 +119,8 @@ func (app *Application) uploadDatabase(etagIfMatch *string) (string, time.Time,
return "", time.Time{}, "", 0, exerr.Wrap(err, "").Build()
}
req.SetBasicAuth(app.config.WebDAVUser, app.config.WebDAVPass)
if etagIfMatch != nil {
req.Header.Set("If-Match", "\""+*etagIfMatch+"\"")
}
@@ -124,7 +134,20 @@ func (app *Application) uploadDatabase(etagIfMatch *string) (string, time.Time,
sz := int64(len(bin))
currTT := ""
progressCallback := func(current int64, total int64) {
newTT := fmt.Sprintf("Uploading (%.0f%%)", float64(current)/float64(total)*100)
if currTT != newTT {
app.setTrayTooltip(newTT)
currTT = newTT
}
}
req.ContentLength = sz
req.Body = NewProgressReader(bytes.NewReader(bin), int64(len(bin)), progressCallback)
t0 := time.Now()
app.LogDebug(fmt.Sprintf("{HTTP} Starting WebDAV upload..."))
resp, err := client.Do(req)
if err != nil {
@@ -132,20 +155,14 @@ func (app *Application) uploadDatabase(etagIfMatch *string) (string, time.Time,
}
defer func() { _ = resp.Body.Close() }()
app.LogDebug(fmt.Sprintf("{HTTP} Finished WebDAV upload in %s", time.Since(t0)))
if resp.StatusCode == http.StatusOK || resp.StatusCode == http.StatusCreated || resp.StatusCode == http.StatusNoContent {
etag := resp.Header.Get("ETag")
if etag == "" {
return "", time.Time{}, "", 0, exerr.New(exerr.TypeInternal, "ETag header is missing").Build()
}
etag = strings.Trim(etag, "\"\r\n ")
lmStr := resp.Header.Get("Last-Modified")
lm, err := time.Parse("Mon, 02 Jan 2006 15:04:05 MST", lmStr)
etag, lm, err := app.parseHeader(resp)
if err != nil {
return "", time.Time{}, "", 0, exerr.Wrap(err, "Failed to parse Last-Modified header").Build()
return "", time.Time{}, "", 0, exerr.Wrap(err, "").Build()
}
lm = lm.In(timeext.TimezoneBerlin)
return etag, lm, sha, sz, nil
}
@@ -154,5 +171,31 @@ func (app *Application) uploadDatabase(etagIfMatch *string) (string, time.Time,
return "", time.Time{}, "", 0, ETagConflictError
}
return "", time.Time{}, "", 0, exerr.New(exerr.TypeInternal, "Failed to upload remote database").Int("sc", resp.StatusCode).Build()
return "", time.Time{}, "", 0, exerr.New(exerr.TypeInternal, fmt.Sprintf("Failed to upload remote database (statuscode: %d)", resp.StatusCode)).Int("sc", resp.StatusCode).Build()
}
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()
}
etag = strings.Trim(etag, "\"\r\n ")
var lm time.Time
lmStr := resp.Header.Get("Last-Modified")
if lmStr == "" {
lm = time.Now().In(timeext.TimezoneBerlin)
app.LogDebug("Last-Modified header is missing, using current time as fallback")
} else {
lm, err = time.Parse("Mon, 02 Jan 2006 15:04:05 MST", lmStr)
if err != nil {
return "", time.Time{}, exerr.Wrap(err, "Failed to parse Last-Modified header").Build()
}
lm = lm.In(timeext.TimezoneBerlin)
}
return etag, lm, nil
}