feat: add download directory placeholders, category support (#1188)

pkg/base/model.go

@@ -182,6 +182,7 @@ type DownloaderStoreConfig struct {
 	ProtocolConfig map[string]any         `json:"protocolConfig"` // ProtocolConfig is special config for each protocol
 	Extra          map[string]any         `json:"extra"`
 	Proxy          *DownloaderProxyConfig `json:"proxy"`
+	Webhook        *WebhookConfig         `json:"webhook"` // Webhook is the webhook configuration
 }
 
 func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
@@ -194,6 +195,9 @@ func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
 	if cfg.Proxy == nil {
 		cfg.Proxy = &DownloaderProxyConfig{}
 	}
+	if cfg.Webhook == nil {
+		cfg.Webhook = &WebhookConfig{}
+	}
 	return cfg
 }
 
@@ -216,9 +220,18 @@ func (cfg *DownloaderStoreConfig) Merge(beforeCfg *DownloaderStoreConfig) *Downl
 	if cfg.Proxy == nil {
 		cfg.Proxy = beforeCfg.Proxy
 	}
+	if cfg.Webhook == nil {
+		cfg.Webhook = beforeCfg.Webhook
+	}
 	return cfg
 }
 
+// WebhookConfig is the webhook configuration
+type WebhookConfig struct {
+	Enable bool     `json:"enable"` // Enable is the flag to enable/disable webhooks
+	URLs   []string `json:"urls"`   // URLs is the list of webhook URLs
+}
+
 type DownloaderProxyConfig struct {
 	Enable bool `json:"enable"`
 	// System is the flag that use system proxy

pkg/base/model_test.go

@@ -18,6 +18,7 @@ func TestDownloaderStoreConfig_Init(t *testing.T) {
 				MaxRunning:     5,
 				ProtocolConfig: map[string]any{},
 				Proxy:          &DownloaderProxyConfig{},
+				Webhook:        &WebhookConfig{},
 			},
 		},
 		{
@@ -29,6 +30,7 @@ func TestDownloaderStoreConfig_Init(t *testing.T) {
 				MaxRunning:     10,
 				ProtocolConfig: map[string]any{},
 				Proxy:          &DownloaderProxyConfig{},
+				Webhook:        &WebhookConfig{},
 			},
 		},
 		{
@@ -43,7 +45,8 @@ func TestDownloaderStoreConfig_Init(t *testing.T) {
 				ProtocolConfig: map[string]any{
 					"key": "value",
 				},
-				Proxy: &DownloaderProxyConfig{},
+				Proxy:   &DownloaderProxyConfig{},
+				Webhook: &WebhookConfig{},
 			},
 		},
 		{
@@ -59,6 +62,7 @@ func TestDownloaderStoreConfig_Init(t *testing.T) {
 				Proxy: &DownloaderProxyConfig{
 					Enable: true,
 				},
+				Webhook: &WebhookConfig{},
 			},
 		},
 	}
@@ -71,6 +75,7 @@ func TestDownloaderStoreConfig_Init(t *testing.T) {
 				ProtocolConfig: tt.fields.ProtocolConfig,
 				Extra:          tt.fields.Extra,
 				Proxy:          tt.fields.Proxy,
+				Webhook:        tt.fields.Webhook,
 			}
 			if got := cfg.Init(); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("Init() = %v, want %v", got, tt.want)
@@ -255,6 +260,7 @@ func TestDownloaderStoreConfig_Merge(t *testing.T) {
 				ProtocolConfig: tt.fields.ProtocolConfig,
 				Extra:          tt.fields.Extra,
 				Proxy:          tt.fields.Proxy,
+				Webhook:        tt.fields.Webhook,
 			}
 			if got := cfg.Merge(tt.args.beforeCfg); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("Merge() = %v, want %v", got, tt.want)

pkg/download/downloader.go

@@ -943,6 +943,9 @@ func (d *Downloader) doCreate(f fetcher.Fetcher, opts *base.Options) (taskId str
 		opts.Path = storeConfig.DownloadDir
 	}
 
