hpz937/zurg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize webdav

Browse Source
This commit is contained in:
Ben Sarmiento
2023-11-21 10:32:14 +01:00
parent 10980f4f3e
commit cbf14e953f
3 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
internal/dav/listing.go
View File

@@ -1,7 +1,6 @@
package dav
import (
"encoding/xml"
"fmt"
"net/http"
"path"
@@ -20,18 +19,17 @@ func HandlePropfindRequest(w http.ResponseWriter, r *http.Request, t *torrent.To
requestPath := path.Clean(r.URL.Path)
requestPath = strings.Trim(requestPath, "/")
var output []byte
var err error
filteredSegments := strings.Split(requestPath, "/")
switch {
case len(filteredSegments) == 1 && filteredSegments[0] == "":
output, err = handleRoot(t)
err = handleRoot(w, t)
case len(filteredSegments) == 1:
output, err = handleListOfTorrents(requestPath, t)
err = handleListOfTorrents(w, requestPath, t)
case len(filteredSegments) == 2:
output, err = handleSingleTorrent(requestPath, t)
err = handleSingleTorrent(w, requestPath, t)
default:
log.Warnf("Request %s %s not found", r.Method, requestPath)
http.Error(w, "Not Found", http.StatusNotFound)
@@ -48,68 +46,67 @@ func HandlePropfindRequest(w http.ResponseWriter, r *http.Request, t *torrent.To
return
}
if output != nil {
respBody := fmt.Sprintf("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n%s\n", output)
w.Header().Set("Content-Type", "text/xml; charset=\"utf-8\"")
w.WriteHeader(http.StatusMultiStatus)
fmt.Fprint(w, respBody)
}
w.Header().Set("Content-Type", "text/xml; charset=\"utf-8\"")
}
func handleRoot(t *torrent.TorrentManager) ([]byte, error) {
var responses []dav.Response
responses = append(responses, dav.Directory(""))
func handleRoot(w http.ResponseWriter, t *torrent.TorrentManager) error {
fmt.Fprint(w, "<?xml?><d:multistatus xmlns:d=\"DAV:\">")
// initial response is the directory itself
fmt.Fprint(w, dav.Directory("", ""))
directories := t.DirectoryMap.Keys()
sort.Strings(directories)
for _, directory := range directories {
responses = append(responses, dav.Directory(directory))
fmt.Fprint(w, dav.Directory(directory, ""))
}
rootResponse := dav.MultiStatus{
XMLNS: "DAV:",
Response: responses,
}
return xml.Marshal(rootResponse)
fmt.Fprint(w, "</d:multistatus>")
return nil
}
func handleListOfTorrents(requestPath string, t *torrent.TorrentManager) ([]byte, error) {
func handleListOfTorrents(w http.ResponseWriter, requestPath string, t *torrent.TorrentManager) error {
basePath := path.Base(requestPath)
torrents, ok := t.DirectoryMap.Get(basePath)
if !ok {
return nil, fmt.Errorf("cannot find directory %s", basePath)
return fmt.Errorf("cannot find directory %s", basePath)
}
var responses []dav.Response
fmt.Fprint(w, "<?xml?><d:multistatus xmlns:d=\"DAV:\">")
// initial response is the directory itself
responses = append(responses, dav.Directory(basePath+"/"))
fmt.Fprint(w, dav.Directory(basePath+"/", ""))
accessKeys := torrents.Keys()
sort.Strings(accessKeys)
for _, accessKey := range accessKeys {
responses = append(responses, dav.Directory(filepath.Join(basePath, accessKey)))
var allTorrents []*torrent.Torrent
torrents.IterCb(func(_ string, tor *torrent.Torrent) {
allTorrents = append(allTorrents, tor)
})
sort.Slice(allTorrents, func(i, j int) bool {
return allTorrents[i].AccessKey < allTorrents[j].AccessKey
})
for _, tor := range allTorrents {
fmt.Fprint(w, dav.Directory(filepath.Join(basePath, tor.AccessKey), tor.LatestAdded))
}
resp := &dav.MultiStatus{
XMLNS: "DAV:",
Response: responses,
}
return xml.Marshal(resp)
fmt.Fprint(w, "</d:multistatus>")
return nil
}
func handleSingleTorrent(requestPath string, t *torrent.TorrentManager) ([]byte, error) {
func handleSingleTorrent(w http.ResponseWriter, requestPath string, t *torrent.TorrentManager) error {
basePath := path.Base(path.Dir(requestPath))
torrents, ok := t.DirectoryMap.Get(basePath)
if !ok {
return nil, fmt.Errorf("cannot find directory %s", basePath)
return fmt.Errorf("cannot find directory %s", basePath)
}
accessKey := path.Base(requestPath)
tor, ok := torrents.Get(accessKey)
if !ok {
return nil, fmt.Errorf("cannot find torrent %s", accessKey)
return fmt.Errorf("cannot find torrent %s", accessKey)
}
var responses []dav.Response
fmt.Fprint(w, "<?xml?><d:multistatus xmlns:d=\"DAV:\">")
// initial response is the directory itself
responses = append(responses, dav.Directory(requestPath+"/"))
fmt.Fprint(w, dav.Directory(requestPath+"/", tor.LatestAdded))
filenames := tor.SelectedFiles.Keys()
sort.Strings(filenames)
for _, filename := range filenames {
@@ -117,16 +114,9 @@ func handleSingleTorrent(requestPath string, t *torrent.TorrentManager) ([]byte,
if file == nil || !strings.HasPrefix(file.Link, "http") {
continue
}
responses = append(responses, dav.File(
filepath.Join(requestPath, filename),
file.Bytes,
convertRFC3339toRFC1123(tor.LatestAdded),
file.Link,
))
fmt.Fprint(w, dav.File(filepath.Join(requestPath, filename), file.Bytes, tor.LatestAdded))
}
resp := &dav.MultiStatus{
XMLNS: "DAV:",
Response: responses,
}
return xml.Marshal(resp)
fmt.Fprint(w, "</d:multistatus>")
return nil
}

18
pkg/dav/response.go
View File

@@ -1,27 +1,39 @@
package dav
func Directory(path string) Response {
import "fmt"
func DavDirectory(path, added string) Response {
return Response{
Href: "/" + customPathEscape(path),
Propstat: PropStat{
Prop: Prop{
ResourceType: ResourceType{Value: "<d:collection/>"},
LastModified: added,
},
Status: "HTTP/1.1 200 OK",
},
}
}
func File(path string, fileSize int64, added string, link string) Response {
func DavFile(path string, fileSize int64, added string, link string) Response {
return Response{
Href: "/" + customPathEscape(path),
Propstat: PropStat{
Prop: Prop{
ContentLength: fileSize,
CreationDate: added,
LastModified: added,
},
Status: "HTTP/1.1 200 OK",
},
}
}
// optimized versions, no more marshalling
func Directory(path, added string) string {
return fmt.Sprintf("<d:response><d:href>/%s</d:href><d:propstat><d:prop><d:resourcetype><d:collection/></d:resourcetype></d:prop><d:prop><d:getlastmodified>%s</d:getlastmodified></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat></d:response>", customPathEscape(path), added)
}
func File(path string, fileSize int64, added string) string {
return fmt.Sprintf("<d:response><d:href>/%s</d:href><d:propstat><d:prop><d:resourcetype></d:resourcetype><d:getcontentlength>%d</d:getcontentlength><d:getlastmodified>%s</d:getlastmodified></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat></d:response>", customPathEscape(path), fileSize, added)
}

1
pkg/dav/types.go
View File

@@ -23,7 +23,6 @@ type PropStat struct {
type Prop struct {
ResourceType ResourceType `xml:"d:resourcetype"`
ContentLength int64 `xml:"d:getcontentlength,omitempty"`
CreationDate string `xml:"d:creationdate,omitempty"`
LastModified string `xml:"d:getlastmodified,omitempty"`
}