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

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"`
-	Address         string  `json:"address"`
-	RefreshInterval int     `json:"refreshInterval"`
-	Storage         Storage `json:"storage"`
-	StorageDir      string  `json:"storageDir"`
-	ApiToken        string  `json:"apiToken"`
+	Network         string                      `json:"network"`
+	Address         string                      `json:"address"`
+	RefreshInterval int                         `json:"refreshInterval"`
+	Storage         Storage                     `json:"storage"`
+	StorageDir      string                      `json:"storageDir"`
+	ApiToken        string                      `json:"apiToken"`
+	DownloadConfig  *base.DownloaderStoreConfig `json:"downloadConfig"`
 
 	ProductionMode bool