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

Implementing recently added

Browse Source
This commit is contained in:
Rob Emery 2025-02-08 18:01:02 +00:00
parent 36dafe4889
commit 9b32a23398
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlna/contenddirectoryservice.go
View File

@ -42,7 +42,7 @@ func init() {
artistRegex = regroup.MustCompile("\\/Music\\/Artists[\\/]?(?P<Artist>[^\\/]+)?[\\/]?(?<ArtistAlbum>[^\\/]+)?[\\/]?(?<ArtistAlbumTrack>[^\\/]+)?") artistRegex = regroup.MustCompile("\\/Music\\/Artists[\\/]?(?P<Artist>[^\\/]+)?[\\/]?(?<ArtistAlbum>[^\\/]+)?[\\/]?(?<ArtistAlbumTrack>[^\\/]+)?")
albumRegex = regroup.MustCompile("\\/Music\\/Albums[\\/]?(?P<AlbumTitle>[^\\/]+)?[\\/]?(?<AlbumTrack>[^\\/]+)?") albumRegex = regroup.MustCompile("\\/Music\\/Albums[\\/]?(?P<AlbumTitle>[^\\/]+)?[\\/]?(?<AlbumTrack>[^\\/]+)?")
genresRegex = regroup.MustCompile("\\/Music\\/Genres[\\/]?(?P<Genre>[^\\/]+)?[\\/]?(?P<GenreArtist>[^/]+)?[\\/]?(?P<GenreTrack>[^\\/]+)?") genresRegex = regroup.MustCompile("\\/Music\\/Genres[\\/]?(?P<Genre>[^\\/]+)?[\\/]?(?P<GenreArtist>[^/]+)?[\\/]?(?P<GenreTrack>[^\\/]+)?")
recentRegex = regroup.MustCompile("\\/Music\\/Recently Added[\\/]?(?P<RecentTrack>[^\\/]+)?") recentRegex = regroup.MustCompile("\\/Music\\/Recently Added[\\/]?(?P<RecentAlbum>[^\\/]+)?")
playlistRegex = regroup.MustCompile("\\/Music\\/Playlist[\\/]?(?P<Playlist>[^\\/]+)?[\\/]?(?P<PlaylistTrack>[^\\/]+)?") playlistRegex = regroup.MustCompile("\\/Music\\/Playlist[\\/]?(?P<Playlist>[^\\/]+)?[\\/]?(?P<PlaylistTrack>[^\\/]+)?")
} }
@ -147,8 +147,7 @@ func (cds *contentDirectoryService) readContainer(o object, host string) (ret []
} }
} else if matchResults, err := albumRegex.Groups(o.Path); err == nil { } else if matchResults, err := albumRegex.Groups(o.Path); err == nil {
if matchResults["AlbumTrack"] != "" { if matchResults["AlbumTrack"] != "" {
log.Debug("TODO AlbumTrack MATCH") //This is never hit as the URL is direct to the streamPath
//This is never hit as the URL is direct to the resourcePath
} else if matchResults["AlbumTitle"] != "" { } else 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)
@ -168,9 +167,8 @@ func (cds *contentDirectoryService) readContainer(o object, host string) (ret []
return ret, nil return ret, nil
} }
} else if matchResults, err := genresRegex.Groups(o.Path); err == nil { } else if matchResults, err := genresRegex.Groups(o.Path); err == nil {
log.Debug("Genre MATCH")
if matchResults["GenreTrack"] != "" { if matchResults["GenreTrack"] != "" {
log.Debug("TODO GenreTrack MATCH") //This is never hit as the URL is direct to the streamPath
} else if matchResults["GenreArtist"] != "" { } else 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"],},
@ -213,12 +211,31 @@ func (cds *contentDirectoryService) readContainer(o object, host string) (ret []
return ret, nil return ret, nil
} }
} else if matchResults, err := recentRegex.Groups(o.Path); err == nil { } else if matchResults, err := recentRegex.Groups(o.Path); err == nil {
log.Debug("TODO recent MATCH")
log.Debug("TODO recent MATCH") //ROB YOU ARE
fmt.Printf("%+v", matchResults) fmt.Printf("%+v", matchResults)
if 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)
} else {
indexes, err := cds.ds.Album(cds.ctx).GetAllWithoutGenres(model.QueryOptions{Sort: "recently_added", Order: "desc", Max: 25})
if err != nil {
fmt.Printf("Error retrieving Indexes: %+v", err)
return nil, err
}
for indexItem := range indexes {
child := object{
Path: path.Join(o.Path, indexes[indexItem].Name),
Id: path.Join(o.Path, indexes[indexItem].ID),
}
ret = append(ret, cds.cdsObjectToUpnpavObject(child, true, host))
}
return ret, nil
}
} else if matchResults, err := playlistRegex.Groups(o.Path); err == nil { } else if matchResults, err := playlistRegex.Groups(o.Path); err == nil {
log.Debug("TODO Playlist MATCH")
if matchResults["PlaylistTrack"] != "" { if matchResults["PlaylistTrack"] != "" {
log.Debug("TODO PlaylistTrack MATCH") //This is never hit as the URL is direct to the streamPath
} else if matchResults["Playlist"] != "" { } else if matchResults["Playlist"] != "" {
log.Debug("Playlist only MATCH") log.Debug("Playlist only MATCH")
x, xerr := cds.ds.Playlist(cds.ctx).Get(matchResults["Playlist"]) x, xerr := cds.ds.Playlist(cds.ctx).Get(matchResults["Playlist"])