[ci] update and refactor

src/config/default.go

@@ -1,12 +1,5 @@
 package config
 
-const (
-	metadataFolder = "./tstor-data/metadata"
-	mountFolder    = "./tstor-data/mount"
-	logsFolder     = "./tstor-data/logs"
-	serverFolder   = "./tstor-data/served-folders/server"
-)
-
 var defaultConfig = Config{
 	WebUi: WebUi{
 		Port: 4444,
@@ -24,21 +17,22 @@ var defaultConfig = Config{
 			Pass:    "admin",
 		},
 		Fuse: Fuse{
-			Enabled:    false,
-			AllowOther: false,
-			Path:       mountFolder,
+			Enabled: false,
 		},
 	},
 
 	TorrentClient: TorrentClient{
-		GlobalCacheSize: 2048,
-		MetadataFolder:  metadataFolder,
-		AddTimeout:      60,
-		ReadTimeout:     120,
+		DataFolder:     "data",
+		MetadataFolder: "metadata",
+
+		// GlobalCacheSize: 2048,
+
+		AddTimeout:  60,
+		ReadTimeout: 120,
 	},
 
 	Log: Log{
-		Path:       logsFolder,
+		Path:       "/tmp/tstor",
 		MaxBackups: 2,
 		MaxSize:    50,
 	},
@@ -69,7 +63,7 @@ var defaultRoutes = []Route{
 var defaultServers = []Server{
 	{
 		Name: "server",
-		Path: serverFolder,
+		Path: "server",
 		Trackers: []string{
 			"wss://tracker.btorrent.xyz",
 			"wss://tracker.openwebtorrent.com",

src/config/load.go

@@ -24,9 +24,9 @@ func Load(path string) (*Config, error) {
 		_ = k.Load(file.Provider(path), yaml.Parser()) // its ok if file doesnt exist
 	}
 
-	err = k.Load(env.Provider("tstor_", ".", func(s string) string {
+	err = k.Load(env.Provider("TSTOR_", ".", func(s string) string {
 		return strings.Replace(strings.ToLower(
-			strings.TrimPrefix(s, "tstor_")), "_", ".", -1)
+			strings.TrimPrefix(s, "TSTOR_")), "_", ".", -1)
 	}), nil)
 	if err != nil {
 		return nil, err

src/config/model.go

@@ -22,11 +22,15 @@ type Log struct {
 }
 
 type TorrentClient struct {
-	ReadTimeout     int    `koanf:"read_timeout,omitempty"`
-	AddTimeout      int    `koanf:"add_timeout,omitempty"`
-	GlobalCacheSize int64  `koanf:"global_cache_size,omitempty"`
-	MetadataFolder  string `koanf:"metadata_folder,omitempty"`
-	DisableIPv6     bool   `koanf:"disable_ipv6,omitempty"`
+	ReadTimeout int `koanf:"read_timeout,omitempty"`
+	AddTimeout  int `koanf:"add_timeout,omitempty"`
+
+	DisableIPv6 bool `koanf:"disable_ipv6,omitempty"`
+
+	DataFolder     string `koanf:"data_folder,omitempty"`
+	MetadataFolder string `koanf:"metadata_folder,omitempty"`
+
+	// GlobalCacheSize int64 `koanf:"global_cache_size,omitempty"`
 
 	Routes  []Route  `koanf:"routes"`
 	Servers []Server `koanf:"servers"`