🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
fix(scanner): pass filename hint to gotaglib's OpenStream for format detection (#5012)
Deluan Quintãoed79a8897bc1
diff --git a/adapters/gotaglib/gotaglib.go b/adapters/gotaglib/gotaglib.goindex 8d166d9a0..1e9660362 100644--- a/adapters/gotaglib/gotaglib.go+++ b/adapters/gotaglib/gotaglib.go@@ -119,7 +119,12 @@ func (e extractor) openFile(filePath string) (f *taglib.File, closeFunc func(),file.Close()return nil, nil, errors.New("file is not seekable")}- f, err = taglib.OpenStream(rs, taglib.WithReadStyle(taglib.ReadStyleFast))+ // WithFilename provides a format detection hint via the file extension,+ // since OpenStream alone relies on content-sniffing which fails for some files.+ f, err = taglib.OpenStream(rs,+ taglib.WithReadStyle(taglib.ReadStyleFast),+ taglib.WithFilename(filePath),+ )if err != nil {file.Close()return nil, nil, errdiff --git a/adapters/gotaglib/gotaglib_test.go b/adapters/gotaglib/gotaglib_test.goindex 529a8110a..8fdf5b406 100644--- a/adapters/gotaglib/gotaglib_test.go+++ b/adapters/gotaglib/gotaglib_test.go@@ -173,6 +173,9 @@ var _ = Describe("Extractor", func() {Entry("correctly parses m4a (aac) gain tags (uppercase)", "test.m4a", "1.04s", 2, 44100, 16, "0.37", "0.48", "0.37", "0.48", false, true),Entry("correctly parses ogg (vorbis) tags", "test.ogg", "1.04s", 2, 8000, 0, "+7.64 dB", "0.11772506", "+7.64 dB", "0.11772506", false, true),+ // ffmpeg -f lavfi -i "sine=frequency=1100:duration=1" -c:a libopus test.opus (tags added via mutagen)+ Entry("correctly parses opus tags (#4998)", "test.opus", "1s", 1, 48000, 0, "+5.12 dB", "0.11345678", "+5.12 dB", "0.11345678", false, true),+// ffmpeg -f lavfi -i "sine=frequency=900:duration=1" test.wma// Weird note: for the tag parsing to work, the lyrics are actually stored in the reverse orderEntry("correctly parses wma/asf tags", "test.wma", "1.02s", 1, 44100, 16, "3.27 dB", "0.132914", "3.27 dB", "0.132914", false, true),diff --git a/go.mod b/go.modindex 3ec225567..76fa243c2 100644--- a/go.mod+++ b/go.mod@@ -7,7 +7,7 @@ replace (github.com/dhowden/tag v0.0.0-20240417053706-3d75831295e8 => github.com/deluan/tag v0.0.0-20241002021117-dfe5e6ea396d// Fork to implement raw tags support- go.senan.xyz/taglib => github.com/deluan/go-taglib v0.0.0-20260119020817-8753c7531798+ go.senan.xyz/taglib => github.com/deluan/go-taglib v0.0.0-20260209170351-c057626454d0)require (diff --git a/go.sum b/go.sumindex 7c67105a9..a91ce3ba3 100644--- a/go.sum+++ b/go.sum@@ -36,8 +36,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc=github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=-github.com/deluan/go-taglib v0.0.0-20260119020817-8753c7531798 h1:q4fvcIK/LxElpyQILCejG6WPYjVb2F/4P93+k017ANk=-github.com/deluan/go-taglib v0.0.0-20260119020817-8753c7531798/go.mod h1:sKDN0U4qXDlq6LFK+aOAkDH4Me5nDV1V/A4B+B69xBA=+github.com/deluan/go-taglib v0.0.0-20260209170351-c057626454d0 h1:R8fMzz++cqdQ3DVjzrmAKmZFr2PT8vT8pQEfRzxms00=+github.com/deluan/go-taglib v0.0.0-20260209170351-c057626454d0/go.mod h1:sKDN0U4qXDlq6LFK+aOAkDH4Me5nDV1V/A4B+B69xBA=github.com/deluan/rest v0.0.0-20211102003136-6260bc399cbf h1:tb246l2Zmpt/GpF9EcHCKTtwzrd0HGfEmoODFA/qnk4=github.com/deluan/rest v0.0.0-20211102003136-6260bc399cbf/go.mod h1:tSgDythFsl0QgS/PFWfIZqcJKnkADWneY80jaVRlqK8=github.com/deluan/sanitize v0.0.0-20241120162836-fdfd8fdfaa55 h1:wSCnggTs2f2ji6nFwQmfwgINcmSMj0xF0oHnoyRSPe4=diff --git a/tests/fixtures/test.opus b/tests/fixtures/test.opusnew file mode 100644index 000000000..5052c0e6eBinary files /dev/null and b/tests/fixtures/test.opus differ