+	// Replace placeholders in download path (e.g., %year%, %month%, %day%, %date%)
+	opts.Path = util.ReplacePathPlaceholders(opts.Path)
+
 	// if enable white download directory, check if the download directory is in the white list
 	if len(d.cfg.WhiteDownloadDirs) > 0 {
 		inWhiteList := false

pkg/download/webhook.go

@@ -35,10 +35,29 @@ type WebhookPayload struct {
 	Task *Task `json:"task"`
 }
 
-// getWebhookUrls extracts and converts webhook URLs from config
+// getWebhookUrls extracts webhook URLs from config
+// Supports both new webhook config format and legacy extra field for backward compatibility
 func (d *Downloader) getWebhookUrls() []string {
 	cfg := d.cfg.DownloaderStoreConfig
-	if cfg == nil || cfg.Extra == nil {
+	if cfg == nil {
+		return nil
+	}
+
+	// Try new webhook config first
+	if cfg.Webhook != nil && cfg.Webhook.Enable && len(cfg.Webhook.URLs) > 0 {
+		urls := make([]string, 0, len(cfg.Webhook.URLs))
+		for _, url := range cfg.Webhook.URLs {
+			if url != "" {
+				urls = append(urls, url)
+			}
+		}
+		if len(urls) > 0 {
+			return urls
+		}
+	}
+
+	// Fall back to legacy extra field for backward compatibility
+	if cfg.Extra == nil {
 		return nil
 	}
 

pkg/download/webhook_test.go

@@ -49,10 +49,10 @@ func TestWebhook_TriggerOnDone(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		// Configure webhook URLs
 		cfg, _ := downloader.GetConfig()
-		if cfg.Extra == nil {
-			cfg.Extra = make(map[string]any)
-		}
-		cfg.Extra["webhookUrls"] = []string{server.URL}
+		cfg.Webhook = &base.WebhookConfig{
+		Enable: true,
+		URLs: []string{server.URL},
+	}
 		downloader.PutConfig(cfg)
 
 		// Create a mock task
@@ -98,10 +98,10 @@ func TestWebhook_TriggerOnError(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		// Configure webhook URLs
 		cfg, _ := downloader.GetConfig()
-		if cfg.Extra == nil {
-			cfg.Extra = make(map[string]any)
-		}
-		cfg.Extra["webhookUrls"] = []string{server.URL}
+		cfg.Webhook = &base.WebhookConfig{
+		Enable: true,
+		URLs: []string{server.URL},
+	}
 		downloader.PutConfig(cfg)
 
 		// Create a mock task
@@ -143,10 +143,10 @@ func TestWebhook_SendTestWebhook(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		// Configure webhook URLs
 		cfg, _ := downloader.GetConfig()
-		if cfg.Extra == nil {
-			cfg.Extra = make(map[string]any)
-		}
-		cfg.Extra["webhookUrls"] = []string{server.URL}
+		cfg.Webhook = &base.WebhookConfig{
+		Enable: true,
+		URLs: []string{server.URL},
+	}
 		downloader.PutConfig(cfg)
 
 		// Send test webhook
@@ -206,10 +206,10 @@ func TestWebhook_MultipleUrls(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		// Configure multiple webhook URLs
 		cfg, _ := downloader.GetConfig()
-		if cfg.Extra == nil {
-			cfg.Extra = make(map[string]any)
-		}
-		cfg.Extra["webhookUrls"] = []string{server1.URL, server2.URL}
+		cfg.Webhook = &base.WebhookConfig{
+		Enable: true,
+		URLs: []string{server1.URL, server2.URL},
+	}
 		downloader.PutConfig(cfg)
 
 		// Create a mock task
@@ -239,10 +239,10 @@ func TestWebhook_TestWebhookFailsOnNon200(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		// Configure webhook URLs
 		cfg, _ := downloader.GetConfig()
-		if cfg.Extra == nil {
-			cfg.Extra = make(map[string]any)
-		}
-		cfg.Extra["webhookUrls"] = []string{server.URL}
+		cfg.Webhook = &base.WebhookConfig{
+		Enable: true,
+		URLs: []string{server.URL},
+	}
 		downloader.PutConfig(cfg)
 
 		// Send test webhook - should fail with non-200 status
@@ -263,10 +263,10 @@ func TestWebhook_TestWebhookFailsOn201(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		// Configure webhook URLs
 		cfg, _ := downloader.GetConfig()
-		if cfg.Extra == nil {
-			cfg.Extra = make(map[string]any)
-		}
-		cfg.Extra["webhookUrls"] = []string{server.URL}
+		cfg.Webhook = &base.WebhookConfig{
+		Enable: true,
+		URLs: []string{server.URL},
+	}
 		downloader.PutConfig(cfg)
 
 		// Send test webhook - should fail with 201 status (only 200 is success)
@@ -333,7 +333,7 @@ func TestWebhook_GetWebhookUrls_EmptyConfig(t *testing.T) {
 func TestWebhook_GetWebhookUrls_NoExtraField(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		cfg, _ := downloader.GetConfig()
-		cfg.Extra = nil
+		cfg.Webhook = nil
 		downloader.PutConfig(cfg)
 
 		urls := downloader.getWebhookUrls()
@@ -346,8 +346,7 @@ func TestWebhook_GetWebhookUrls_NoExtraField(t *testing.T) {
 func TestWebhook_GetWebhookUrls_NoWebhookUrlsKey(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		cfg, _ := downloader.GetConfig()
-		cfg.Extra = make(map[string]any)
-		cfg.Extra["otherKey"] = "value"
+		cfg.Webhook = &base.WebhookConfig{Enable: true}  // No URLs set
 		downloader.PutConfig(cfg)
 
 		urls := downloader.getWebhookUrls()
@@ -360,8 +359,10 @@ func TestWebhook_GetWebhookUrls_NoWebhookUrlsKey(t *testing.T) {
 func TestWebhook_GetWebhookUrls_StringSlice(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		cfg, _ := downloader.GetConfig()
-		cfg.Extra = make(map[string]any)
-		cfg.Extra["webhookUrls"] = []string{"http://example.com", "http://example2.com"}
+		cfg.Webhook = &base.WebhookConfig{
+		Enable: true,
+		URLs: []string{"http://example.com", "http://example2.com"},
+	}
 		downloader.PutConfig(cfg)
 
 		urls := downloader.getWebhookUrls()
@@ -377,8 +378,10 @@ func TestWebhook_GetWebhookUrls_StringSlice(t *testing.T) {
 func TestWebhook_GetWebhookUrls_InterfaceSlice(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		cfg, _ := downloader.GetConfig()
-		cfg.Extra = make(map[string]any)
-		cfg.Extra["webhookUrls"] = []interface{}{"http://example.com", "http://example2.com"}
+		cfg.Webhook = &base.WebhookConfig{
+		Enable: true,
+		URLs: []string{"http://example.com", "http://example2.com"},
+	}
 		downloader.PutConfig(cfg)
 
 		urls := downloader.getWebhookUrls()
@@ -395,7 +398,7 @@ func TestWebhook_GetWebhookUrls_EmptyStringSlice(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		cfg, _ := downloader.GetConfig()
 		cfg.Extra = make(map[string]any)
-		cfg.Extra["webhookUrls"] = []string{}
+		cfg.Webhook.URLs = []string{}
 		downloader.PutConfig(cfg)
 
 		urls := downloader.getWebhookUrls()
@@ -408,8 +411,10 @@ func TestWebhook_GetWebhookUrls_EmptyStringSlice(t *testing.T) {
 func TestWebhook_GetWebhookUrls_InterfaceSliceWithEmptyStrings(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		cfg, _ := downloader.GetConfig()
-		cfg.Extra = make(map[string]any)
-		cfg.Extra["webhookUrls"] = []interface{}{"", "", ""}
+		cfg.Webhook = &base.WebhookConfig{
+		Enable: true,
+		URLs: []string{"", "", ""},
+	}
 		downloader.PutConfig(cfg)
 
 		urls := downloader.getWebhookUrls()
@@ -422,13 +427,15 @@ func TestWebhook_GetWebhookUrls_InterfaceSliceWithEmptyStrings(t *testing.T) {
 func TestWebhook_GetWebhookUrls_InterfaceSliceMixedTypes(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		cfg, _ := downloader.GetConfig()
-		cfg.Extra = make(map[string]any)
-		cfg.Extra["webhookUrls"] = []interface{}{"http://example.com", 123, "http://example2.com", nil, ""}
+		cfg.Webhook = &base.WebhookConfig{
+			Enable: true,
+			URLs:   []string{"http://example.com", "", "http://example2.com", ""},
+		}
 		downloader.PutConfig(cfg)
 
 		urls := downloader.getWebhookUrls()
 		if len(urls) != 2 {
-			t.Errorf("Expected 2 valid URLs (ignoring non-strings and empty), got %d: %v", len(urls), urls)
+			t.Errorf("Expected 2 valid URLs (ignoring empty strings), got %d: %v", len(urls), urls)
 		}
 		if urls[0] != "http://example.com" || urls[1] != "http://example2.com" {
 			t.Errorf("URLs don't match expected values: %v", urls)
@@ -439,13 +446,28 @@ func TestWebhook_GetWebhookUrls_InterfaceSliceMixedTypes(t *testing.T) {
 func TestWebhook_GetWebhookUrls_InvalidType(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		cfg, _ := downloader.GetConfig()
-		cfg.Extra = make(map[string]any)
-		cfg.Extra["webhookUrls"] = "not-a-slice"
+		cfg.Webhook = &base.WebhookConfig{Enable: false}  // Disabled webhook
 		downloader.PutConfig(cfg)
 
 		urls := downloader.getWebhookUrls()
 		if urls != nil {
-			t.Errorf("Expected nil for invalid type, got %v", urls)
+			t.Errorf("Expected nil for disabled webhook, got %v", urls)
+		}
+	})
+}
+
+func TestWebhook_GetWebhookUrls_DisabledWebhook(t *testing.T) {
+	setupWebhookTest(t, func(downloader *Downloader) {
+		cfg, _ := downloader.GetConfig()
+		cfg.Webhook = &base.WebhookConfig{
+			Enable: false,
+			URLs:   []string{"http://example.com"},
+		}
+		downloader.PutConfig(cfg)
+
+		urls := downloader.getWebhookUrls()
+		if urls != nil {
+			t.Errorf("Expected nil for disabled webhook even with URLs, got %v", urls)
 		}
 	})
 }
@@ -617,8 +639,10 @@ func TestWebhook_TriggerWebhooks_EmptyUrlSkipped(t *testing.T) {
 
 	setupWebhookTest(t, func(downloader *Downloader) {
 		cfg, _ := downloader.GetConfig()
-		cfg.Extra = make(map[string]any)
-		cfg.Extra["webhookUrls"] = []string{server.URL, "", server.URL}
+		cfg.Webhook = &base.WebhookConfig{
+		Enable: true,
+		URLs: []string{server.URL, "", server.URL},
+	}
 		downloader.PutConfig(cfg)
 
 		task := NewTask()
@@ -650,8 +674,10 @@ func TestWebhook_WebhookDataStructure(t *testing.T) {
 
 	setupWebhookTest(t, func(downloader *Downloader) {
 		cfg, _ := downloader.GetConfig()
-		cfg.Extra = make(map[string]any)
-		cfg.Extra["webhookUrls"] = []string{server.URL}
+		cfg.Webhook = &base.WebhookConfig{
+		Enable: true,
+		URLs: []string{server.URL},
+	}
 		downloader.PutConfig(cfg)
 
 		task := NewTask()
@@ -692,7 +718,7 @@ func TestWebhook_SendTestWebhook_EmptyUrls(t *testing.T) {
 	setupWebhookTest(t, func(downloader *Downloader) {
 		cfg, _ := downloader.GetConfig()
 		cfg.Extra = make(map[string]any)
-		cfg.Extra["webhookUrls"] = []string{}
+		cfg.Webhook.URLs = []string{}
 		downloader.PutConfig(cfg)
 
 		err := downloader.SendTestWebhook()
@@ -717,8 +743,10 @@ func TestWebhook_SendTestWebhook_MixedResults(t *testing.T) {
 
 	setupWebhookTest(t, func(downloader *Downloader) {
 		cfg, _ := downloader.GetConfig()
-		cfg.Extra = make(map[string]any)
-		cfg.Extra["webhookUrls"] = []string{server1.URL, server2.URL}
+		cfg.Webhook = &base.WebhookConfig{
+		Enable: true,
+		URLs: []string{server1.URL, server2.URL},
+	}
 		downloader.PutConfig(cfg)
 
 		// Should fail because server2 returns 500

pkg/util/path.go

@@ -8,6 +8,7 @@ import (
 	syspath "path"
 	"path/filepath"
 	"strings"
+	"time"
 )
 
 func Dir(path string) string {
@@ -199,3 +200,28 @@ func ReplaceInvalidFilename(path string) string {
 	}
 	return path
 }
+
+// ReplacePathPlaceholders replaces date placeholders in a path with actual values
+// Supported placeholders:
+//   - %year%  - Current year (e.g., 2025)
+//   - %month% - Current month (01-12)
+//   - %day%   - Current day (01-31)
+//   - %date%  - Full date format (2025-01-01)
+func ReplacePathPlaceholders(path string) string {
+	if path == "" {
+		return ""
+	}
+
+	now := time.Now()
+	year := fmt.Sprintf("%d", now.Year())
+	month := fmt.Sprintf("%02d", now.Month())
+	day := fmt.Sprintf("%02d", now.Day())
+	date := fmt.Sprintf("%s-%s-%s", year, month, day)
+
+	path = strings.ReplaceAll(path, "%year%", year)
+	path = strings.ReplaceAll(path, "%month%", month)
+	path = strings.ReplaceAll(path, "%day%", day)
+	path = strings.ReplaceAll(path, "%date%", date)
+
+	return path
+}

pkg/util/path_test.go

@@ -1,8 +1,11 @@
 package util
 
 import (
+	"fmt"
 	"os"
+	"strings"
 	"testing"
+	"time"
 )
 
 func TestDir(t *testing.T) {
@@ -240,3 +243,75 @@ func TestReplaceInvalidFilename(t *testing.T) {
 		})
 	}
 }
+
+func TestReplacePathPlaceholders(t *testing.T) {
+	now := time.Now()
+	year := fmt.Sprintf("%d", now.Year())
+	month := fmt.Sprintf("%02d", now.Month())
+	day := fmt.Sprintf("%02d", now.Day())
+	date := fmt.Sprintf("%s-%s-%s", year, month, day)
+
+	tests := []struct {
+		name string
+		path string
+		want string
+	}{
+		{
+			name: "empty path",
+			path: "",
+			want: "",
+		},
+		{
+			name: "no placeholders",
+			path: "/home/user/Downloads",
+			want: "/home/user/Downloads",
+		},
+		{
+			name: "year placeholder",
+			path: "/Downloads/%year%",
+			want: "/Downloads/" + year,
+		},
+		{
+			name: "month placeholder",
+			path: "/Downloads/%month%",
+			want: "/Downloads/" + month,
+		},
+		{
+			name: "day placeholder",
+			path: "/Downloads/%day%",
+			want: "/Downloads/" + day,
+		},
+		{
+			name: "date placeholder",
+			path: "/Downloads/%date%",
+			want: "/Downloads/" + date,
+		},
+		{
+			name: "multiple placeholders",
+			path: "/Downloads/%year%-%month%",
+			want: "/Downloads/" + year + "-" + month,
+		},
+		{
+			name: "mixed path with placeholders",
+			path: "/home/user/Downloads/%year%/%month%/%day%",
+			want: "/home/user/Downloads/" + year + "/" + month + "/" + day,
+		},
+		{
+			name: "windows style path",
+			path: "D:\\Downloads\\%year%-%month%",
+			want: "D:\\Downloads\\" + year + "-" + month,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := ReplacePathPlaceholders(tt.path)
+			if !strings.Contains(got, year) && tt.path != "" && strings.Contains(tt.path, "%year%") {
+				t.Errorf("ReplacePathPlaceholders() = %v, want containing year %v", got, year)
+			}
+			if got != tt.want {
+				t.Errorf("ReplacePathPlaceholders() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}