refactor: refactor task logic for better scalability (#76)

* refactor: a big refactor. wip

* refactor: port handle file

* refactor: place all handlers

* fix: task info nil pointer

* feat: enhance task progress tracking and context management

* feat: cancel task

* feat: stream mode

* feat: silent mode

* feat: dir cmd

* refactor: remove unused old file

* feat: rule cmd

* feat: handle silent mode

* feat: batch task

* fix: batch task progress and temp file cleanup

* refactor: update file creation and cleanup methods for better resource management

* feat: add save command with silent mode handling

* feat: message link

* feat: update message prompts to include file count in storage selection

* feat: slient save links

* refactor: reduce dup code

* feat: rule type

* feat: chose dir

* feat: refactor file handling and storage rules, improve error handling and logging

* feat: rule mode

* feat: telegraph pics

* fix: tphpics nil pointer and inaccurate dirpath

* feat: silent save telegraph

* feat: add suffix to avoid file overwrite

* feat: new storage telegram

* chore: tidy go mod
This commit is contained in:
Krau
2025-06-15 23:57:49 +08:00
committed by GitHub
parent 280745cae3
commit 900823cdb9
150 changed files with 5730 additions and 3923 deletions

View File

@@ -3,7 +3,7 @@ package storage
import (
"fmt"
"github.com/krau/SaveAny-Bot/types"
storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage"
)
type AlistStorageConfig struct {
@@ -29,8 +29,8 @@ func (a *AlistStorageConfig) Validate() error {
return nil
}
func (a *AlistStorageConfig) GetType() types.StorageType {
return types.StorageTypeAlist
func (a *AlistStorageConfig) GetType() storenum.StorageType {
return storenum.Alist
}
func (a *AlistStorageConfig) GetName() string {

View File

@@ -4,16 +4,17 @@ import (
"fmt"
"reflect"
"github.com/krau/SaveAny-Bot/types"
storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage"
"github.com/mitchellh/mapstructure"
"github.com/spf13/viper"
)
var storageFactories = map[types.StorageType]func(cfg *BaseConfig) (StorageConfig, error){
types.StorageTypeLocal: createStorageConfig(&LocalStorageConfig{}),
types.StorageTypeAlist: createStorageConfig(&AlistStorageConfig{}),
types.StorageTypeWebdav: createStorageConfig(&WebdavStorageConfig{}),
types.StorageTypeMinio: createStorageConfig(&MinioStorageConfig{}),
var storageFactories = map[storenum.StorageType]func(cfg *BaseConfig) (StorageConfig, error){
storenum.Local: createStorageConfig(&LocalStorageConfig{}),
storenum.Alist: createStorageConfig(&AlistStorageConfig{}),
storenum.Webdav: createStorageConfig(&WebdavStorageConfig{}),
storenum.Minio: createStorageConfig(&MinioStorageConfig{}),
storenum.Telegram: createStorageConfig(&TelegramStorageConfig{}),
}
func createStorageConfig(configType StorageConfig) func(cfg *BaseConfig) (StorageConfig, error) {
@@ -41,8 +42,12 @@ func LoadStorageConfigs(v *viper.Viper) ([]StorageConfig, error) {
if !baseCfg.Enable {
continue
}
st, err := storenum.ParseStorageType(baseCfg.Type)
if err != nil {
return nil, fmt.Errorf("invalid storage type %s for %s: %w", baseCfg.Type, baseCfg.Name, err)
}
factory, ok := storageFactories[types.StorageType(baseCfg.Type)]
factory, ok := storageFactories[st]
if !ok {
return nil, fmt.Errorf("unsupported storage type: %s", baseCfg.Type)
}

View File

@@ -3,7 +3,7 @@ package storage
import (
"fmt"
"github.com/krau/SaveAny-Bot/types"
storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage"
)
type LocalStorageConfig struct {
@@ -18,8 +18,8 @@ func (l *LocalStorageConfig) Validate() error {
return nil
}
func (l *LocalStorageConfig) GetType() types.StorageType {
return types.StorageTypeLocal
func (l *LocalStorageConfig) GetType() storenum.StorageType {
return storenum.Local
}
func (l *LocalStorageConfig) GetName() string {

View File

@@ -3,7 +3,7 @@ package storage
import (
"fmt"
"github.com/krau/SaveAny-Bot/types"
storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage"
)
type MinioStorageConfig struct {
@@ -32,8 +32,8 @@ func (m *MinioStorageConfig) Validate() error {
return nil
}
func (m *MinioStorageConfig) GetType() types.StorageType {
return types.StorageTypeMinio
func (m *MinioStorageConfig) GetType() storenum.StorageType {
return storenum.Minio
}
func (m *MinioStorageConfig) GetName() string {

View File

@@ -0,0 +1,32 @@
package storage
import (
"fmt"
storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage"
)
type TelegramStorageConfig struct {
BaseConfig
ChatID int64 `toml:"chat_id" mapstructure:"chat_id" json:"chat_id"`
RateLimit int `toml:"rate_limit" mapstructure:"rate_limit" json:"rate_limit"`
RateBurst int `toml:"rate_burst" mapstructure:"rate_burst" json:"rate_burst"`
}
func (m *TelegramStorageConfig) Validate() error {
if m.ChatID == 0 {
return fmt.Errorf("chat_id is required for telegram storage")
}
if m.RateLimit < 0 || m.RateBurst < 0 {
return fmt.Errorf("rate_limit and rate_burst must be greater than 0 for telegram storage")
}
return nil
}
func (m *TelegramStorageConfig) GetType() storenum.StorageType {
return storenum.Telegram
}
func (m *TelegramStorageConfig) GetName() string {
return m.Name
}

View File

@@ -1,10 +1,12 @@
package storage
import "github.com/krau/SaveAny-Bot/types"
import (
storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage"
)
type StorageConfig interface {
Validate() error
GetType() types.StorageType
GetType() storenum.StorageType
GetName() string
}

View File

@@ -3,7 +3,7 @@ package storage
import (
"fmt"
"github.com/krau/SaveAny-Bot/types"
storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage"
)
type WebdavStorageConfig struct {
@@ -27,8 +27,8 @@ func (w *WebdavStorageConfig) Validate() error {
return nil
}
func (w *WebdavStorageConfig) GetType() types.StorageType {
return types.StorageTypeWebdav
func (w *WebdavStorageConfig) GetType() storenum.StorageType {
return storenum.Webdav
}
func (w *WebdavStorageConfig) GetName() string {

View File

@@ -1,15 +1,16 @@
package config
import (
"context"
"errors"
"fmt"
"os"
"strings"
"github.com/duke-git/lancet/v2/slice"
"github.com/krau/SaveAny-Bot/common/i18n"
"github.com/krau/SaveAny-Bot/common/i18n/i18nk"
"github.com/krau/SaveAny-Bot/config/storage"
"github.com/krau/SaveAny-Bot/i18n"
"github.com/krau/SaveAny-Bot/i18n/i18nk"
"github.com/spf13/viper"
)
@@ -53,7 +54,6 @@ type telegramConfig struct {
AppHash string `toml:"app_hash" mapstructure:"app_hash" json:"app_hash"`
Timeout int `toml:"timeout" mapstructure:"timeout" json:"timeout"`
Proxy proxyConfig `toml:"proxy" mapstructure:"proxy"`
FloodRetry int `toml:"flood_retry" mapstructure:"flood_retry" json:"flood_retry"`
RpcRetry int `toml:"rpc_retry" mapstructure:"rpc_retry" json:"rpc_retry"`
Userbot userbotConfig `toml:"userbot" mapstructure:"userbot" json:"userbot"`
}
@@ -79,7 +79,7 @@ func (c Config) GetStorageByName(name string) storage.StorageConfig {
return nil
}
func Init() error {
func Init(ctx context.Context) error {
viper.SetConfigName("config")
viper.AddConfigPath(".")
viper.AddConfigPath("/etc/saveany/")