fix: web config file not loaded when is relative path (#636)

cmd/server.go

@@ -27,19 +27,29 @@ func Start(cfg *model.StartConfig) {
 		panic(err)
 	}
 	if downloadCfg.FirstLoad {
-		// Set default download dir, in docker, it will be ${exe}/Downloads, else it will be ${user}/Downloads
+		// Set default download config
-		var downloadDir string
+		if cfg.DownloadConfig != nil {
-		if base.InDocker == "true" {
+			cfg.DownloadConfig.Merge(downloadCfg)
-			downloadDir = filepath.Join(filepath.Dir(cfg.StorageDir), "Downloads")
+			// TODO Use PatchConfig
-		} else {
+			rest.Downloader.PutConfig(cfg.DownloadConfig)
-			userDir, err := os.UserHomeDir()
+			downloadCfg = cfg.DownloadConfig
-			if err == nil {
-				downloadDir = filepath.Join(userDir, "Downloads")
-			}
 		}
-		if downloadDir != "" {
+
-			downloadCfg.DownloadDir = downloadDir
+		downloadDir := downloadCfg.DownloadDir
-			rest.Downloader.PutConfig(downloadCfg)
+		// Set default download dir, in docker, it will be ${exe}/Downloads, else it will be ${user}/Downloads
+		if downloadDir == "" {
+			if base.InDocker == "true" {
+				downloadDir = filepath.Join(filepath.Dir(cfg.StorageDir), "Downloads")
+			} else {
+				userDir, err := os.UserHomeDir()
+				if err == nil {
+					downloadDir = filepath.Join(userDir, "Downloads")
+				}
+			}
+			if downloadDir != "" {
+				downloadCfg.DownloadDir = downloadDir
+				rest.Downloader.PutConfig(downloadCfg)
+			}
 		}
 	}
 	watchExit()

cmd/web/flags.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"github.com/GopeedLab/gopeed/pkg/base"
 	"os"
 	"path/filepath"
 )
@@ -15,6 +16,8 @@ type args struct {
 	Password   *string `json:"password"`
 	ApiToken   *string `json:"apiToken"`
 	StorageDir *string `json:"storageDir"`
+	// DownloadConfig when the first time to start the server, it will be configured as initial value
+	DownloadConfig *base.DownloaderStoreConfig `json:"downloadConfig"`
 
 	configPath *string
 }
@@ -25,7 +28,7 @@ func parse() *args {
 	cliArgs.Port = flag.Int("P", 9999, "Bind Port")
 	cliArgs.Username = flag.String("u", "gopeed", "HTTP Basic Auth Username")
 	cliArgs.Password = flag.String("p", "", "HTTP Basic Auth Pwd")
-	cliArgs.ApiToken = flag.String("T", "", "API token, that can only be used when basic authentication is enabled.")
+	cliArgs.ApiToken = flag.String("T", "", "API token, it must be configured when using HTTP API in the case of enabling basic authentication")
 	cliArgs.StorageDir = flag.String("d", "", "Storage directory")
 	cliArgs.configPath = flag.String("c", "./config.json", "Config file path")
 	flag.Parse()
@@ -57,8 +60,9 @@ func loadConfig(path string) *args {
 	var args args
 
 	if !filepath.IsAbs(path) {
-		dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
+		dir, err := os.Getwd()
 		if err != nil {
+			fmt.Println("config dir get failed, reason:" + err.Error())
 			return &args
 		}
 		path = filepath.Join(dir, path)

cmd/web/main.go

@@ -48,6 +48,7 @@ func main() {
 		Storage:        model.StorageBolt,
 		StorageDir:     filepath.Join(dir, "storage"),
 		ApiToken:       *args.ApiToken,
+		DownloadConfig: args.DownloadConfig,
 		ProductionMode: true,
 		WebEnable:      true,
 		WebFS:          sub,

pkg/base/model.go

@@ -150,11 +150,33 @@ func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
 	if cfg.MaxRunning == 0 {
 		cfg.MaxRunning = 5
 	}
+	if cfg.ProtocolConfig == nil {
+		cfg.ProtocolConfig = make(map[string]any)
+	}
 	if cfg.Proxy == nil {
 		cfg.Proxy = &DownloaderProxyConfig{}
 	}
+	return cfg
+}
+
+func (cfg *DownloaderStoreConfig) Merge(beforeCfg *DownloaderStoreConfig) *DownloaderStoreConfig {
+	if beforeCfg == nil {
+		return cfg
+	}
+	if cfg.DownloadDir == "" {
+		cfg.DownloadDir = beforeCfg.DownloadDir
+	}
+	if cfg.MaxRunning == 0 {
+		cfg.MaxRunning = beforeCfg.MaxRunning
+	}
 	if cfg.ProtocolConfig == nil {
-		cfg.ProtocolConfig = make(map[string]any)
+		cfg.ProtocolConfig = beforeCfg.ProtocolConfig
+	}
+	if cfg.Extra == nil {
+		cfg.Extra = beforeCfg.Extra
+	}
+	if cfg.Proxy == nil {
+		cfg.Proxy = beforeCfg.Proxy
 	}
 	return cfg
 }

pkg/base/model_test.go

@@ -0,0 +1,264 @@
+package base
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestDownloaderStoreConfig_Init(t *testing.T) {
+	tests := []struct {
+		name   string
+		fields *DownloaderStoreConfig
+		want   *DownloaderStoreConfig
+	}{
+		{
+			"Init",
+			&DownloaderStoreConfig{},
+			&DownloaderStoreConfig{
+				MaxRunning:     5,
+				ProtocolConfig: map[string]any{},
+				Proxy:          &DownloaderProxyConfig{},
+			},
+		},
+		{
+			"Init MaxRunning",
+			&DownloaderStoreConfig{
+				MaxRunning: 10,
+			},
+			&DownloaderStoreConfig{
+				MaxRunning:     10,
+				ProtocolConfig: map[string]any{},
+				Proxy:          &DownloaderProxyConfig{},
+			},
+		},
+		{
+			"Init ProtocolConfig",
+			&DownloaderStoreConfig{
+				ProtocolConfig: map[string]any{
+					"key": "value",
+				},
+			},
+			&DownloaderStoreConfig{
+				MaxRunning: 5,
+				ProtocolConfig: map[string]any{
+					"key": "value",
+				},
+				Proxy: &DownloaderProxyConfig{},
+			},
+		},
+		{
+			"Init Proxy",
+			&DownloaderStoreConfig{
+				Proxy: &DownloaderProxyConfig{
+					Enable: true,
+				},
+			},
+			&DownloaderStoreConfig{
+				MaxRunning:     5,
+				ProtocolConfig: map[string]any{},
+				Proxy: &DownloaderProxyConfig{
+					Enable: true,
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cfg := &DownloaderStoreConfig{
+				FirstLoad:      tt.fields.FirstLoad,
+				DownloadDir:    tt.fields.DownloadDir,
+				MaxRunning:     tt.fields.MaxRunning,
+				ProtocolConfig: tt.fields.ProtocolConfig,
+				Extra:          tt.fields.Extra,
+				Proxy:          tt.fields.Proxy,
+			}
+			if got := cfg.Init(); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("Init() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestDownloaderStoreConfig_Merge(t *testing.T) {
+	type args struct {
+		beforeCfg *DownloaderStoreConfig
+	}
+	tests := []struct {
+		name   string
+		fields *DownloaderStoreConfig
+		args   args
+		want   *DownloaderStoreConfig
+	}{
+		{
+			"Merge Nil",
+			&DownloaderStoreConfig{},
+			args{
+				beforeCfg: nil,
+			},
+			&DownloaderStoreConfig{},
+		},
+		{
+			"Merge DownloadDir No Override",
+			&DownloaderStoreConfig{
+				DownloadDir: "before",
+			},
+			args{
+				beforeCfg: &DownloaderStoreConfig{
+					DownloadDir: "after",
+				},
+			},
+			&DownloaderStoreConfig{
+				DownloadDir: "before",
+			},
+		},
+		{
+			"Merge DownloadDir Override",
+			&DownloaderStoreConfig{},
+			args{
+				beforeCfg: &DownloaderStoreConfig{
+					DownloadDir: "after",
+				},
+			},
+			&DownloaderStoreConfig{
+				DownloadDir: "after",
+			},
+		},
+		{
+			"Merge MaxRunning No Override",
+			&DownloaderStoreConfig{
+				MaxRunning: 1,
+			},
+			args{
+				beforeCfg: &DownloaderStoreConfig{
+					MaxRunning: 10,
+				},
+			},
+			&DownloaderStoreConfig{
+				MaxRunning: 1,
+			},
+		},
+		{
+			"Merge MaxRunning Override",
+			&DownloaderStoreConfig{},
+			args{
+				beforeCfg: &DownloaderStoreConfig{
+					MaxRunning: 10,
+				},
+			},
+			&DownloaderStoreConfig{
+				MaxRunning: 10,
+			},
+		},
+		{
+			"Merge ProtocolConfig No Override",
+			&DownloaderStoreConfig{
+				ProtocolConfig: map[string]any{},
+			},
+			args{
+				beforeCfg: &DownloaderStoreConfig{
+					ProtocolConfig: map[string]any{
+						"key": "after",
+					},
+				},
+			},
+			&DownloaderStoreConfig{
+				ProtocolConfig: map[string]any{},
+			},
+		},
+		{
+			"Merge ProtocolConfig Override",
+			&DownloaderStoreConfig{},
+			args{
+				beforeCfg: &DownloaderStoreConfig{
+					ProtocolConfig: map[string]any{
+						"key": "after",
+					},
+				},
+			},
+			&DownloaderStoreConfig{
+				ProtocolConfig: map[string]any{
+					"key": "after",
+				},
+			},
+		},
+		{
+			"Merge Extra No Override",
+			&DownloaderStoreConfig{
+				Extra: map[string]any{},
+			},
+			args{
+				beforeCfg: &DownloaderStoreConfig{
+					Extra: map[string]any{
+						"key": "after",
+					},
+				},
+			},
+			&DownloaderStoreConfig{
+				Extra: map[string]any{},
+			},
+		},
+		{
+			"Merge Extra Override",
+			&DownloaderStoreConfig{},
+			args{
+				beforeCfg: &DownloaderStoreConfig{
+					Extra: map[string]any{
+						"key": "after",
+					},
+				},
+			},
+			&DownloaderStoreConfig{
+				Extra: map[string]any{
+					"key": "after",
+				},
+			},
+		},
+		{
+			"Merge Proxy No Override",
+			&DownloaderStoreConfig{
+				Proxy: &DownloaderProxyConfig{},
+			},
+			args{
+				beforeCfg: &DownloaderStoreConfig{
+					Proxy: &DownloaderProxyConfig{
+						Scheme: "http",
+					},
+				},
+			},
+			&DownloaderStoreConfig{
+				Proxy: &DownloaderProxyConfig{},
+			},
+		},
+		{
+			"Merge Proxy Override",
+			&DownloaderStoreConfig{},
+			args{
+				beforeCfg: &DownloaderStoreConfig{
+					Proxy: &DownloaderProxyConfig{
+						Scheme: "http",
+					},
+				},
+			},
+			&DownloaderStoreConfig{
+				Proxy: &DownloaderProxyConfig{
+					Scheme: "http",
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cfg := &DownloaderStoreConfig{
+				FirstLoad:      tt.fields.FirstLoad,
+				DownloadDir:    tt.fields.DownloadDir,
+				MaxRunning:     tt.fields.MaxRunning,
+				ProtocolConfig: tt.fields.ProtocolConfig,
+				Extra:          tt.fields.Extra,
+				Proxy:          tt.fields.Proxy,
+			}
+			if got := cfg.Merge(tt.args.beforeCfg); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("Merge() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

pkg/rest/model/server.go

@@ -2,6 +2,7 @@ package model
 
 import (
 	"encoding/base64"
+	"github.com/GopeedLab/gopeed/pkg/base"
 	"io/fs"
 )
 
@@ -13,12 +14,13 @@ const (
 )
 
 type StartConfig struct {
-	Network         string  `json:"network"`
+	Network         string                      `json:"network"`
-	Address         string  `json:"address"`
+	Address         string                      `json:"address"`
-	RefreshInterval int     `json:"refreshInterval"`
+	RefreshInterval int                         `json:"refreshInterval"`
-	Storage         Storage `json:"storage"`
+	Storage         Storage                     `json:"storage"`
-	StorageDir      string  `json:"storageDir"`
+	StorageDir      string                      `json:"storageDir"`
-	ApiToken        string  `json:"apiToken"`
+	ApiToken        string                      `json:"apiToken"`
+	DownloadConfig  *base.DownloaderStoreConfig `json:"downloadConfig"`
 
 	ProductionMode bool
 

ui/flutter/lib/app/modules/setting/views/setting_view.dart

@@ -337,7 +337,7 @@ class SettingView extends GetView<SettingController> {
       );
     });
     final buildBtSeedConfig = _buildConfigItem('seedConfig',
-        () => 'seedKeep'.tr + (btConfig.seedKeep ? 'on'.tr : 'off'.tr),
+        () => '${'seedKeep'.tr}(${btConfig.seedKeep ? 'on'.tr : 'off'.tr})',
         (Key key) {
       final seedRatioController =
           TextEditingController(text: btConfig.seedRatio.toString());