Skip to content

Fix .dms.json not found when working directory differs from media path #188

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

Merged
anacrolix merged 2 commits into from
Aug 12, 2026
Merged

Fix .dms.json not found when working directory differs from media path #188

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
904564e
Initial plan
Copilot Aug 7, 2026
7926c0d
Fix .dms.json not found if working directory != media path
Copilot Aug 7, 2026
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
7 changes: 3 additions & 4 deletions dlna/dms/cds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"encoding/xml"
"fmt"
"io/fs"
"io/ioutil"
"net/http"
"net/url"
"os"
Expand Down Expand Up @@ -59,8 +58,8 @@ type dmsDynamicMediaItem struct {
Resources []dmsDynamicStreamResource
}

func readDynamicStream(metadataPath string) (*dmsDynamicMediaItem, error) {
bytes, err := ioutil.ReadFile(metadataPath)
func readDynamicStream(fsys fs.FS, metadataPath string) (*dmsDynamicMediaItem, error) {
bytes, err := fs.ReadFile(fsys, metadataPath)
if err != nil {
return nil, err
}
Expand All @@ -74,7 +73,7 @@ func readDynamicStream(metadataPath string) (*dmsDynamicMediaItem, error) {

func (me *contentDirectoryService) cdsObjectDynamicStreamToUpnpavObject(cdsObject object, fileInfo fs.FileInfo, host, userAgent string) (ret interface{}, err error) {
// at this point we know that entryFilePath points to a .dms.json file; slurp and parse
dmsMediaItem, err := readDynamicStream(cdsObject.FilePath())
dmsMediaItem, err := readDynamicStream(me.FS, cdsObject.FilePath())
if err != nil {
me.Logger.Info("file ignored", "path", cdsObject.FilePath(), "error", err)
return
Expand Down
2 changes: 1 addition & 1 deletion dlna/dms/dms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ func (server *Server) contentDirectoryEventSubHandler(w http.ResponseWriter, r *
}

func (server *Server) serveDynamicStream(w http.ResponseWriter, r *http.Request, metadataPath string) error {
dmsMediaItem, err := readDynamicStream(metadataPath)
dmsMediaItem, err := readDynamicStream(server.FS, metadataPath)
if err != nil {
return err
}
Expand Down