Arav/dwelling-radio
1
0
Fork 0
Code Releases 25 Activity

Okay, now let's return original idea of adding songs one by one.

Browse Source
This commit is contained in:
Alexander Andreev 2023-03-12 21:48:01 +04:00
parent 6d4a276dd8
commit d48972caa0
Signed by: Arav
GPG Key ID: D22A817D95815393
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/radio/icecast.go
View File

@ -181,10 +181,7 @@ func (pw *PlaylistLogWatcher) Watch(playlistPath string, n int) (err error) {
pw.watcher.WatchForMask(pw.changed, watcher.ModIgnMask) pw.watcher.WatchForMask(pw.changed, watcher.ModIgnMask)
lastPlayedCache, err = icecastLastPlayedSongs(playlistPath, n) lastPlayedCache = make([]Song, 0, n)
if err != nil {
return errors.Wrap(err, "cannot instantiate last played cache")
}
go func() { go func() {
for { for {
@ -192,8 +189,12 @@ func (pw *PlaylistLogWatcher) Watch(playlistPath string, n int) (err error) {
case mask := <-pw.changed: case mask := <-pw.changed:
if mask&syscall.IN_MODIFY > 0 { if mask&syscall.IN_MODIFY > 0 {
lastPlayedCacheMutex.Lock() lastPlayedCacheMutex.Lock()
if songs, err := icecastLastPlayedSongs(playlistPath, n); err == nil && len(songs) > 0 { if songs, err := icecastLastPlayedSongs(playlistPath, 1); err == nil && len(songs) > 0 {
lastPlayedCache = songs if len(lastPlayedCache) == n {
lastPlayedCache = append(lastPlayedCache[1:], songs...)
} else {
lastPlayedCache = append(lastPlayedCache, songs...)
}
} }
lastPlayedCacheMutex.Unlock() lastPlayedCacheMutex.Unlock()
} else if mask&syscall.IN_IGNORED > 0 { } else if mask&syscall.IN_IGNORED > 0 {