feat: refactor file processing and storage handling with improved path management

storage/alist/alist.go

@@ -10,7 +10,6 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"path"
 	"time"
 
 	"github.com/krau/SaveAny-Bot/config"
@@ -20,7 +19,6 @@ import (
 type Alist struct {
 	client    *http.Client
 	token     string
-	basePath  string
 	baseURL   string
 	loginInfo *loginRequest
 }
@@ -105,7 +103,6 @@ func (a *Alist) refreshToken() {
 }
 
 func (a *Alist) Init() {
-	a.basePath = config.Cfg.Storage.Alist.BasePath
 	a.baseURL = config.Cfg.Storage.Alist.URL
 	a.client = &http.Client{
 		Timeout: 12 * time.Hour,
@@ -128,7 +125,6 @@ func (a *Alist) Init() {
 }
 
 func (a *Alist) Save(ctx context.Context, filePath, storagePath string) error {
-	storagePath = path.Join(a.basePath, storagePath)
 	file, err := os.Open(filePath)
 	if err != nil {
 		return fmt.Errorf("failed to open file: %w", err)

storage/local/local.go

@@ -21,7 +21,6 @@ func (l *Local) Init() {
 }
 
 func (l *Local) Save(ctx context.Context, filePath, storagePath string) error {
-	storagePath = filepath.Join(config.Cfg.Storage.Local.BasePath, storagePath)
 	absPath, err := filepath.Abs(storagePath)
 	if err != nil {
 		return err

storage/storage.go

@@ -3,6 +3,8 @@ package storage
 import (
 	"context"
 	"errors"
+	"path"
+	"path/filepath"
 	"sync"
 
 	"github.com/duke-git/lancet/v2/slice"
@@ -16,7 +18,7 @@ import (
 
 type Storage interface {
 	Init()
-	Save(cttx context.Context, filePath, storagePath string) error
+	Save(cttx context.Context, localFilePath, storagePath string) error
 }
 
 var Storages = make(map[types.StorageType]Storage)
@@ -47,6 +49,7 @@ func Init() {
 }
 
 func Save(storageType types.StorageType, ctx context.Context, filePath, storagePath string) error {
+	logger.L.Debugf("Saving file %s to storage: [%s] %s", filePath, storageType, storagePath)
 	if ctx == nil {
 		ctx = context.Background()
 	}
@@ -59,7 +62,16 @@ func Save(storageType types.StorageType, ctx context.Context, filePath, storageP
 		wg.Add(1)
 		go func(storage Storage) {
 			defer wg.Done()
-			if err := storage.Save(ctx, filePath, storagePath); err != nil {
+			storageDestPath := storagePath
+			switch storage.(type) {
+			case *local.Local:
+				storageDestPath = filepath.Join(config.Cfg.Storage.Local.BasePath, storagePath)
+			case *webdav.Webdav:
+				storageDestPath = path.Join(config.Cfg.Storage.Webdav.BasePath, storagePath)
+			case *alist.Alist:
+				storageDestPath = path.Join(config.Cfg.Storage.Alist.BasePath, storagePath)
+			}
+			if err := storage.Save(ctx, filePath, storageDestPath); err != nil {
 				errs = append(errs, err)
 			}
 		}(storage)

storage/webdav/webdav.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"os"
 	"path"
-	"strings"
 	"time"
 
 	"github.com/krau/SaveAny-Bot/config"
@@ -15,13 +14,11 @@ import (
 type Webdav struct{}
 
 var (
-	Client   *gowebdav.Client
-	basePath string
+	Client *gowebdav.Client
 )
 
 func (w *Webdav) Init() {
 	webdavConfig := config.Cfg.Storage.Webdav
-	basePath = strings.TrimSuffix(webdavConfig.BasePath, "/")
 	Client = gowebdav.NewClient(webdavConfig.URL, webdavConfig.Username, webdavConfig.Password)
 	if err := Client.Connect(); err != nil {
 		logger.L.Fatalf("Failed to connect to webdav server: %v", err)
@@ -31,7 +28,6 @@ func (w *Webdav) Init() {
 }
 
 func (w *Webdav) Save(ctx context.Context, filePath, storagePath string) error {
-	storagePath = path.Join(basePath, storagePath)
 	if err := Client.MkdirAll(path.Dir(storagePath), os.ModePerm); err != nil {
 		logger.L.Errorf("Failed to create directory %s: %v", path.Dir(storagePath), err)
 		return ErrFailedToCreateDirectory