third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-05-07 05:41:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renaming "object" to make it more obvious it's part of the CDS

Browse Source
This commit is contained in:
Rob Emery 2025-04-19 10:36:54 +01:00
parent 88cb5bf38e
commit 9892be3e36
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
dlna/contenddirectoryservice.go
View File

@ -52,7 +52,7 @@ func (cds *contentDirectoryService) updateIDString() string {
// Turns the given entry and DMS host into a UPnP object. A nil object is // Turns the given entry and DMS host into a UPnP object. A nil object is
// returned if the entry is not of interest. // returned if the entry is not of interest.
func (cds *contentDirectoryService) cdsObjectToUpnpavObject(cdsObject object, isContainer bool, host string, filesize int64) (ret interface{}) { func (cds *contentDirectoryService) cdsObjectToUpnpavObject(cdsObject contentDirectoryObject, isContainer bool, host string, filesize int64) (ret interface{}) {
obj := upnpav.Object{ obj := upnpav.Object{
ID: cdsObject.ID(), ID: cdsObject.ID(),
Restricted: 1, Restricted: 1,
@ -96,12 +96,12 @@ func (cds *contentDirectoryService) cdsObjectToUpnpavObject(cdsObject object, is
} }
// Returns all the upnpav objects in a directory. // Returns all the upnpav objects in a directory.
func (cds *contentDirectoryService) readContainer(o object, host string) (ret []interface{}, err error) { func (cds *contentDirectoryService) readContainer(o contentDirectoryObject, host string) (ret []interface{}, err error) {
log.Debug(fmt.Sprintf("ReadContainer called '%s'", o)) log.Debug(fmt.Sprintf("ReadContainer called '%s'", o))
if o.Path == "/" || o.Path == "" { if o.Path == "/" || o.Path == "" {
log.Debug("ReadContainer default route") log.Debug("ReadContainer default route")
newObject := object{Path: "/Music"} newObject := contentDirectoryObject{Path: "/Music"}
ret = append(ret, cds.cdsObjectToUpnpavObject(newObject, true, host, -1)) ret = append(ret, cds.cdsObjectToUpnpavObject(newObject, true, host, -1))
return ret, nil return ret, nil
} }
@ -124,17 +124,17 @@ func (cds *contentDirectoryService) readContainer(o object, host string) (ret []
return ret, nil return ret, nil
} }
func handleDefault(ret []interface{}, cds *contentDirectoryService, o object, host string) ([]interface{}, error) { func handleDefault(ret []interface{}, cds *contentDirectoryService, o contentDirectoryObject, host string) ([]interface{}, error) {
ret = append(ret, cds.cdsObjectToUpnpavObject(object{Path: "/Music/Files"}, true, host, -1)) ret = append(ret, cds.cdsObjectToUpnpavObject(contentDirectoryObject{Path: "/Music/Files"}, true, host, -1))
ret = append(ret, cds.cdsObjectToUpnpavObject(object{Path: "/Music/Artists"}, true, host, -1)) ret = append(ret, cds.cdsObjectToUpnpavObject(contentDirectoryObject{Path: "/Music/Artists"}, true, host, -1))
ret = append(ret, cds.cdsObjectToUpnpavObject(object{Path: "/Music/Albums"}, true, host, -1)) ret = append(ret, cds.cdsObjectToUpnpavObject(contentDirectoryObject{Path: "/Music/Albums"}, true, host, -1))
ret = append(ret, cds.cdsObjectToUpnpavObject(object{Path: "/Music/Genres"}, true, host, -1)) ret = append(ret, cds.cdsObjectToUpnpavObject(contentDirectoryObject{Path: "/Music/Genres"}, true, host, -1))
ret = append(ret, cds.cdsObjectToUpnpavObject(object{Path: "/Music/Recently Added"}, true, host, -1)) ret = append(ret, cds.cdsObjectToUpnpavObject(contentDirectoryObject{Path: "/Music/Recently Added"}, true, host, -1))
ret = append(ret, cds.cdsObjectToUpnpavObject(object{Path: "/Music/Playlists"}, true, host, -1)) ret = append(ret, cds.cdsObjectToUpnpavObject(contentDirectoryObject{Path: "/Music/Playlists"}, true, host, -1))
return ret, nil return ret, nil
} }
func handleArtist(matchResults map[string]string, ret []interface{}, cds *contentDirectoryService, o object, host string) ([]interface{}, error) { func handleArtist(matchResults map[string]string, ret []interface{}, cds *contentDirectoryService, o contentDirectoryObject, host string) ([]interface{}, error) {
if matchResults["ArtistAlbum"] != "" { if matchResults["ArtistAlbum"] != "" {
tracks, _ := cds.ds.MediaFile(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_id": matchResults["ArtistAlbum"]}}) tracks, _ := cds.ds.MediaFile(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_id": matchResults["ArtistAlbum"]}})
return cds.doMediaFiles(tracks, o.Path, ret, host) return cds.doMediaFiles(tracks, o.Path, ret, host)
@ -150,7 +150,7 @@ func handleArtist(matchResults map[string]string, ret []interface{}, cds *conten
for letterIndex := range indexes { for letterIndex := range indexes {
for artist := range indexes[letterIndex].Artists { for artist := range indexes[letterIndex].Artists {
artistId := indexes[letterIndex].Artists[artist].ID artistId := indexes[letterIndex].Artists[artist].ID
child := object{ child := contentDirectoryObject{
Path: path.Join(o.Path, indexes[letterIndex].Artists[artist].Name), Path: path.Join(o.Path, indexes[letterIndex].Artists[artist].Name),
Id: path.Join(o.Path, artistId), Id: path.Join(o.Path, artistId),
} }
@ -160,7 +160,7 @@ func handleArtist(matchResults map[string]string, ret []interface{}, cds *conten
return ret, nil return ret, nil
} }
func handleAlbum(matchResults map[string]string, ret []interface{}, cds *contentDirectoryService, o object, host string) ([]interface{}, error) { func handleAlbum(matchResults map[string]string, ret []interface{}, cds *contentDirectoryService, o contentDirectoryObject, host string) ([]interface{}, error) {
if matchResults["AlbumTitle"] != "" { if matchResults["AlbumTitle"] != "" {
tracks, _ := cds.ds.MediaFile(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_id": matchResults["AlbumTitle"]}}) tracks, _ := cds.ds.MediaFile(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_id": matchResults["AlbumTitle"]}})
return cds.doMediaFiles(tracks, o.Path, ret, host) return cds.doMediaFiles(tracks, o.Path, ret, host)
@ -171,7 +171,7 @@ func handleAlbum(matchResults map[string]string, ret []interface{}, cds *content
return nil, err return nil, err
} }
for indexItem := range indexes { for indexItem := range indexes {
child := object{ child := contentDirectoryObject{
Path: path.Join(o.Path, indexes[indexItem].Name), Path: path.Join(o.Path, indexes[indexItem].Name),
Id: path.Join(o.Path, indexes[indexItem].ID), Id: path.Join(o.Path, indexes[indexItem].ID),
} }
@ -180,7 +180,7 @@ func handleAlbum(matchResults map[string]string, ret []interface{}, cds *content
return ret, nil return ret, nil
} }
func handleGenre(matchResults map[string]string, ret []interface{}, cds *contentDirectoryService, o object, host string) ([]interface{}, error) { func handleGenre(matchResults map[string]string, ret []interface{}, cds *contentDirectoryService, o contentDirectoryObject, host string) ([]interface{}, error) {
if matchResults["GenreArtist"] != "" { if matchResults["GenreArtist"] != "" {
tracks, err := cds.ds.MediaFile(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.And{ tracks, err := cds.ds.MediaFile(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.And{
squirrel.Eq{"genre.id": matchResults["Genre"]}, squirrel.Eq{"genre.id": matchResults["Genre"]},
@ -200,7 +200,7 @@ func handleGenre(matchResults map[string]string, ret []interface{}, cds *content
return nil, err return nil, err
} }
for artistIndex := range artists { for artistIndex := range artists {
child := object{ child := contentDirectoryObject{
Path: path.Join(o.Path, artists[artistIndex].Name), Path: path.Join(o.Path, artists[artistIndex].Name),
Id: path.Join(o.Path, artists[artistIndex].ID), Id: path.Join(o.Path, artists[artistIndex].ID),
} }
@ -214,7 +214,7 @@ func handleGenre(matchResults map[string]string, ret []interface{}, cds *content
return nil, err return nil, err
} }
for indexItem := range indexes { for indexItem := range indexes {
child := object{ child := contentDirectoryObject{
Path: path.Join(o.Path, indexes[indexItem].Name), Path: path.Join(o.Path, indexes[indexItem].Name),
Id: path.Join(o.Path, indexes[indexItem].ID), Id: path.Join(o.Path, indexes[indexItem].ID),
} }
@ -223,7 +223,7 @@ func handleGenre(matchResults map[string]string, ret []interface{}, cds *content
return ret, nil return ret, nil
} }
func handleRecent(matchResults map[string]string, ret []interface{}, cds *contentDirectoryService, o object, host string) ([]interface{}, error) { func handleRecent(matchResults map[string]string, ret []interface{}, cds *contentDirectoryService, o contentDirectoryObject, host string) ([]interface{}, error) {
if matchResults["RecentAlbum"] != "" { if matchResults["RecentAlbum"] != "" {
tracks, _ := cds.ds.MediaFile(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_id": matchResults["RecentAlbum"]}}) tracks, _ := cds.ds.MediaFile(cds.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_id": matchResults["RecentAlbum"]}})
return cds.doMediaFiles(tracks, o.Path, ret, host) return cds.doMediaFiles(tracks, o.Path, ret, host)
@ -234,7 +234,7 @@ func handleRecent(matchResults map[string]string, ret []interface{}, cds *conten
return nil, err return nil, err
} }
for indexItem := range indexes { for indexItem := range indexes {
child := object{ child := contentDirectoryObject{
Path: path.Join(o.Path, indexes[indexItem].Name), Path: path.Join(o.Path, indexes[indexItem].Name),
Id: path.Join(o.Path, indexes[indexItem].ID), Id: path.Join(o.Path, indexes[indexItem].ID),
} }
@ -243,7 +243,7 @@ func handleRecent(matchResults map[string]string, ret []interface{}, cds *conten
return ret, nil return ret, nil
} }
func handlePlaylists(matchResults map[string]string, ret []interface{}, cds *contentDirectoryService, o object, host string) ([]interface{}, error) { func handlePlaylists(matchResults map[string]string, ret []interface{}, cds *contentDirectoryService, o contentDirectoryObject, host string) ([]interface{}, error) {
if matchResults["Playlist"] != "" { if matchResults["Playlist"] != "" {
x, err := cds.ds.Playlist(cds.ctx).GetWithTracks(matchResults["Playlist"], false, false) x, err := cds.ds.Playlist(cds.ctx).GetWithTracks(matchResults["Playlist"], false, false)
if err != nil { if err != nil {
@ -258,7 +258,7 @@ func handlePlaylists(matchResults map[string]string, ret []interface{}, cds *con
return nil, err return nil, err
} }
for indexItem := range indexes { for indexItem := range indexes {
child := object{ child := contentDirectoryObject{
Path: path.Join(o.Path, indexes[indexItem].Name), Path: path.Join(o.Path, indexes[indexItem].Name),
Id: path.Join(o.Path, indexes[indexItem].ID), Id: path.Join(o.Path, indexes[indexItem].ID),
} }
@ -334,7 +334,7 @@ func floatToDurationString(totalSeconds32 float32) string {
func (cds *contentDirectoryService) doAlbums(albums model.Albums, basepath string, ret []interface{}, host string) ([]interface{}, error) { func (cds *contentDirectoryService) doAlbums(albums model.Albums, basepath string, ret []interface{}, host string) ([]interface{}, error) {
for _, album := range albums { for _, album := range albums {
child := object{ child := contentDirectoryObject{
Path: path.Join(basepath, album.Name), Path: path.Join(basepath, album.Name),
Id: path.Join(basepath, album.ID), Id: path.Join(basepath, album.ID),
} }
@ -354,7 +354,7 @@ func (cds *contentDirectoryService) doFiles(ret []interface{}, oPath string, hos
files, _ := os.ReadDir(localFilePath) files, _ := os.ReadDir(localFilePath)
for _, file := range files { for _, file := range files {
child := object{ child := contentDirectoryObject{
Path: path.Join(oPath, file.Name()), Path: path.Join(oPath, file.Name()),
Id: path.Join(oPath, file.Name()), Id: path.Join(oPath, file.Name()),
} }
@ -373,7 +373,7 @@ type browse struct {
} }
// ContentDirectory object from ObjectID. // ContentDirectory object from ObjectID.
func (cds *contentDirectoryService) objectFromID(id string) (o object, err error) { func (cds *contentDirectoryService) objectFromID(id string) (o contentDirectoryObject, err error) {
log.Debug("objectFromID called", "id", id) log.Debug("objectFromID called", "id", id)
o.Path, err = url.QueryUnescape(id) o.Path, err = url.QueryUnescape(id)
if err != nil { if err != nil {
@ -470,14 +470,14 @@ func (cds *contentDirectoryService) Handle(action string, argsXML []byte, r *htt
} }
} }
// Represents a ContentDirectory object. // Represents a ContentDirectory contentDirectoryObject.
type object struct { type contentDirectoryObject struct {
Path string // The cleaned, absolute path for the object relative to the server. Path string // The cleaned, absolute path for the object relative to the server.
Id string Id string
} }
// Returns the ObjectID for the object. This is used in various ContentDirectory actions. // Returns the ObjectID for the object. This is used in various ContentDirectory actions.
func (o object) ID() string { func (o contentDirectoryObject) ID() string {
if o.Id != "" { if o.Id != "" {
return o.Id return o.Id
} }
@ -491,13 +491,13 @@ func (o object) ID() string {
return url.QueryEscape(o.Path) return url.QueryEscape(o.Path)
} }
func (o *object) IsRoot() bool { func (o *contentDirectoryObject) IsRoot() bool {
return o.Path == "/" return o.Path == "/"
} }
// Returns the object's parent ObjectID. Fortunately it can be deduced from the // Returns the object's parent ObjectID. Fortunately it can be deduced from the
// ObjectID (for now). // ObjectID (for now).
func (o object) ParentID() string { func (o contentDirectoryObject) ParentID() string {
if o.IsRoot() { if o.IsRoot() {
return "-1" return "-1"
} }