nemunaire/reveil
1
0
Fork 0
Code Issues 1 Pull Requests Releases 27 Activity

Some refactoring

Browse Source
This commit is contained in:
nemunaire 2021-10-30 12:25:52 +02:00
parent 7c6aad7f3e
commit 1bf2591eda
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
main.go
View File

@ -4,7 +4,6 @@ import (
"bytes"
"flag"
"fmt"
"io"
"log"
"math"
"math/rand"
@ -138,7 +137,6 @@ func speakWeather() {
}
func loadFile(filepath string) (name string, s beep.StreamSeekCloser, format beep.Format, err error) {
for _, decoder := range []func(io.ReadCloser) (beep.StreamSeekCloser, beep.Format, error){flac.Decode, mp3.Decode, wav.Decode} {
var fd *os.File
name = path.Base(filepath)
@ -148,14 +146,17 @@ func loadFile(filepath string) (name string, s beep.StreamSeekCloser, format bee
return
}
// Try decoding as FLAC
s, format, err = decoder(fd)
if err == nil {
break
}
switch strings.ToLower(path.Ext(filepath)) {
case ".flac":
s, format, err = flac.Decode(fd)
case ".mp3":
s, format, err = mp3.Decode(fd)
default:
s, format, err = wav.Decode(fd)
}
if err != nil {
fd.Close()
return
}
@ -177,7 +178,8 @@ func main() {
return
}
seed := time.Now().Unix() % 172800 * 64
seed := time.Now().Unix()
seed -= seed % 172800
log.Println("Starting reveil with seed:", seed)
@ -211,6 +213,7 @@ func main() {
formats[i], formats[j] = formats[j], formats[i]
})
}
log.Println("Playlist in use:", strings.Join(paths, " ; "))
var launched time.Time
var volume *effects.Volume
@ -218,7 +221,7 @@ func main() {
dontUpdateVolume := false
hasClaironed := claironTime == nil || *claironTime == -1
hasSpokeWeather := weatherTime == nil || *weatherTime == -1
reverseOrder := time.Now().Unix()%86400%2 == 0
reverseOrder := (time.Now().Unix()/86400)%2 == 0
playedItem := -1
// Create infinite stream
@ -226,9 +229,11 @@ func main() {
if !hasClaironed && time.Since(launched) >= *claironTime {
log.Println("clairon time!")
*claironTime += *claironTime / 2
_, sample, format, err := loadFile("/home/nemunaire/www/audio/miracle-morning/clairon-reveil.mp3")
//_, sample, format, err := loadFile("/home/nemunaire/www/audio/miracle-morning/clairon-reveil.mp3")
//_, sample, format, err := loadFile("/home/nemunaire/www/audio/miracle-morning/coq.flac")
_, sample, format, err := loadFile("/home/nemunaire/www/audio/miracle-morning/NukeAnthem.flac")
if err == nil {
volume.Volume = 1
volume.Volume = 0.1
dontUpdateVolume = true
if format.SampleRate != sampleRate {
return beep.Resample(3, format.SampleRate, sampleRate, sample)