fix parameters

eja · Jul 2, 2024 · dcfcf92 · dcfcf92
1 parent 75b262b
commit dcfcf92
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 20 deletions.
diff --git a/cmd/tv/main.go b/cmd/tv/main.go
@@ -3,7 +3,6 @@
 package main
 
 import (
-	"os"
 	"tv/internal/core"
 	"tv/internal/sys"
 	"tv/internal/web"
@@ -37,11 +36,6 @@ func main() {
 		if err := web.Router(); err != nil {
 			log.Fatal(err)
 		}
-		if _, err := os.Stat(sys.Options.MediaPath); os.IsNotExist(err) {
-			if err := os.MkdirAll(sys.Options.MediaPath, 0755); err != nil {
-				log.Fatal("Cannot create media folder", err)
-			}
-		}
 		go core.Start()
 		if err := tibulaWeb.Start(); err != nil {
 			log.Fatal("Cannot start the web service: ", err)

diff --git a/internal/core/channels.go b/internal/core/channels.go
@@ -16,15 +16,13 @@ import (
 	"github.com/eja/tibula/log"
 )
 
-const channelsBatch = 100
-
 func checkChannels() (err error) {
 	db := tibula.Session()
 	if err = db.Open(sys.Options.DbType, sys.Options.DbName, sys.Options.DbUser, sys.Options.DbPass, sys.Options.DbHost, sys.Options.DbPort); err != nil {
 		return
 	}
 	for {
-		timeLastCheck := time.Now().Add(-time.Duration(sys.Options.CheckInterval) * time.Second).Format("2006-01-02 15:04:05")
+		timeLastCheck := time.Now().Add(-time.Duration(sys.Options.TvCheckInterval) * time.Second).Format("2006-01-02 15:04:05")
 		timeLastWorking := time.Now().Add(-30 * 24 * time.Hour).Format("2006-01-02 15:04:05")
 		rows, err := db.Rows(`SELECT * FROM tvChannels WHERE 
 		  (checkLast < ? OR checkLast IS NULL OR checkLast = "") AND 
@@ -36,7 +34,7 @@ func checkChannels() (err error) {
 			name != "" 
 			ORDER BY power DESC, checkLast ASC 
 			LIMIT ?
-		`, timeLastCheck, timeLastWorking, timeLastWorking, channelsBatch)
+		`, timeLastCheck, timeLastWorking, timeLastWorking, sys.Options.TvCheckBatch)
 		if err != nil {
 			return err
 		}
@@ -46,7 +44,7 @@ func checkChannels() (err error) {
 			var videoSize string
 			status := 0
 			ABR := 0
-			framePath := filepath.Join(sys.Options.MediaPath, row["name"]+".png")
+			framePath := filepath.Join(sys.Options.TvMediaPath, row["name"]+".png")
 
 			cors, subtitles, err := checkPlaylist(row["sourceUrl"])
 			if err != nil {

diff --git a/internal/core/main.go b/internal/core/main.go
@@ -11,8 +11,8 @@ import (
 const tag = "[tv] [core]"
 
 func Start() (err error) {
-	if _, err = os.Stat(sys.Options.MediaPath); err != nil {
-		err = os.MkdirAll(sys.Options.MediaPath, os.ModePerm)
+	if _, err = os.Stat(sys.Options.TvMediaPath); err != nil {
+		err = os.MkdirAll(sys.Options.TvMediaPath, os.ModePerm)
 		if err != nil {
 			return err
 		}

diff --git a/internal/sys/main.go b/internal/sys/main.go
@@ -12,8 +12,9 @@ import (
 var Options typeConfigSys
 
 func Configure() error {
-	flag.StringVar(&Options.MediaPath, "media-path", "/opt/eja/tv/media", "Media folder path")
-	flag.IntVar(&Options.CheckInterval, "check-interval", 3600, "Channels check interval")
+	flag.StringVar(&Options.TvMediaPath, "tv-media-path", "/opt/eja/tv/media", "Media folder path")
+	flag.IntVar(&Options.TvCheckInterval, "tv-check-interval", 3600, "Channels check interval")
+	flag.IntVar(&Options.TvCheckBatch, "tv-check-batch", 10, "Channels check batch")
 
 	if err := sys.Configure(); err != nil {
 		return err

diff --git a/internal/sys/types.go b/internal/sys/types.go
@@ -8,8 +8,9 @@ import (
 
 type typeConfigSys struct {
 	sys.TypeConfig
-	MediaPath     string `json:"media_path,omitempty"`
-	CheckInterval int    `json:"check_interval,omitempty"`
+	TvMediaPath     string `json:"tv_media_path,omitempty"`
+	TvCheckInterval int    `json:"tv_check_interval,omitempty"`
+	TvCheckBatch    int    `json:"tv_check_batch,omitempty"`
 }
 
 var String = sys.String

diff --git a/internal/sys/version.go b/internal/sys/version.go
@@ -3,4 +3,4 @@
 package sys
 
 const Name = "tv"
-const Version = "8.7.1"
+const Version = "8.7.2"
diff --git a/internal/sys/wizard.go b/internal/sys/wizard.go
@@ -18,10 +18,14 @@ func Wizard() error {
 		return err
 	}
 
-	Options.MediaPath = sys.WizardPrompt("Media folder path")
+	Options.TvMediaPath = sys.WizardPrompt("Media folder path")
 	checkInterval := sys.WizardPrompt("Channels check interval")
 	if checkInterval != "" {
-		Options.CheckInterval = int(Number(checkInterval))
+		Options.TvCheckInterval = int(Number(checkInterval))
+	}
+	checkBatch := sys.WizardPrompt("Channels check batch size")
+	if checkBatch != "" {
+		Options.TvCheckBatch = int(Number(checkBatch))
 	}
 
 	tibula.Assets = dbAssets