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

Fix reading dirs from a MergeFS

Browse Source
This commit is contained in:
Deluan
2020-11-05 13:34:56 -05:00
parent 9cbeddae8f
commit fb1461fd0b
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/merge_fs.go
+5 -5
View File
@@ -90,7 +90,7 @@ type mergedDir struct {
pos int
}
func (d mergedDir) Readdir(count int) ([]os.FileInfo, error) {
func (d *mergedDir) Readdir(count int) ([]os.FileInfo, error) {
if d.pos >= len(d.entries) && count > 0 {
return nil, io.EOF
}
@@ -102,12 +102,12 @@ func (d mergedDir) Readdir(count int) ([]os.FileInfo, error) {
return e, nil
}
func (d mergedDir) Close() error { return nil }
func (d mergedDir) Stat() (os.FileInfo, error) { return d.info, nil }
func (d mergedDir) Read(p []byte) (n int, err error) {
func (d *mergedDir) Close() error { return nil }
func (d *mergedDir) Stat() (os.FileInfo, error) { return d.info, nil }
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) {
func (d *mergedDir) Seek(offset int64, whence int) (int64, error) {
if offset == 0 && whence == io.SeekStart {
d.pos = 0
return 0, nil