X-Git-Url: https://code.octet-stream.net/broadcaster/blobdiff_plain/c94fef11f43279165f39680fa0b0922c86702687..9c3c69125e54fc23d6ee89dc33465f9d1c9c1912:/server/files.go

diff --git a/server/files.go b/server/files.go
index 4d6e293..b452997 100644
--- a/server/files.go
+++ b/server/files.go
@@ -7,6 +7,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"sync"
 )
 
 type FileSpec struct {
@@ -18,6 +19,7 @@ type AudioFiles struct {
 	path       string
 	list       []FileSpec
 	changeWait chan bool
+	filesMutex sync.Mutex
 }
 
 var files AudioFiles
@@ -36,6 +38,8 @@ func (r *AudioFiles) Refresh() {
 		log.Println("couldn't read dir", r.path)
 		return
 	}
+	r.filesMutex.Lock()
+	defer r.filesMutex.Unlock()
 	r.list = nil
 	for _, file := range entries {
 		f, err := os.Open(filepath.Join(r.path, file.Name()))
@@ -57,6 +61,8 @@ func (r *AudioFiles) Path() string {
 }
 
 func (r *AudioFiles) Files() []FileSpec {
+	r.filesMutex.Lock()
+	defer r.filesMutex.Unlock()
 	return r.list
 }
 
@@ -68,6 +74,8 @@ func (r *AudioFiles) Delete(filename string) {
 	}
 }
 
-func (r *AudioFiles) ChangeChannel() chan bool {
-	return r.changeWait
+func (r *AudioFiles) WatchForChanges() ([]FileSpec, chan bool) {
+	r.filesMutex.Lock()
+	defer r.filesMutex.Unlock()
+	return r.list, r.changeWait
 }