Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(propfind): add audio and location props #4389

Merged
merged 2 commits into from
Dec 6, 2023
Merged

feat(propfind): add audio and location props #4389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
103835b
feat(propfind): add audio and location props
dschmidt Dec 6, 2023
22b5f8a
fix(propfind): make audio sub props lowercase
dschmidt Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/unreleased/add-audio-and-location-props.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Enhancement: Add audio and location props

Add `oc:audio` and `oc:location` props to PROPFIND responses for propall requests or when they are explicitly requested.

https://github.com/cs3org/reva/pull/4389
78 changes: 77 additions & 1 deletion internal/http/services/owncloud/ocdav/propfind/propfind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,33 @@ const (
tracerName = "ocdav"
)

// these keys are used to lookup in ArbitraryMetadata, generated prop names are lowercased
var (
audioKeys = []string{
"album",
"albumArtist",
"artist",
"bitrate",
"composers",
"copyright",
"disc",
"discCount",
"duration",
"genre",
"hasDrm",
"isVariableBitrate",
"title",
"track",
"trackCount",
"year",
}
dschmidt marked this conversation as resolved.
Show resolved Hide resolved
locationKeys = []string{
"altitude",
"latitude",
"longitude",
}
)

type countingReader struct {
n int
r io.Reader
Expand Down Expand Up @@ -786,6 +813,14 @@ func (p *Handler) getSpaceResourceInfos(ctx context.Context, w http.ResponseWrit
return resourceInfos, true
}

func metadataKeysWithPrefix(prefix string, keys []string) []string {
fullKeys := []string{}
for _, key := range keys {
fullKeys = append(fullKeys, fmt.Sprintf("%s.%s", prefix, key))
}
return fullKeys
}

// metadataKeys splits the propfind properties into arbitrary metadata and ResourceInfo field mask paths
func metadataKeys(pf XML) ([]string, []string) {

Expand All @@ -809,6 +844,10 @@ func metadataKeys(pf XML) ([]string, []string) {
switch key {
case "share-types":
fieldMaskKeys = append(fieldMaskKeys, key)
case "http://owncloud.org/ns/audio":
metadataKeys = append(metadataKeys, metadataKeysWithPrefix("libre.graph.audio", audioKeys)...)
case "http://owncloud.org/ns/location":
metadataKeys = append(metadataKeys, metadataKeysWithPrefix("libre.graph.location", locationKeys)...)
default:
metadataKeys = append(metadataKeys, key)
}
Expand Down Expand Up @@ -866,7 +905,7 @@ func requiresExplicitFetching(n *xml.Name) bool {
}
case net.NsOwncloud:
switch n.Local {
case "favorite", "share-types", "checksums", "size", "tags":
case "favorite", "share-types", "checksums", "size", "tags", "audio", "location":
return true
default:
return false
Expand Down Expand Up @@ -1082,6 +1121,33 @@ func mdToPropResponse(ctx context.Context, pf *XML, md *provider.ResourceInfo, p
appendToNotFound = func(p ...prop.PropertyXML) {}
}

appendMetadataProp := func(metadata map[string]string, tagNamespace string, name string, metadataPrefix string, keys []string) {
content := strings.Builder{}
for _, key := range keys {
lowerCaseKey := strings.ToLower(key)
if v, ok := metadata[fmt.Sprintf("%s.%s", metadataPrefix, key)]; ok {
content.WriteString("<")
content.WriteString(tagNamespace)
content.WriteString(":")
content.WriteString(lowerCaseKey)
content.WriteString(">")
content.Write(prop.Escaped("", v).InnerXML)
content.WriteString("</")
content.WriteString(tagNamespace)
content.WriteString(":")
content.WriteString(lowerCaseKey)
content.WriteString(">")
}
}

propName := fmt.Sprintf("%s:%s", tagNamespace, name)
if content.Len() > 0 {
appendToOK(prop.Raw(propName, content.String()))
} else {
appendToNotFound(prop.NotFound(propName))
}
}

// when allprops has been requested
if pf.Allprop != nil {
// return all known properties
Expand Down Expand Up @@ -1180,6 +1246,8 @@ func mdToPropResponse(ctx context.Context, pf *XML, md *provider.ResourceInfo, p

if k := md.GetArbitraryMetadata().GetMetadata(); k != nil {
propstatOK.Prop = append(propstatOK.Prop, prop.Raw("oc:tags", k["tags"]))
appendMetadataProp(k, "oc", "audio", "libre.graph.audio", audioKeys)
appendMetadataProp(k, "oc", "location", "libre.graph.location", locationKeys)
}

// ls do not report any properties as missing by default
Expand Down Expand Up @@ -1453,6 +1521,14 @@ func mdToPropResponse(ctx context.Context, pf *XML, md *provider.ResourceInfo, p
if k := md.GetArbitraryMetadata().GetMetadata(); k != nil {
propstatOK.Prop = append(propstatOK.Prop, prop.Raw("oc:tags", k["tags"]))
}
case "audio":
if k := md.GetArbitraryMetadata().GetMetadata(); k != nil {
appendMetadataProp(k, "oc", "audio", "libre.graph.audio", audioKeys)
}
case "location":
if k := md.GetArbitraryMetadata().GetMetadata(); k != nil {
appendMetadataProp(k, "oc", "location", "libre.graph.location", locationKeys)
}
case "name":
appendToOK(prop.Escaped("oc:name", md.Name))
case "shareid":
Expand Down
Loading