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

Playlist log watcher was made into a struct.

Browse Source
This commit is contained in:
Alexander Andreev 2022-09-19 01:55:09 +04:00
parent 3727f44381
commit f631fdfa7c
Signed by: Arav
GPG Key ID: 0388CC8FAA51063F
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/dwelling-radio/main.go
View File

@ -51,10 +51,11 @@ func main() {
}
defer logErr.Close()
if err := radio.IcecastWatchPlaylist(config.Icecast.Playlist, config.ListLastNSongs); err != nil {
playlistWatcher := radio.NewPlaylistLogWatcher()
if err := playlistWatcher.Watch(config.Icecast.Playlist, config.ListLastNSongs); err != nil {
logErr.Fatalln(err)
}
defer radio.IcecastWatchClose()
defer playlistWatcher.Close()
hand := handlers.NewRadioHandlers(config, logErr)
srv := server.NewHttpServer()

34
internal/radio/icecast.go
View File

@ -166,35 +166,45 @@ func icecastLastPlayedSongs(playlistPath string, n int) ([]Song, error) {
return songs, nil
}
var playlistWatcher watcher.InotifyWatcher
var playlistChanged chan uint32 = make(chan uint32)
type PlaylistLogWatcher struct {
watcher *watcher.InotifyWatcher
changed chan uint32
}
func IcecastWatchPlaylist(playlistPath string, lastNSongs int) error {
playlistWatcher, err := watcher.NewInotifyWatcher()
func NewPlaylistLogWatcher() *PlaylistLogWatcher {
return &PlaylistLogWatcher{changed: make(chan uint32)}
}
func (pw *PlaylistLogWatcher) Watch(playlistPath string, n int) (err error) {
if pw.watcher != nil {
pw.watcher.Close()
}
pw.watcher, err = watcher.NewInotifyWatcher()
if err != nil {
return errors.Wrap(err, "cannot instantiate inotify watcher")
}
err = playlistWatcher.AddWatch(playlistPath, watcher.ModIgnMask)
err = pw.watcher.AddWatch(playlistPath, watcher.ModIgnMask)
if err != nil {
return errors.Wrap(err, "cannot set a playlist to watch")
}
playlistWatcher.WatchForMask(playlistChanged, watcher.ModIgnMask)
pw.watcher.WatchForMask(pw.changed, watcher.ModIgnMask)
go func() {
for {
select {
case mask := <-playlistChanged:
case mask := <-pw.changed:
if mask&syscall.IN_MODIFY > 0 {
lastPlayedCacheMutex.Lock()
if songs, err := icecastLastPlayedSongs(playlistPath, lastNSongs); err == nil {
if songs, err := icecastLastPlayedSongs(playlistPath, n); err == nil {
lastPlayedCache = songs
}
lastPlayedCacheMutex.Unlock()
} else if mask&syscall.IN_IGNORED > 0 {
playlistWatcher.Close()
IcecastWatchPlaylist(playlistPath, lastNSongs)
pw.Close()
pw.Watch(playlistPath, n)
return
}
}
@ -204,6 +214,6 @@ func IcecastWatchPlaylist(playlistPath string, lastNSongs int) error {
return nil
}
func IcecastWatchClose() {
playlistWatcher.Close()
func (pw *PlaylistLogWatcher) Close() {
pw.watcher.Close()
}