Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

serve dlna: fix container childCount to reflect actual contents

Nick Craig-Wood49650db8afc9
diff --git a/cmd/serve/dlna/cds.go b/cmd/serve/dlna/cds.go
index c9a87b488..81e3e05f7 100644
--- a/cmd/serve/dlna/cds.go
+++ b/cmd/serve/dlna/cds.go
@@ -42,12 +42,16 @@ func (cds *contentDirectoryService) cdsObjectToUpnpavObject(cdsObject object, fi
}
if fileInfo.IsDir() {
- defaultChildCount := 1
obj.Class = "object.container.storageFolder"
obj.Title = fileInfo.Name()
+ childCount, err := cds.countChildren(cdsObject.Path)
+ if err != nil {
+ fs.Debugf(cds, "error counting children of %s: %v", cdsObject.Path, err)
+ childCount = 0
+ }
return upnpav.Container{
Object: obj,
- ChildCount: &defaultChildCount,
+ ChildCount: &childCount,
}, nil
}
@@ -266,6 +270,23 @@ func (cds *contentDirectoryService) objectFromID(id string) (o object, err error
return
}
+// countChildren returns the number of child items in a directory.
+func (cds *contentDirectoryService) countChildren(dirPath string) (int, error) {
+ node, err := cds.vfs.Stat(dirPath)
+ if err != nil {
+ return 0, err
+ }
+ dir, ok := node.(*vfs.Dir)
+ if !ok {
+ return 0, nil
+ }
+ entries, err := dir.ReadDirAll()
+ if err != nil {
+ return 0, err
+ }
+ return len(entries), nil
+}
+
func (cds *contentDirectoryService) Handle(action string, argsXML []byte, r *http.Request) ([]soapArg, error) {
host := r.Host