🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Allow SeekStart in a merged dir
Deluanb795ad55a357
diff --git a/utils/merge_fs.go b/utils/merge_fs.goindex ee746a8fd..8392bc7af 100644--- a/utils/merge_fs.go+++ b/utils/merge_fs.go@@ -8,19 +8,23 @@ import ("sort")-type MergeFS struct {- base http.FileSystem- overlay http.FileSystem-}-+// NewMergeFS returns a simple implementation of a merged FS (http.FileSystem), that can combine a base FS with a+// overlay FS. The semantics are:+// - Files from the overlay FS will override file s with the same name in the base FS+// - Directories are combined, with priority for the overlay FS over the base FS for files with matching namesfunc NewMergeFS(base, overlay http.FileSystem) http.FileSystem {- return &MergeFS{+ return &mergeFS{base: base,overlay: overlay,}}-func (m MergeFS) Open(name string) (http.File, error) {+type mergeFS struct {+ base http.FileSystem+ overlay http.FileSystem+}++func (m mergeFS) Open(name string) (http.File, error) {f, err := m.overlay.Open(name)if err != nil {return m.base.Open(name)@@ -44,7 +48,7 @@ func (m MergeFS) Open(name string) (http.File, error) {return m.mergeDirs(name, info, baseDir, f)}-func (m MergeFS) mergeDirs(name string, info os.FileInfo, baseDir http.File, overlayDir http.File) (http.File, error) {+func (m mergeFS) mergeDirs(name string, info os.FileInfo, baseDir http.File, overlayDir http.File) (http.File, error) {merged := map[string]os.FileInfo{}baseFiles, err := baseDir.Readdir(-1)@@ -104,5 +108,9 @@ func (d mergedDir) Read(p []byte) (n int, err error) {return 0, fmt.Errorf("cannot Read from directory %s", d.name)}func (d mergedDir) Seek(offset int64, whence int) (int64, error) {+ if offset == 0 && whence == io.SeekStart {+ d.pos = 0+ return 0, nil+ }return 0, fmt.Errorf("unsupported Seek in directory %s", d.name)}diff --git a/utils/merge_fs_test.go b/utils/merge_fs_test.goindex 9b7b21786..cd86e3602 100644--- a/utils/merge_fs_test.go+++ b/utils/merge_fs_test.go@@ -11,7 +11,7 @@ import (. "github.com/onsi/gomega")-var _ = Describe("MergeFS", func() {+var _ = Describe("mergeFS", func() {var baseName, overlayName stringvar baseDir, overlayDir, mergedDir http.FileSystem