feat: add dynamic times

Author: serafdev

cmd/darsrec/main.go

@@ -23,8 +23,10 @@ func main() {
 			os.Exit(1)
 		}
 	}
-	data := rec.NewRecordConfigDataS()
 
-	rec.StartRecServer(host, password, data)
+	_, err := rec.StartRecServer(host, password)
+	if err != nil {
+		return
+	}
 
 }

cmd/monolith/main.go

@@ -71,9 +71,8 @@ func main() {
 	if config.Features.Record {
 		host := os.Getenv("MDROID_OBS_WEBSOCKET_HOST")
 		password := os.Getenv("MDROID_OBS_WEBSOCKET_PASSWORD")
-		data := rec.NewRecordConfigDataS()
 
-		obsClient := startServerWithRetry(host, password, data)
+		obsClient := startServerWithRetry(host, password)
 
 		// Calculate the duration until midnight
 		now := time.Now()
@@ -94,7 +93,7 @@ func main() {
 				if err != nil {
 					return
 				}
-				obsClient = startServerWithRetry(host, password, data)
+				obsClient = startServerWithRetry(host, password)
 			}
 		}()
 
@@ -125,11 +124,6 @@ out:
 
 }
 
-// proxy, move to apis, maybe pkg/apis/proxyserver/proxyserver.go
-func proxy() {
-	fmt.Println("implement me")
-}
-
 func bot(obs *rec.Recorder, notifyChan chan string) {
 	guildID := os.Getenv("MDROID_BOT_GUILD_ID")
 	botToken := os.Getenv("MDROID_BOT_TOKEN")
@@ -175,9 +169,9 @@ func notifyPrayer(prayerName, prayerTime string, in time.Duration, notifyChan ch
 	notifyChan <- msg
 }
 
-func startServerWithRetry(host string, password string, data *rec.RecordConfigDataS) *rec.Recorder {
+func startServerWithRetry(host string, password string) *rec.Recorder {
 	for {
-		obs, err := rec.StartRecServer(host, password, data)
+		obs, err := rec.StartRecServer(host, password)
 		if err != nil {
 			fmt.Printf("could not reach or authenticate to OBS, retrying in 1 minutes...\n")
 			time.Sleep(1 * time.Minute)

rec/rec_iqama.go

@@ -2,7 +2,6 @@ package rec
 
 import (
 	"fmt"
-	v1 "github.com/ccil-kbw/robot/iqama/v1"
 	v2 "github.com/ccil-kbw/robot/iqama/v2"
 	"sync"
 	"time"
@@ -29,6 +28,10 @@ func NewRecordConfigDataS() *RecordConfigDataS {
 		fmt.Println("couldn't fetch iqama times, keeping current data")
 	}
 
+	if today == nil {
+
+	}
+
 	fajr := today.Fajr.Iqama
 	dhuhr := today.Dhuhr.Iqama
 	isha := today.Isha.Iqama
@@ -61,61 +64,15 @@ func NewRecordConfigDataS() *RecordConfigDataS {
 			},
 		},
 	}
-	//rc.Refresh()
 	return rc
 }
+
 func (rc *RecordConfigDataS) Get() *[]RecordConfig {
 	defer rc.mu.Unlock()
 	rc.mu.Lock()
 	return rc.data
 }
 
-func (rc *RecordConfigDataS) Refresh() {
-	defer rc.mu.Unlock()
-	rc.mu.Lock()
-	timeLocation, err := time.LoadLocation("America/Montreal")
-	if err != nil {
-		fmt.Println("couldn't access remote iqama")
-	}
-
-	iqamaTimes, err := v1.Get()
-	if err != nil || iqamaTimes == nil {
-		fmt.Println("couldn't fetch iqama times, keeping current data")
-		if rc.Get() == nil {
-			rc.data = &[]RecordConfig{
-				{
-					Description:   "Jumuaa Recording",
-					StartTime:     time.Date(2023, 1, 1, 11, 55, 0, 0, timeLocation),
-					Duration:      JumuaaRecordDuration,
-					RecordingDays: []time.Weekday{time.Friday},
-				},
-			}
-		}
-		return
-	}
-
-	rc.data = &[]RecordConfig{
-		{
-			Description:   "Fajr Recording",
-			StartTime:     toTime(iqamaTimes.Fajr.Iqama),
-			Duration:      DarsRecordDuration,
-			RecordingDays: EveryDay,
-		},
-		{
-			Description:   "Dhuhur Recording",
-			StartTime:     toTime(iqamaTimes.Dhuhr.Iqama),
-			Duration:      DarsRecordDuration,
-			RecordingDays: EveryDay,
-		},
-		{
-			Description:   "Jumuaa Recording",
-			StartTime:     time.Date(2023, 1, 1, 11, 55, 0, 0, timeLocation),
-			Duration:      JumuaaRecordDuration,
-			RecordingDays: []time.Weekday{time.Friday},
-		},
-	}
-}
-
 type RecordConfig struct {
 	Description string
 

rec/server.go

@@ -5,7 +5,7 @@ import (
 	"time"
 )
 
-func StartRecServer(host, password string, data *RecordConfigDataS) (*Recorder, error) {
+func StartRecServer(host, password string) (*Recorder, error) {
 	client, err := New(host, password)
 	if err != nil {
 		fmt.Println("could not initiate client")
@@ -15,6 +15,7 @@ func StartRecServer(host, password string, data *RecordConfigDataS) (*Recorder,
 	fmt.Println("Starting OBS recording control routine")
 	go func() {
 		for {
+			data := NewRecordConfigDataS()
 
 			isRecording, err := client.IsRecording()
 			if err != nil {
@@ -36,8 +37,6 @@ func StartRecServer(host, password string, data *RecordConfigDataS) (*Recorder,
 				recordTimeLimit = 2 * 60 * 60 * 1000
 			}
 
-
-
 			// Stop recording if not supposed to be recording but currently recording
 			if !shouldRecord && isRecording && (client.RecordTime() > recordTimeLimit) {
 				err := client.StopRecording()