mirror of
https://github.com/navidrome/navidrome.git
synced 2026-10-08 02:17:25 +02:00
95f67d2c4e* fix(share): reuse cached transcodes when streaming from share links Public share streams built the stream request with only the share's format and bit rate, leaving sample rate, bit depth and channels at zero. Regular playback resolves those through the transcode decider (e.g. 48000 Hz for Opus), and they are part of the transcoding cache key, so a track already transcoded during normal playback was transcoded again into a separate, identical cache entry when played through a share link. The public router now resolves share stream requests with the same TranscodeDecider.ResolveRequest used by the Subsonic stream endpoint, so both paths produce the same request and share cache entries. Fixes #6261 * fix(archiver): reuse cached transcodes when zipping downloads Zip downloads (album, artist, playlist and share) built the stream request with only the format and bit rate, leaving sample rate, bit depth and channels at zero. Those are part of the transcoding cache key, so a track already transcoded for playback was transcoded again into a separate cache entry when downloaded in a zip, and vice versa. The archiver now resolves each request with TranscodeDecider.ResolveRequest, the same as single-song downloads and streams. This also applies the decider's defaults, so a zip requested without a bit rate uses the target format's default bit rate instead of leaving it to ffmpeg. * fix(archiver): name zip entries after the resolved transcoding format The transcode decider can pick a different format than the one requested (for example a player's forced transcoding, or a fallback to the default downsampling format when the requested one can't be produced). Zip entry names and the playlist M3U were still built from the requested format, so an entry could end in .mp3 or .flac while holding Opus data. Each track's request is now resolved before its entry name is built, and the name uses the resolved format.
67 lines
2 KiB
Go
67 lines
2 KiB
Go
package public
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"path"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
"github.com/navidrome/navidrome/conf"
|
|
"github.com/navidrome/navidrome/consts"
|
|
"github.com/navidrome/navidrome/core"
|
|
"github.com/navidrome/navidrome/core/artwork"
|
|
"github.com/navidrome/navidrome/core/publicurl"
|
|
"github.com/navidrome/navidrome/core/stream"
|
|
"github.com/navidrome/navidrome/model"
|
|
"github.com/navidrome/navidrome/server"
|
|
"github.com/navidrome/navidrome/ui"
|
|
)
|
|
|
|
type Router struct {
|
|
http.Handler
|
|
artwork artwork.Artwork
|
|
streamer stream.MediaStreamer
|
|
decider stream.TranscodeDecider
|
|
archiver core.Archiver
|
|
share core.Share
|
|
assetsHandler http.Handler
|
|
ds model.DataStore
|
|
}
|
|
|
|
func New(ds model.DataStore, artwork artwork.Artwork, streamer stream.MediaStreamer, decider stream.TranscodeDecider, share core.Share, archiver core.Archiver) *Router {
|
|
p := &Router{ds: ds, artwork: artwork, streamer: streamer, decider: decider, share: share, archiver: archiver}
|
|
shareRoot := path.Join(conf.Server.BasePath, consts.URLPathPublic)
|
|
p.assetsHandler = http.StripPrefix(shareRoot, http.FileServer(http.FS(ui.BuildAssets())))
|
|
p.Handler = p.routes()
|
|
|
|
return p
|
|
}
|
|
|
|
func (pub *Router) routes() http.Handler {
|
|
r := chi.NewRouter()
|
|
|
|
r.Group(func(r chi.Router) {
|
|
r.Use(server.URLParamsMiddleware)
|
|
r.Group(func(r chi.Router) {
|
|
r.Use(server.ThrottleBacklog(conf.Server.DevArtworkMaxRequests, conf.Server.DevArtworkThrottleBacklogLimit,
|
|
conf.Server.DevArtworkThrottleBacklogTimeout))
|
|
r.HandleFunc("/img/{id}", pub.handleImages)
|
|
})
|
|
if conf.Server.EnableSharing {
|
|
r.HandleFunc("/s/{id}", pub.handleStream)
|
|
if conf.Server.EnableDownloads {
|
|
r.HandleFunc("/d/{id}", pub.handleDownloads)
|
|
}
|
|
r.HandleFunc("/{id}/m3u", pub.handleM3U)
|
|
r.HandleFunc("/{id}", pub.handleShares)
|
|
r.HandleFunc("/", pub.handleShares)
|
|
r.Handle("/*", pub.assetsHandler)
|
|
}
|
|
})
|
|
return r
|
|
}
|
|
|
|
func ShareURL(ctx context.Context, id string) string {
|
|
uri := path.Join(consts.URLPathPublic, id)
|
|
return publicurl.PublicURL(ctx, uri, nil)
|
|
}
|