mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-05 05:27:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix race condition

Browse source
This commit is contained in:
Deluan 2023-04-01 17:45:18 -04:00
parent 2ccc5bc941
commit 83ae2ba3e6
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scanner/scanner.go
View file

@ -158,13 +158,11 @@ func (s *scanner) RescanAll(ctx context.Context, fullRescan bool) error {
return nil return nil
} }
func (s *scanner) getStatus(folder string) *scanStatus { func (s *scanner) getStatus(folder string) (scanStatus, bool) {
s.lock.RLock() s.lock.RLock()
defer s.lock.RUnlock() defer s.lock.RUnlock()
if status, ok := s.status[folder]; ok { status, ok := s.status[folder]
return status return *status, ok
}
return nil
} }
func (s *scanner) incStatusCounter(folder string, numFiles uint32) (totalFolders uint32, totalFiles uint32) { func (s *scanner) incStatusCounter(folder string, numFiles uint32) (totalFolders uint32, totalFiles uint32) {
@ -199,8 +197,8 @@ func (s *scanner) setStatusEnd(folder string, lastUpdate time.Time) {
} }
func (s *scanner) Status(mediaFolder string) (*StatusInfo, error) { func (s *scanner) Status(mediaFolder string) (*StatusInfo, error) {
status := s.getStatus(mediaFolder) status, ok := s.getStatus(mediaFolder)
if status == nil { if !ok {
return nil, errors.New("mediaFolder not found") return nil, errors.New("mediaFolder not found")
} }
return &StatusInfo{ return &StatusInfo{

4
server/events/sse.go
View file

@ -111,7 +111,7 @@ func writeEvent(w io.Writer, event message, timeout time.Duration) error {
_, err := fmt.Fprintf(w, "id: %d\nevent: %s\ndata: %s\n\n", event.id, event.event, event.data) _, err := fmt.Fprintf(w, "id: %d\nevent: %s\ndata: %s\n\n", event.id, event.event, event.data)
// If the writer is an http.Flusher, flush the data immediately. // If the writer is an http.Flusher, flush the data immediately.
if flusher, ok := w.(http.Flusher); ok { if flusher, ok := w.(http.Flusher); ok && flusher != nil {
flusher.Flush() flusher.Flush()
} }
@ -135,7 +135,7 @@ func (b *broker) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// Make sure that the writer supports flushing. // Make sure that the writer supports flushing.
_, ok := w.(http.Flusher) _, ok := w.(http.Flusher)
if !ok { if !ok {
log.Error(w, "Streaming unsupported! Events cannot be sent to this client", "address", r.RemoteAddr, log.Error(r, "Streaming unsupported! Events cannot be sent to this client", "address", r.RemoteAddr,
"userAgent", r.UserAgent(), "user", user.UserName) "userAgent", r.UserAgent(), "user", user.UserName)
http.Error(w, "Streaming unsupported!", http.StatusInternalServerError) http.Error(w, "Streaming unsupported!", http.StatusInternalServerError)
return return