arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

More log to media_streamer

Browse Source
This commit is contained in:
Deluan
2020-05-21 21:26:48 -04:00
parent a3ba05b2cc
commit e21262675e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/media_streamer.go
+8 -4
View File
@@ -41,9 +41,11 @@ func (ms *mediaStreamer) NewStream(ctx context.Context, id string, reqFormat str
var format string var format string
var bitRate int var bitRate int
var cached bool
defer func() { defer func() {
log.Info("Streaming file", "title", mf.Title, "artist", mf.Artist, "format", format, log.Info("Streaming file", "title", mf.Title, "artist", mf.Artist, "format", format, "cached", cached,
"bitRate", bitRate, "user", userName(ctx), "transcoding", format != "raw", "originalFormat", mf.Suffix) "bitRate", bitRate, "user", userName(ctx), "transcoding", format != "raw",
"originalFormat", mf.Suffix, "originalBitRate", mf.BitRate)
}() }()
format, bitRate = selectTranscodingOptions(ctx, ms.ds, mf, reqFormat, reqBitRate) format, bitRate = selectTranscodingOptions(ctx, ms.ds, mf, reqFormat, reqBitRate)
@@ -76,8 +78,10 @@ func (ms *mediaStreamer) NewStream(ctx context.Context, id string, reqFormat str
return nil, err return nil, err
} }
cached = w == nil
// If this is a brand new transcoding request, not in the cache, start transcoding // If this is a brand new transcoding request, not in the cache, start transcoding
if w != nil { if !cached {
log.Trace(ctx, "Cache miss. Starting new transcoding session", "id", mf.ID) log.Trace(ctx, "Cache miss. Starting new transcoding session", "id", mf.ID)
t, err := ms.ds.Transcoding(ctx).FindByFormat(format) t, err := ms.ds.Transcoding(ctx).FindByFormat(format)
if err != nil { if err != nil {
@@ -93,7 +97,7 @@ func (ms *mediaStreamer) NewStream(ctx context.Context, id string, reqFormat str
} }
// If it is in the cache, check if the stream is done being written. If so, return a ReaderSeeker // If it is in the cache, check if the stream is done being written. If so, return a ReaderSeeker
if w == nil { if cached {
size := getFinalCachedSize(r) size := getFinalCachedSize(r)
if size > 0 { if size > 0 {
log.Debug(ctx, "Streaming cached file", "id", mf.ID, "path", mf.Path, log.Debug(ctx, "Streaming cached file", "id", mf.ID, "path", mf.Path,