Remove timeout from main.go

Fix rebase more

Author: avedor

src/config/config.go

@@ -18,14 +18,14 @@ type Config struct {
 	Persist      bool   `env:"PERSIST" env-default:"true"`
 	System       string `env:"EXPLO_SYSTEM"`
 	Debug        bool   `env:"DEBUG" env-default:"false"`
-	Timeout      int    `env:"TIMEOUT" env-default:"10"`
 }
 
 type ClientConfig struct {
 	ClientID     string `env:"CLIENT_ID" env-default:"explo"`
 	LibraryName  string `env:"LIBRARY_NAME" env-default:"Explo"`
 	URL          string `env:"SYSTEM_URL"`
 	DownloadDir  string `env:"DOWNLOAD_DIR"`
+	SlskdDir     string `env:"SLSKD_DIR"`
 	PlaylistDir  string `env:"PLAYLIST_DIR"`
 	PlaylistName string
 	PlaylistID   string
@@ -99,11 +99,10 @@ type Slskd struct {
 }
 
 type Youtube struct {
-	APIKey     string   `env:"YOUTUBE_API_KEY"`
-	Separator  string   `env:"FILENAME_SEPARATOR" env-default:" "`
-	FfmpegPath string   `env:"FFMPEG_PATH"`
-	YtdlpPath  string   `env:"YTDLP_PATH"`
-	FilterList []string `env:"FILTER_LIST" env-default:"live,remix,instrumental,extended"`
+	APIKey     string `env:"YOUTUBE_API_KEY"`
+	FfmpegPath string `env:"FFMPEG_PATH"`
+	YtdlpPath  string `env:"YTDLP_PATH"`
+	Filters    Filters
 }
 
 func ReadEnv() Config {

src/main/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"explo/src/debug"
 	"log"
-	"time"
 
 	"explo/src/client"
 	"explo/src/config"
@@ -18,9 +17,9 @@ type Song struct {
 	Album  string
 }
 
-func initHttpClient(cfg *config.Config) *util.HttpClient {
+func initHttpClient() *util.HttpClient {
 	return util.NewHttp(util.HttpClientConfig{
-		Timeout: time.Duration(cfg.Timeout) * time.Second,
+		Timeout: 10,
 	})
 }
 
@@ -33,7 +32,7 @@ func main() {
 
 	cfg := config.ReadEnv()
 	setup(&cfg)
-	httpClient := initHttpClient(&cfg)
+	httpClient := initHttpClient()
 	client, err := client.NewClient(&cfg, httpClient)
 	if err != nil {
 		log.Fatal(err)