beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

WebDAV: Fix upload with updated client library #2267

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2023-02-22 21:39:40 +01:00
parent e1b955a35d
commit 1cc64cc5e6
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
internal/remote/webdav/webdav.go
View file

@ -25,6 +25,7 @@ Additional information can be found in our Developer Guide:
package webdav
import (
"bufio"
"fmt"
"os"
"path"
@ -274,15 +275,17 @@ func (c Client) Upload(from, to string) (err error) {
file, err := os.Open(from)
if err != nil || file == nil {
if err != nil {
return err
}
defer func(file *os.File) {
_ = file.Close()
}(file)
defer file.Close()
return c.client.WriteStream(to, file, fs.ModeFile)
reader := bufio.NewReader(file)
err = c.client.WriteStream(to, reader, fs.ModeFile)
return err
}
// Delete deletes a single file or directory on a remote server.

2
internal/remote/webdav/webdav_test.go
View file

@ -143,7 +143,7 @@ func TestClient_UploadAndDelete(t *testing.T) {
tempName := rnd.UUID() + fs.ExtJPEG
if err := c.Upload("testdata/example.jpg", tempName); err != nil {
if err := c.Upload(fs.Abs("testdata/example.jpg"), tempName); err != nil {
t.Fatal(err)
}