add tmdb auth key to the config.yml

trinity-aml · Jul 4, 2023 · 5a96cb4 · 5a96cb4
1 parent a4a5fe4
commit 5a96cb4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/config/config.go b/config/config.go
@@ -11,10 +11,11 @@ var ProxyHost = ""
 var UseProxy = false
 
 type ConfigParser struct {
-	Host     string `yaml:"host" env:"HOST_RUTOR" env-default:"http://rutor.info"`
-	Port     string `yaml:"port" env:"PORT_RUTOR" env-default:"38888"`
-	UseProxy string `yaml:"useproxy" env:"USEPROXY_RUTOR" env-defaults:"false"`
-	Proxy    string `yaml:"proxy" env:"PROXY_RUTOR" env-default:""`
+	Host      string `yaml:"host" env:"HOST_RUTOR" env-default:"http://rutor.info"`
+	Port      string `yaml:"port" env:"PORT_RUTOR" env-default:"38888"`
+	UseProxy  string `yaml:"useproxy" env:"USEPROXY_RUTOR" env-defaults:"false"`
+	Proxy     string `yaml:"proxy" env:"PROXY_RUTOR" env-default:""`
+	TmdbToken string `yaml:"tmdbtoken"`
 }
 
 var cfg ConfigParser
@@ -31,6 +32,8 @@ func ReadConfigParser(vars string) (string, error) {
 			return cfg.Proxy, nil
 		case vars == "UseProxy":
 			return cfg.UseProxy, nil
+		case vars == "TmdbToken":
+			return cfg.TmdbToken, nil
 		}
 	}
 	return "", err

diff --git a/movies/tmdb/tmdb.go b/movies/tmdb/tmdb.go
@@ -1,13 +1,13 @@
 package tmdb
 
 import (
+	"NUMParser/config"
 	"NUMParser/db/models"
 	"NUMParser/db/tmdb"
 	"NUMParser/utils"
 	"github.com/jmcvetta/napping"
 	"log"
 	"os"
-	"path/filepath"
 	"sort"
 	"strconv"
 	"strings"
@@ -26,13 +26,21 @@ var (
 func Init() {
 	log.Println("Init tmdb")
 
-	dir := filepath.Dir(os.Args[0])
-	buf, err := os.ReadFile(filepath.Join(dir, "tmdb.key"))
-	if err != nil || strings.TrimSpace(string(buf)) == "" {
+	//	dir := filepath.Dir(os.Args[0])
+	//	buf, err := os.ReadFile(filepath.Join(dir, "tmdb.key"))
+	//	if err != nil || strings.TrimSpace(string(buf)) == "" {
+	//		log.Println("Fatal error read tmdb auth key:", err)
+	//		os.Exit(1)
+	//	}
+	//	TMDBAuthKey = strings.TrimSpace(string(buf))
+
+	buf, err := config.ReadConfigParser("TmdbToken")
+	if err == nil && buf != "" {
+		TMDBAuthKey = strings.TrimSpace(buf)
+	} else {
 		log.Println("Fatal error read tmdb auth key:", err)
 		os.Exit(1)
 	}
-	TMDBAuthKey = strings.TrimSpace(string(buf))
 
 	lstmg := GetGenres("movie")
 	lsttvg := GetGenres("tv")