fix: add missing fi statement in Dockerfile path setting step

- Implemented a new task type for handling direct links downloads.
- Added command handler for downloading multiple links via /dl command.
- Introduced progress tracking for direct link downloads.
- Enhanced filename parsing to support various encoding scenarios.
- Updated enums to include direct links as a task type.
- Refactored existing task structures to accommodate new functionality.
- Improved error handling and logging throughout the download process.

.dockerignore

@@ -9,3 +9,4 @@ cache/
 docs/
 config.example.toml
 docker-compose.*
+playwright/

.github/workflows/build-docker.yml

@@ -7,15 +7,26 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
+  IMAGE_NAME: krau/saveany-bot
+
+concurrency:
+  group: docker-build-${{ github.repository }}
+  cancel-in-progress: true
 
 jobs:
-  build-and-push:
+  prepare:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
 
+    outputs:
+      tags: ${{ steps.meta.outputs.tags }}
+      labels: ${{ steps.meta.outputs.labels }}
+      version: ${{ steps.args.outputs.version }}
+      git_commit: ${{ steps.args.outputs.git_commit }}
+      build_time: ${{ steps.args.outputs.build_time }}
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -29,10 +40,30 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=sha
-            type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=latest
 
-      - name: Set up QEMU
+      - name: Extract Dockerfile args
-        uses: docker/setup-qemu-action@v3
+        id: args
+        run: |
+          echo "git_commit=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
+          echo "build_time=$(git show -s --format=%cI)" >> "$GITHUB_OUTPUT"
+
+  build:
+    needs: prepare
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
+        type: [default, micro, pico]
+      fail-fast: false
+
+    runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-latest' || 'ubuntu-24.04-arm' }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -44,20 +75,43 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set Dockerfile path
+        id: dockerfile
+        run: |
+          if [ "${{ matrix.type }}" == "default" ]; then
+            echo "DOCKERFILE=./Dockerfile" >> "$GITHUB_OUTPUT"
+          elif [ "${{ matrix.type }}" == "micro" ]; then
+            echo "DOCKERFILE=./Dockerfile.micro" >> "$GITHUB_OUTPUT"
+          else
+            echo "DOCKERFILE=./Dockerfile.pico" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Set image tags
+        id: tags
+        run: |
+          if [ "${{ matrix.type }}" == "default" ]; then
+            TAGS="${{ needs.prepare.outputs.tags }}"
+          elif [ "${{ matrix.type }}" == "micro" ]; then
+            TAGS="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:micro,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:micro-latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:micro-${{ needs.prepare.outputs.version }}"
+          else
+            TAGS="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:pico,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:pico-latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:pico-${{ needs.prepare.outputs.version }}"
+          fi
+          echo "TAGS=$TAGS" >> "$GITHUB_OUTPUT"
+
       - name: Build and push Docker image
-        id: build-and-push
         uses: docker/build-push-action@v6
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
+          file: ${{ steps.dockerfile.outputs.DOCKERFILE }}
+          platforms: ${{ matrix.arch == 'amd64' && 'linux/amd64' || 'linux/arm64' }}
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ steps.tags.outputs.TAGS }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ needs.prepare.outputs.labels }}
           cache-from: |
-            type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+            type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.type }}-latest
             type=gha
           cache-to: type=gha,mode=max
           build-args: |
-            VERSION=${{ steps.meta.outputs.version }}
+            VERSION=${{ needs.prepare.outputs.version }}
-            GitCommit=${{ github.sha }}
+            GitCommit=${{ needs.prepare.outputs.git_commit }}
-            BuildTime=${{ fromJson(toJSON(github.event.repository.pushed_at)) }}
+            BuildTime=${{ needs.prepare.outputs.build_time }}

.github/workflows/build-release.yml

@@ -63,9 +63,9 @@ jobs:
             README.md
           ldflags: >-
             -s -w
-            -X "github.com/krau/SaveAny-Bot/pkg/consts.Version=${{ env.VERSION }}"
+            -X "github.com/krau/SaveAny-Bot/config.Version=${{ env.VERSION }}"
-            -X "github.com/krau/SaveAny-Bot/pkg/consts.BuildTime=${{ format(github.event.repository.updated_at, 'yyyy-MM-dd HH:mm:ss') }}"
+            -X "github.com/krau/SaveAny-Bot/config.BuildTime=${{ format(github.event.repository.updated_at, 'yyyy-MM-dd HH:mm:ss') }}"
-            -X "github.com/krau/SaveAny-Bot/pkg/consts.GitCommit=${{ github.sha }}"
+            -X "github.com/krau/SaveAny-Bot/config.GitCommit=${{ github.sha }}"
           binary_name: saveany-bot
         env:
           VERSION: ${{ env.VERSION }}

.gitignore

@@ -7,4 +7,6 @@ session.*
 cache.db
 .vscode/
 temp/
-.hugo_build.lock
+.hugo_build.lock
+playwright/
+testplugins/

Dockerfile

@@ -13,18 +13,27 @@ RUN --mount=type=cache,target=/go/pkg/mod \
 COPY . .
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg \
-    CGO_ENABLED=0 \ 
+    CGO_ENABLED=0 \
-    go build -trimpath \ 
+    go build -trimpath \
-    -ldflags "-s -w \ 
+    -ldflags=" \
-    -X github.com/krau/SaveAny-Bot/common.Version=${VERSION} \
+    -s -w \
-    -X github.com/krau/SaveAny-Bot/common.GitCommit=${GitCommit} \
+    -X 'github.com/krau/SaveAny-Bot/config.Version=${VERSION}' \
-    -X github.com/krau/SaveAny-Bot/common.BuildTime=${BuildTime}" \
+    -X 'github.com/krau/SaveAny-Bot/config.GitCommit=${GitCommit}' \
+    -X 'github.com/krau/SaveAny-Bot/config.BuildTime=${BuildTime}' \
+    -X 'github.com/krau/SaveAny-Bot/config.Docker=true' \
+    " \
     -o saveany-bot .
 
 FROM alpine:latest
 
+RUN apk add --no-cache curl ffmpeg
+
 WORKDIR /app
 
 COPY --from=builder /app/saveany-bot .
+COPY entrypoint.sh .
 
-ENTRYPOINT  ["/app/saveany-bot"]
+RUN chmod +x /app/saveany-bot && \
+    chmod +x /app/entrypoint.sh
+
+ENTRYPOINT ["/app/entrypoint.sh"]

Dockerfile.micro

@@ -0,0 +1,41 @@
+FROM golang:alpine AS builder
+
+ARG VERSION="dev"
+ARG GitCommit="Unknown"
+ARG BuildTime="Unknown"
+
+WORKDIR /app
+
+COPY go.mod go.sum ./
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go mod download
+
+COPY . .
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/go/pkg \
+    CGO_ENABLED=0 \
+    go build -trimpath \
+    -tags=no_jsparser,no_minio \
+    -ldflags=" \
+    -s -w \
+    -X 'github.com/krau/SaveAny-Bot/config.Version=${VERSION}' \
+    -X 'github.com/krau/SaveAny-Bot/config.GitCommit=${GitCommit}' \
+    -X 'github.com/krau/SaveAny-Bot/config.BuildTime=${BuildTime}' \
+    -X 'github.com/krau/SaveAny-Bot/config.Docker=true' \
+    " \
+    -o saveany-bot .
+
+FROM alpine:latest
+
+RUN apk add --no-cache curl
+
+WORKDIR /app
+
+COPY --from=builder /app/saveany-bot .
+COPY entrypoint.sh .
+
+RUN chmod +x /app/saveany-bot && \
+    chmod +x /app/entrypoint.sh
+
+ENTRYPOINT ["/app/entrypoint.sh"]
+

Dockerfile.pico

@@ -0,0 +1,35 @@
+# pico is the minimum build of SaveAnyBot, which disables all the optional features like JS parsing and MinIO support.
+FROM golang:alpine AS builder
+
+ARG VERSION="dev"
+ARG GitCommit="Unknown"
+ARG BuildTime="Unknown"
+
+WORKDIR /app
+
+COPY go.mod go.sum ./
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go mod download
+
+COPY . .
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/go/pkg \
+    CGO_ENABLED=0 \
+    go build -trimpath \
+    -tags=no_jsparser,no_minio,sqlite_glebarez \
+    -ldflags=" \
+    -s -w \
+    -X 'github.com/krau/SaveAny-Bot/config.Version=${VERSION}' \
+    -X 'github.com/krau/SaveAny-Bot/config.GitCommit=${GitCommit}' \
+    -X 'github.com/krau/SaveAny-Bot/config.BuildTime=${BuildTime}' \
+    -X 'github.com/krau/SaveAny-Bot/config.Docker=true' \
+    " \
+    -o saveany-bot . && chmod +x saveany-bot
+
+FROM scratch
+
+WORKDIR /app
+
+COPY --from=builder /app/saveany-bot .
+
+ENTRYPOINT ["/app/saveany-bot"]

README.md

@@ -4,28 +4,70 @@
 
 **简体中文** | [English](https://sabot.unv.app/en/)
 
-把 Telegram 上的文件转存到多种存储端.
+> **把 Telegram 上的文件转存到多种存储端.**
+
+[![Release Date](https://img.shields.io/github/release-date/krau/saveany-bot?label=release)](https://github.com/krau/saveany-bot/releases)
+[![tag](https://img.shields.io/github/v/tag/krau/saveany-bot.svg)](https://github.com/krau/saveany-bot/releases)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/krau/saveany-bot/build-release.yml)](https://github.com/krau/saveany-bot/actions/workflows/build-release.yml)
+[![Stars](https://img.shields.io/github/stars/krau/saveany-bot?style=flat)](https://github.com/krau/saveany-bot/stargazers)
+[![Downloads](https://img.shields.io/github/downloads/krau/saveany-bot/total)](https://github.com/krau/saveany-bot/releases)
+[![Issues](https://img.shields.io/github/issues/krau/saveany-bot)](https://github.com/krau/saveany-bot/issues)
+[![Pull Requests](https://img.shields.io/github/issues-pr/krau/saveany-bot?label=pr)](https://github.com/krau/saveany-bot/pulls)
+[![License](https://img.shields.io/github/license/krau/saveany-bot)](./LICENSE)
 
 </div>
 
-## 部署
+## 🎯 Features
 
-请参考 [部署文档](https://sabot.unv.app/deployment/installation/)
+- 支持文档/视频/图片/贴纸…甚至还有 [Telegraph](https://telegra.ph/)
-
-## Features
-
-- 支持文档/视频/图片/贴纸… 甚至还有 Telegraph
 - 破解禁止保存的文件
 - 批量下载
 - 流式传输
-- 多用户
+- 多用户使用
 - 基于存储规则的自动整理
-- 支持多种存储端:
+- 监听并自动转存指定聊天的消息, 支持过滤
+- 使用 js 编写解析器插件以转存任意网站的文件
+- 存储端支持:
   - Alist
-  - Minio (S3 兼容)
+  - S3
   - WebDAV
-  - Telegram (重传回指定聊天)
   - 本地磁盘
+  - Telegram (重传回指定聊天)
+
+## 📦 Quick Start
+
+创建文件 `config.toml` 并填入以下内容:
+
+```toml
+[telegram]
+token = "" # 你的 Bot Token, 在 @BotFather 获取
+[telegram.proxy]
+# 启用代理连接 telegram, 当前只支持 socks5
+enable = false
+url = "socks5://127.0.0.1:7890"
+
+[[storages]]
+name = "本地磁盘"
+type = "local"
+enable = true
+base_path = "./downloads"
+
+[[users]]
+id = 114514 # 你的 Telegram 账号 id
+storages = []
+blacklist = true
+```
+
+使用 Docker 运行 Save Any Bot:
+
+```bash
+docker run -d --name saveany-bot \
+    -v ./config.toml:/app/config.toml \
+    -v ./downloads:/app/downloads \
+    ghcr.io/krau/saveany-bot:latest
+```
+
+请 [**查看文档**](https://sabot.unv.app/) 以获取更多配置选项和使用方法.
 
 ## Sponsors
 
@@ -48,6 +90,13 @@
                     <sub><b>Krau</b></sub>
                 </a>
             </td>
+            <td align="center">
+                <a href="https://github.com/Silentely">
+                    <img src="https://avatars.githubusercontent.com/u/22141172?v=4" width="100;" alt="Silentely"/>
+                    <br />
+                    <sub><b>Abner</b></sub>
+                </a>
+            </td>
             <td align="center">
                 <a href="https://github.com/TG-Twilight">
                     <img src="https://avatars.githubusercontent.com/u/121682528?v=4" width="100;" alt="TG-Twilight"/>
@@ -63,8 +112,8 @@
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/ahcorn">
+                <a href="https://github.com/AHCorn">
-                    <img src="https://avatars.githubusercontent.com/u/42889600?v=4" width="100;" alt="ahcorn"/>
+                    <img src="https://avatars.githubusercontent.com/u/42889600?v=4" width="100;" alt="AHCorn"/>
                     <br />
                     <sub><b>安和</b></sub>
                 </a>
@@ -81,3 +130,9 @@
 - [gotgproto](https://github.com/celestix/gotgproto)
 - [tdl](https://github.com/iyear/tdl)
 - All the dependencies
+
+## Contact
+
+- [![Group](https://img.shields.io/badge/ProjectSaveAny-Group-blue)](https://t.me/ProjectSaveAny)
+- [![Discussion](https://img.shields.io/badge/Github-Discussion-white)](https://github.com/krau/saveany-bot/discussions)
+- [![PersonalChannel](https://img.shields.io/badge/Krau-PersonalChannel-cyan)](https://t.me/acherkrau)

client/bot/bot.go

@@ -9,53 +9,49 @@ import (
 	"github.com/celestix/gotgproto/ext"
 	"github.com/celestix/gotgproto/sessionMaker"
 	"github.com/charmbracelet/log"
-	"github.com/gotd/td/telegram/dcs"
 	"github.com/gotd/td/tg"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers"
 	"github.com/krau/SaveAny-Bot/client/middleware"
-	"github.com/krau/SaveAny-Bot/common/utils/netutil"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 	"github.com/krau/SaveAny-Bot/config"
-	"github.com/ncruces/go-sqlite3/gormlite"
+	"github.com/krau/SaveAny-Bot/database"
-	"golang.org/x/net/proxy"
 )
 
-func Init(ctx context.Context) {
+func Init(ctx context.Context) <-chan struct{} {
 	log.FromContext(ctx).Info("初始化 Bot...")
 	resultChan := make(chan struct {
 		client *gotgproto.Client
 		err    error
 	})
+	shouldRestart := make(chan struct{})
+
 	go func() {
-		var resolver dcs.Resolver
+		resolver, err := tgutil.NewConfigProxyResolver()
-		if config.Cfg.Telegram.Proxy.Enable && config.Cfg.Telegram.Proxy.URL != "" {
+		if err != nil {
-			dialer, err := netutil.NewProxyDialer(config.Cfg.Telegram.Proxy.URL)
+			resultChan <- struct {
-			if err != nil {
+				client *gotgproto.Client
-				resultChan <- struct {
+				err    error
-					client *gotgproto.Client
+			}{nil, err}
-					err    error
+			return
-				}{nil, err}
-				return
-			}
-			resolver = dcs.Plain(dcs.PlainOptions{
-				Dial: dialer.(proxy.ContextDialer).DialContext,
-			})
-		} else {
-			resolver = dcs.DefaultResolver()
 		}
 		client, err := gotgproto.NewClient(
-			config.Cfg.Telegram.AppID,
+			config.C().Telegram.AppID,
-			config.Cfg.Telegram.AppHash,
+			config.C().Telegram.AppHash,
-			gotgproto.ClientTypeBot(config.Cfg.Telegram.Token),
+			gotgproto.ClientTypeBot(config.C().Telegram.Token),
 			&gotgproto.ClientOpts{
-				Session:          sessionMaker.SqlSession(gormlite.Open(config.Cfg.DB.Session)),
+				Session:          sessionMaker.SqlSession(database.GetDialect(config.C().DB.Session)),
 				DisableCopyright: true,
 				Middlewares:      middleware.NewDefaultMiddlewares(ctx, 5*time.Minute),
 				Resolver:         resolver,
 				Context:          ctx,
-				MaxRetries:       config.Cfg.Telegram.RpcRetry,
+				MaxRetries:       config.C().Telegram.RpcRetry,
 				AutoFetchReply:   true,
 				ErrorHandler: func(ctx *ext.Context, u *ext.Update, s string) error {
-					log.FromContext(ctx).Errorf("Unhandled error: %s", s)
+					if s == "SAVEANTBOT-RESTART" {
+						shouldRestart <- struct{}{}
+						return dispatcher.EndGroups
+					}
+					log.FromContext(ctx).Errorf("unhandled error: %s", s)
 					return dispatcher.EndGroups
 				},
 			},
@@ -70,17 +66,13 @@ func Init(ctx context.Context) {
 		client.API().BotsSetBotCommands(ctx, &tg.BotsSetBotCommandsRequest{
 			Scope: &tg.BotCommandScopeDefault{},
 		})
+		commands := make([]tg.BotCommand, 0, len(handlers.CommandHandlers))
+		for _, info := range handlers.CommandHandlers {
+			commands = append(commands, tg.BotCommand{Command: info.Cmd, Description: info.Desc})
+		}
 		_, err = client.API().BotsSetBotCommands(ctx, &tg.BotsSetBotCommandsRequest{
-			Scope: &tg.BotCommandScopeDefault{},
+			Scope:    &tg.BotCommandScopeDefault{},
-			Commands: []tg.BotCommand{
+			Commands: commands,
-				{Command: "start", Description: "开始使用"},
-				{Command: "help", Description: "显示帮助"},
-				{Command: "silent", Description: "开启/关闭静默模式"},
-				{Command: "storage", Description: "设置默认存储端"},
-				{Command: "save", Description: "保存所回复的文件"},
-				{Command: "dir", Description: "管理存储文件夹"},
-				{Command: "rule", Description: "管理规则"},
-			},
 		})
 		resultChan <- struct {
 			client *gotgproto.Client
@@ -98,4 +90,5 @@ func Init(ctx context.Context) {
 		handlers.Register(result.client.Dispatcher)
 		log.FromContext(ctx).Info("Bot 初始化完成")
 	}
+	return shouldRestart
 }

client/bot/handlers/add_task.go

@@ -3,6 +3,7 @@ package handlers
 import (
 	"errors"
 	"fmt"
+	"path"
 	"strings"
 
 	"github.com/celestix/gotgproto/dispatcher"
@@ -11,6 +12,7 @@ import (
 	"github.com/gotd/td/tg"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/shortcut"
+	"github.com/krau/SaveAny-Bot/common/utils/fsutil"
 	"github.com/krau/SaveAny-Bot/database"
 	"github.com/krau/SaveAny-Bot/pkg/enums/tasktype"
 	"github.com/krau/SaveAny-Bot/pkg/tcbdata"
@@ -41,7 +43,7 @@ func handleAddCallback(ctx *ext.Context, update *ext.Update) error {
 
 	if !data.SettedDir && len(dirs) != 0 {
 		// ask for directory selection
-		markup, err := msgelem.BuildSetDirKeyboard(dirs, dataid)
+		markup, err := msgelem.BuildSetDirMarkupForAdd(dirs, dataid)
 		if err != nil {
 			log.FromContext(ctx).Errorf("Failed to build directory keyboard: %s", err)
 			ctx.AnswerCallback(msgelem.AlertCallbackAnswer(queryID, "目录键盘构建失败: "+err.Error()))
@@ -72,9 +74,16 @@ func handleAddCallback(ctx *ext.Context, update *ext.Update) error {
 		}
 		return shortcut.CreateAndAddTGFileTaskWithEdit(ctx, userID, selectedStorage, dirPath, data.Files[0], msgID)
 	case tasktype.TaskTypeTphpics:
-		return shortcut.CreateAndAddTphTaskWithEdit(ctx, userID, data.TphPageNode, data.TphDirPath, data.TphPics, selectedStorage, msgID)
+		return shortcut.CreateAndAddtelegraphWithEdit(ctx, userID, data.TphPageNode, data.TphDirPath, data.TphPics, selectedStorage, msgID)
+	case tasktype.TaskTypeParseditem:
+		if len(data.ParsedItem.Resources) > 1 {
+			dirPath = path.Join(dirPath, fsutil.NormalizePathname(data.ParsedItem.Title))
+		}
+		shortcut.CreateAndAddParsedTaskWithEdit(ctx, selectedStorage, dirPath, data.ParsedItem, msgID, userID)
+	case tasktype.TaskTypeDirectlinks:
+		shortcut.CreateAndAddDirectTaskWithEdit(ctx, selectedStorage, dirPath, data.DirectLinks, msgID, userID)
 	default:
-		log.FromContext(ctx).Errorf("Unsupported task type: %s", data.TaskType)
+		return fmt.Errorf("unexcept task type: %s", data.TaskType)
 	}
 	return dispatcher.EndGroups
 }

client/bot/handlers/cancel_task.go

@@ -26,3 +26,20 @@ func handleCancelCallback(ctx *ext.Context, update *ext.Update) error {
 
 	return dispatcher.EndGroups
 }
+
+func handleCancelCmd(ctx *ext.Context, update *ext.Update) error {
+	logger := log.FromContext(ctx)
+	args := strings.Fields(update.EffectiveMessage.Text)
+	if len(args) < 2 {
+		ctx.Reply(update, ext.ReplyTextString("用法: /cancel <task_id>"), nil)
+		return dispatcher.EndGroups
+	}
+	taskID := args[1]
+	if err := core.CancelTask(ctx, taskID); err != nil {
+		logger.Errorf("failed to cancel task %s: %v", taskID, err)
+		ctx.Reply(update, ext.ReplyTextString("取消任务失败: "+err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+	ctx.Reply(update, ext.ReplyTextString("已请求取消任务: "+taskID), nil)
+	return dispatcher.EndGroups
+}

client/bot/handlers/config.go

@@ -0,0 +1,144 @@
+package handlers
+
+import (
+	"fmt"
+	"strings"
+	"text/template"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/database"
+	"github.com/krau/SaveAny-Bot/pkg/enums/fnamest"
+	"github.com/krau/SaveAny-Bot/pkg/tcbdata"
+)
+
+func handleConfigCmd(ctx *ext.Context, update *ext.Update) error {
+	ctx.Reply(update, ext.ReplyTextString("请选择要配置的选项"), &ext.ReplyOpts{
+		Markup: &tg.ReplyInlineMarkup{
+			Rows: []tg.KeyboardButtonRow{
+				{
+					Buttons: []tg.KeyboardButtonClass{
+						&tg.KeyboardButtonCallback{
+							Text: "文件名策略",
+							Data: fmt.Appendf(nil, "%s %s", tcbdata.TypeConfig, "fnamest"),
+						},
+					},
+				},
+			},
+		},
+	})
+	return dispatcher.EndGroups
+}
+
+func handleConfigCallback(ctx *ext.Context, update *ext.Update) error {
+	args := strings.Fields(string(update.CallbackQuery.Data))
+	invaildDataAnswer := func() error {
+		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+			QueryID:   update.CallbackQuery.GetQueryID(),
+			Alert:     true,
+			Message:   "无效的回调数据",
+			CacheTime: 5,
+		})
+		return dispatcher.EndGroups
+	}
+	if len(args) < 2 {
+		return invaildDataAnswer()
+	}
+	switch args[1] {
+	case "fnamest":
+		return handleConfigFnameSTCallback(ctx, update)
+	default:
+		return invaildDataAnswer()
+	}
+}
+
+func handleConfigFnameSTCallback(ctx *ext.Context, update *ext.Update) error {
+	userID := update.CallbackQuery.GetUserID()
+	user, err := database.GetUserByChatID(ctx, userID)
+	if err != nil {
+		return err
+	}
+	args := strings.Fields(string(update.CallbackQuery.Data))
+	if len(args) == 3 {
+		selected := args[2]
+		st, err := fnamest.ParseFnameST(selected)
+		if err != nil {
+			return err
+		}
+		user.FilenameStrategy = st.String()
+		if err := database.UpdateUser(ctx, user); err != nil {
+			return err
+		}
+		ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
+			ID:      update.CallbackQuery.GetMsgID(),
+			Message: fmt.Sprintf("已将文件名策略设置为: %s", fnamest.FnameSTDisplay[st]),
+		})
+		return dispatcher.EndGroups
+	}
+	opts := fnamest.FnameSTValues()
+	buttons := make([]tg.KeyboardButtonClass, 0, len(opts))
+	for _, opt := range opts {
+		buttons = append(buttons, &tg.KeyboardButtonCallback{
+			Text: fnamest.FnameSTDisplay[opt],
+			Data: fmt.Appendf(nil, "%s %s %s", tcbdata.TypeConfig, "fnamest", opt),
+		})
+	}
+	markup := &tg.ReplyInlineMarkup{Rows: []tg.KeyboardButtonRow{
+		{Buttons: buttons},
+	}}
+	currentStStr := user.FilenameStrategy
+	if currentStStr == "" {
+		currentStStr = fnamest.Default.String()
+	}
+	currentSt, err := fnamest.ParseFnameST(currentStStr)
+	if err != nil {
+		currentSt = fnamest.Default
+	}
+	ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
+		ID:          update.CallbackQuery.GetMsgID(),
+		Message:     fmt.Sprintf("请选择文件名策略, 当前策略: %s", fnamest.FnameSTDisplay[currentSt]),
+		ReplyMarkup: markup,
+	})
+	return dispatcher.EndGroups
+}
+
+func handleConfigFnameTmpl(ctx *ext.Context, update *ext.Update) error {
+	userID := update.GetUserChat().GetID()
+	user, err := database.GetUserByChatID(ctx, userID)
+	if err != nil {
+		return err
+	}
+	args := strings.Fields(string(update.EffectiveMessage.Text))
+	if len(args) <= 1 {
+		text := `使用该命令设置文件名模板, 示例:
+/fnametmpl 图片_{{.msgid}}_{{.msgdate}}.jpg
+
+可用变量:
+- {{.msgid}}: 消息ID
+- {{.msgtags}}: 消息中的标签, 将以下划线分隔输出
+- {{.msggen}}: 根据消息生成的文件名
+- {{.msgdate}}: 消息日期, 格式 YYYY-MM-DD_HH-MM-SS
+- {{.origname}}: 媒体的原始文件名 (如果有)
+- {{.chatid}}: 消息的聊天ID
+`
+		if user.FilenameTemplate != "" {
+			text += fmt.Sprintf("\n\n当前模板: %s", user.FilenameTemplate)
+		}
+		text += "\n\n模板仅在文件名策略设置为 '自定义模板' 时生效, 且模板解析错误时会回退到默认文件名"
+		ctx.Reply(update, ext.ReplyTextString(text), nil)
+		return dispatcher.EndGroups
+	}
+	newTmpl := strings.Join(args[1:], " ")
+	_, err = template.New("filename").Parse(newTmpl)
+	if err != nil {
+		ctx.Reply(update, ext.ReplyTextString("无效的模板, 请检查语法\n"+err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+	user.FilenameTemplate = newTmpl
+	if err := database.UpdateUser(ctx, user); err != nil {
+		return err
+	}
+	ctx.Reply(update, ext.ReplyTextString("已更新文件名模板"), nil)
+	return dispatcher.EndGroups
+}

client/bot/handlers/dl.go

@@ -0,0 +1,49 @@
+package handlers
+
+import (
+	"fmt"
+	"net/url"
+	"strings"
+
+	"github.com/celestix/gotgproto/ext"
+	"github.com/charmbracelet/log"
+	"github.com/duke-git/lancet/v2/slice"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
+	"github.com/krau/SaveAny-Bot/pkg/enums/tasktype"
+	"github.com/krau/SaveAny-Bot/pkg/tcbdata"
+	"github.com/krau/SaveAny-Bot/storage"
+)
+
+func handleDlCmd(ctx *ext.Context, update *ext.Update) error {
+	logger := log.FromContext(ctx)
+	args := strings.Split(update.EffectiveMessage.Text, " ")
+	if len(args) < 2 {
+		ctx.Reply(update, ext.ReplyTextString("用法: /dl <链接1> <链接2> ..."), nil)
+		return nil
+	}
+	links := args[1:]
+	for i, link := range links {
+		links[i] = strings.TrimSpace(link)
+		u, err := url.Parse(link)
+		if err != nil || u.Scheme == "" || u.Host == "" {
+			logger.Warn("invaild link", link)
+			links[i] = ""
+		}
+	}
+	links = slice.Compact(links)
+	if len(links) == 0 {
+		ctx.Reply(update, ext.ReplyTextString("没有有效的链接可供下载"), nil)
+		return nil
+	}
+	markup, err := msgelem.BuildAddSelectStorageKeyboard(storage.GetUserStorages(ctx, update.GetUserChat().GetID()), tcbdata.Add{
+		TaskType:    tasktype.TaskTypeDirectlinks,
+		DirectLinks: links,
+	})
+	if err != nil {
+		return err
+	}
+	ctx.Reply(update, ext.ReplyTextString(fmt.Sprintf("共 %d 个文件, 请选择存储位置", len(links))), &ext.ReplyOpts{
+		Markup: markup,
+	})
+	return nil
+}

client/bot/handlers/help.go

@@ -5,27 +5,16 @@ import (
 
 	"github.com/celestix/gotgproto/dispatcher"
 	"github.com/celestix/gotgproto/ext"
-	"github.com/krau/SaveAny-Bot/pkg/consts"
+	"github.com/krau/SaveAny-Bot/common/i18n"
+	"github.com/krau/SaveAny-Bot/common/i18n/i18nk"
+	"github.com/krau/SaveAny-Bot/config"
 )
 
 func handleHelpCmd(ctx *ext.Context, update *ext.Update) error {
-	const helpText string = `
+	shortHash := config.GitCommit
-Save Any Bot - 转存你的 Telegram 文件
-版本: %s , 提交: %s
-
-命令:
-/start - 开始使用
-/help - 显示帮助
-/silent - 开关静默模式
-/storage - 设置默认存储位置
-/save [自定义文件名] - 保存文件
-
-使用帮助: https://sabot.unv.app/usage/
-`
-	shortHash := consts.GitCommit
 	if len(shortHash) > 7 {
 		shortHash = shortHash[:7]
 	}
-	ctx.Reply(update, ext.ReplyTextString(fmt.Sprintf(helpText, consts.Version, shortHash)), nil)
+	ctx.Reply(update, ext.ReplyTextString(fmt.Sprintf(i18n.T(i18nk.BotMsgHelpTextFmt), config.Version, shortHash)), nil)
 	return dispatcher.EndGroups
 }

client/bot/handlers/link.go

@@ -6,6 +6,7 @@ import (
 	"github.com/celestix/gotgproto/dispatcher"
 	"github.com/celestix/gotgproto/ext"
 	"github.com/charmbracelet/log"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/dirutil"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/shortcut"
 	"github.com/krau/SaveAny-Bot/pkg/tcbdata"
@@ -43,20 +44,14 @@ func handleMessageLink(ctx *ext.Context, update *ext.Update) error {
 }
 
 func handleSilentSaveLink(ctx *ext.Context, update *ext.Update) error {
-	logger := log.FromContext(ctx)
 	stor := storage.FromContext(ctx)
-	if stor == nil {
-		logger.Warn("Context storage is nil")
-		ctx.Reply(update, ext.ReplyTextString("未找到存储"), nil)
-		return dispatcher.EndGroups
-	}
 	replied, files, _, err := shortcut.GetFilesFromUpdateLinkMessageWithReplyEdit(ctx, update)
 	if err != nil {
 		return err
 	}
 	userId := update.GetUserChat().GetID()
 	if len(files) == 1 {
-		return shortcut.CreateAndAddTGFileTaskWithEdit(ctx, userId, stor, "", files[0], replied.ID)
+		return shortcut.CreateAndAddTGFileTaskWithEdit(ctx, userId, stor, dirutil.PathFromContext(ctx), files[0], replied.ID)
 	}
-	return shortcut.CreateAndAddBatchTGFileTaskWithEdit(ctx, userId, stor, "", files, replied.ID)
+	return shortcut.CreateAndAddBatchTGFileTaskWithEdit(ctx, userId, stor, dirutil.PathFromContext(ctx), files, replied.ID)
 }

client/bot/handlers/media.go

@@ -1,20 +1,14 @@
 package handlers
 
 import (
-	"fmt"
-	"sync"
-	"time"
-
 	"github.com/celestix/gotgproto/dispatcher"
 	"github.com/celestix/gotgproto/ext"
 	"github.com/charmbracelet/log"
-	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/dirutil"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/mediautil"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/shortcut"
-	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+	"github.com/krau/SaveAny-Bot/database"
-	"github.com/krau/SaveAny-Bot/pkg/tcbdata"
-	"github.com/krau/SaveAny-Bot/pkg/tfile"
 	"github.com/krau/SaveAny-Bot/storage"
 )
 
@@ -26,12 +20,17 @@ func handleMediaMessage(ctx *ext.Context, update *ext.Update) error {
 		return handleGroupMediaMessage(ctx, update, message, groupID)
 	}
 	logger.Debugf("Got media: %s", message.Media.TypeName())
-
+	userId := update.GetUserChat().GetID()
-	msg, file, err := shortcut.GetFileFromMessageWithReply(ctx, update, message)
+	userDB, err := database.GetUserByChatID(ctx, userId)
 	if err != nil {
 		return err
 	}
-	userId := update.GetUserChat().GetID()
+	tfOpts := mediautil.TfileOptions(ctx, userDB, message)
+	msg, file, err := shortcut.GetFileFromMessageWithReply(ctx, update, message, tfOpts...)
+	if err != nil {
+		return err
+	}
+
 	stors := storage.GetUserStorages(ctx, userId)
 	req, err := msgelem.BuildAddOneSelectStorageMessage(ctx, stors, file, msg.ID)
 	if err != nil {
@@ -46,11 +45,6 @@ func handleMediaMessage(ctx *ext.Context, update *ext.Update) error {
 func handleSilentSaveMedia(ctx *ext.Context, update *ext.Update) error {
 	logger := log.FromContext(ctx)
 	stor := storage.FromContext(ctx)
-	if stor == nil {
-		logger.Warn("Context storage is nil")
-		ctx.Reply(update, ext.ReplyTextString("未找到存储"), nil)
-		return dispatcher.EndGroups
-	}
 	message := update.EffectiveMessage.Message
 	groupID, isGroup := message.GetGroupedID()
 	if isGroup && groupID != 0 {
@@ -58,102 +52,14 @@ func handleSilentSaveMedia(ctx *ext.Context, update *ext.Update) error {
 	}
 	logger.Debugf("Got media: %s", message.Media.TypeName())
 	userID := update.GetUserChat().GetID()
-	msg, file, err := shortcut.GetFileFromMessageWithReply(ctx, update, message)
+	userDB, err := database.GetUserByChatID(ctx, userID)
 	if err != nil {
 		return err
 	}
-	return shortcut.CreateAndAddTGFileTaskWithEdit(ctx, userID, stor, "", file, msg.ID)
+	tfOpts := mediautil.TfileOptions(ctx, userDB, message)
-}
+	msg, file, err := shortcut.GetFileFromMessageWithReply(ctx, update, message, tfOpts...)
-
-type MediaGroupHandler struct {
-	groups  map[int64][]tfile.TGFileMessage
-	timers  map[int64]*time.Timer
-	mu      sync.Mutex
-	timeout time.Duration
-}
-
-var mediaGroupHandler = &MediaGroupHandler{
-	groups:  make(map[int64][]tfile.TGFileMessage),
-	timers:  make(map[int64]*time.Timer),
-	timeout: 1 * time.Second,
-}
-
-func handleGroupMediaMessage(ctx *ext.Context, update *ext.Update, message *tg.Message, groupID int64) error {
-	logger := log.FromContext(ctx)
-	media := message.Media
-	supported := mediautil.IsSupported(media)
-	if !supported {
-		return dispatcher.EndGroups
-	}
-	file, err := tfile.FromMediaMessage(media, ctx.Raw, message, tfile.WithNameIfEmpty(
-		tgutil.GenFileNameFromMessage(*message),
-	))
 	if err != nil {
-		logger.Errorf("Failed to get file from media: %s", err)
+		return err
-		return dispatcher.EndGroups
 	}
-	mediaGroupHandler.mu.Lock()
+	return shortcut.CreateAndAddTGFileTaskWithEdit(ctx, userID, stor, dirutil.PathFromContext(ctx), file, msg.ID)
-	defer mediaGroupHandler.mu.Unlock()
-	if mediaGroupHandler.groups[groupID] == nil {
-		mediaGroupHandler.groups[groupID] = make([]tfile.TGFileMessage, 0)
-	}
-	mediaGroupHandler.groups[groupID] = append(mediaGroupHandler.groups[groupID], file)
-
-	if timer, exists := mediaGroupHandler.timers[groupID]; exists {
-		timer.Stop()
-	}
-	mediaGroupHandler.timers[groupID] = time.AfterFunc(mediaGroupHandler.timeout, func() {
-		processMediaGroup(ctx, update, groupID)
-	})
-	return dispatcher.EndGroups
-}
-
-func processMediaGroup(ctx *ext.Context, update *ext.Update, groupID int64) {
-	logger := log.FromContext(ctx)
-	mediaGroupHandler.mu.Lock()
-	items := mediaGroupHandler.groups[groupID]
-	delete(mediaGroupHandler.groups, groupID)
-	delete(mediaGroupHandler.timers, groupID)
-	mediaGroupHandler.mu.Unlock()
-	if len(items) == 0 {
-		logger.Warn("No media items to process for group", "groupID", groupID)
-		return
-	}
-	logger.Debugf("Processing media group %d with %d items", groupID, len(items))
-
-	userId := update.GetUserChat().GetID()
-	msg, err := ctx.Reply(update, ext.ReplyTextString("正在保存文件..."), nil)
-	if err != nil {
-		logger.Errorf("Failed to reply: %s", err)
-		return
-	}
-	stor := storage.FromContext(ctx)
-	if stor != nil {
-		// In silent mode
-		if len(items) == 1 {
-			shortcut.CreateAndAddTGFileTaskWithEdit(ctx, userId, stor, "", items[0], msg.ID)
-			return
-		}
-		shortcut.CreateAndAddBatchTGFileTaskWithEdit(ctx, userId, stor, "", items, msg.ID)
-		return
-	}
-
-	stors := storage.GetUserStorages(ctx, userId)
-	markup, err := msgelem.BuildAddSelectStorageKeyboard(stors, tcbdata.Add{
-		Files:   items,
-		AsBatch: len(items) > 1,
-	})
-	if err != nil {
-		logger.Errorf("构建存储选择键盘失败: %s", err)
-		ctx.EditMessage(userId, &tg.MessagesEditMessageRequest{
-			ID:      msg.ID,
-			Message: "构建存储选择键盘失败: " + err.Error(),
-		})
-		return
-	}
-	ctx.EditMessage(userId, &tg.MessagesEditMessageRequest{
-		ID:          msg.ID,
-		Message:     fmt.Sprintf("共 %d 个文件, 请选择存储位置", len(items)),
-		ReplyMarkup: markup,
-	})
 }

client/bot/handlers/media_group.go

@@ -0,0 +1,126 @@
+package handlers
+
+import (
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/charmbracelet/log"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/mediautil"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/shortcut"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+	"github.com/krau/SaveAny-Bot/config"
+	"github.com/krau/SaveAny-Bot/pkg/tcbdata"
+	"github.com/krau/SaveAny-Bot/pkg/tfile"
+	"github.com/krau/SaveAny-Bot/storage"
+)
+
+type MediaGroupHandler struct {
+	groups    map[int64][]tfile.TGFileMessage
+	timers    map[int64]*time.Timer
+	mu        sync.Mutex
+	timeout   time.Duration
+	setupOnce sync.Once
+}
+
+func (m *MediaGroupHandler) SetupTimeout(timeoutSec int) {
+	m.setupOnce.Do(func() {
+		if timeoutSec < 1 {
+			timeoutSec = 1
+		}
+		m.timeout = time.Duration(timeoutSec) * time.Second
+	})
+}
+
+var (
+	mediaGroupHandler = &MediaGroupHandler{
+		groups: make(map[int64][]tfile.TGFileMessage),
+		timers: make(map[int64]*time.Timer),
+		mu:     sync.Mutex{},
+	}
+)
+
+func handleGroupMediaMessage(ctx *ext.Context, update *ext.Update, message *tg.Message, groupID int64) error {
+	mediaGroupHandler.SetupTimeout(max(config.C().Telegram.MediaGroupTimeout, 1))
+	logger := log.FromContext(ctx)
+	media := message.Media
+	supported := mediautil.IsSupported(media)
+	if !supported {
+		return dispatcher.EndGroups
+	}
+	file, err := tfile.FromMediaMessage(media, ctx.Raw, message, tfile.WithNameIfEmpty(
+		tgutil.GenFileNameFromMessage(*message),
+	))
+	if err != nil {
+		logger.Errorf("Failed to get file from media: %s", err)
+		return dispatcher.EndGroups
+	}
+	mediaGroupHandler.mu.Lock()
+	defer mediaGroupHandler.mu.Unlock()
+	if mediaGroupHandler.groups[groupID] == nil {
+		mediaGroupHandler.groups[groupID] = make([]tfile.TGFileMessage, 0)
+	}
+	mediaGroupHandler.groups[groupID] = append(mediaGroupHandler.groups[groupID], file)
+
+	if timer, exists := mediaGroupHandler.timers[groupID]; exists {
+		timer.Stop()
+	}
+	mediaGroupHandler.timers[groupID] = time.AfterFunc(mediaGroupHandler.timeout, func() {
+		processMediaGroup(ctx, update, groupID)
+	})
+	return dispatcher.EndGroups
+}
+
+func processMediaGroup(ctx *ext.Context, update *ext.Update, groupID int64) {
+	logger := log.FromContext(ctx)
+	mediaGroupHandler.mu.Lock()
+	items := mediaGroupHandler.groups[groupID]
+	delete(mediaGroupHandler.groups, groupID)
+	delete(mediaGroupHandler.timers, groupID)
+	mediaGroupHandler.mu.Unlock()
+	if len(items) == 0 {
+		logger.Warn("No media items to process for group", "groupID", groupID)
+		return
+	}
+	logger.Debugf("Processing media group %d with %d items", groupID, len(items))
+
+	userId := update.GetUserChat().GetID()
+	msg, err := ctx.Reply(update, ext.ReplyTextString("正在保存文件..."), nil)
+	if err != nil {
+		logger.Errorf("Failed to reply: %s", err)
+		return
+	}
+	stor := storage.FromContext(ctx)
+	if stor != nil {
+		// In silent mode
+		if len(items) == 1 {
+			shortcut.CreateAndAddTGFileTaskWithEdit(ctx, userId, stor, "", items[0], msg.ID)
+			return
+		}
+		shortcut.CreateAndAddBatchTGFileTaskWithEdit(ctx, userId, stor, "", items, msg.ID)
+		return
+	}
+
+	stors := storage.GetUserStorages(ctx, userId)
+	markup, err := msgelem.BuildAddSelectStorageKeyboard(stors, tcbdata.Add{
+		Files:   items,
+		AsBatch: len(items) > 1,
+	})
+	if err != nil {
+		logger.Errorf("构建存储选择键盘失败: %s", err)
+		ctx.EditMessage(userId, &tg.MessagesEditMessageRequest{
+			ID:      msg.ID,
+			Message: "构建存储选择键盘失败: " + err.Error(),
+		})
+		return
+	}
+	ctx.EditMessage(userId, &tg.MessagesEditMessageRequest{
+		ID:          msg.ID,
+		Message:     fmt.Sprintf("共 %d 个文件, 请选择存储位置", len(items)),
+		ReplyMarkup: markup,
+	})
+}

client/bot/handlers/middleware.go

@@ -4,6 +4,7 @@ import (
 	"github.com/celestix/gotgproto/dispatcher"
 	"github.com/celestix/gotgproto/ext"
 	"github.com/duke-git/lancet/v2/slice"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/dirutil"
 	"github.com/krau/SaveAny-Bot/config"
 	"github.com/krau/SaveAny-Bot/database"
 	"github.com/krau/SaveAny-Bot/storage"
@@ -11,7 +12,7 @@ import (
 
 func checkPermission(ctx *ext.Context, update *ext.Update) error {
 	userID := update.GetUserChat().GetID()
-	if !slice.Contain(config.Cfg.GetUsersID(), userID) {
+	if !slice.Contain(config.C().GetUsersID(), userID) {
 		const noPermissionText string = `
 您不在白名单中, 无法使用此 Bot.
 您可以部署自己的实例: https://github.com/krau/SaveAny-Bot
@@ -43,6 +44,14 @@ func handleSilentMode(next func(*ext.Context, *ext.Update) error, handler func(*
 			ctx.Reply(update, ext.ReplyTextString("获取默认存储失败: "+err.Error()), nil)
 			return dispatcher.EndGroups
 		}
+		if user.DefaultDir != 0 {
+			dir, err := database.GetDirByID(ctx, user.DefaultDir)
+			if err != nil {
+				ctx.Reply(update, ext.ReplyTextString("获取默认文件夹失败: "+err.Error()), nil)
+				return next(ctx, update)
+			}
+			ctx.Context = dirutil.WithContext(ctx.Context, dir)
+		}
 		ctx.Context = storage.WithContext(ctx.Context, stor)
 		return handler(ctx, update)
 	}

client/bot/handlers/parse.go

@@ -0,0 +1,121 @@
+// 处理任意文本消息, 用于通用地从外部源下载文件
+
+package handlers
+
+import (
+	"errors"
+	"path"
+	"strings"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/charmbracelet/log"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/dirutil"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/shortcut"
+	"github.com/krau/SaveAny-Bot/common/utils/fsutil"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+	"github.com/krau/SaveAny-Bot/parsers"
+	"github.com/krau/SaveAny-Bot/pkg/enums/tasktype"
+	"github.com/krau/SaveAny-Bot/pkg/tcbdata"
+	"github.com/krau/SaveAny-Bot/storage"
+)
+
+func handleTextMessage(ctx *ext.Context, u *ext.Update) error {
+	logger := log.FromContext(ctx)
+	text := u.EffectiveMessage.Text
+	entityUrls := tgutil.ExtractMessageEntityUrls(u.EffectiveMessage.Message)
+	if len(entityUrls) > 0 {
+		text += "\n" + strings.Join(entityUrls, "\n")
+	}
+	ok, pser := parsers.CanHandle(text)
+	if !ok {
+		return dispatcher.EndGroups
+	}
+	msg, err := ctx.Reply(u, ext.ReplyTextString("正在解析..."), nil)
+	if err != nil {
+		return err
+	}
+
+	item, err := pser.Parse(ctx, text)
+	if errors.Is(err, parsers.ErrNoParserFound) {
+		return dispatcher.EndGroups
+	}
+	if err != nil {
+		logger.Error("Failed to parse text", "error", err)
+		ctx.Reply(u, ext.ReplyTextString("Failed to parse text: "+err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+	logger.Debug("Parsed item from text message", "title", item.Title, "url", item.URL)
+	userID := u.GetUserChat().GetID()
+	markup, err := msgelem.BuildAddSelectStorageKeyboard(storage.GetUserStorages(ctx, userID), tcbdata.Add{
+		TaskType:   tasktype.TaskTypeParseditem,
+		ParsedItem: item,
+	})
+	if err != nil {
+		logger.Errorf("Failed to build storage selection keyboard: %s", err)
+		ctx.Reply(u, ext.ReplyTextString("Failed to build storage selection keyboard: "+err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+	text, entities, err := msgelem.BuildParsedTextEntity(*item)
+	if err != nil {
+		logger.Errorf("Failed to build parsed text entity: %s", err)
+		ctx.Reply(u, ext.ReplyTextString("Failed to build parsed text entity: "+err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+	ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
+		Message:     text,
+		ReplyMarkup: markup,
+		Entities:    entities,
+		ID:          msg.ID,
+	})
+
+	return dispatcher.EndGroups
+}
+
+func handleSilentSaveText(ctx *ext.Context, u *ext.Update) error {
+	logger := log.FromContext(ctx)
+	stor := storage.FromContext(ctx)
+	text := u.EffectiveMessage.Text
+	if text == "" {
+		return dispatcher.EndGroups
+	}
+	item, err := parsers.ParseWithContext(ctx, text)
+	if errors.Is(err, parsers.ErrNoParserFound) {
+		return dispatcher.EndGroups
+	}
+	if err != nil {
+		logger.Error("Failed to parse text", "error", err)
+		ctx.Reply(u, ext.ReplyTextString("Failed to parse text: "+err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+	logger.Debug("Parsed item from text message", "title", item.Title, "url", item.URL)
+	userID := u.GetUserChat().GetID()
+	text, entities, err := msgelem.BuildParsedTextEntity(*item)
+	if err != nil {
+		logger.Errorf("Failed to build parsed text entity: %s", err)
+		ctx.Reply(u, ext.ReplyTextString("Failed to build parsed text entity: "+err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+	msg, err := ctx.SendMessage(userID, &tg.MessagesSendMessageRequest{
+		Message:  text,
+		Entities: entities,
+		ReplyTo: &tg.InputReplyToMessage{
+			ReplyToMsgID:  u.EffectiveMessage.ID,
+			ReplyToPeerID: u.GetUserChat().AsInputPeer(),
+		},
+	})
+	if err != nil {
+		logger.Errorf("Failed to send message: %s", err)
+		return dispatcher.EndGroups
+	}
+	dirPath := ""
+	if len(item.Resources) > 1 {
+		dirPath = fsutil.NormalizePathname(item.Title)
+	}
+	if p := dirutil.PathFromContext(ctx); p != "" {
+		dirPath = path.Join(p, dirPath)
+	}
+	return shortcut.CreateAndAddParsedTaskWithEdit(ctx, stor, dirPath, item, msg.ID, userID)
+}

client/bot/handlers/parser.go

@@ -0,0 +1,97 @@
+package handlers
+
+import (
+	"bytes"
+	"strings"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/config"
+	"github.com/krau/SaveAny-Bot/parsers"
+)
+
+func handleParserCmd(ctx *ext.Context, u *ext.Update) error {
+	args := strings.Split(u.EffectiveMessage.Text, " ")
+	help := `
+用法:
+
+/parser install <回复一个文件> - 安装解析器
+`
+	if len(args) < 2 {
+		ctx.Reply(u, ext.ReplyTextString(help), nil)
+		return nil
+	}
+	switch args[1] {
+	// case "list":
+	// 	return handleParserListCmd(ctx, u)
+	case "install":
+		return handleParserInstallCmd(ctx, u)
+	// case "uninstall":
+	// return handleParserUninstallCmd(ctx, u)
+	default:
+	}
+	return dispatcher.EndGroups
+}
+
+func handleParserInstallCmd(ctx *ext.Context, u *ext.Update) error {
+	if !config.C().Parser.PluginEnable {
+		ctx.Reply(u, ext.ReplyTextString("解析器插件功能未启用"), nil)
+		return dispatcher.EndGroups
+	}
+	if u.EffectiveMessage.ReplyToMessage == nil || u.EffectiveMessage.ReplyToMessage.Media == nil {
+		ctx.Reply(u, ext.ReplyTextString("请回复一个包含解析器文件的消息"), nil)
+		return dispatcher.EndGroups
+	}
+	media := u.EffectiveMessage.ReplyToMessage.Media
+	document, ok := media.(*tg.MessageMediaDocument)
+	if !ok {
+		ctx.Reply(u, ext.ReplyTextString("回复的消息不包含有效的文件"), nil)
+		return dispatcher.EndGroups
+	}
+	value, ok := document.GetDocument()
+	if !ok {
+		ctx.Reply(u, ext.ReplyTextString("回复的消息不包含有效的文件"), nil)
+		return dispatcher.EndGroups
+	}
+	doc, ok := value.AsNotEmpty()
+	if !ok {
+		ctx.Reply(u, ext.ReplyTextString("回复的消息不包含有效的文件"), nil)
+		return dispatcher.EndGroups
+	}
+	if !strings.HasPrefix(doc.MimeType, "text/") {
+		ctx.Reply(u, ext.ReplyTextString("错误的文件类型"), nil)
+		return dispatcher.EndGroups
+	}
+	if doc.Size > 1024*1024*10 {
+		ctx.Reply(u, ext.ReplyTextString("文件过大"), nil)
+		return dispatcher.EndGroups
+	}
+	var fileName string
+	for _, attr := range doc.Attributes {
+		if fileNameAttr, ok := attr.(*tg.DocumentAttributeFilename); ok {
+			fileName = fileNameAttr.FileName
+			break
+		}
+	}
+	if fileName == "" {
+		ctx.Reply(u, ext.ReplyTextString("无法获取文件名"), nil)
+		return dispatcher.EndGroups
+	}
+	if !strings.HasSuffix(fileName, ".js") {
+		ctx.Reply(u, ext.ReplyTextString("仅支持 .js 文件作为解析器"), nil)
+		return dispatcher.EndGroups
+	}
+	data := bytes.NewBuffer(nil)
+	_, err := ctx.DownloadMedia(media, ext.DownloadOutputStream{Writer: data}, nil)
+	if err != nil {
+		ctx.Reply(u, ext.ReplyTextString("文件下载失败: "+err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+	if err := parsers.AddPlugin(ctx, data.String(), fileName); err != nil {
+		ctx.Reply(u, ext.ReplyTextString("插件安装失败: "+err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+	ctx.Reply(u, ext.ReplyTextString("插件安装成功: "+fileName), nil)
+	return dispatcher.EndGroups
+}

client/bot/handlers/register.go

@@ -1,14 +1,45 @@
 package handlers
 
 import (
+	"regexp"
+
 	"github.com/celestix/gotgproto/dispatcher"
 	"github.com/celestix/gotgproto/dispatcher/handlers"
 	"github.com/celestix/gotgproto/dispatcher/handlers/filters"
 	"github.com/celestix/gotgproto/ext"
+	sabotfilters "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/filters"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/re"
+	userclient "github.com/krau/SaveAny-Bot/client/user"
+	"github.com/krau/SaveAny-Bot/config"
 	"github.com/krau/SaveAny-Bot/pkg/tcbdata"
 )
 
+type DescCommandHandler struct {
+	Cmd     string
+	Desc    string
+	handler func(ctx *ext.Context, u *ext.Update) error
+}
+
+var CommandHandlers = []DescCommandHandler{
+	{"start", "开始使用", handleHelpCmd},
+	{"silent", "切换静默模式", handleSilentCmd},
+	{"storage", "设置默认存储端", handleStorageCmd},
+	{"dir", "管理存储文件夹", handleDirCmd},
+	{"rule", "管理自动存储规则", handleRuleCmd},
+	{"save", "保存文件", handleSilentMode(handleSaveCmd, handleSilentSaveReplied)},
+	{"dl", "下载给定链接的文件", handleDlCmd},
+	{"task", "管理任务队列", handleTaskCmd},
+	{"cancel", "取消任务", handleCancelCmd},
+	{"watch", "监听聊天(UserBot)", handleWatchCmd},
+	{"unwatch", "取消监听聊天(UserBot)", handleUnwatchCmd},
+	{"lswatch", "列出监听的聊天(UserBot)", handleLswatchCmd},
+	{"config", "修改配置", handleConfigCmd},
+	{"fnametmpl", "设置文件命名模板", handleConfigFnameTmpl},
+	{"help", "显示帮助", handleHelpCmd},
+	{"parser", "管理解析器", handleParserCmd},
+	{"update", "检查更新", handleUpdateCmd},
+}
+
 func Register(disp dispatcher.Dispatcher) {
 	disp.AddHandler(handlers.NewMessage(filters.Message.ChatType(filters.ChatTypeChannel), func(ctx *ext.Context, u *ext.Update) error {
 		return dispatcher.EndGroups
@@ -17,25 +48,20 @@ func Register(disp dispatcher.Dispatcher) {
 		return dispatcher.EndGroups
 	}))
 	disp.AddHandler(handlers.NewMessage(filters.Message.All, checkPermission))
-	disp.AddHandler(handlers.NewCommand("start", handleHelpCmd))
+	for _, info := range CommandHandlers {
-	disp.AddHandler(handlers.NewCommand("help", handleHelpCmd))
+		disp.AddHandler(handlers.NewCommand(info.Cmd, info.handler))
-	disp.AddHandler(handlers.NewCommand("silent", handleSilentCmd))
+	}
-	disp.AddHandler(handlers.NewCommand("storage", handleStorageCmd))
+	disp.AddHandler(handlers.NewCallbackQuery(filters.CallbackQuery.Prefix("update"), handleUpdateCallback))
-	disp.AddHandler(handlers.NewCommand("dir", handleDirCmd))
-	disp.AddHandler(handlers.NewCommand("rule", handleRuleCmd))
-	disp.AddHandler(handlers.NewCommand("save", handleSilentMode(handleSaveCmd, handleSilentSaveReplied)))
 	disp.AddHandler(handlers.NewCallbackQuery(filters.CallbackQuery.Prefix(tcbdata.TypeAdd), handleAddCallback))
 	disp.AddHandler(handlers.NewCallbackQuery(filters.CallbackQuery.Prefix(tcbdata.TypeSetDefault), handleSetDefaultCallback))
-	disp.AddHandler(handlers.NewCallbackQuery(filters.CallbackQuery.Prefix("cancel"), handleCancelCallback))
+	disp.AddHandler(handlers.NewCallbackQuery(filters.CallbackQuery.Prefix(tcbdata.TypeCancel), handleCancelCallback))
-	linkRegexFilter, err := filters.Message.Regex(re.TgMessageLinkRegexString)
+	disp.AddHandler(handlers.NewCallbackQuery(filters.CallbackQuery.Prefix(tcbdata.TypeConfig), handleConfigCallback))
-	if err != nil {
+	disp.AddHandler(handlers.NewMessage(sabotfilters.RegexUrl(regexp.MustCompile(re.TgMessageLinkRegexString)), handleSilentMode(handleMessageLink, handleSilentSaveLink)))
-		panic("failed to create regex filter: " + err.Error())
+	disp.AddHandler(handlers.NewMessage(sabotfilters.RegexUrl(regexp.MustCompile(re.TelegraphUrlRegexString)), handleSilentMode(handleTelegraphUrlMessage, handleSilentSaveTelegraph)))
-	}
-	disp.AddHandler(handlers.NewMessage(linkRegexFilter, handleSilentMode(handleMessageLink, handleSilentSaveLink)))
-	telegraphUrlRegexFilter, err := filters.Message.Regex(re.TelegraphUrlRegexString)
-	if err != nil {
-		panic("failed to create Telegraph URL regex filter: " + err.Error())
-	}
-	disp.AddHandler(handlers.NewMessage(telegraphUrlRegexFilter, handleSilentMode(handleTelegraphUrlMessage, handleSilentSaveTelegraph)))
 	disp.AddHandler(handlers.NewMessage(filters.Message.Media, handleSilentMode(handleMediaMessage, handleSilentSaveMedia)))
+	disp.AddHandler(handlers.NewMessage(filters.Message.Text, handleSilentMode(handleTextMessage, handleSilentSaveText)))
+
+	if config.C().Telegram.Userbot.Enable {
+		go listenMediaMessageEvent(userclient.GetMediaMessageCh())
+	}
 }

client/bot/handlers/rule.go

@@ -10,13 +10,14 @@ import (
 	"github.com/charmbracelet/log"
 	"github.com/duke-git/lancet/v2/slice"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
+	"github.com/krau/SaveAny-Bot/common/utils/strutil"
 	"github.com/krau/SaveAny-Bot/database"
-	"github.com/krau/SaveAny-Bot/pkg/enums/rule"
+	"github.com/krau/SaveAny-Bot/pkg/rule"
 )
 
 func handleRuleCmd(ctx *ext.Context, update *ext.Update) error {
 	logger := log.FromContext(ctx)
-	args := strings.Split(update.EffectiveMessage.Text, " ")
+	args := strutil.ParseArgsRespectQuotes(update.EffectiveMessage.Text)
 	userChatID := update.GetUserChat().GetID()
 	user, err := database.GetUserByChatID(ctx, userChatID)
 	if err != nil {

client/bot/handlers/save.go

@@ -7,14 +7,17 @@ import (
 
 	"github.com/celestix/gotgproto/dispatcher"
 	"github.com/celestix/gotgproto/ext"
-	"github.com/celestix/gotgproto/functions"
 	"github.com/charmbracelet/log"
 	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/dirutil"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/mediautil"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/shortcut"
+	"github.com/krau/SaveAny-Bot/common/i18n"
+	"github.com/krau/SaveAny-Bot/common/i18n/i18nk"
 	"github.com/krau/SaveAny-Bot/common/utils/strutil"
 	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+	"github.com/krau/SaveAny-Bot/database"
 	"github.com/krau/SaveAny-Bot/pkg/tcbdata"
 	"github.com/krau/SaveAny-Bot/pkg/tfile"
 
@@ -23,27 +26,25 @@ import (
 
 func handleSaveCmd(ctx *ext.Context, update *ext.Update) error {
 	logger := log.FromContext(ctx)
-	args := strings.Split(string(update.EffectiveMessage.Text), " ")
+	args := strings.Split(update.EffectiveMessage.Text, " ")
 	if len(args) >= 3 {
 		return handleBatchSave(ctx, update, args[1:])
 	}
 	replyTo := update.EffectiveMessage.ReplyToMessage
 	if replyTo == nil || replyTo.Message == nil {
-		ctx.Reply(update, ext.ReplyTextString(msgelem.SaveHelpText), nil)
+		ctx.Reply(update, ext.ReplyTextString(i18n.T(i18nk.BotMsgSaveHelpText)), nil)
 		return dispatcher.EndGroups
 	}
-	genFilename := func() string {
+	userDB, err := database.GetUserByChatID(ctx, update.GetUserChat().GetID())
-		if len(args) > 1 {
+	if err != nil {
-			return args[1]
+		return err
-		}
-		filename := tgutil.GenFileNameFromMessage(*replyTo.Message)
-		return filename
-	}()
-	option := tfile.WithNameIfEmpty(genFilename)
-	if len(args) > 1 {
-		option = tfile.WithName(genFilename)
 	}
-	msg, file, err := shortcut.GetFileFromMessageWithReply(ctx, update, replyTo.Message, option)
+	opts := mediautil.TfileOptions(ctx, userDB, replyTo.Message)
+	if len(args) > 1 {
+		// custom filename via command arg
+		opts = append(opts, tfile.WithName(strings.Join(args[1:], " ")))
+	}
+	msg, file, err := shortcut.GetFileFromMessageWithReply(ctx, update, replyTo.Message, opts...)
 	if err != nil {
 		return err
 	}
@@ -64,34 +65,26 @@ func handleSilentSaveReplied(ctx *ext.Context, update *ext.Update) error {
 	if len(args) >= 3 {
 		return handleBatchSave(ctx, update, args[1:])
 	}
-	logger := log.FromContext(ctx)
 	stor := storage.FromContext(ctx)
-	if stor == nil {
-		logger.Warn("Context storage is nil")
-		ctx.Reply(update, ext.ReplyTextString("未找到存储"), nil)
-		return dispatcher.EndGroups
-	}
 	replyTo := update.EffectiveMessage.ReplyToMessage
 	if replyTo == nil || replyTo.Message == nil {
-		ctx.Reply(update, ext.ReplyTextString(msgelem.SaveHelpText), nil)
+		ctx.Reply(update, ext.ReplyTextString(i18n.T(i18nk.BotMsgSaveHelpText)), nil)
 		return dispatcher.EndGroups
 	}
-	genFilename := func() string {
+	userDB, err := database.GetUserByChatID(ctx, update.GetUserChat().GetID())
-		if len(args) > 1 {
-			return args[1]
-		}
-		filename := tgutil.GenFileNameFromMessage(*replyTo.Message)
-		return filename
-	}()
-	option := tfile.WithNameIfEmpty(genFilename)
-	if len(args) > 1 {
-		option = tfile.WithName(genFilename)
-	}
-	msg, file, err := shortcut.GetFileFromMessageWithReply(ctx, update, replyTo.Message, option)
 	if err != nil {
 		return err
 	}
-	return shortcut.CreateAndAddTGFileTaskWithEdit(ctx, update.GetUserChat().GetID(), stor, "", file, msg.GetID())
+	opts := mediautil.TfileOptions(ctx, userDB, replyTo.Message)
+	if len(args) > 1 {
+		// custom filename via command arg
+		opts = append(opts, tfile.WithName(strings.Join(args[1:], " ")))
+	}
+	msg, file, err := shortcut.GetFileFromMessageWithReply(ctx, update, replyTo.Message, opts...)
+	if err != nil {
+		return err
+	}
+	return shortcut.CreateAndAddTGFileTaskWithEdit(ctx, update.GetUserChat().GetID(), stor, dirutil.PathFromContext(ctx), file, msg.GetID())
 }
 
 func handleBatchSave(ctx *ext.Context, update *ext.Update, args []string) error {
@@ -125,7 +118,7 @@ func handleBatchSave(ctx *ext.Context, update *ext.Update, args []string) error
 		return dispatcher.EndGroups
 	}
 
-	// TODO: generator istead of get all messages
+	// [TODO]: generator istead of get all messages
 	msgs, err := tgutil.GetMessagesRange(ctx, chatID, int(startID), int(endID))
 	if err != nil {
 		ctx.Reply(update, ext.ReplyTextString("获取消息失败: "+err.Error()), nil)
@@ -158,9 +151,8 @@ func handleBatchSave(ctx *ext.Context, update *ext.Update, args []string) error
 			sb.Reset()
 			sb.WriteString(msg.GetMessage())
 			sb.WriteString(" ")
-			fn, _ := functions.GetMediaFileNameWithId(media)
+			fn, _ := tgutil.GetMediaFileName(media)
 			sb.WriteString(fn)
-			log.FromContext(ctx).Debugf("正在检查消息内容: %s", sb.String())
 			if !filter.MatchString(sb.String()) {
 				continue
 			}
@@ -194,5 +186,4 @@ func handleBatchSave(ctx *ext.Context, update *ext.Update, args []string) error
 		return dispatcher.EndGroups
 	}
 	return shortcut.CreateAndAddBatchTGFileTaskWithEdit(ctx, update.GetUserChat().GetID(), stor, "", files, replied.ID)
-
 }

client/bot/handlers/silent.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/celestix/gotgproto/dispatcher"
@@ -36,51 +37,71 @@ func handleSilentCmd(ctx *ext.Context, update *ext.Update) error {
 func handleSetDefaultCallback(ctx *ext.Context, update *ext.Update) error {
 	dataid := strings.Split(string(update.CallbackQuery.Data), " ")[1]
 	data, ok := cache.Get[tcbdata.SetDefaultStorage](dataid)
-	if !ok {
+
+	failedAnswer := func(message string) error {
 		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
 			QueryID:   update.CallbackQuery.GetQueryID(),
 			Alert:     true,
-			Message:   "数据已过期",
+			Message:   message,
 			CacheTime: 5,
 		})
 		return dispatcher.EndGroups
 	}
+
+	if !ok {
+		return failedAnswer("数据已过期")
+	}
 	userID := update.CallbackQuery.GetUserID()
 
 	storageName := data.StorageName
 	selectedStorage, err := storage.GetStorageByUserIDAndName(ctx, userID, storageName)
 	if err != nil {
-		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+		return failedAnswer("存储获取失败: " + err.Error())
-			QueryID:   update.CallbackQuery.GetQueryID(),
-			Alert:     true,
-			Message:   "存储获取失败: " + err.Error(),
-			CacheTime: 5,
-		})
-		return dispatcher.EndGroups
 	}
 	user, err := database.GetUserByChatID(ctx, userID)
 	if err != nil {
-		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+		return failedAnswer("获取用户信息失败: " + err.Error())
-			QueryID:   update.CallbackQuery.GetQueryID(),
+	}
-			Alert:     true,
+	var dir *database.Dir
-			Message:   "获取用户信息失败: " + err.Error(),
+	if data.DirID != 0 {
-			CacheTime: 5,
+		// 已经选择了文件夹
-		})
+		var err error
-		return dispatcher.EndGroups
+		dir, err = database.GetDirByID(ctx, data.DirID)
+		if err != nil {
+			return failedAnswer("获取文件夹信息失败: " + err.Error())
+		}
+		user.DefaultDir = dir.ID
+	} else {
+		// 检查是否有可用的文件夹
+		dirs, err := database.GetDirsByUserIDAndStorageName(ctx, user.ID, storageName)
+		if err != nil {
+			return failedAnswer("获取目录失败: " + err.Error())
+		}
+		if len(dirs) > 0 {
+			// 要求选择文件夹
+			markup, err := msgelem.BuildSetDefaultDirMarkup(ctx, storageName, dirs)
+			if err != nil {
+				return failedAnswer("构建目录选择失败: " + err.Error())
+			}
+			ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
+				ID:          update.CallbackQuery.GetMsgID(),
+				Message:     "请选择要保存到的默认文件夹",
+				ReplyMarkup: markup,
+			})
+			return dispatcher.EndGroups
+		}
 	}
 	user.DefaultStorage = selectedStorage.Name()
 	if err := database.UpdateUser(ctx, user); err != nil {
-		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+		return failedAnswer("更新用户信息失败: " + err.Error())
-			QueryID:   update.CallbackQuery.GetQueryID(),
+	}
-			Alert:     true,
+	msg := fmt.Sprintf("已将默认存储位置设为: %s", selectedStorage.Name())
-			Message:   "更新用户信息失败: " + err.Error(),
+	if dir != nil {
-			CacheTime: 5,
+		msg += fmt.Sprintf(":/%s", strings.TrimPrefix(dir.Path, "/"))
-		})
-		return dispatcher.EndGroups
 	}
 	ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
 		ID:      update.CallbackQuery.GetMsgID(),
-		Message: "已将默认存储位置设置为: " + selectedStorage.Name(),
+		Message: msg,
 	})
 	return dispatcher.EndGroups
 }
@@ -92,7 +113,7 @@ func handleStorageCmd(ctx *ext.Context, update *ext.Update) error {
 		ctx.Reply(update, ext.ReplyTextString("无可用的存储"), nil)
 		return nil
 	}
-	markup, err := msgelem.BuildSetDefaultStorageMarkup(ctx, userID, storages)
+	markup, err := msgelem.BuildSetDefaultStorageMarkup(ctx, storages)
 	if err != nil {
 		ctx.Reply(update, ext.ReplyTextString("获取存储失败: "+err.Error()), nil)
 		return nil

client/bot/handlers/tasks.go

@@ -0,0 +1,113 @@
+package handlers
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/charmbracelet/log"
+	"github.com/gotd/td/telegram/message/styling"
+	"github.com/krau/SaveAny-Bot/core"
+)
+
+func handleTaskCmd(ctx *ext.Context, update *ext.Update) error {
+	logger := log.FromContext(ctx)
+	args := strings.Fields(update.EffectiveMessage.Text)
+	if len(args) == 1 {
+		showRunningTasks(ctx, update)
+		return dispatcher.EndGroups
+	}
+
+	switch args[1] {
+	case "running", "run", "r":
+		showRunningTasks(ctx, update)
+	case "queued", "queue", "q", "waiting":
+		showQueuedTasks(ctx, update)
+	case "cancel", "c":
+		if len(args) < 3 {
+			ctx.Reply(update, ext.ReplyTextString("用法: /tasks cancel <task_id>"), nil)
+			return dispatcher.EndGroups
+		}
+		taskID := args[2]
+		if err := core.CancelTask(ctx, taskID); err != nil {
+			logger.Errorf("取消任务 %s 失败: %v", taskID, err)
+			ctx.Reply(update, ext.ReplyTextString("取消任务失败: "+err.Error()), nil)
+			return dispatcher.EndGroups
+		}
+		ctx.Reply(update, ext.ReplyTextStyledTextArray([]styling.StyledTextOption{
+			styling.Plain("已请求取消任务: "),
+			styling.Code(taskID),
+		}), nil)
+	default:
+		ctx.Reply(update, ext.ReplyTextString("用法: /tasks [running|queued|cancel <task_id>]"), nil)
+	}
+	return dispatcher.EndGroups
+}
+
+func showRunningTasks(ctx *ext.Context, update *ext.Update) {
+	tasks := core.GetRunningTasks(ctx)
+	if len(tasks) == 0 {
+		ctx.Reply(update, ext.ReplyTextString("当前没有正在运行的任务"), nil)
+		return
+	}
+	opts := make([]styling.StyledTextOption, 0, 2+len(tasks)*4)
+	opts = append(opts,
+		styling.Bold("当前正在运行的任务:"),
+		styling.Plain(fmt.Sprintf("\n总数: %d\n", len(tasks))),
+	)
+	for _, t := range tasks {
+		created := t.Created.In(time.Local).Format("2006-01-02 15:04:05")
+		status := "运行中"
+		if t.Cancelled {
+			status = "已请求取消"
+		}
+		opts = append(opts,
+			styling.Plain("\nID: "),
+			styling.Code(t.ID),
+			styling.Plain("\n名称: "),
+			styling.Code(t.Title),
+			styling.Plain("\n创建时间: "),
+			styling.Code(created),
+			styling.Plain("\n状态: "),
+			styling.Code(status),
+		)
+	}
+	ctx.Reply(update, ext.ReplyTextStyledTextArray(opts), nil)
+}
+
+func showQueuedTasks(ctx *ext.Context, update *ext.Update) {
+	tasks := core.GetQueuedTasks(ctx)
+	if len(tasks) == 0 {
+		ctx.Reply(update, ext.ReplyTextString("当前没有排队中的任务"), nil)
+		return
+	}
+	opts := make([]styling.StyledTextOption, 0, 2+len(tasks)*3)
+	opts = append(opts,
+		styling.Bold("当前排队中的任务:"),
+		styling.Plain(fmt.Sprintf("\n总数: %d\n", len(tasks))),
+	)
+	for _, t := range tasks {
+		created := t.Created.In(time.Local).Format("2006-01-02 15:04:05")
+		status := "排队中"
+		if t.Cancelled {
+			status = "已请求取消"
+		}
+		opts = append(opts,
+			styling.Plain("\nID: "),
+			styling.Code(t.ID),
+			styling.Plain("\n名称: "),
+			styling.Code(t.Title),
+			styling.Plain("\n创建时间: "),
+			styling.Code(created),
+			styling.Plain("\n状态: "),
+			styling.Code(status),
+		)
+		if len(tasks) > 10 {
+			opts = append(opts, styling.Plain("\n...\n只显示前 10 个任务, 共 "+fmt.Sprintf("%d", len(tasks))+" 个任务"))
+			break
+		}
+	}
+	ctx.Reply(update, ext.ReplyTextStyledTextArray(opts), nil)
+}

client/bot/handlers/telegraph.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"fmt"
+	"path"
 
 	"github.com/celestix/gotgproto/dispatcher"
 	"github.com/celestix/gotgproto/ext"
@@ -9,6 +10,7 @@ import (
 	"github.com/gotd/td/telegram/message/entity"
 	"github.com/gotd/td/telegram/message/styling"
 	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/dirutil"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/shortcut"
 	"github.com/krau/SaveAny-Bot/pkg/enums/tasktype"
@@ -59,18 +61,16 @@ func handleTelegraphUrlMessage(ctx *ext.Context, update *ext.Update) error {
 }
 
 func handleSilentSaveTelegraph(ctx *ext.Context, update *ext.Update) error {
-	logger := log.FromContext(ctx)
 	stor := storage.FromContext(ctx)
-	if stor == nil {
-		logger.Warn("Context storage is nil")
-		ctx.Reply(update, ext.ReplyTextString("未找到存储"), nil)
-		return dispatcher.EndGroups
-	}
 	msg, result, err := shortcut.GetTphPicsFromMessageWithReply(ctx, update)
 	if err != nil {
 		return err
 	}
 	userID := update.GetUserChat().GetID()
-	return shortcut.CreateAndAddTphTaskWithEdit(ctx, userID, result.Page, result.TphDir, result.Pics, stor, msg.ID)
+	dirpath := result.TphDir
+	if p := dirutil.PathFromContext(ctx); p != "" {
+		dirpath = path.Join(p, dirpath)
+	}
+	return shortcut.CreateAndAddtelegraphWithEdit(ctx, userID, result.Page, dirpath, result.Pics, stor, msg.ID)
 
 }

client/bot/handlers/update.go

@@ -0,0 +1,116 @@
+package handlers
+
+import (
+	"errors"
+	"fmt"
+	"regexp"
+	"strings"
+
+	"github.com/blang/semver"
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/gotd/td/telegram/message/html"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/config"
+	"github.com/unvgo/ghselfupdate"
+)
+
+func handleUpdateCmd(ctx *ext.Context, u *ext.Update) error {
+	currentV, err := semver.Parse(config.Version)
+	if err != nil {
+		ctx.Reply(u, ext.ReplyTextString(fmt.Sprintf("You are in dev or the version var failed to inject: %v", err)), nil)
+		return dispatcher.EndGroups
+	}
+	latest, ok, err := ghselfupdate.DetectLatest(config.GitRepo)
+	if err != nil {
+		ctx.Reply(u, ext.ReplyTextString(fmt.Sprintf("检测最新版本失败: %v", err)), nil)
+		return dispatcher.EndGroups
+	}
+	if !ok {
+		ctx.Reply(u, ext.ReplyTextString("没有找到版本信息"), nil)
+		return dispatcher.EndGroups
+	}
+	if latest.Version.Major != currentV.Major {
+		ctx.Reply(u, ext.ReplyTextString(fmt.Sprintf("检测到大版本更新: %s -> %s , 请前往 GitHub 手动下载最新版本并查看迁移指南", currentV, latest.Version)), nil)
+		return dispatcher.EndGroups
+	}
+	if latest.Version.LT(currentV) || latest.Version.Equals(currentV) {
+		ctx.Reply(u, ext.ReplyTextString(fmt.Sprintf("当前已经是最新版本: %s", config.Version)), nil)
+		return dispatcher.EndGroups
+	}
+	indocker := config.Docker == "true"
+	ctx.Sender.To(u.GetUserChat().AsInputPeer()).StyledText(ctx, html.String(nil, func() string {
+		md := latest.ReleaseNotes
+		md = regexp.MustCompile(`(?m)^###\s+&nbsp;&nbsp;&nbsp;(.+)$`).ReplaceAllString(md, "<b>$1</b>")
+		md = regexp.MustCompile(`(?m)^#####\s+&nbsp;&nbsp;&nbsp;&nbsp;(.+)$`).ReplaceAllString(md, "<i>$1</i>")
+
+		md = regexp.MustCompile(`(?m)^- `).ReplaceAllString(md, "• ")
+
+		md = regexp.MustCompile(`\[\((\w{6,})\)\]\((https?://[^\s)]+)\)`).ReplaceAllString(md, `(<a href="$2">$1</a>)`)
+
+		md = regexp.MustCompile(`\[(.+?)\]\((https?://[^\s)]+)\)`).ReplaceAllString(md, `<a href="$2">$1</a>`)
+
+		md = strings.ReplaceAll(md, "&nbsp;", " ")
+
+		return `<blockquote expandable>` + md + `</blockquote>`
+	}()))
+	if indocker {
+		text := fmt.Sprintf("发现新版本: %s\n当前版本: %s\n发布时间: %s\n由于您正在使用 Docker 部署, 请自行在部署平台上执行更新命令",
+			latest.Version,
+			config.Version,
+			latest.PublishedAt.Format("2006-01-02 15:04:05"),
+		)
+		ctx.Reply(u, ext.ReplyTextString(text), nil)
+		return dispatcher.EndGroups
+	}
+	text := fmt.Sprintf(`发现新版本: %s
+当前版本: %s
+
+文件大小: %.2f MB
+下载链接: %s
+发布时间: %s
+
+升级将重启 Bot , 是否升级?`, latest.Version, config.Version,
+		float64(latest.AssetByteSize)/(1024*1024), latest.AssetURL,
+		latest.PublishedAt.Format("2006-01-02 15:04:05"),
+	)
+	ctx.Reply(u, ext.ReplyTextString(text), &ext.ReplyOpts{
+		Markup: &tg.ReplyInlineMarkup{
+			Rows: []tg.KeyboardButtonRow{
+				{
+					Buttons: []tg.KeyboardButtonClass{
+						&tg.KeyboardButtonCallback{
+							Text: "升级",
+							Data: []byte("update"),
+						},
+					},
+				},
+			},
+		},
+	})
+	return dispatcher.EndGroups
+}
+
+func handleUpdateCallback(ctx *ext.Context, u *ext.Update) error {
+	currentV, err := semver.Parse(config.Version)
+	if err != nil {
+		return err
+	}
+	ctx.EditMessage(u.GetUserChat().GetID(), &tg.MessagesEditMessageRequest{
+		ID:      u.CallbackQuery.GetMsgID(),
+		Message: fmt.Sprintf("正在升级中, 当前版本: %s", config.Version),
+	})
+	latest, err := ghselfupdate.UpdateSelf(currentV, config.GitRepo)
+	if err != nil {
+		ctx.EditMessage(u.GetUserChat().GetID(), &tg.MessagesEditMessageRequest{
+			ID:      u.CallbackQuery.GetMsgID(),
+			Message: fmt.Sprintf("升级失败: %v", err),
+		})
+		return dispatcher.EndGroups
+	}
+	ctx.EditMessage(u.GetUserChat().GetID(), &tg.MessagesEditMessageRequest{
+		ID:      u.CallbackQuery.GetMsgID(),
+		Message: fmt.Sprintf("已升级至版本 %s\n若 Bot 未自动重启请手动启动", latest.Version),
+	})
+	return errors.New("SAVEANTBOT-RESTART")
+}

client/bot/handlers/utils/dirutil/context.go

@@ -0,0 +1,37 @@
+package dirutil
+
+import (
+	"context"
+
+	"github.com/krau/SaveAny-Bot/database"
+)
+
+type contextKey struct{}
+
+var dirContextKey = contextKey{}
+
+func WithContext(ctx context.Context, dir *database.Dir) context.Context {
+	if dir == nil {
+		return ctx
+	}
+	return context.WithValue(ctx, dirContextKey, dir)
+}
+
+func FromContext(ctx context.Context) *database.Dir {
+	dir, ok := ctx.Value(dirContextKey).(*database.Dir)
+	if !ok {
+		return nil
+	}
+	return dir
+}
+
+// PathFromContext returns the directory path stored in the context.
+//
+// If no directory is found, an empty string is returned.
+func PathFromContext(ctx context.Context) string {
+	dir := FromContext(ctx)
+	if dir == nil {
+		return ""
+	}
+	return dir.Path
+}

client/bot/handlers/utils/filters/url.go

@@ -0,0 +1,26 @@
+package filters
+
+import (
+	"regexp"
+	"slices"
+
+	"github.com/celestix/gotgproto/dispatcher/handlers/filters"
+	"github.com/celestix/gotgproto/types"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+)
+
+func RegexUrl(r *regexp.Regexp) filters.MessageFilter {
+	return func(m *types.Message) bool {
+		if m.Text == "" {
+			return false
+		}
+		if r.MatchString(m.Text) {
+			return true
+		}
+		urls := tgutil.ExtractMessageEntityUrls(m.Message)
+		if len(urls) == 0 {
+			return false
+		}
+		return slices.ContainsFunc(urls, r.MatchString)
+	}
+}

client/bot/handlers/utils/mediautil/media.go

@@ -1,6 +1,20 @@
 package mediautil
 
-import "github.com/gotd/td/tg"
+import (
+	"context"
+	"fmt"
+	"strings"
+	"text/template"
+	"time"
+
+	"github.com/charmbracelet/log"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/common/utils/strutil"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+	"github.com/krau/SaveAny-Bot/database"
+	"github.com/krau/SaveAny-Bot/pkg/enums/fnamest"
+	"github.com/krau/SaveAny-Bot/pkg/tfile"
+)
 
 func IsSupported(media tg.MessageMediaClass) bool {
 	switch media.(type) {
@@ -10,3 +24,118 @@ func IsSupported(media tg.MessageMediaClass) bool {
 		return false
 	}
 }
+
+type FilenameTemplateData struct {
+	MsgID    string `json:"msgid,omitempty"`
+	MsgTags  string `json:"msgtags,omitempty"`
+	MsgGen   string `json:"msggen,omitempty"`
+	MsgDate  string `json:"msgdate,omitempty"`
+	OrigName string `json:"origname,omitempty"`
+	ChatID   string `json:"chatid,omitempty"`
+}
+
+func (f FilenameTemplateData) ToMap() map[string]string {
+	return map[string]string{
+		"msgid":    f.MsgID,
+		"msgtags":  f.MsgTags,
+		"msggen":   f.MsgGen,
+		"msgdate":  f.MsgDate,
+		"origname": f.OrigName,
+		"chatid":   f.ChatID,
+	}
+}
+
+func TfileOptions(ctx context.Context, user *database.User, message *tg.Message) []tfile.TGFileOption {
+	opts := make([]tfile.TGFileOption, 0)
+	var fnameOpt tfile.TGFileOption
+	switch user.FilenameStrategy {
+	case fnamest.Message.String():
+		fnameOpt = tfile.WithName(tgutil.GenFileNameFromMessage(*message))
+	case fnamest.Template.String():
+		if user.FilenameTemplate == "" {
+			log.FromContext(ctx).Warnf("empty filename template")
+			fnameOpt = tfile.WithNameIfEmpty(tgutil.GenFileNameFromMessage(*message))
+			break
+		}
+		tmpl, err := template.New("filename").Parse(user.FilenameTemplate)
+		if err != nil {
+			log.FromContext(ctx).Errorf("failed to parse filename template: %s", err)
+			fnameOpt = tfile.WithNameIfEmpty(tgutil.GenFileNameFromMessage(*message))
+			break
+		}
+		data := BuildFilenameTemplateData(message)
+		var sb strings.Builder
+		err = tmpl.Execute(&sb, data)
+		if err != nil {
+			log.FromContext(ctx).Errorf("failed to execute filename template: %s", err)
+			fnameOpt = tfile.WithNameIfEmpty(tgutil.GenFileNameFromMessage(*message))
+			break
+		}
+		fnameOpt = tfile.WithName(sb.String())
+	default:
+		fnameOpt = tfile.WithNameIfEmpty(tgutil.GenFileNameFromMessage(*message))
+	}
+	opts = append(opts, fnameOpt, tfile.WithMessage(message))
+	return opts
+}
+
+func BuildFilenameTemplateData(message *tg.Message) map[string]string {
+	data := FilenameTemplateData{
+		MsgID: func() string {
+			id := message.GetID()
+			if id == 0 {
+				return ""
+			}
+			return fmt.Sprintf("%d", id)
+		}(),
+		MsgTags: func() string {
+			tags := strutil.ExtractTagsFromText(message.GetMessage())
+			if len(tags) == 0 {
+				return ""
+			}
+			return strings.Join(tags, "_")
+		}(),
+		MsgGen: tgutil.GenFileNameFromMessage(*message),
+		OrigName: func() string {
+			f, _ := tgutil.GetMediaFileName(message.Media)
+			return f
+		}(),
+		MsgDate: func() string {
+			date := message.GetDate()
+			if date == 0 {
+				return ""
+			}
+			t := time.Unix(int64(date), 0)
+			return t.Format("2006-01-02_15-04-05")
+		}(),
+		ChatID: func() string {
+			// 如果消息是频道的(从消息链接中fetch的) 直接使用其chat id, 无论它是否是从其他来源转发的
+			if message.GetPost() {
+				peer := message.GetPeerID()
+				switch p := peer.(type) {
+				case *tg.PeerChannel:
+					return intToStringOmitZero(p.ChannelID)
+				default: // impossible case
+					return intToStringOmitZero(tgutil.ChatIdFromPeer(peer))
+				}
+			}
+			fwdHeader, ok := message.GetFwdFrom()
+			if !ok {
+				return intToStringOmitZero(tgutil.ChatIdFromPeer(message.GetPeerID()))
+			}
+			fwdFrom, ok := fwdHeader.GetFromID()
+			if !ok {
+				return intToStringOmitZero(tgutil.ChatIdFromPeer(message.GetPeerID()))
+			}
+			return intToStringOmitZero(tgutil.ChatIdFromPeer(fwdFrom))
+		}(),
+	}.ToMap()
+	return data
+}
+
+func intToStringOmitZero(i int64) string {
+	if i == 0 {
+		return ""
+	}
+	return fmt.Sprintf("%d", i)
+}

client/bot/handlers/utils/msgelem/parse.go

@@ -0,0 +1,39 @@
+package msgelem
+
+import (
+	"fmt"
+
+	"github.com/duke-git/lancet/v2/strutil"
+	"github.com/gotd/td/telegram/message/entity"
+	"github.com/gotd/td/telegram/message/styling"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/pkg/parser"
+)
+
+func BuildParsedTextEntity(item parser.Item) (string, []tg.MessageEntityClass, error) {
+	eb := entity.Builder{}
+	if err := styling.Perform(&eb,
+		styling.Bold(fmt.Sprintf("[%s]%s", item.Site, item.Title)),
+		styling.Plain("\n链接: "),
+		styling.Code(item.URL),
+		styling.Plain("\n作者: "),
+		styling.Code(item.Author),
+		styling.Plain("\n描述: "),
+		styling.Code(strutil.Ellipsis(item.Description, 233)),
+		styling.Plain("\n文件数量: "),
+		styling.Code(fmt.Sprintf("%d", len(item.Resources))),
+		styling.Plain("\n预计总大小: "),
+		styling.Code(fmt.Sprintf("%.2f MB", func() float64 {
+			var totalSize int64
+			for _, res := range item.Resources {
+				totalSize += res.Size
+			}
+			return float64(totalSize) / 1024 / 1024
+		}())),
+		styling.Plain("\n请选择存储位置"),
+	); err != nil {
+		return "", nil, fmt.Errorf("构建消息失败: %w", err)
+	}
+	text, entities := eb.Complete()
+	return text, entities, nil
+}

client/bot/handlers/utils/msgelem/save.go

@@ -1,15 +0,0 @@
-package msgelem
-
-const (
-	SaveHelpText = `
-	使用方法:
-
-	1. 使用该命令回复要保存的文件, 可选文件名参数.
-	示例:
-	/save custom_file_name.mp4
-
-	2. 设置默认存储后, 发送 /save <频道ID/用户名> <消息ID范围> 来批量保存文件. 遵从存储规则, 若未匹配到任何规则则使用默认存储.
-	示例:
-	/save @moreacg 114-514
-	`
-)

client/bot/handlers/utils/msgelem/storage.go

@@ -24,6 +24,8 @@ func BuildAddSelectStorageKeyboard(stors []storage.Storage, adddata tcbdata.Add)
 			taskType = tasktype.TaskTypeTgfiles
 		} else if adddata.TphPageNode != nil {
 			taskType = tasktype.TaskTypeTphpics
+		} else if adddata.ParsedItem != nil {
+			taskType = tasktype.TaskTypeParseditem
 		} else {
 			return nil, fmt.Errorf("unknown task type: %s", taskType)
 		}
@@ -41,6 +43,10 @@ func BuildAddSelectStorageKeyboard(stors []storage.Storage, adddata tcbdata.Add)
 			TphPageNode: adddata.TphPageNode,
 			TphPics:     adddata.TphPics,
 			TphDirPath:  adddata.TphDirPath,
+
+			ParsedItem: adddata.ParsedItem,
+
+			DirectLinks: adddata.DirectLinks,
 		}
 		dataid := xid.New().String()
 		err := cache.Set(dataid, data)
@@ -90,7 +96,10 @@ func BuildAddOneSelectStorageMessage(ctx context.Context, stors []storage.Storag
 	}, nil
 }
 
-func BuildSetDefaultStorageMarkup(ctx context.Context, userID int64, stors []storage.Storage) (*tg.ReplyInlineMarkup, error) {
+// Builds the inline keyboard for setting default storage
+func BuildSetDefaultStorageMarkup(
+	ctx context.Context,
+	stors []storage.Storage) (*tg.ReplyInlineMarkup, error) {
 	buttons := make([]tg.KeyboardButtonClass, 0)
 	for _, storage := range stors {
 		data := tcbdata.SetDefaultStorage{
@@ -115,7 +124,35 @@ func BuildSetDefaultStorageMarkup(ctx context.Context, userID int64, stors []sto
 	return markup, nil
 }
 
-func BuildSetDirKeyboard(dirs []database.Dir, dataid string) (*tg.ReplyInlineMarkup, error) {
+func BuildSetDefaultDirMarkup(ctx context.Context,
+	seletedStorage string,
+	dirs []database.Dir) (*tg.ReplyInlineMarkup, error) {
+	buttons := make([]tg.KeyboardButtonClass, 0)
+	for _, dir := range dirs {
+		dataid := xid.New().String()
+		data := tcbdata.SetDefaultStorage{
+			StorageName: seletedStorage,
+			DirID:       dir.ID,
+		}
+		err := cache.Set(dataid, data)
+		if err != nil {
+			return nil, err
+		}
+		buttons = append(buttons, &tg.KeyboardButtonCallback{
+			Text: dir.Path,
+			Data: fmt.Appendf(nil, "%s %s", tcbdata.TypeSetDefault, dataid),
+		})
+	}
+	markup := &tg.ReplyInlineMarkup{}
+	for i := 0; i < len(buttons); i += 3 {
+		row := tg.KeyboardButtonRow{}
+		row.Buttons = buttons[i:min(i+3, len(buttons))]
+		markup.Rows = append(markup.Rows, row)
+	}
+	return markup, nil
+}
+
+func BuildSetDirMarkupForAdd(dirs []database.Dir, dataid string) (*tg.ReplyInlineMarkup, error) {
 	data, ok := cache.Get[tcbdata.Add](dataid)
 	if !ok {
 		return nil, fmt.Errorf("failed to get data from cache: %s", dataid)

client/bot/handlers/utils/ruleutil/rule.go

@@ -7,8 +7,6 @@ import (
 
 	"github.com/charmbracelet/log"
 	"github.com/krau/SaveAny-Bot/database"
-	"github.com/krau/SaveAny-Bot/pkg/consts"
-	ruleenum "github.com/krau/SaveAny-Bot/pkg/enums/rule"
 	"github.com/krau/SaveAny-Bot/pkg/rule"
 	"github.com/krau/SaveAny-Bot/pkg/tfile"
 )
@@ -36,8 +34,8 @@ func (m matchedStorName) String() string {
 }
 
 // can we use this storage name directly?
-func (m matchedStorName) IsUsable() bool {
+func (m matchedStorName) Usable() bool {
-	return m != "" && m != consts.RuleStorNameChosen
+	return m != "" && m != rule.RuleStorNameChosen
 }
 
 type MatchedDirPath string
@@ -47,17 +45,17 @@ func (m MatchedDirPath) String() string {
 }
 
 func (m MatchedDirPath) NeedNewForAlbum() bool {
-	return m != "" && m == consts.RuleDirPathNewForAlbum
+	return m != "" && m == rule.RuleDirPathNewForAlbum
 }
 
-func ApplyRule(ctx context.Context, rules []database.Rule, inputs *ruleInput) (matchedStorageName matchedStorName, dirPath MatchedDirPath) {
+func ApplyRule(ctx context.Context, rules []database.Rule, inputs *ruleInput) (matched bool, matchedStorageName matchedStorName, dirPath MatchedDirPath) {
 	if inputs == nil || len(rules) == 0 {
-		return "", ""
+		return false, "", ""
 	}
 	logger := log.FromContext(ctx)
 	for _, ur := range rules {
 		switch ur.Type {
-		case ruleenum.FileNameRegex.String():
+		case rule.FileNameRegex.String():
 			ru, err := rule.NewRuleFileNameRegex(ur.StorageName, ur.DirPath, ur.Data)
 			if err != nil {
 				logger.Errorf("Failed to create rule: %s", err)
@@ -72,7 +70,7 @@ func ApplyRule(ctx context.Context, rules []database.Rule, inputs *ruleInput) (m
 				dirPath = MatchedDirPath(ru.StoragePath())
 				matchedStorageName = matchedStorName(ru.StorageName())
 			}
-		case ruleenum.MessageRegex.String():
+		case rule.MessageRegex.String():
 			ru, err := rule.NewRuleMessageRegex(ur.StorageName, ur.DirPath, ur.Data)
 			if err != nil {
 				logger.Errorf("Failed to create rule: %s", err)
@@ -87,7 +85,7 @@ func ApplyRule(ctx context.Context, rules []database.Rule, inputs *ruleInput) (m
 				dirPath = MatchedDirPath(ru.StoragePath())
 				matchedStorageName = matchedStorName(ru.StorageName())
 			}
-		case ruleenum.IsAlbum.String():
+		case rule.IsAlbum.String():
 			matchAlbum, err := convertor.ToBool(ur.Data)
 			if err != nil {
 				matchAlbum = false
@@ -108,5 +106,8 @@ func ApplyRule(ctx context.Context, rules []database.Rule, inputs *ruleInput) (m
 			}
 		}
 	}
-	return
+	if matchedStorageName != "" || dirPath != "" {
+		return true, matchedStorageName, dirPath
+	}
+	return false, "", ""
 }

client/bot/handlers/utils/shortcut/directlinks.go

@@ -0,0 +1,30 @@
+package shortcut
+
+import (
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/charmbracelet/log"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+	"github.com/krau/SaveAny-Bot/core"
+	"github.com/krau/SaveAny-Bot/core/tasks/directlinks"
+	"github.com/krau/SaveAny-Bot/storage"
+	"github.com/rs/xid"
+)
+
+func CreateAndAddDirectTaskWithEdit(ctx *ext.Context, stor storage.Storage, dirPath string, links []string, msgID int, userID int64) error {
+	injectCtx := tgutil.ExtWithContext(ctx.Context, ctx)
+	task := directlinks.NewTask(xid.New().String(), injectCtx, links, stor, stor.JoinStoragePath(dirPath), directlinks.NewProgress(msgID, userID))
+	if err := core.AddTask(injectCtx, task); err != nil {
+		log.FromContext(ctx).Errorf("Failed to add task: %s", err)
+		ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
+			ID:      msgID,
+			Message: "任务添加失败: " + err.Error(),
+		})
+		return dispatcher.EndGroups
+	}
+	ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
+		Message: "任务已添加",
+	})
+	return dispatcher.EndGroups
+}

client/bot/handlers/utils/shortcut/message.go

@@ -10,6 +10,7 @@ import (
 	"github.com/celestix/gotgproto/ext"
 	"github.com/celestix/gotgproto/types"
 	"github.com/charmbracelet/log"
+	"github.com/gotd/td/telegram/downloader"
 	"github.com/gotd/td/tg"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/mediautil"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
@@ -19,20 +20,20 @@ import (
 	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 	"github.com/krau/SaveAny-Bot/common/utils/tphutil"
 	"github.com/krau/SaveAny-Bot/config"
+	"github.com/krau/SaveAny-Bot/database"
 	"github.com/krau/SaveAny-Bot/pkg/telegraph"
 	"github.com/krau/SaveAny-Bot/pkg/tfile"
 )
 
 // 获取消息中的文件并回复等待消息, 返回等待消息, 获取到的文件
-func GetFileFromMessageWithReply(ctx *ext.Context, update *ext.Update, message *tg.Message, tfileopts ...tfile.TGFileOptions) (replied *types.Message,
+func GetFileFromMessageWithReply(ctx *ext.Context, update *ext.Update, message *tg.Message, tfileopts ...tfile.TGFileOption) (replied *types.Message,
 	file tfile.TGFileMessage, err error,
 ) {
 	logger := log.FromContext(ctx)
 	media := message.Media
 	supported := mediautil.IsSupported(media)
 	if !supported {
-		ctx.Reply(update, ext.ReplyTextString("不支持的消息类型"), nil)
+		return nil, nil, dispatcher.ContinueGroups
-		return nil, nil, dispatcher.EndGroups
 	}
 
 	replied, err = ctx.Reply(update, ext.ReplyTextString("正在获取文件信息..."), nil)
@@ -40,15 +41,15 @@ func GetFileFromMessageWithReply(ctx *ext.Context, update *ext.Update, message *
 		logger.Errorf("Failed to reply: %s", err)
 		return nil, nil, dispatcher.EndGroups
 	}
-	options := []tfile.TGFileOptions{
+	// options := []tfile.TGFileOption{
-		tfile.WithMessage(message),
+	// 	tfile.WithMessage(message),
-	}
+	// }
-	if len(tfileopts) > 0 {
+	// if len(tfileopts) > 0 {
-		options = append(options, tfileopts...)
+	// 	options = append(options, tfileopts...)
-	} else {
+	// } else {
-		options = append(options, tfile.WithNameIfEmpty(tgutil.GenFileNameFromMessage(*message)))
+	// 	options = append(options, tfile.WithNameIfEmpty(tgutil.GenFileNameFromMessage(*message)))
-	}
+	// }
-	file, err = tfile.FromMediaMessage(media, ctx.Raw, message, options...)
+	file, err = tfile.FromMediaMessage(media, ctx.Raw, message, tfileopts...)
 	if err != nil {
 		logger.Errorf("Failed to get file from media: %s", err)
 		ctx.Reply(update, ext.ReplyTextString("获取文件失败: "+err.Error()), nil)
@@ -62,7 +63,7 @@ type EditMessageFunc func(text string, markup tg.ReplyMarkupClass)
 // 获取链接中的文件并回复等待消息
 func GetFilesFromUpdateLinkMessageWithReplyEdit(ctx *ext.Context, update *ext.Update) (replied *types.Message, files []tfile.TGFileMessage, editReplied EditMessageFunc, err error) {
 	logger := log.FromContext(ctx)
-	msgLinks := re.TgMessageLinkRegexp.FindAllString(update.EffectiveMessage.GetMessage(), -1)
+	msgLinks := re.TgMessageLinkRegexp.FindAllString(tgutil.ExtractMessageEntityUrlsText(update.EffectiveMessage.Message), -1)
 	if len(msgLinks) == 0 {
 		logger.Warn("no matched message links but called handleMessageLink")
 		return nil, nil, nil, dispatcher.EndGroups
@@ -81,9 +82,14 @@ func GetFilesFromUpdateLinkMessageWithReplyEdit(ctx *ext.Context, update *ext.Up
 			logger.Errorf("failed to edit message: %s", err)
 		}
 	}
-
+	user, err := database.GetUserByChatID(ctx, update.GetUserChat().GetID())
+	if err != nil {
+		logger.Errorf("failed to get user from db: %s", err)
+		editReplied("获取用户信息失败: "+err.Error(), nil)
+		return nil, nil, nil, dispatcher.EndGroups
+	}
 	files = make([]tfile.TGFileMessage, 0, len(msgLinks))
-	addFile := func(client tfile.DlerClient, msg *tg.Message) {
+	addFile := func(client downloader.Client, msg *tg.Message) {
 		if msg == nil || msg.Media == nil {
 			logger.Warn("message is nil, skipping")
 			return
@@ -93,7 +99,8 @@ func GetFilesFromUpdateLinkMessageWithReplyEdit(ctx *ext.Context, update *ext.Up
 			logger.Debugf("message %d has no media", msg.GetID())
 			return
 		}
-		file, err := tfile.FromMediaMessage(media, client, msg, tfile.WithNameIfEmpty(tgutil.GenFileNameFromMessage(*msg)))
+		opts := mediautil.TfileOptions(ctx, user, msg)
+		file, err := tfile.FromMediaMessage(media, client, msg, opts...)
 		if err != nil {
 			logger.Errorf("failed to create file from media: %s", err)
 			return
@@ -102,7 +109,7 @@ func GetFilesFromUpdateLinkMessageWithReplyEdit(ctx *ext.Context, update *ext.Up
 	}
 
 	tctx := ctx
-	if config.Cfg.Telegram.Userbot.Enable {
+	if config.C().Telegram.Userbot.Enable {
 		tctx = uc.GetCtx()
 	}
 
@@ -119,12 +126,12 @@ func GetFilesFromUpdateLinkMessageWithReplyEdit(ctx *ext.Context, update *ext.Up
 		}
 		msg, err := tgutil.GetMessageByID(tctx, chatId, msgId)
 		if err != nil {
-			logger.Errorf("failed to get message by ID: %s", err)
+			logger.Error(err)
 			continue
 		}
 		groupID, isGroup := msg.GetGroupedID()
 		if isGroup && groupID != 0 && !linkUrl.Query().Has("single") {
-			gmsgs, err := tgutil.GetGroupedMessages(ctx, chatId, msg)
+			gmsgs, err := tgutil.GetGroupedMessages(tctx, chatId, msg)
 			if err != nil {
 				logger.Errorf("failed to get grouped messages: %s", err)
 			} else {
@@ -164,7 +171,7 @@ type TelegraphResult struct {
 // return replied message, image urls, telegraph path(unescaped), error
 func GetTphPicsFromMessageWithReply(ctx *ext.Context, update *ext.Update) (*types.Message, *TelegraphResult, error) {
 	logger := log.FromContext(ctx)
-	tphurl := re.TelegraphUrlRegexp.FindString(update.EffectiveMessage.GetMessage()) // TODO: batch urls
+	tphurl := re.TelegraphUrlRegexp.FindString(tgutil.ExtractMessageEntityUrlsText(update.EffectiveMessage.Message))
 	if tphurl == "" {
 		logger.Warnf("No telegraph url found but called handleTelegraph")
 		return nil, nil, dispatcher.ContinueGroups
@@ -176,11 +183,13 @@ func GetTphPicsFromMessageWithReply(ctx *ext.Context, update *ext.Update) (*type
 		ctx.Reply(update, ext.ReplyTextString("解析 telegraph 路径失败: "+err.Error()), nil)
 		return nil, nil, dispatcher.EndGroups
 	}
+	tphdir = strings.TrimSpace(tphdir)
 	msg, err := ctx.Reply(update, ext.ReplyTextString("正在获取 telegraph 页面..."), nil)
 	if err != nil {
 		logger.Errorf("Failed to reply to update: %s", err)
 		return nil, nil, dispatcher.EndGroups
 	}
+	logger.Debugf("Fetching telegraph page: %s", pagepath)
 	page, err := tphutil.DefaultClient().GetPage(ctx, pagepath)
 	if err != nil {
 		logger.Errorf("Failed to get telegraph page: %s", err)
@@ -208,6 +217,10 @@ func GetTphPicsFromMessageWithReply(ctx *ext.Context, update *ext.Update) (*type
 		}
 		if node.Tag == "img" {
 			if src, ok := node.Attrs["src"]; ok {
+				if strings.HasPrefix(src, "/file/") {
+					// handle images on telegra.ph server
+					src = "https://telegra.ph" + src
+				}
 				imgs = append(imgs, src)
 			}
 		}

client/bot/handlers/utils/shortcut/parsed.go

@@ -0,0 +1,35 @@
+package shortcut
+
+import (
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/charmbracelet/log"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+	"github.com/krau/SaveAny-Bot/core"
+	"github.com/krau/SaveAny-Bot/core/tasks/parsed"
+	"github.com/krau/SaveAny-Bot/pkg/parser"
+	"github.com/krau/SaveAny-Bot/storage"
+	"github.com/rs/xid"
+)
+
+func CreateAndAddParsedTaskWithEdit(ctx *ext.Context, stor storage.Storage, dirPath string, item *parser.Item, msgID int, userID int64) error {
+	injectCtx := tgutil.ExtWithContext(ctx.Context, ctx)
+	task := parsed.NewTask(xid.New().String(), injectCtx, stor, stor.JoinStoragePath(dirPath), item, parsed.NewProgress(msgID, userID))
+	if err := core.AddTask(injectCtx, task); err != nil {
+		log.FromContext(ctx).Errorf("Failed to add task: %s", err)
+		ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
+			ID:      msgID,
+			Message: "任务添加失败: " + err.Error(),
+		})
+		return dispatcher.EndGroups
+	}
+	text, entities := msgelem.BuildTaskAddedEntities(ctx, item.Title, core.GetLength(ctx))
+	ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
+		ID:       msgID,
+		Message:  text,
+		Entities: entities,
+	})
+	return dispatcher.EndGroups
+}

client/bot/handlers/utils/shortcut/tftask.go

@@ -13,15 +13,15 @@ import (
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/ruleutil"
 	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 	"github.com/krau/SaveAny-Bot/core"
-	"github.com/krau/SaveAny-Bot/core/batchtftask"
+	"github.com/krau/SaveAny-Bot/core/tasks/batchtfile"
-	"github.com/krau/SaveAny-Bot/core/tftask"
+	tftask "github.com/krau/SaveAny-Bot/core/tasks/tfile"
 	"github.com/krau/SaveAny-Bot/database"
 	"github.com/krau/SaveAny-Bot/pkg/tfile"
 	"github.com/krau/SaveAny-Bot/storage"
 	"github.com/rs/xid"
 )
 
-// 创建一个 tftask.TGFileTask 并添加到任务队列中, 以编辑消息的方式反馈结果
+// 创建一个 tfile.TGFileTask 并添加到任务队列中, 以编辑消息的方式反馈结果
 func CreateAndAddTGFileTaskWithEdit(ctx *ext.Context, userID int64, stor storage.Storage, dirPath string, file tfile.TGFileMessage, trackMsgID int) error {
 	logger := log.FromContext(ctx)
 	user, err := database.GetUserByChatID(ctx, userID)
@@ -34,9 +34,14 @@ func CreateAndAddTGFileTaskWithEdit(ctx *ext.Context, userID int64, stor storage
 		return dispatcher.EndGroups
 	}
 	if user.ApplyRule && user.Rules != nil {
-		matchedStorageName, matchedDirPath := ruleutil.ApplyRule(ctx, user.Rules, ruleutil.NewInput(file))
+		matched, matchedStorageName, matchedDirPath := ruleutil.ApplyRule(ctx, user.Rules, ruleutil.NewInput(file))
-		dirPath = matchedDirPath.String()
+		if !matched {
-		if matchedStorageName.IsUsable() {
+			goto startCreateTask
+		}
+		if matchedDirPath != "" {
+			dirPath = matchedDirPath.String()
+		}
+		if matchedStorageName.Usable() {
 			stor, err = storage.GetStorageByUserIDAndName(ctx, user.ChatID, matchedStorageName.String())
 			if err != nil {
 				logger.Errorf("Failed to get storage by user ID and name: %s", err)
@@ -48,7 +53,7 @@ func CreateAndAddTGFileTaskWithEdit(ctx *ext.Context, userID int64, stor storage
 			}
 		}
 	}
-
+startCreateTask:
 	storagePath := stor.JoinStoragePath(path.Join(dirPath, file.Name()))
 	injectCtx := tgutil.ExtWithContext(ctx.Context, ctx)
 	taskid := xid.New().String()
@@ -82,7 +87,7 @@ func CreateAndAddTGFileTaskWithEdit(ctx *ext.Context, userID int64, stor storage
 	return dispatcher.EndGroups
 }
 
-// 创建一个 batchtftask.BatchTGFileTask 并添加到任务队列中, 以编辑消息的方式反馈结果
+// 创建一个 batchtfile.BatchTGFileTask 并添加到任务队列中, 以编辑消息的方式反馈结果
 func CreateAndAddBatchTGFileTaskWithEdit(ctx *ext.Context, userID int64, stor storage.Storage, dirPath string, files []tfile.TGFileMessage, trackMsgID int) error {
 	logger := log.FromContext(ctx)
 	user, err := database.GetUserByChatID(ctx, userID)
@@ -101,16 +106,18 @@ func CreateAndAddBatchTGFileTaskWithEdit(ctx *ext.Context, userID int64, stor st
 		if !useRule {
 			return stor.Name(), ruleutil.MatchedDirPath(dirPath)
 		}
-		storName, dirP := ruleutil.ApplyRule(ctx, user.Rules, ruleutil.NewInput(file))
+		matched, storName, dirP := ruleutil.ApplyRule(ctx, user.Rules, ruleutil.NewInput(file))
-
+		if !matched {
+			return stor.Name(), ruleutil.MatchedDirPath(dirPath)
+		}
 		storname := storName.String()
-		if !storName.IsUsable() {
+		if !storName.Usable() {
 			storname = stor.Name()
 		}
 		return storname, dirP
 	}
 
-	elems := make([]batchtftask.TaskElement, 0, len(files))
+	elems := make([]batchtfile.TaskElement, 0, len(files))
 	type albumFile struct {
 		file    tfile.TGFileMessage
 		storage storage.Storage
@@ -132,7 +139,7 @@ func CreateAndAddBatchTGFileTaskWithEdit(ctx *ext.Context, userID int64, stor st
 		}
 		if !dirPath.NeedNewForAlbum() {
 			storPath := fileStor.JoinStoragePath(path.Join(dirPath.String(), file.Name()))
-			elem, err := batchtftask.NewTaskElement(fileStor, storPath, file)
+			elem, err := batchtfile.NewTaskElement(fileStor, storPath, file)
 			if err != nil {
 				logger.Errorf("Failed to create task element: %s", err)
 				ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
@@ -167,7 +174,7 @@ func CreateAndAddBatchTGFileTaskWithEdit(ctx *ext.Context, userID int64, stor st
 		albumStor := afiles[0].storage
 		for _, af := range afiles {
 			afstorPath := af.storage.JoinStoragePath(path.Join(dirPath, albumDir, af.file.Name()))
-			elem, err := batchtftask.NewTaskElement(albumStor, afstorPath, af.file)
+			elem, err := batchtfile.NewTaskElement(albumStor, afstorPath, af.file)
 			if err != nil {
 				logger.Errorf("Failed to create task element for album file: %s", err)
 				ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
@@ -182,7 +189,7 @@ func CreateAndAddBatchTGFileTaskWithEdit(ctx *ext.Context, userID int64, stor st
 
 	injectCtx := tgutil.ExtWithContext(ctx.Context, ctx)
 	taskid := xid.New().String()
-	task := batchtftask.NewBatchTGFileTask(taskid, injectCtx, elems, batchtftask.NewProgressTracker(trackMsgID, userID), true)
+	task := batchtfile.NewBatchTGFileTask(taskid, injectCtx, elems, batchtfile.NewProgressTracker(trackMsgID, userID), true)
 	if err := core.AddTask(injectCtx, task); err != nil {
 		logger.Errorf("Failed to add batch task: %s", err)
 		ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{

client/bot/handlers/utils/shortcut/tphtask.go

@@ -9,19 +9,21 @@ import (
 	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 	"github.com/krau/SaveAny-Bot/common/utils/tphutil"
 	"github.com/krau/SaveAny-Bot/core"
-	"github.com/krau/SaveAny-Bot/core/tphtask"
+	tphtask "github.com/krau/SaveAny-Bot/core/tasks/telegraph"
 	"github.com/krau/SaveAny-Bot/pkg/telegraph"
 	"github.com/krau/SaveAny-Bot/storage"
 	"github.com/rs/xid"
 )
 
-func CreateAndAddTphTaskWithEdit(ctx *ext.Context,
+func CreateAndAddtelegraphWithEdit(
+	ctx *ext.Context,
 	userID int64,
 	tphpage *telegraph.Page,
 	dirPath string, // unescaped ph path for file storage
 	pics []string,
 	stor storage.Storage,
 	trackMsgID int) error {
+		
 	injectCtx := tgutil.ExtWithContext(ctx.Context, ctx)
 	task := tphtask.NewTask(xid.New().String(),
 		injectCtx,

client/bot/handlers/watch.go

@@ -0,0 +1,255 @@
+package handlers
+
+import (
+	"fmt"
+	"path"
+	"regexp"
+	"strings"
+	"text/template"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/charmbracelet/log"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/mediautil"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/ruleutil"
+	userclient "github.com/krau/SaveAny-Bot/client/user"
+	"github.com/krau/SaveAny-Bot/common/i18n"
+	"github.com/krau/SaveAny-Bot/common/i18n/i18nk"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+	"github.com/krau/SaveAny-Bot/core"
+	"github.com/krau/SaveAny-Bot/core/tasks/tfile"
+	"github.com/krau/SaveAny-Bot/database"
+	"github.com/krau/SaveAny-Bot/pkg/enums/fnamest"
+	"github.com/krau/SaveAny-Bot/storage"
+	"github.com/rs/xid"
+)
+
+func handleWatchCmd(ctx *ext.Context, update *ext.Update) error {
+	logger := log.FromContext(ctx)
+	args := strings.Split(update.EffectiveMessage.Text, " ")
+	if len(args) < 2 {
+		ctx.Reply(update, ext.ReplyTextString(i18n.T(i18nk.BotMsgWatchHelpText)), nil)
+		return dispatcher.EndGroups
+	}
+	userChatID := update.GetUserChat().GetID()
+	user, err := database.GetUserByChatID(ctx, userChatID)
+	if err != nil {
+		logger.Errorf("获取用户失败: %s", err)
+		ctx.Reply(update, ext.ReplyTextString("获取用户失败"), nil)
+		return dispatcher.EndGroups
+	}
+	if user.DefaultStorage == "" {
+		ctx.Reply(update, ext.ReplyTextString("请先设置默认存储, 使用 /storage 命令"), nil)
+		return dispatcher.EndGroups
+	}
+	chatArg := args[1]
+	chatID, err := tgutil.ParseChatID(ctx, chatArg)
+	if err != nil {
+		ctx.Reply(update, ext.ReplyTextString("无效的ID或用户名: "+err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+	watching, err := user.WatchingChat(ctx, chatID)
+	if err != nil {
+		logger.Errorf("Failed to check if user is watching chat %d: %s", chatID, err)
+		return dispatcher.EndGroups
+	}
+	if watching {
+		ctx.Reply(update, ext.ReplyTextString("已经在监听此聊天"), nil)
+		return dispatcher.EndGroups
+	}
+	filter := ""
+	if len(args) > 2 {
+		filterArg := strings.Join(args[2:], " ")
+		filterType := strings.Split(filterArg, ":")[0]
+		filterData := strings.Split(filterArg, ":")[1]
+		if filterType == "" || filterData == "" {
+			ctx.Reply(update, ext.ReplyTextString("过滤器格式错误, 请使用 <过滤器类型>:<表达式>"), nil)
+			return dispatcher.EndGroups
+		}
+		switch filterType {
+		case "msgre":
+			_, err := regexp.Compile(filterData)
+			if err != nil {
+				ctx.Reply(update, ext.ReplyTextString("正则表达式格式错误: "+err.Error()), nil)
+				return dispatcher.EndGroups
+			}
+			filter = filterType + ":" + filterData
+		default:
+			ctx.Reply(update, ext.ReplyTextString("不支持的过滤器类型, 请参阅文档"), nil)
+			return dispatcher.EndGroups
+		}
+	}
+	if err := user.WatchChat(ctx, database.WatchChat{
+		UserID: user.ID,
+		ChatID: chatID,
+		Filter: filter,
+	}); err != nil {
+		logger.Errorf("Failed to watch chat %d: %s", chatID, err)
+		ctx.Reply(update, ext.ReplyTextString("监听聊天失败: "+err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+	ctx.Reply(update, ext.ReplyTextString("已开始监听聊天: "+chatArg), nil)
+	return dispatcher.EndGroups
+}
+
+func handleLswatchCmd(ctx *ext.Context, update *ext.Update) error {
+	logger := log.FromContext(ctx)
+	userChatID := update.GetUserChat().GetID()
+	user, err := database.GetUserByChatID(ctx, userChatID)
+	if err != nil {
+		logger.Errorf("获取用户失败: %s", err)
+		ctx.Reply(update, ext.ReplyTextString("获取用户失败"), nil)
+		return dispatcher.EndGroups
+	}
+	chats := user.WatchChats
+	if len(chats) == 0 {
+		ctx.Reply(update, ext.ReplyTextString("当前没有监听任何聊天"), nil)
+		return dispatcher.EndGroups
+	}
+	var sb strings.Builder
+	sb.WriteString("当前监听的聊天:\n")
+	for _, chat := range chats {
+		sb.WriteString("- ")
+		sb.WriteString(fmt.Sprintf("%d", chat.ChatID))
+		if chat.Filter != "" {
+			sb.WriteString(" (过滤器: ")
+			sb.WriteString(chat.Filter)
+			sb.WriteString(")")
+		}
+		sb.WriteString("\n")
+	}
+	ctx.Reply(update, ext.ReplyTextString(sb.String()), nil)
+	return dispatcher.EndGroups
+}
+
+func handleUnwatchCmd(ctx *ext.Context, update *ext.Update) error {
+	logger := log.FromContext(ctx)
+	args := strings.Split(update.EffectiveMessage.Text, " ")
+	if len(args) < 2 {
+		ctx.Reply(update, ext.ReplyTextString("请提供要取消监听的聊天ID或用户名"), nil)
+		return dispatcher.EndGroups
+	}
+	userChatID := update.GetUserChat().GetID()
+	user, err := database.GetUserByChatID(ctx, userChatID)
+	if err != nil {
+		logger.Errorf("获取用户失败: %s", err)
+		ctx.Reply(update, ext.ReplyTextString("获取用户失败"), nil)
+		return dispatcher.EndGroups
+	}
+	chatArg := args[1]
+	chatID, err := tgutil.ParseChatID(ctx, chatArg)
+	if err != nil {
+		ctx.Reply(update, ext.ReplyTextString("无效的ID或用户名: "+err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+	if err := user.UnwatchChat(ctx, chatID); err != nil {
+		logger.Errorf("Failed to unwatch chat %d: %s", chatID, err)
+		ctx.Reply(update, ext.ReplyTextString("取消监听聊天失败: "+err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+	ctx.Reply(update, ext.ReplyTextString("已取消监听聊天: "+chatArg), nil)
+	return dispatcher.EndGroups
+}
+
+func listenMediaMessageEvent(ch chan userclient.MediaMessageEvent) {
+	logger := log.FromContext(userclient.GetCtx())
+	for event := range ch {
+		logger.Debug("Received media message event", "chat_id", event.ChatID, "file_name", event.File.Name())
+		ctx := event.Ctx
+		file := event.File
+		chats, err := database.GetWatchChatsByChatID(ctx, event.ChatID)
+		if err != nil {
+			logger.Errorf("Failed to get watch chats for chat ID %d: %v", event.ChatID, err)
+			continue
+		}
+		msgText := event.File.Message().GetMessage()
+		for _, chat := range chats {
+			if chat.Filter != "" {
+				filter := strings.Split(chat.Filter, ":")
+				if len(filter) != 2 {
+					logger.Warnf("Invalid filter format in chat %d, skipping", chat.ChatID)
+					continue
+				}
+				filterType := filter[0]
+				filterData := filter[1]
+				switch filterType {
+				case "msgre": // [TODO] enums for filter types
+					if ok, err := regexp.MatchString(filterData, msgText); err != nil {
+						continue
+					} else if !ok {
+						continue
+					}
+				default:
+					logger.Warnf("Unsupported filter type %s in chat %d, skipping", filterType, chat.ChatID)
+					continue
+				}
+			}
+			user, err := database.GetUserByID(ctx, chat.UserID)
+			if err != nil {
+				logger.Errorf("Failed to get user by ID %d: %v", chat.UserID, err)
+				continue
+			}
+			if user.DefaultStorage == "" {
+				logger.Warnf("User %d has no default storage set, skipping media message handling", chat.UserID)
+				continue
+			}
+			stor, err := storage.GetStorageByUserIDAndName(ctx, user.ChatID, user.DefaultStorage)
+			if err != nil {
+				logger.Errorf("Failed to get storage by user ID %d and name %s: %v", user.ChatID, user.DefaultStorage, err)
+				continue
+			}
+			switch user.FilenameStrategy {
+			case fnamest.Message.String():
+				file.SetName(tgutil.GenFileNameFromMessage(*file.Message()))
+			case fnamest.Template.String():
+				if user.FilenameTemplate == "" {
+					logger.Warnf("Empty filename template for user %d, using default filename", user.ChatID)
+					break
+				}
+				message := file.Message()
+				tmpl, err := template.New("filename").Parse(user.FilenameTemplate)
+				if err != nil {
+					logger.Errorf("Failed to parse filename template for user %d: %s", user.ChatID, err)
+					break
+				}
+				data := mediautil.BuildFilenameTemplateData(message)
+				var sb strings.Builder
+				err = tmpl.Execute(&sb, data)
+				if err != nil {
+					log.FromContext(ctx).Errorf("failed to execute filename template: %s", err)
+					break
+				}
+				file.SetName(sb.String())
+			}
+			var dirPath string
+			if user.ApplyRule && user.Rules != nil {
+				matched, matchedStorageName, matchedDirPath := ruleutil.ApplyRule(ctx, user.Rules, ruleutil.NewInput(file))
+				if !matched {
+					goto startCreateTask
+				}
+				dirPath = matchedDirPath.String()
+				if matchedStorageName.Usable() {
+					stor, err = storage.GetStorageByUserIDAndName(ctx, user.ChatID, matchedStorageName.String())
+					if err != nil {
+						logger.Errorf("Failed to get storage by user ID and name: %s", err)
+						continue
+					}
+				}
+			}
+		startCreateTask:
+			storagePath := stor.JoinStoragePath(path.Join(dirPath, file.Name()))
+			injectCtx := tgutil.ExtWithContext(ctx.Context, ctx)
+			taskid := xid.New().String()
+			task, err := tfile.NewTGFileTask(taskid, injectCtx, file, stor, storagePath, nil)
+			if err != nil {
+				logger.Errorf("create task failed: %s", err)
+				continue
+			}
+			if err := core.AddTask(injectCtx, task); err != nil {
+				logger.Errorf("add task failed: %s", err)
+				continue
+			}
+			logger.Infof("Added media message task for user %d in chat %d: %s", chat.UserID, event.ChatID, file.Name())
+		}
+	}
+}

client/middleware/default.go

@@ -16,7 +16,7 @@ import (
 func NewDefaultMiddlewares(ctx context.Context, timeout time.Duration) []telegram.Middleware {
 	return []telegram.Middleware{
 		recovery.New(ctx, newBackoff(timeout)),
-		retry.New(config.Cfg.Telegram.RpcRetry),
+		retry.New(config.C().Telegram.RpcRetry),
 		floodwait.NewSimpleWaiter(),
 	}
 }

client/middleware/recovery/recovery.go

@@ -2,11 +2,11 @@ package recovery
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/cenkalti/backoff/v4"
 	"github.com/charmbracelet/log"
-	"github.com/go-faster/errors"
 	"github.com/gotd/td/bin"
 	"github.com/gotd/td/telegram"
 	"github.com/gotd/td/tg"
@@ -31,7 +31,7 @@ func (r *recovery) Handle(next tg.Invoker) telegram.InvokeFunc {
 		return backoff.RetryNotify(func() error {
 			if err := next.Invoke(ctx, input, output); err != nil {
 				if r.shouldRecover(ctx, err) {
-					return errors.Wrap(err, "recover")
+					return fmt.Errorf("recovery: %w", err)
 				}
 
 				return backoff.Permanent(err)

client/user/auth_terminal.go

@@ -1,80 +1,57 @@
 package user
 
 import (
+	"bufio"
+	"fmt"
+	"os"
 	"strings"
 
 	"github.com/celestix/gotgproto"
-	"github.com/charmbracelet/huh"
+	"golang.org/x/term"
-	"github.com/charmbracelet/log"
-	"github.com/fatih/color"
 )
 
 type terminalAuthConversator struct{}
 
-func (t *terminalAuthConversator) AskPhoneNumber() (string, error) {
+func readLine(prompt string) (string, error) {
-	phone := ""
+	fmt.Print(prompt)
-	err := huh.NewInput().Title("Your Phone Number").
+	reader := bufio.NewReader(os.Stdin)
-		Placeholder("+44 123456").
+	text, err := reader.ReadString('\n')
-		Prompt("> ").
-		Value(&phone).
-		WithTheme(huh.ThemeCatppuccin()).
-		Run()
-
 	if err != nil {
 		return "", err
 	}
+	return strings.TrimSpace(text), nil
+}
 
-	log.Info("Sending code to your phone number...")
+func (t *terminalAuthConversator) AskPhoneNumber() (string, error) {
-
+	fmt.Println("Your Phone Number (e.g. +44 123456):")
-	return strings.TrimSpace(phone), nil
+	return readLine("> ")
 }
 
 func (t *terminalAuthConversator) AskCode() (string, error) {
-	code := ""
+	fmt.Println("Your Code (e.g. 123456):")
-	err := huh.NewInput().Title("Your Code").
+	return readLine("> ")
-		Placeholder("123456").
-		Value(&code).
-		Prompt("> ").
-		WithTheme(huh.ThemeCatppuccin()).
-		Run()
-
-	if err != nil {
-		return "", err
-	}
-
-	return strings.TrimSpace(code), nil
 }
 
 func (t *terminalAuthConversator) AskPassword() (string, error) {
-	pwd := ""
+	fmt.Println("Your 2FA Password:")
-
+	fmt.Print("> ")
-	err := huh.NewInput().Title("Your 2FA Password").
+	bytePwd, err := term.ReadPassword(int(os.Stdin.Fd()))
-		EchoMode(huh.EchoModePassword).
+	fmt.Println()
-		Value(&pwd).
-		Prompt("> ").
-		WithTheme(huh.ThemeCatppuccin()).
-		Run()
 	if err != nil {
 		return "", err
 	}
 
-	return strings.TrimSpace(pwd), nil
+	return strings.TrimSpace(string(bytePwd)), nil
 }
 
 func (t *terminalAuthConversator) AuthStatus(authStatus gotgproto.AuthStatus) {
 	switch authStatus.Event {
 	case gotgproto.AuthStatusPhoneRetrial:
-		color.Red("The phone number you just entered seems to be incorrect,")
+		fmt.Printf("The phone number is incorrect. Attempts left: %d\n", authStatus.AttemptsLeft)
-		color.Red("Attempts Left: %d", authStatus.AttemptsLeft)
-		color.Red("Please try again....")
 	case gotgproto.AuthStatusPasswordRetrial:
-		color.Red("The 2FA password you just entered seems to be incorrect,")
+		fmt.Printf("The 2FA password is incorrect. Attempts left: %d\n", authStatus.AttemptsLeft)
-		color.Red("Attempts Left: %d", authStatus.AttemptsLeft)
-		color.Red("Please try again....")
 	case gotgproto.AuthStatusPhoneCodeRetrial:
-		color.Red("The OTP you just entered seems to be incorrect,")
+		fmt.Printf("The OTP code is incorrect. Attempts left: %d\n", authStatus.AttemptsLeft)
-		color.Red("Attempts Left: %d", authStatus.AttemptsLeft)
-		color.Red("Please try again....")
 	default:
 	}
 }

client/user/userclient.go

@@ -6,15 +6,17 @@ import (
 
 	"github.com/celestix/gotgproto"
 	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/dispatcher/handlers"
+	"github.com/celestix/gotgproto/dispatcher/handlers/filters"
 	"github.com/celestix/gotgproto/ext"
 	"github.com/celestix/gotgproto/sessionMaker"
+
 	"github.com/charmbracelet/log"
-	"github.com/gotd/td/telegram/dcs"
+	"github.com/gotd/td/tg"
 	"github.com/krau/SaveAny-Bot/client/middleware"
-	"github.com/krau/SaveAny-Bot/common/utils/netutil"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 	"github.com/krau/SaveAny-Bot/config"
-	"github.com/ncruces/go-sqlite3/gormlite"
+	"github.com/krau/SaveAny-Bot/database"
-	"golang.org/x/net/proxy"
 )
 
 var uc *gotgproto.Client
@@ -48,33 +50,25 @@ func Login(ctx context.Context) (*gotgproto.Client, error) {
 		err    error
 	})
 	go func() {
-		var resolver dcs.Resolver
+		resolver, err := tgutil.NewConfigProxyResolver()
-		if config.Cfg.Telegram.Proxy.Enable && config.Cfg.Telegram.Proxy.URL != "" {
+		if err != nil {
-			dialer, err := netutil.NewProxyDialer(config.Cfg.Telegram.Proxy.URL)
+			res <- struct {
-			if err != nil {
+				client *gotgproto.Client
-				res <- struct {
+				err    error
-					client *gotgproto.Client
+			}{nil, err}
-					err    error
+			return
-				}{nil, err}
-				return
-			}
-			resolver = dcs.Plain(dcs.PlainOptions{
-				Dial: dialer.(proxy.ContextDialer).DialContext,
-			})
-		} else {
-			resolver = dcs.DefaultResolver()
 		}
 		tclient, err := gotgproto.NewClient(
-			config.Cfg.Telegram.AppID,
+			config.C().Telegram.AppID,
-			config.Cfg.Telegram.AppHash,
+			config.C().Telegram.AppHash,
 			gotgproto.ClientTypePhone(""),
 			&gotgproto.ClientOpts{
-				Session:          sessionMaker.SqlSession(gormlite.Open(config.Cfg.Telegram.Userbot.Session)),
+				Session:          sessionMaker.SqlSession(database.GetDialect(config.C().Telegram.Userbot.Session)),
 				AuthConversator:  &terminalAuthConversator{},
 				Context:          ctx,
 				DisableCopyright: true,
 				Resolver:         resolver,
-				MaxRetries:       config.Cfg.Telegram.RpcRetry,
+				MaxRetries:       config.C().Telegram.RpcRetry,
 				AutoFetchReply:   true,
 				Middlewares:      middleware.NewDefaultMiddlewares(ctx, 5*time.Minute),
 				ErrorHandler: func(ctx *ext.Context, u *ext.Update, s string) error {
@@ -106,6 +100,19 @@ func Login(ctx context.Context) (*gotgproto.Client, error) {
 			return nil, r.err
 		}
 		uc = r.client
+		uc.Dispatcher.AddHandler(handlers.NewMessage(filters.Message.Media, func(ctx *ext.Context, u *ext.Update) error {
+			switch u.UpdateClass.(type) {
+			case *tg.UpdateEditChannelMessage, *tg.UpdateEditMessage, *tg.UpdateDeleteChannelMessages, *tg.UpdateDeleteMessages:
+				return dispatcher.EndGroups
+			}
+			chatId := u.EffectiveChat().GetID()
+			watchChats, err := database.GetWatchChatsByChatID(ctx, chatId)
+			if err != nil || len(watchChats) == 0 {
+				return dispatcher.EndGroups
+			}
+			return dispatcher.ContinueGroups
+		}))
+		uc.Dispatcher.AddHandler(handlers.NewMessage(filters.Message.Media, handleMediaMessage))
 		log.FromContext(ctx).Infof("User client logged in successfully: %s", uc.Self.FirstName+" "+uc.Self.LastName)
 		return uc, nil
 	}

client/user/watch.go

@@ -0,0 +1,100 @@
+package user
+
+import (
+	"sync"
+	"time"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+	"github.com/krau/SaveAny-Bot/pkg/tfile"
+)
+
+type MediaMessageEvent struct {
+	Ctx       *ext.Context
+	ChatID    int64 // from witch the media message was sent
+	MessageID int
+	File      tfile.TGFileMessage
+}
+
+type messageKey struct {
+	ChatID    int64
+	MessageID int
+}
+
+type MediaMessageHandler struct {
+	events   map[messageKey]MediaMessageEvent
+	timers   map[messageKey]*time.Timer
+	mu       sync.Mutex
+	debounce time.Duration
+}
+
+var (
+	mediaMessageCh      = make(chan MediaMessageEvent, 100)
+	mediaMessageHandler = &MediaMessageHandler{
+		events:   make(map[messageKey]MediaMessageEvent),
+		timers:   make(map[messageKey]*time.Timer),
+		debounce: 5 * time.Second,
+	}
+)
+
+func GetMediaMessageCh() chan MediaMessageEvent {
+	return mediaMessageCh
+}
+
+func sendMediaMessageEvent(event MediaMessageEvent) {
+	key := messageKey{ChatID: event.ChatID, MessageID: event.MessageID}
+
+	mediaMessageHandler.mu.Lock()
+	defer mediaMessageHandler.mu.Unlock()
+
+	if timer, exists := mediaMessageHandler.timers[key]; exists {
+		timer.Stop()
+	} else {
+		mediaMessageHandler.events[key] = event
+	}
+
+	mediaMessageHandler.timers[key] = time.AfterFunc(mediaMessageHandler.debounce, func() {
+		mediaMessageHandler.mu.Lock()
+		event := mediaMessageHandler.events[key]
+		delete(mediaMessageHandler.events, key)
+		delete(mediaMessageHandler.timers, key)
+		mediaMessageHandler.mu.Unlock()
+
+		mediaMessageCh <- event
+	})
+}
+
+func handleMediaMessage(ctx *ext.Context, update *ext.Update) error {
+	message := update.EffectiveMessage
+	media, ok := message.GetMedia()
+	if !ok || media == nil {
+		return dispatcher.EndGroups
+	}
+	support := func() bool {
+		switch media.(type) {
+		case *tg.MessageMediaDocument, *tg.MessageMediaPhoto:
+			return true
+		default:
+			return false
+		}
+	}()
+	if !support {
+		return dispatcher.EndGroups
+	}
+	file, err := tfile.FromMediaMessage(media, ctx.Raw, message.Message, tfile.WithNameIfEmpty(
+		tgutil.GenFileNameFromMessage(*message.Message),
+	))
+	if err != nil {
+		return err
+	}
+	chatId := update.EffectiveChat().GetID()
+	sendMediaMessageEvent(MediaMessageEvent{
+		Ctx:       ctx,
+		ChatID:    chatId,
+		MessageID: message.ID,
+		File:      file,
+	})
+	return dispatcher.EndGroups
+}

cmd/geni18n/main.go

@@ -8,9 +8,10 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
-	"regexp"
 	"sort"
 	"strings"
+
+	"github.com/goccy/go-yaml"
 )
 
 func main() {
@@ -20,28 +21,27 @@ func main() {
 	flag.Parse()
 
 	keys := make(map[string]struct{})
-	re := regexp.MustCompile(`^\s*\[+\s*([^\]\[]+)\s*\]+`)
 
 	err := filepath.WalkDir(*dir, func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
-		if d.IsDir() || !strings.HasSuffix(d.Name(), ".toml") {
+		if d.IsDir() || !(strings.HasSuffix(d.Name(), ".yaml") || strings.HasSuffix(d.Name(), ".yml")) {
 			return nil
 		}
-		f, err := os.Open(path)
+
+		data, err := os.ReadFile(path)
 		if err != nil {
 			return err
 		}
-		defer f.Close()
 
-		s := bufio.NewScanner(f)
+		var content map[string]interface{}
-		for s.Scan() {
+		if err := yaml.Unmarshal(data, &content); err != nil {
-			if m := re.FindStringSubmatch(s.Text()); m != nil {
+			return fmt.Errorf("failed to parse yaml %s: %w", path, err)
-				keys[m[1]] = struct{}{}
-			}
 		}
-		return s.Err()
+
+		collectKeys(content, "", keys)
+		return nil
 	})
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error walking directory: %v\n", err)
@@ -62,23 +62,44 @@ func main() {
 	defer f.Close()
 
 	w := bufio.NewWriter(f)
-	fmt.Fprintf(w, "// Code generated by cmd/gen_i18n. DO NOT EDIT.\n")
+	fmt.Fprintf(w, "// Code generated by cmd/geni18n. DO NOT EDIT.\n")
 	fmt.Fprintf(w, "package %s\n\n", *pkg)
+	fmt.Fprintf(w, "type Key string\n\n")
 	fmt.Fprintf(w, "const (\n")
 	for _, key := range list {
 		name := toPascal(key)
-		fmt.Fprintf(w, "\t%s = %q\n", name, key)
+		fmt.Fprintf(w, "\t%s Key = %q\n", name, key)
 	}
 	fmt.Fprintf(w, ")\n")
 	w.Flush()
 }
 
+func collectKeys(node map[string]interface{}, prefix string, keys map[string]struct{}) {
+	for k, v := range node {
+		fullKey := k
+		if prefix != "" {
+			fullKey = prefix + "." + k
+		}
+		switch val := v.(type) {
+		case map[string]interface{}:
+			collectKeys(val, fullKey, keys)
+		default:
+			keys[fullKey] = struct{}{}
+		}
+	}
+}
+
+// 转 PascalCase
 func toPascal(key string) string {
 	parts := strings.Split(key, ".")
 	for i, p := range parts {
-		if len(p) > 0 {
+		subs := strings.Split(p, "_")
-			parts[i] = strings.ToUpper(string(p[0])) + p[1:]
+		for j, s := range subs {
+			if len(s) > 0 {
+				subs[j] = strings.ToUpper(s[:1]) + s[1:]
+			}
 		}
+		parts[i] = strings.Join(subs, "")
 	}
 	return strings.Join(parts, "")
 }

cmd/run.go

@@ -19,12 +19,13 @@ import (
 	"github.com/krau/SaveAny-Bot/config"
 	"github.com/krau/SaveAny-Bot/core"
 	"github.com/krau/SaveAny-Bot/database"
+	"github.com/krau/SaveAny-Bot/parsers"
 	"github.com/krau/SaveAny-Bot/storage"
 	"github.com/spf13/cobra"
 )
 
 func Run(cmd *cobra.Command, _ []string) {
-	ctx := cmd.Context()
+	ctx, cancel := context.WithCancel(cmd.Context())
 	logger := log.NewWithOptions(os.Stdout, log.Options{
 		Level:           log.DebugLevel,
 		ReportTimestamp: true,
@@ -33,66 +34,84 @@ func Run(cmd *cobra.Command, _ []string) {
 	})
 	ctx = log.WithContext(ctx, logger)
 
-	initAll(ctx)
+	exitChan, err := initAll(ctx)
+	if err != nil {
+		logger.Fatal("Init failed", "error", err)
+	}
+	go func() {
+		<-exitChan
+		cancel()
+	}()
+
 	core.Run(ctx)
 
 	<-ctx.Done()
-	logger.Info(i18n.T(i18nk.Exiting))
+	logger.Info(i18n.T(i18nk.LifetimeExiting))
-	defer logger.Info(i18n.T(i18nk.Bye))
+	defer logger.Info(i18n.T(i18nk.LifetimeBye))
 	cleanCache()
 }
 
-func initAll(ctx context.Context) {
+func initAll(ctx context.Context) (<-chan struct{}, error) {
 	if err := config.Init(ctx); err != nil {
-		fmt.Println("Failed to load config:", err)
+		return nil, fmt.Errorf("failed to load config: %w", err)
-		os.Exit(1)
 	}
 	cache.Init()
 	logger := log.FromContext(ctx)
-	i18n.Init(config.Cfg.Lang)
+	i18n.Init(config.C().Lang)
-	logger.Info(i18n.T(i18nk.Initing))
+	logger.Info(i18n.T(i18nk.LifetimeIniting))
 	database.Init(ctx)
 	storage.LoadStorages(ctx)
-	if config.Cfg.Telegram.Userbot.Enable {
+	if config.C().Parser.PluginEnable {
-		_, err := userclient.Login(ctx)
+		for _, dir := range config.C().Parser.PluginDirs {
-		if err != nil {
+			if err := parsers.LoadPlugins(ctx, dir); err != nil {
-			logger.Fatalf("User client login failed: %s", err)
+				logger.Error(i18n.T(i18nk.ParserPluginLoadFailed), "dir", dir, "error", err)
+			} else {
+				logger.Debug(i18n.T(i18nk.ParserPluginLoadedDir), "dir", dir)
+			}
 		}
 	}
-	bot.Init(ctx)
+	if config.C().Telegram.Userbot.Enable {
+		_, err := userclient.Login(ctx)
+		if err != nil {
+			logger.Fatal(i18n.T(i18nk.LifetimeUserLoginFailed, map[string]any{
+				"Error": err,
+			}))
+		}
+	}
+	return bot.Init(ctx), nil
 }
 
 func cleanCache() {
-	if config.Cfg.NoCleanCache {
+	if config.C().NoCleanCache {
 		return
 	}
-	if config.Cfg.Temp.BasePath != "" && !config.Cfg.Stream {
+	if config.C().Temp.BasePath != "" && !config.C().Stream {
-		if slices.Contains([]string{"/", ".", "\\", ".."}, filepath.Clean(config.Cfg.Temp.BasePath)) {
+		if slices.Contains([]string{"/", ".", "\\", ".."}, filepath.Clean(config.C().Temp.BasePath)) {
-			log.Error(i18n.T(i18nk.InvalidCacheDir, map[string]any{
+			log.Error(i18n.T(i18nk.ConfigErrInvalidCacheDir, map[string]any{
-				"Path": config.Cfg.Temp.BasePath,
+				"Path": config.C().Temp.BasePath,
 			}))
 			return
 		}
 		currentDir, err := os.Getwd()
 		if err != nil {
-			log.Error(i18n.T(i18nk.GetWorkdirFailed, map[string]any{
+			log.Error(i18n.T(i18nk.ErrGetWorkdirFailed, map[string]any{
 				"Error": err,
 			}))
 			return
 		}
-		cachePath := filepath.Join(currentDir, config.Cfg.Temp.BasePath)
+		cachePath := filepath.Join(currentDir, config.C().Temp.BasePath)
 		cachePath, err = filepath.Abs(cachePath)
 		if err != nil {
-			log.Error(i18n.T(i18nk.GetCacheAbsPathFailed, map[string]any{
+			log.Error(i18n.T(i18nk.ErrGetCacheAbsPathFailed, map[string]any{
 				"Error": err,
 			}))
 			return
 		}
-		log.Info(i18n.T(i18nk.CleaningCache, map[string]any{
+		log.Info(i18n.T(i18nk.LifetimeCleaningCache, map[string]any{
 			"Path": cachePath,
 		}))
 		if err := fsutil.RemoveAllInDir(cachePath); err != nil {
-			log.Error(i18n.T(i18nk.CleanCacheFailed, map[string]any{
+			log.Error(i18n.T(i18nk.ErrCleanCacheFailed, map[string]any{
 				"Error": err,
 			}))
 		}

cmd/version.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/krau/SaveAny-Bot/pkg/consts"
+	"github.com/krau/SaveAny-Bot/config"
-	"github.com/rhysd/go-github-selfupdate/selfupdate"
+	"github.com/unvgo/ghselfupdate"
 
 	"github.com/blang/semver"
 	"github.com/spf13/cobra"
@@ -16,7 +16,7 @@ var VersionCmd = &cobra.Command{
 	Aliases: []string{"v"},
 	Short:   "Print the version number of saveany-bot",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Printf("saveany-bot version: %s %s/%s\nBuildTime: %s, Commit: %s\n", consts.Version, runtime.GOOS, runtime.GOARCH, consts.BuildTime, consts.GitCommit)
+		fmt.Printf("saveany-bot version: %s %s/%s\nBuildTime: %s, Commit: %s\n", config.Version, runtime.GOOS, runtime.GOARCH, config.BuildTime, config.GitCommit)
 	},
 }
 
@@ -25,18 +25,33 @@ var upgradeCmd = &cobra.Command{
 	Aliases: []string{"up"},
 	Short:   "Upgrade saveany-bot to the latest version",
 	Run: func(cmd *cobra.Command, args []string) {
-		v := semver.MustParse(consts.Version)
+		v := semver.MustParse(config.Version)
-		latest, err := selfupdate.UpdateSelf(v, "krau/SaveAny-Bot")
+		latest, found, err := ghselfupdate.DetectLatest(config.GitRepo)
 		if err != nil {
-			fmt.Println("Binary update failed:", err)
+			fmt.Println("Error occurred while detecting latest version:", err)
 			return
 		}
-		if latest.Version.Equals(v) {
+		if !found {
-			fmt.Println("Current binary is the latest version", consts.Version)
+			fmt.Println("No releases found")
-		} else {
+			return
-			fmt.Println("Successfully updated to version", latest.Version)
-			fmt.Println("Release note:\n", latest.ReleaseNotes)
 		}
+		if latest.Version.Major != v.Major {
+			fmt.Printf("Major version upgrade detected: %s -> %s. Please manually download the latest version and check the migration guide.\n", v, latest.Version)
+			return
+		}
+		if latest.Version.Equals(v) || latest.Version.LT(v) {
+			fmt.Println("Current binary is the latest version", config.Version)
+			return
+		}
+		fmt.Printf("Updating to version %s...\n", latest.Version)
+		latest, err = ghselfupdate.UpdateSelf(v, config.GitRepo)
+		if err != nil {
+			fmt.Println("Update failed:", err)
+			return
+		}
+		fmt.Println("Successfully updated to version", latest.Version)
+		fmt.Println("Release note:\n", latest.ReleaseNotes)
+
 	},
 }
 

common/cache/ristretto.go

@@ -16,8 +16,8 @@ func Init() {
 		panic("cache already initialized")
 	}
 	c, err := ristretto.NewCache(&ristretto.Config[string, any]{
-		NumCounters: config.Cfg.Cache.NumCounters,
+		NumCounters: config.C().Cache.NumCounters,
-		MaxCost:     config.Cfg.Cache.MaxCost,
+		MaxCost:     config.C().Cache.MaxCost,
 		BufferItems: 64,
 		OnReject: func(item *ristretto.Item[any]) {
 			log.Warnf("Cache item rejected: key=%d, value=%v", item.Key, item.Value)
@@ -30,7 +30,7 @@ func Init() {
 }
 
 func Set(key string, value any) error {
-	ok := cache.SetWithTTL(key, value, 0, time.Duration(config.Cfg.Cache.TTL)*time.Second)
+	ok := cache.SetWithTTL(key, value, 0, time.Duration(config.C().Cache.TTL)*time.Second)
 	if !ok {
 		return fmt.Errorf("failed to set value in cache")
 	}

common/i18n/i18n.go

@@ -1,3 +1,5 @@
+// [TODO] complete the i18n support
+
 package i18n
 
 import (
@@ -5,12 +7,13 @@ import (
 
 	"maps"
 
+	"github.com/goccy/go-yaml"
+	"github.com/krau/SaveAny-Bot/common/i18n/i18nk"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
-	"github.com/pelletier/go-toml/v2"
 	"golang.org/x/text/language"
 )
 
-//go:embed locale/*.toml
+//go:embed locale/*
 var localesFS embed.FS
 
 var (
@@ -20,7 +23,7 @@ var (
 
 func Init(lang string) {
 	bundle = i18n.NewBundle(language.SimplifiedChinese)
-	bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal)
+	bundle.RegisterUnmarshalFunc("yaml", yaml.Unmarshal)
 	files, err := localesFS.ReadDir("locale")
 	if err != nil {
 		panic("failed to read locale directory: " + err.Error())
@@ -39,7 +42,7 @@ func Init(lang string) {
 	}
 }
 
-func T(key string, templateData ...map[string]any) string {
+func T(key i18nk.Key, templateData ...map[string]any) string {
 	if localizer == nil || bundle == nil {
 		panic("localizer or bundle is not initialized, call Init() first")
 	}
@@ -48,11 +51,11 @@ func T(key string, templateData ...map[string]any) string {
 		maps.Copy(templateDataMap, data)
 	}
 	msg, err := localizer.Localize(&i18n.LocalizeConfig{
-		MessageID:    key,
+		MessageID:    string(key),
 		TemplateData: templateDataMap,
 	})
 	if err != nil {
-		return key
+		return string(key)
 	}
 	return msg
 }
@@ -77,32 +80,32 @@ func TWithLang(lang, key string, templateData ...map[string]any) string {
 }
 
 // Only use in tests or packages that load before i18n
-func TWithoutInit(lang, key string, templateData ...map[string]any) string {
+func TWithoutInit(lang string, key i18nk.Key, templateData ...map[string]any) string {
 	bundle := i18n.NewBundle(language.SimplifiedChinese)
-	bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal)
+	bundle.RegisterUnmarshalFunc("yaml", yaml.Unmarshal)
 	files, err := localesFS.ReadDir("locale")
 	if err != nil {
-		return key
+		return string(key)
 	}
 	for _, file := range files {
 		if _, err := bundle.LoadMessageFileFS(localesFS, "locale/"+file.Name()); err != nil {
-			return key
+			return string(key)
 		}
 	}
 	localizer := i18n.NewLocalizer(bundle, lang)
 	if localizer == nil {
-		return key
+		return string(key)
 	}
 	templateDataMap := make(map[string]any)
 	for _, data := range templateData {
 		maps.Copy(templateDataMap, data)
 	}
 	msg, err := localizer.Localize(&i18n.LocalizeConfig{
-		MessageID:    key,
+		MessageID:    string(key),
 		TemplateData: templateDataMap,
 	})
 	if err != nil {
-		return key
+		return string(key)
 	}
 	return msg
 }

common/i18n/i18nk/keys.go

@@ -1,19 +1,24 @@
-// Code generated by cmd/gen_i18n. DO NOT EDIT.
+// Code generated by cmd/geni18n. DO NOT EDIT.
 package i18nk
 
+type Key string
+
 const (
-	CleanCacheFailed = "CleanCacheFailed"
+	BotMsgHelpTextFmt Key = "bot.msg.help_text_fmt"
-	CleaningCache = "CleaningCache"
+	BotMsgSaveHelpText Key = "bot.msg.save_help_text"
-	ConfigInvalidDuplicateStorageName = "ConfigInvalid.DuplicateStorageName"
+	BotMsgWatchHelpText Key = "bot.msg.watch_help_text"
-	ConfigInvalidWorkersOrRetry = "ConfigInvalid.WorkersOrRetry"
+	ConfigErrDuplicateStorageName Key = "config.err.duplicate_storage_name"
-	CreateRmTimerFailed = "CreateRmTimerFailed"
+	ConfigErrInvalidCacheDir Key = "config.err.invalid_cache_dir"
-	GetCacheAbsPathFailed = "GetCacheAbsPathFailed"
+	ConfigLoadedStorages Key = "config.loaded_storages"
-	GetWorkdirFailed = "GetWorkdirFailed"
+	ErrCleanCacheFailed Key = "err.clean_cache_failed"
-	InvalidCacheDir = "InvalidCacheDir"
+	ErrGetCacheAbsPathFailed Key = "err.get_cache_abs_path_failed"
-	LoadedStorages = "LoadedStorages"
+	ErrGetWorkdirFailed Key = "err.get_workdir_failed"
-	RemoveFileAfter = "RemoveFileAfter"
+	LifetimeBye Key = "lifetime.bye"
-	RemoveFileFailed = "RemoveFileFailed"
+	LifetimeCleaningCache Key = "lifetime.cleaning_cache"
-	Bye = "bye"
+	LifetimeExiting Key = "lifetime.exiting"
-	Exiting = "exiting"
+	LifetimeInitfailed Key = "lifetime.initfailed"
-	Initing = "initing"
+	LifetimeIniting Key = "lifetime.initing"
+	LifetimeUserLoginFailed Key = "lifetime.user_login_failed"
+	ParserPluginLoadFailed Key = "parser.plugin.load_failed"
+	ParserPluginLoadedDir Key = "parser.plugin.loaded_dir"
 )

common/i18n/locale/zh-Hans.toml

@@ -1,28 +0,0 @@
-[initing]
-other = "正在启动..."
-[exiting]
-other = "正在退出..."
-[bye]
-other = "已退出"
-[InvalidCacheDir]
-other = "无效的缓存文件夹: {{.Path}}"
-[GetWorkdirFailed]
-other = "获取工作目录失败: {{.Error}}"
-[GetCacheAbsPathFailed]
-other = "获取缓存绝对路径失败: {{.Error}}"
-[CleaningCache]
-other = "正在清理缓存文件夹: {{.Path}}"
-[CleanCacheFailed]
-other = "清理缓存失败: {{.Error}}"
-[CreateRmTimerFailed]
-other = "创建清理定时器失败, 路径: {{.Path}}, 错误: {{.Error}}"
-[RemoveFileAfter]
-other = "将在 {{.Duration}} 后删除文件: {{.Path}}"
-[RemoveFileFailed]
-other = "删除文件失败: {{.Path}}, 错误: {{.Error}}"
-[LoadedStorages]
-other = "已加载 {{.Count}} 个存储"
-[ConfigInvalid.WorkersOrRetry]
-other = "配置无效: workers 或 retry 必须大于 0, 但当前值为: workers={{.Workers}}, retry={{.Retry}}"
-[ConfigInvalid.DuplicateStorageName]
-other = "存储名称重复: {{.Name}}"

common/i18n/locale/zh-Hans.yaml

@@ -0,0 +1,66 @@
+lifetime:
+  initing: 正在启动
+  initfailed: 初始化失败
+  exiting: 正在退出
+  user_login_failed: "用户登录失败: {{.Error}}"
+  cleaning_cache: "正在清理缓存 {{.Path}}"
+  bye: 已退出
+config:
+  loaded_storages: "已加载 {{.Count}} 个存储后端"
+  err:
+    invalid_cache_dir: "无效的缓存目录: {{.Path}}，请检查配置文件"
+    duplicate_storage_name: "存储名称 '{{.Name}}' 重复，请检查配置文件"
+err:
+  get_workdir_failed: "获取工作目录失败: {{.Error}}"
+  get_cache_abs_path_failed: "获取缓存绝对路径失败: {{.Error}}"
+  clean_cache_failed: "清理缓存失败: {{.Error}}"
+parser:
+  plugin:
+    load_failed: 加载解析器插件失败
+    loaded_dir: 解析器插件已加载
+bot:
+  msg:
+    help_text_fmt: |
+      Save Any Bot - 转存你的 Telegram 文件
+      版本: %s , 提交: %s
+
+      命令:
+      /start - 开始使用
+      /help - 显示帮助
+      /silent - 开关静默模式
+      /storage - 设置默认存储位置
+      /save [自定义文件名] - 保存文件
+      /dir - 管理存储目录
+      /rule - 管理规则
+      /config - 修改配置
+      /fnametmpl - 设置文件自定义命名模板
+      /parser - 管理解析器插件
+      /watch - 监听聊天并自动保存 (UserBot)
+      /update - 检查更新并升级
+
+      使用帮助: https://sabot.unv.app/usage
+      反馈群组: https://t.me/ProjectSaveAny
+    save_help_text: |
+      使用方法:
+
+      1. 使用该命令回复要保存的文件, 可选文件名参数.
+      示例:
+      /save custom_file_name.mp4
+
+      2. 设置默认存储后, 发送 /save <频道ID/用户名> <消息ID范围> 来批量保存文件. 遵从存储规则, 若未匹配到任何规则则使用默认存储.
+      示例:
+      /save @acherkrau 114-514
+    watch_help_text: |
+      使用 /watch 命令监听一个聊天的消息, 并自动保存到默认存储中, 遵从存储规则.
+
+      命令语法:
+      /watch <chat_id> [filter]
+
+      参数:
+      - <chat_id>: 聊天的 ID 或用户名
+      - [filter]: 可选, 格式为 过滤器类型:表达式 , 所有支持类型的过滤器请查看文档
+
+      命令示例:
+      /watch -1002229835658 msgre:.*plana.*
+
+      这将监听 ID 为 -1002229835658 的聊天, 并转存所有包含 "plana" 的媒体消息

common/tdler/dler.go

@@ -1,17 +1,14 @@
-package tfile
+package tdler
 
 import (
 	"github.com/gotd/td/telegram/downloader"
 	"github.com/krau/SaveAny-Bot/common/utils/dlutil"
 	"github.com/krau/SaveAny-Bot/config"
 	"github.com/krau/SaveAny-Bot/pkg/consts/tglimit"
+	"github.com/krau/SaveAny-Bot/pkg/tfile"
 )
 
-type DlerClient interface {
+func NewDownloader(file tfile.TGFile) *downloader.Builder {
-	downloader.Client
-}
-
-func NewDownloader(file TGFile) *downloader.Builder {
 	return downloader.NewDownloader().WithPartSize(tglimit.MaxPartSize).
-		Download(file.Dler(), file.Location()).WithThreads(dlutil.BestThreads(file.Size(), config.Cfg.Threads))
+		Download(file.Dler(), file.Location()).WithThreads(dlutil.BestThreads(file.Size(), config.C().Threads))
 }

common/utils/fsutil/fs.go

@@ -3,6 +3,8 @@ package fsutil
 import (
 	"os"
 	"path/filepath"
+	"strings"
+	"unicode"
 
 	"github.com/gabriel-vasile/mimetype"
 )
@@ -55,3 +57,21 @@ func CreateFile(fp string) (*File, error) {
 	}
 	return &File{File: file}, nil
 }
+
+func NormalizePathname(s string) string {
+	specials := `\/:*?"<>|` + "\n\r\t"
+	var builder strings.Builder
+	for _, ch := range s {
+		if strings.ContainsRune(specials, ch) || unicode.IsControl(ch) {
+			builder.WriteRune('_')
+		} else {
+			builder.WriteRune(ch)
+		}
+	}
+
+	result := strings.TrimRightFunc(builder.String(), func(r rune) bool {
+		return r == '.' || r == '_' || unicode.IsSpace(r)
+	})
+
+	return result
+}

common/utils/fsutil/normalize_pathname_test.go

@@ -0,0 +1,46 @@
+package fsutil_test
+
+import (
+	"testing"
+
+	"github.com/krau/SaveAny-Bot/common/utils/fsutil"
+)
+
+func TestNormalizePathname(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected string
+	}{
+		{
+			input:    "hello/world?.txt  ",
+			expected: "hello_world_.txt",
+		},
+		{
+			input:    "bad|name:\nfile\r.",
+			expected: "bad_name__file",
+		},
+		{
+			input:    "normal.txt",
+			expected: "normal.txt",
+		},
+		{
+			input:    "test....   ",
+			expected: "test",
+		},
+		{
+			input:    "abc<>def",
+			expected: "abc__def",
+		},
+		{
+			input:    "with\tcontrol",
+			expected: "with_control",
+		},
+	}
+
+	for _, tc := range tests {
+		got := fsutil.NormalizePathname(tc.input)
+		if got != tc.expected {
+			t.Errorf("NormalizePathname(%q) = %q; want %q", tc.input, got, tc.expected)
+		}
+	}
+}

common/utils/ioutil/writer.go

@@ -1,6 +1,8 @@
 package ioutil
 
-import "io"
+import (
+	"io"
+)
 
 type ProgressWriterAt struct {
 	wrAt    io.WriterAt
@@ -46,4 +48,4 @@ func NewProgressWriter(
 		wr:      wr,
 		onWrite: onWrite,
 	}
-}
+}

common/utils/netutil/proxy.go

@@ -1,15 +1,78 @@
 package netutil
 
 import (
+	"context"
+	"fmt"
+	"net"
+	"net/http"
 	"net/url"
+	"sync"
+	"time"
 
+	"github.com/charmbracelet/log"
+	"github.com/krau/SaveAny-Bot/config"
 	"golang.org/x/net/proxy"
 )
 
-func NewProxyDialer(proxyUrl string) (proxy.Dialer, error) {
+func NewProxyHTTPClient(proxyUrl string) (*http.Client, error) {
-	url, err := url.Parse(proxyUrl)
+	if proxyUrl == "" {
+		return http.DefaultClient, nil
+	}
+	transport, err := NewProxyTransport(proxyUrl)
 	if err != nil {
 		return nil, err
 	}
-	return proxy.FromURL(url, proxy.Direct)
+	return &http.Client{
+		Transport: transport,
+	}, nil
+}
+
+var (
+	defaultProxyHttpClient         *http.Client
+	onceLoadDefaultProxyHttpClient sync.Once
+)
+
+func DefaultParserHTTPClient() *http.Client {
+	onceLoadDefaultProxyHttpClient.Do(func() {
+		client, err := NewProxyHTTPClient(config.C().Parser.Proxy)
+		if err != nil {
+			log.Warn("Failed to create default proxy HTTP client, using http.DefaultClient", "error", err)
+			defaultProxyHttpClient = http.DefaultClient
+		} else {
+			defaultProxyHttpClient = client
+		}
+	})
+	return defaultProxyHttpClient
+}
+
+func NewProxyTransport(proxyStr string) (*http.Transport, error) {
+	proxyURL, err := url.Parse(proxyStr)
+	if err != nil {
+		return nil, err
+	}
+	transport := &http.Transport{
+		ForceAttemptHTTP2:     true,
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+	}
+	switch proxyURL.Scheme {
+	case "http", "https":
+		transport.Proxy = http.ProxyURL(proxyURL)
+
+	case "socks5", "socks5h":
+		dialer, err := proxy.FromURL(proxyURL, proxy.Direct)
+		if err != nil {
+			return nil, err
+		}
+		transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
+			return dialer.(proxy.ContextDialer).DialContext(ctx, network, addr)
+		}
+
+	default:
+		return nil, fmt.Errorf("unsupported proxy type: %s", proxyURL.Scheme)
+	}
+
+	return transport, nil
 }

common/utils/strutil/string.go

@@ -48,3 +48,46 @@ func ParseIntStrRange(input string, sep string) (int64, int64, error) {
 	}
 	return min, max, nil
 }
+
+func ParseArgsRespectQuotes(input string) []string {
+	var args []string
+	var current strings.Builder
+	inQuotes := false
+	escaped := false
+
+	for _, r := range input {
+		switch {
+		case escaped:
+			if r == '"' || r == '\\' {
+				current.WriteRune(r)
+			} else {
+				current.WriteRune('\\')
+				current.WriteRune(r)
+			}
+			escaped = false
+
+		case r == '\\':
+			escaped = true
+
+		case r == '"':
+			inQuotes = !inQuotes
+
+		case r == ' ' || r == '\t':
+			if inQuotes {
+				current.WriteRune(r)
+			} else if current.Len() > 0 {
+				args = append(args, current.String())
+				current.Reset()
+			}
+
+		default:
+			current.WriteRune(r)
+		}
+	}
+
+	if current.Len() > 0 {
+		args = append(args, current.String())
+	}
+
+	return args
+}

common/utils/strutil/string_test.go

@@ -0,0 +1,148 @@
+package strutil_test
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/krau/SaveAny-Bot/common/utils/strutil"
+)
+
+func TestExtractTagsFromText(t *testing.T) {
+	tests := []struct {
+		text     string
+		expected []string
+	}{
+		{
+			text: `初音ミクHappy 16th Birthday -Dear Creators-
+			✨エンドイラスト公開！✨
+			https://piapro.net/miku16thbd/
+			#初音ミク #miku16th`,
+			expected: []string{"初音ミク", "miku16th"},
+		},
+		{
+			text: `ひっつきむし
+			#創作百合`,
+			expected: []string{"創作百合"},
+		},
+		{
+			text:     `#創作百合 #原创`,
+			expected: []string{"創作百合", "原创"},
+		},
+		{
+			text:     `プラニャ　#ブルアカ`,
+			expected: []string{"ブルアカ"},
+		},
+		{
+			text:     `原神是一款#开放世界#冒险游戏，由中国著名游戏公司#miHoYo开发。`,
+			expected: []string{},
+		},
+	}
+
+	for _, test := range tests {
+		result := strutil.ExtractTagsFromText(test.text)
+		if !reflect.DeepEqual(result, test.expected) {
+			t.Fatalf("ExtractTagsFromText(%s) = %v, expected %v", test.text, result, test.expected)
+		}
+	}
+}
+
+func TestParseIntStrRange(t *testing.T) {
+	tests := []struct {
+		name    string
+		input   string
+		sep     string
+		wantMin int64
+		wantMax int64
+		wantErr bool
+	}{
+		{
+			name:    "normal range",
+			input:   "10-20",
+			sep:     "-",
+			wantMin: 10,
+			wantMax: 20,
+		},
+		{
+			name:    "reverse order",
+			input:   "30 - 10",
+			sep:     "-",
+			wantMin: 10,
+			wantMax: 30,
+		},
+		{
+			name:    "invalid format",
+			input:   "10",
+			sep:     "-",
+			wantErr: true,
+		},
+		{
+			name:    "invalid number",
+			input:   "a-b",
+			sep:     "-",
+			wantErr: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			min, max, err := strutil.ParseIntStrRange(tt.input, tt.sep)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("ParseIntStrRange(%q) error = %v, wantErr %v", tt.input, err, tt.wantErr)
+				return
+			}
+			if !tt.wantErr {
+				if min != tt.wantMin || max != tt.wantMax {
+					t.Errorf("ParseIntStrRange(%q) = (%d, %d), want (%d, %d)", tt.input, min, max, tt.wantMin, tt.wantMax)
+				}
+			}
+		})
+	}
+}
+
+func TestParseArgsRespectQuotes(t *testing.T) {
+	tests := []struct {
+		name  string
+		input string
+		want  []string
+	}{
+		{
+			name:  "simple split",
+			input: `/rule add FILENAME-REGEX (?i)\.(mp4|mkv)$ "我的 Alist" /视频`,
+			want:  []string{"/rule", "add", "FILENAME-REGEX", "(?i)\\.(mp4|mkv)$", "我的 Alist", "/视频"},
+		},
+		{
+			name:  "escaped quotes",
+			input: `/rule add "My \"Awesome\" Folder"`,
+			want:  []string{"/rule", "add", `My "Awesome" Folder`},
+		},
+		{
+			name:  "escaped backslash",
+			input: `/cmd "C:\\Users\\Admin" test`,
+			want:  []string{"/cmd", `C:\Users\Admin`, "test"},
+		},
+		{
+			name:  "multiple quoted parts",
+			input: `"Hello World" "你好 世界"`,
+			want:  []string{"Hello World", "你好 世界"},
+		},
+		{
+			name:  "unquoted words",
+			input: "a b c",
+			want:  []string{"a", "b", "c"},
+		},
+		{
+			name:  "mixed quotes and plain",
+			input: `cmd "quoted arg" plain`,
+			want:  []string{"cmd", "quoted arg", "plain"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := strutil.ParseArgsRespectQuotes(tt.input)
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("ParseArgsRespectQuotes(%q) = %#v, want %#v", tt.input, got, tt.want)
+			}
+		})
+	}
+}

common/utils/tgutil/media.go

@@ -0,0 +1,40 @@
+package tgutil
+
+import (
+	"fmt"
+
+	"github.com/gabriel-vasile/mimetype"
+	"github.com/gotd/td/tg"
+)
+
+func GetMediaFileName(media tg.MessageMediaClass) (string, error) {
+	switch v := media.(type) {
+	case *tg.MessageMediaPhoto:
+		f, ok := v.Photo.AsNotEmpty()
+		if !ok {
+			return "", fmt.Errorf("unknown type media: %T", media)
+		}
+		return fmt.Sprintf("%d.png", f.ID), nil
+	case *tg.MessageMediaDocument:
+		f, ok := v.Document.AsNotEmpty()
+		if !ok {
+			return "", fmt.Errorf("unknown type media: %T", media)
+		}
+		fileName := ""
+		for _, attribute := range f.Attributes {
+			if name, ok := attribute.(*tg.DocumentAttributeFilename); ok {
+				fileName = name.GetFileName()
+				break
+			}
+		}
+		if fileName == "" {
+			mmt := mimetype.Lookup(f.GetMimeType())
+			if mmt != nil {
+				fileName = fmt.Sprintf("%d.%s", f.GetID(), mmt.Extension())
+			}
+		}
+		return fileName, nil
+	default:
+		return "", fmt.Errorf("unsupported type media: %T", media)
+	}
+}

common/utils/tgutil/message.go

@@ -4,21 +4,26 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+	"unicode"
+	"unicode/utf16"
 
 	"github.com/celestix/gotgproto/ext"
 	"github.com/duke-git/lancet/v2/maputil"
-
 	"github.com/duke-git/lancet/v2/mathutil"
 	"github.com/duke-git/lancet/v2/slice"
 	lcstrutil "github.com/duke-git/lancet/v2/strutil"
 	"github.com/duke-git/lancet/v2/validator"
 	"github.com/gabriel-vasile/mimetype"
+	"github.com/gotd/td/constant"
 	"github.com/gotd/td/tg"
 	"github.com/krau/SaveAny-Bot/common/cache"
 	"github.com/krau/SaveAny-Bot/common/utils/strutil"
 	"github.com/rs/xid"
 )
 
+// generate a file name from the message content and media type
+//
+// it will never return an empty string
 func GenFileNameFromMessage(message tg.Message) string {
 	ext := func(media tg.MessageMediaClass) string {
 		switch media := media.(type) {
@@ -58,16 +63,12 @@ func GenFileNameFromMessage(message tg.Message) string {
 			return fmt.Sprintf("%s_%s", tagStr, strconv.Itoa(message.GetID()))
 		}
 		text = lcstrutil.Substring(strings.Map(func(r rune) rune {
-			if r < 0x20 || r == 0x7F {
-				return '_'
-			}
 			switch r {
-			// invalid characters
 			case '/', '\\',
 				':', '*', '?', '"', '<', '>', '|':
 				return '_'
-			// empty
+			}
-			case ' ', '\t', '\r', '\n':
+			if unicode.IsControl(r) || unicode.IsSpace(r) {
 				return '_'
 			}
 			if validator.IsPrintable(string(r)) {
@@ -82,7 +83,13 @@ func GenFileNameFromMessage(message tg.Message) string {
 	}()
 
 	if filename == "" {
-		filename = fmt.Sprintf("%d_%s", message.GetID(), xid.New().String())
+		mname, err := GetMediaFileName(message.Media)
+		if err != nil {
+			filename = fmt.Sprintf("%d_%s", message.GetID(), xid.New().String())
+		} else {
+			filename = mname
+		}
+
 	}
 	return filename + ext
 }
@@ -105,6 +112,31 @@ func InputMessageClassSliceFromInt(ids []int) []tg.InputMessageClass {
 }
 
 func GetMessagesRange(ctx *ext.Context, chatID int64, minId, maxId int) ([]*tg.Message, error) {
+	if msg, err := getMessagesRange(ctx, chatID, minId, maxId); err == nil {
+		return msg, nil
+	}
+	in := constant.TDLibPeerID(chatID)
+	plain := in.ToPlain()
+
+	var channel constant.TDLibPeerID
+	channel.Channel(plain)
+	if msg, err := getMessagesRange(ctx, int64(channel), minId, maxId); err == nil {
+		return msg, nil
+	}
+	var userID constant.TDLibPeerID
+	userID.User(plain)
+	if msg, err := getMessagesRange(ctx, int64(userID), minId, maxId); err == nil {
+		return msg, nil
+	}
+	var chat constant.TDLibPeerID
+	chat.Chat(plain)
+	if msg, err := getMessagesRange(ctx, int64(chat), minId, maxId); err == nil {
+		return msg, nil
+	}
+	return nil, fmt.Errorf("failed to get messages range for chatID %d", chatID)
+}
+
+func getMessagesRange(ctx *ext.Context, chatID int64, minId, maxId int) ([]*tg.Message, error) {
 	if minId > maxId {
 		return nil, fmt.Errorf("minId (%d) cannot be greater than maxId (%d)", minId, maxId)
 	}
@@ -160,97 +192,98 @@ func GetMessagesRange(ctx *ext.Context, chatID int64, minId, maxId int) ([]*tg.M
 	return result, nil
 }
 
-type MessageItem struct {
+// [TODO]
-	Message *tg.Message
+// type MessageItem struct {
-	Error   error
+// 	Message *tg.Message
-}
+// 	Error   error
+// }
 
-func IterMessages(ctx *ext.Context, chatID int64, minId, maxId int) (<-chan MessageItem, error) {
+// func IterMessages(ctx *ext.Context, chatID int64, minId, maxId int) (<-chan MessageItem, error) {
-	total := maxId - minId + 1
+// 	total := maxId - minId + 1
-	ch := make(chan MessageItem, 100)
+// 	ch := make(chan MessageItem, 100)
 
-	go func() {
+// 	go func() {
-		defer close(ch)
+// 		defer close(ch)
-		if !ctx.Self.Bot {
+// 		if !ctx.Self.Bot {
-			perr := ctx.PeerStorage.GetInputPeerById(chatID)
+// 			perr := ctx.PeerStorage.GetInputPeerById(chatID)
-			if perr == nil || perr.(*tg.InputPeerEmpty) != nil {
+// 			if perr == nil || perr.(*tg.InputPeerEmpty) != nil {
-				ch <- MessageItem{
+// 				ch <- MessageItem{
-					Error: fmt.Errorf("peer not found: %d", chatID),
+// 					Error: fmt.Errorf("peer not found: %d", chatID),
-				}
+// 				}
-				return
+// 				return
-			}
+// 			}
 
-			for i := 0; i < total; i += 100 {
+// 			for i := 0; i < total; i += 100 {
-				start := minId + i
+// 				start := minId + i
-				end := min(start+100, maxId)
+// 				end := min(start+100, maxId)
-				msgs, err := ctx.Raw.MessagesGetHistory(ctx, &tg.MessagesGetHistoryRequest{
+// 				msgs, err := ctx.Raw.MessagesGetHistory(ctx, &tg.MessagesGetHistoryRequest{
-					Peer:      perr,
+// 					Peer:      perr,
-					OffsetID:  start,
+// 					OffsetID:  start,
-					AddOffset: start - end,
+// 					AddOffset: start - end,
-					Limit:     100,
+// 					Limit:     100,
-				})
+// 				})
-				if err != nil {
+// 				if err != nil {
-					ch <- MessageItem{
+// 					ch <- MessageItem{
-						Error: fmt.Errorf("failed to get messages: %w", err),
+// 						Error: fmt.Errorf("failed to get messages: %w", err),
-					}
+// 					}
-					return
+// 					return
-				}
+// 				}
-				var msgClass []tg.MessageClass
+// 				var msgClass []tg.MessageClass
-				switch msgsv := msgs.(type) {
+// 				switch msgsv := msgs.(type) {
-				case *tg.MessagesMessages:
+// 				case *tg.MessagesMessages:
-					msgClass = msgsv.GetMessages()
+// 					msgClass = msgsv.GetMessages()
-				case *tg.MessagesMessagesSlice:
+// 				case *tg.MessagesMessagesSlice:
-					msgClass = msgsv.GetMessages()
+// 					msgClass = msgsv.GetMessages()
-				case *tg.MessagesChannelMessages:
+// 				case *tg.MessagesChannelMessages:
-					msgClass = msgsv.GetMessages()
+// 					msgClass = msgsv.GetMessages()
-				default:
+// 				default:
-					ch <- MessageItem{
+// 					ch <- MessageItem{
-						Error: fmt.Errorf("unsupported message type: %T", msgsv),
+// 						Error: fmt.Errorf("unsupported message type: %T", msgsv),
-					}
+// 					}
-					continue
+// 					continue
-				}
+// 				}
-				for _, msg := range msgClass {
+// 				for _, msg := range msgClass {
-					msg, ok := msg.AsNotEmpty()
+// 					msg, ok := msg.AsNotEmpty()
-					if !ok {
+// 					if !ok {
-						continue
+// 						continue
-					}
+// 					}
-					switch msg := msg.(type) {
+// 					switch msg := msg.(type) {
-					case *tg.Message:
+// 					case *tg.Message:
-						key := fmt.Sprintf("tgmsg:%d:%d:%d", ctx.Self.ID, chatID, msg.GetID())
+// 						key := fmt.Sprintf("tgmsg:%d:%d:%d", ctx.Self.ID, chatID, msg.GetID())
-						cache.Set(key, msg)
+// 						cache.Set(key, msg)
-						ch <- MessageItem{
+// 						ch <- MessageItem{
-							Message: msg,
+// 							Message: msg,
-						}
+// 						}
-					}
+// 					}
-				}
+// 				}
-			}
+// 			}
-		} else {
+// 		} else {
-			for i := 0; i < total; i += 100 {
+// 			for i := 0; i < total; i += 100 {
-				start := minId + i
+// 				start := minId + i
-				end := min(start+100, maxId)
+// 				end := min(start+100, maxId)
-				msgs, err := GetMessagesRange(ctx, chatID, start, end)
+// 				msgs, err := GetMessagesRange(ctx, chatID, start, end)
-				if err != nil {
+// 				if err != nil {
-					ch <- MessageItem{
+// 					ch <- MessageItem{
-						Error: fmt.Errorf("failed to get messages: %w", err),
+// 						Error: fmt.Errorf("failed to get messages: %w", err),
-					}
+// 					}
-					return
+// 					return
-				}
+// 				}
-				for _, msg := range msgs {
+// 				for _, msg := range msgs {
-					if msg == nil {
+// 					if msg == nil {
-						continue
+// 						continue
-					}
+// 					}
-					ch <- MessageItem{
+// 					ch <- MessageItem{
-						Message: msg,
+// 						Message: msg,
-					}
+// 					}
-				}
+// 				}
-			}
+// 			}
-		}
+// 		}
-	}()
+// 	}()
 
-	return ch, nil
+// 	return ch, nil
-}
+// }
 
-func GetMessageByID(ctx *ext.Context, chatID int64, msgID int) (*tg.Message, error) {
+func getMessageByID(ctx *ext.Context, chatID int64, msgID int) (*tg.Message, error) {
 	key := fmt.Sprintf("tgmsg:%d:%d:%d", ctx.Self.ID, chatID, msgID)
 	if msg, ok := cache.Get[*tg.Message](key); ok {
 		return msg, nil
@@ -273,6 +306,33 @@ func GetMessageByID(ctx *ext.Context, chatID int64, msgID int) (*tg.Message, err
 	return tgm, nil
 }
 
+// f**k gotgproto's breaking changes
+func GetMessageByID(ctx *ext.Context, chatID int64, msgID int) (*tg.Message, error) {
+	// we don't know what the input chatID is bot api style(e.g. channel with -100 prefix) or plain tdlib style(no any prefix and every id is positive)
+	if msg, err := getMessageByID(ctx, chatID, msgID); err == nil {
+		return msg, nil
+	}
+	in := constant.TDLibPeerID(chatID)
+	plain := in.ToPlain()
+	var channel constant.TDLibPeerID
+	channel.Channel(plain)
+	if msg, err := getMessageByID(ctx, int64(channel), msgID); err == nil {
+		return msg, nil
+	}
+	var chat constant.TDLibPeerID
+	chat.Chat(plain)
+	if msg, err := getMessageByID(ctx, int64(chat), msgID); err == nil {
+		return msg, nil
+	}
+	var userID constant.TDLibPeerID
+	userID.User(plain)
+	if msg, err := getMessageByID(ctx, int64(userID), msgID); err == nil {
+		return msg, nil
+	}
+
+	return nil, fmt.Errorf("failed to get message by ID: chatID=%d, msgID=%d", chatID, msgID)
+}
+
 func GetGroupedMessages(ctx *ext.Context, chatID int64, msg *tg.Message) ([]*tg.Message, error) {
 	groupID, isGroup := msg.GetGroupedID()
 	if !isGroup || groupID == 0 {
@@ -286,7 +346,7 @@ func GetGroupedMessages(ctx *ext.Context, chatID int64, msg *tg.Message) ([]*tg.
 	}
 	msgs, err := GetMessagesRange(ctx, chatID, minID, maxID)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get grouped messages: %w", err)
+		return nil, err
 	}
 	groupedMessages := make([]*tg.Message, 0, len(msgs))
 	for _, m := range msgs {
@@ -300,3 +360,49 @@ func GetGroupedMessages(ctx *ext.Context, chatID int64, msg *tg.Message) ([]*tg.
 	}
 	return groupedMessages, nil
 }
+
+func ExtractMessageEntityUrls(msg *tg.Message) []string {
+	if len(msg.Entities) == 0 {
+		return nil
+	}
+	msgText := msg.GetMessage()
+	if msgText == "" {
+		return nil
+	}
+
+	runes := []rune(msgText)
+	utf16Codes := utf16.Encode(runes)
+
+	var urls []string
+	for _, entity := range msg.Entities {
+		switch ent := entity.(type) {
+		case *tg.MessageEntityTextURL:
+			urls = append(urls, ent.GetURL())
+		case *tg.MessageEntityURL:
+			start := ent.Offset
+			end := ent.Offset + ent.Length
+			if start < 0 || end > len(utf16Codes) {
+				continue
+			}
+			subRunes := utf16.Decode(utf16Codes[start:end])
+			urls = append(urls, string(subRunes))
+		}
+	}
+	return urls
+}
+
+func ExtractMessageEntityUrlsText(msg *tg.Message) string {
+	if msg == nil {
+		return ""
+	}
+	urls := ExtractMessageEntityUrls(msg)
+	if len(urls) == 0 {
+		return msg.GetMessage()
+	}
+	var sb strings.Builder
+	for _, url := range urls {
+		sb.WriteString(url)
+		sb.WriteString(" ")
+	}
+	return sb.String()
+}

common/utils/tgutil/net.go

@@ -0,0 +1,41 @@
+package tgutil
+
+import (
+	"net/url"
+
+	"github.com/gotd/td/telegram/dcs"
+	"github.com/krau/SaveAny-Bot/config"
+	"golang.org/x/net/proxy"
+)
+
+func newProxyDialer(proxyUrl string) (proxy.Dialer, error) {
+	url, err := url.Parse(proxyUrl)
+	if err != nil {
+		return nil, err
+	}
+	return proxy.FromURL(url, proxy.Direct)
+}
+
+func NewConfigProxyResolver() (dcs.Resolver, error) {
+	resolver := dcs.DefaultResolver()
+	if config.C().Proxy != "" {
+		// gloabl proxy, which has lower priority
+		dialer, err := newProxyDialer(config.C().Proxy)
+		if err != nil {
+			return nil, err
+		}
+		resolver = dcs.Plain(dcs.PlainOptions{
+			Dial: dialer.(proxy.ContextDialer).DialContext,
+		})
+	}
+	if config.C().Telegram.Proxy.Enable && config.C().Telegram.Proxy.URL != "" {
+		dialer, err := newProxyDialer(config.C().Telegram.Proxy.URL)
+		if err != nil {
+			return nil, err
+		}
+		resolver = dcs.Plain(dcs.PlainOptions{
+			Dial: dialer.(proxy.ContextDialer).DialContext,
+		})
+	}
+	return resolver, nil
+}

common/utils/tgutil/peer.go

@@ -0,0 +1,16 @@
+package tgutil
+
+import "github.com/gotd/td/tg"
+
+func ChatIdFromPeer(peer tg.PeerClass) int64 {
+	switch peer := peer.(type) {
+	case *tg.PeerChannel:
+		return peer.ChannelID
+	case *tg.PeerUser:
+		return peer.UserID
+	case *tg.PeerChat:
+		return peer.ChatID
+	default:
+		return 0
+	}
+}

common/utils/tgutil/resolve.go

@@ -86,7 +86,7 @@ func ParseMessageLink(ctx *ext.Context, link string) (int64, int, error) {
 		return chatID, msgID, nil
 	case 3:
 		// https://t.me/c/123456789/123
-		// https://t.me/acherkrau/123/456 , 456: message thread ID
+		// https://t.me/acherkrau/123/456 , 123: topic id
 		chatPart, msgPart := paths[1], paths[2]
 		if paths[0] != "c" {
 			chatPart = paths[0]

common/utils/tphutil/tph.go

@@ -2,28 +2,38 @@ package tphutil
 
 import (
 	"encoding/json"
+	"strings"
+	"sync"
 
 	"github.com/krau/SaveAny-Bot/config"
 	"github.com/krau/SaveAny-Bot/pkg/telegraph"
 )
 
-var tphClient *telegraph.Client
+var (
+	tphClient *telegraph.Client
+	once      sync.Once
+)
 
 func DefaultClient() *telegraph.Client {
-	if tphClient != nil {
+	once.Do(func() {
-		return tphClient
+		tphClient = initDefault()
-	}
+	})
-	if config.Cfg.Telegram.Proxy.Enable && config.Cfg.Telegram.Proxy.URL != "" {
+	return tphClient
-		proxyUrl := config.Cfg.Telegram.Proxy.URL
+}
+
+func initDefault() *telegraph.Client {
+	var client *telegraph.Client
+	if config.C().Telegram.Proxy.Enable && config.C().Telegram.Proxy.URL != "" {
+		proxyUrl := config.C().Telegram.Proxy.URL
 		var err error
-		tphClient, err = telegraph.NewClientWithProxy(proxyUrl)
+		client, err = telegraph.NewClientWithProxy(proxyUrl)
 		if err != nil {
-			tphClient = telegraph.NewClient()
+			client = telegraph.NewClient()
 		}
 	} else {
-		tphClient = telegraph.NewClient()
+		client = telegraph.NewClient()
 	}
-	return tphClient
+	return client
 }
 
 func GetNodeImages(node telegraph.Node) []string {
@@ -41,6 +51,10 @@ func GetNodeImages(node telegraph.Node) []string {
 
 	if nodeElement.Tag == "img" {
 		if src, exists := nodeElement.Attrs["src"]; exists {
+			if strings.HasPrefix(src, "/file/") {
+				// handle images on telegra.ph server
+				src = "https://telegra.ph" + src
+			}
 			srcs = append(srcs, src)
 		}
 	}

config.example.toml

@@ -22,7 +22,7 @@ url = "socks5://127.0.0.1:7890"
 [[storages]]
 # 标识名, 需要唯一
 name = "本机1"
-# 存储类型, 目前可用: local, alist, webdav, minio, telegram
+# 存储类型, 目前可用: local, alist, webdav, s3, telegram
 type = "local"
 # 启用存储
 enable = true

config/parser.go

@@ -0,0 +1,15 @@
+package config
+
+type parserConfig struct {
+	PluginEnable bool                      `toml:"plugin_enable" mapstructure:"plugin_enable" json:"plugin_enable"`
+	PluginDirs   []string                  `toml:"plugin_dirs" mapstructure:"plugin_dirs" json:"plugin_dirs"`
+	Proxy        string                    `toml:"proxy" mapstructure:"proxy" json:"proxy"`
+	ParserCfgs   map[string]map[string]any `mapstructure:",remain"`
+}
+
+func (c Config) GetParserConfigByName(name string) map[string]any {
+	if c.Parser.ParserCfgs == nil {
+		return nil
+	}
+	return c.Parser.ParserCfgs[name]
+}

config/storage/factory.go

@@ -14,6 +14,7 @@ var storageFactories = map[storenum.StorageType]func(cfg *BaseConfig) (StorageCo
 	storenum.Alist:    createStorageConfig(&AlistStorageConfig{}),
 	storenum.Webdav:   createStorageConfig(&WebdavStorageConfig{}),
 	storenum.Minio:    createStorageConfig(&MinioStorageConfig{}),
+	storenum.S3:       createStorageConfig(&S3StorageConfig{}),
 	storenum.Telegram: createStorageConfig(&TelegramStorageConfig{}),
 }
 

config/storage/s3.go

@@ -0,0 +1,43 @@
+package storage
+
+import (
+	"fmt"
+
+	storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage"
+)
+
+type S3StorageConfig struct {
+	BaseConfig
+	Endpoint        string `toml:"endpoint" mapstructure:"endpoint" json:"endpoint"`
+	AccessKeyID     string `toml:"access_key_id" mapstructure:"access_key_id" json:"access_key_id"`
+	SecretAccessKey string `toml:"secret_access_key" mapstructure:"secret_access_key" json:"secret_access_key"`
+	BucketName      string `toml:"bucket_name" mapstructure:"bucket_name" json:"bucket_name"`
+	UseSSL          bool   `toml:"use_ssl" mapstructure:"use_ssl" json:"use_ssl"`
+	BasePath        string `toml:"base_path" mapstructure:"base_path" json:"base_path"`
+	Region          string `toml:"region" mapstructure:"region" json:"region"`
+	VirtualHost     bool   `toml:"virtual_host" mapstructure:"virtual_host" json:"virtual_host"`
+}
+
+func (m *S3StorageConfig) Validate() error {
+	if m.Endpoint == "" {
+		return fmt.Errorf("endpoint is required for s3 storage")
+	}
+	if m.AccessKeyID == "" || m.SecretAccessKey == "" {
+		return fmt.Errorf("access_key_id and secret_access_key are required for s3 storage")
+	}
+	if m.BucketName == "" {
+		return fmt.Errorf("bucket_name is required for s3 storage")
+	}
+	if m.BasePath == "" {
+		return fmt.Errorf("base_path is required for s3 storage")
+	}
+	return nil
+}
+
+func (m *S3StorageConfig) GetType() storenum.StorageType {
+	return storenum.S3
+}
+
+func (m *S3StorageConfig) GetName() string {
+	return m.Name
+}

config/storage/telegram.go

@@ -9,8 +9,14 @@ import (
 type TelegramStorageConfig struct {
 	BaseConfig
 	ChatID    int64 `toml:"chat_id" mapstructure:"chat_id" json:"chat_id"`
+	ForceFile bool  `toml:"force_file" mapstructure:"force_file" json:"force_file"`
 	RateLimit int   `toml:"rate_limit" mapstructure:"rate_limit" json:"rate_limit"`
 	RateBurst int   `toml:"rate_burst" mapstructure:"rate_burst" json:"rate_burst"`
+	SkipLarge bool  `toml:"skip_large" mapstructure:"skip_large" json:"skip_large"` // skip files larger than Telegram limit(2GB)
+	// split files larger than Telegram limit(2GB) into parts of specified size, in MB, leave 0 to set default(2000MB)
+	// only effective when SkipLarge is false
+	// use zip when splitting
+	SplitSizeMB int64 `toml:"split_size_mb" mapstructure:"split_size_mb" json:"split_size_mb"`
 }
 
 func (m *TelegramStorageConfig) Validate() error {

config/tg.go

@@ -1,12 +1,13 @@
 package config
 
 type telegramConfig struct {
-	Token    string        `toml:"token" mapstructure:"token"`
+	Token             string        `toml:"token" mapstructure:"token"`
-	AppID    int           `toml:"app_id" mapstructure:"app_id" json:"app_id"`
+	AppID             int           `toml:"app_id" mapstructure:"app_id" json:"app_id"`
-	AppHash  string        `toml:"app_hash" mapstructure:"app_hash" json:"app_hash"`
+	AppHash           string        `toml:"app_hash" mapstructure:"app_hash" json:"app_hash"`
-	Proxy    tgProxyConfig `toml:"proxy" mapstructure:"proxy"`
+	Proxy             tgProxyConfig `toml:"proxy" mapstructure:"proxy"`
-	RpcRetry int           `toml:"rpc_retry" mapstructure:"rpc_retry" json:"rpc_retry"`
+	RpcRetry          int           `toml:"rpc_retry" mapstructure:"rpc_retry" json:"rpc_retry"`
-	Userbot  userbotConfig `toml:"userbot" mapstructure:"userbot" json:"userbot"` // [TODO]
+	Userbot           userbotConfig `toml:"userbot" mapstructure:"userbot" json:"userbot"`
+	MediaGroupTimeout int           `toml:"media_group_timeout" mapstructure:"media_group_timeout" json:"media_group_timeout"`
 }
 
 type userbotConfig struct {

config/user.go

@@ -14,7 +14,7 @@ var userIDs []int64
 var storages []string
 var userStorages = make(map[int64][]string)
 
-func (c *Config) GetStorageNamesByUserID(userID int64) []string {
+func (c Config) GetStorageNamesByUserID(userID int64) []string {
 	us, ok := userStorages[userID]
 	if ok {
 		return us
@@ -22,11 +22,11 @@ func (c *Config) GetStorageNamesByUserID(userID int64) []string {
 	return nil
 }
 
-func (c *Config) GetUsersID() []int64 {
+func (c Config) GetUsersID() []int64 {
 	return userIDs
 }
 
-func (c *Config) HasStorage(userID int64, storageName string) bool {
+func (c Config) HasStorage(userID int64, storageName string) bool {
 	us, ok := userStorages[userID]
 	if !ok {
 		return false

config/version.go

@@ -0,0 +1,14 @@
+package config
+
+// inject version by '-X' flag
+// go build -ldflags "-X github.com/krau/SaveAny-Bot/config.Version=${{ env.VERSION }}"
+var (
+	Version   string = "dev"
+	BuildTime string = "unknown"
+	GitCommit string = "unknown"
+	Docker    string = "false" // whether built inside Docker
+)
+
+const (
+	GitRepo = "krau/SaveAny-Bot"
+)

config/viper.go

@@ -4,14 +4,18 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
+	"net"
+	"net/http"
+	"net/url"
 	"strings"
+	"time"
 
 	"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/spf13/viper"
+	"golang.org/x/net/proxy"
 )
 
 type Config struct {
@@ -21,6 +25,7 @@ type Config struct {
 	NoCleanCache bool   `toml:"no_clean_cache" mapstructure:"no_clean_cache" json:"no_clean_cache"`
 	Threads      int    `toml:"threads" mapstructure:"threads" json:"threads"`
 	Stream       bool   `toml:"stream" mapstructure:"stream" json:"stream"`
+	Proxy        string `toml:"proxy" mapstructure:"proxy" json:"proxy"`
 
 	Cache    cacheConfig             `toml:"cache" mapstructure:"cache" json:"cache"`
 	Users    []userConfig            `toml:"users" mapstructure:"users" json:"users"`
@@ -28,10 +33,15 @@ type Config struct {
 	DB       dbConfig                `toml:"db" mapstructure:"db"`
 	Telegram telegramConfig          `toml:"telegram" mapstructure:"telegram"`
 	Storages []storage.StorageConfig `toml:"-" mapstructure:"-" json:"storages"`
+	Parser   parserConfig            `toml:"parser" mapstructure:"parser" json:"parser"`
 	Hook     hookConfig              `toml:"hook" mapstructure:"hook" json:"hook"`
 }
 
-var Cfg *Config = &Config{}
+var cfg = &Config{}
+
+func C() Config {
+	return *cfg
+}
 
 func (c Config) GetStorageByName(name string) storage.StorageConfig {
 	for _, storage := range c.Storages {
@@ -91,48 +101,51 @@ func Init(ctx context.Context) error {
 
 	if err := viper.ReadInConfig(); err != nil {
 		fmt.Println("Error reading config file, ", err)
-		os.Exit(1)
+		return err
 	}
 
-	if err := viper.Unmarshal(Cfg); err != nil {
+	if err := viper.Unmarshal(cfg); err != nil {
 		fmt.Println("Error unmarshalling config file, ", err)
-		os.Exit(1)
+		return err
 	}
 
 	storagesConfig, err := storage.LoadStorageConfigs(viper.GetViper())
 	if err != nil {
 		return fmt.Errorf("error loading storage configs: %w", err)
 	}
-	Cfg.Storages = storagesConfig
+	cfg.Storages = storagesConfig
 
 	storageNames := make(map[string]struct{})
-	for _, storage := range Cfg.Storages {
+	for _, storage := range cfg.Storages {
 		if _, ok := storageNames[storage.GetName()]; ok {
-			return errors.New(i18n.TWithoutInit(Cfg.Lang, i18nk.ConfigInvalidDuplicateStorageName, map[string]any{
+			return errors.New(i18n.TWithoutInit(cfg.Lang, i18nk.ConfigErrDuplicateStorageName, map[string]any{
 				"Name": storage.GetName(),
 			}))
 		}
 		storageNames[storage.GetName()] = struct{}{}
 	}
 
-	fmt.Println(i18n.TWithoutInit(Cfg.Lang, i18nk.LoadedStorages, map[string]any{
+	fmt.Println(i18n.TWithoutInit(cfg.Lang, i18nk.ConfigLoadedStorages, map[string]any{
-		"Count": len(Cfg.Storages),
+		"Count": len(cfg.Storages),
 	}))
-	for _, storage := range Cfg.Storages {
+	for _, storage := range cfg.Storages {
 		fmt.Printf("  - %s (%s)\n", storage.GetName(), storage.GetType())
 	}
 
-	if Cfg.Workers < 1 || Cfg.Retry < 1 {
+	if cfg.Workers < 1 {
-		return errors.New(i18n.TWithoutInit(Cfg.Lang, i18nk.ConfigInvalidWorkersOrRetry, map[string]any{
+		cfg.Workers = 1
-			"Workers": Cfg.Workers,
+	}
-			"Retry":   Cfg.Retry,
+	if cfg.Threads < 1 {
-		}))
+		cfg.Threads = 1
+	}
+	if cfg.Retry < 1 {
+		cfg.Retry = 1
 	}
 
-	for _, storage := range Cfg.Storages {
+	for _, storage := range cfg.Storages {
 		storages = append(storages, storage.GetName())
 	}
-	for _, user := range Cfg.Users {
+	for _, user := range cfg.Users {
 		userIDs = append(userIDs, user.ID)
 		if user.Blacklist {
 			userStorages[user.ID] = slice.Compact(slice.Difference(storages, user.Storages))
@@ -140,22 +153,43 @@ func Init(ctx context.Context) error {
 			userStorages[user.ID] = user.Storages
 		}
 	}
-	return nil
+	if cfg.Proxy != "" {
-}
+		http.DefaultTransport, err = newProxyTransport(cfg.Proxy)
-
+		if err != nil {
-func Set(key string, value any) {
+			return fmt.Errorf("failed to create proxy transport: %w", err)
-	viper.Set(key, value)
+		}
-}
-
-func ReloadConfig() error {
-	if err := viper.WriteConfig(); err != nil {
-		return err
-	}
-	if err := viper.ReadInConfig(); err != nil {
-		return err
-	}
-	if error := viper.Unmarshal(Cfg); error != nil {
-		return error
 	}
 	return nil
 }
+
+func newProxyTransport(proxyStr string) (*http.Transport, error) {
+	proxyURL, err := url.Parse(proxyStr)
+	if err != nil {
+		return nil, err
+	}
+	transport := &http.Transport{
+		ForceAttemptHTTP2:     true,
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+	}
+	switch proxyURL.Scheme {
+	case "http", "https":
+		transport.Proxy = http.ProxyURL(proxyURL)
+
+	case "socks5", "socks5h":
+		dialer, err := proxy.FromURL(proxyURL, proxy.Direct)
+		if err != nil {
+			return nil, err
+		}
+		transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
+			return dialer.(proxy.ContextDialer).DialContext(ctx, network, addr)
+		}
+
+	default:
+		return nil, fmt.Errorf("unsupported proxy type: %s", proxyURL.Scheme)
+	}
+
+	return transport, nil
+}

core/core.go

@@ -10,17 +10,18 @@ import (
 	"github.com/krau/SaveAny-Bot/pkg/queue"
 )
 
-var queueInstance *queue.TaskQueue[Exectable]
+var queueInstance *queue.TaskQueue[Executable]
 
-type Exectable interface {
+type Executable interface {
 	Type() tasktype.TaskType
+	Title() string
 	TaskID() string
 	Execute(ctx context.Context) error
 }
 
-func worker(ctx context.Context, qe *queue.TaskQueue[Exectable], semaphore chan struct{}) {
+func worker(ctx context.Context, qe *queue.TaskQueue[Executable], semaphore chan struct{}) {
 	logger := log.FromContext(ctx)
-	execHooks := config.Cfg.Hook.Exec
+	execHooks := config.C().Hook.Exec
 	for {
 		semaphore <- struct{}{}
 		qtask, err := qe.Get()
@@ -28,27 +29,27 @@ func worker(ctx context.Context, qe *queue.TaskQueue[Exectable], semaphore chan
 			logger.Error("Failed to get task from queue:", err)
 			break // queue closed and empty
 		}
-		task := qtask.Data
+		exe := qtask.Data
-		logger.Infof("Processing task: %s", task.TaskID())
+		logger.Infof("Processing task: %s", exe.TaskID())
 		if err := ExecCommandString(qtask.Context(), execHooks.TaskBeforeStart); err != nil {
-			logger.Errorf("Failed to execute before start hook for task %s: %v", task.TaskID(), err)
+			logger.Errorf("Failed to execute before start hook for task %s: %v", exe.TaskID(), err)
 		}
-		if err := task.Execute(qtask.Context()); err != nil {
+		if err := exe.Execute(qtask.Context()); err != nil {
 			if errors.Is(err, context.Canceled) {
-				logger.Infof("Task %s was canceled", task.TaskID())
+				logger.Infof("Task %s was canceled", exe.TaskID())
 				if err := ExecCommandString(ctx, execHooks.TaskCancel); err != nil {
-					logger.Errorf("Failed to execute cancel hook for task %s: %v", task.TaskID(), err)
+					logger.Errorf("Failed to execute cancel hook for task %s: %v", exe.TaskID(), err)
 				}
 			} else {
-				logger.Errorf("Failed to execute task %s: %v", task.TaskID(), err)
+				logger.Errorf("Failed to execute task %s: %v", exe.TaskID(), err)
 				if err := ExecCommandString(ctx, execHooks.TaskFail); err != nil {
-					logger.Errorf("Failed to execute fail hook for task %s: %v", task.TaskID(), err)
+					logger.Errorf("Failed to execute fail hook for task %s: %v", exe.TaskID(), err)
 				}
 			}
 		} else {
-			logger.Infof("Task %s completed successfully", task.TaskID())
+			logger.Infof("Task %s completed successfully", exe.TaskID())
 			if err := ExecCommandString(ctx, execHooks.TaskSuccess); err != nil {
-				logger.Errorf("Failed to execute success hook for task %s: %v", task.TaskID(), err)
+				logger.Errorf("Failed to execute success hook for task %s: %v", exe.TaskID(), err)
 			}
 		}
 		qe.Done(qtask.ID)
@@ -58,18 +59,18 @@ func worker(ctx context.Context, qe *queue.TaskQueue[Exectable], semaphore chan
 
 func Run(ctx context.Context) {
 	log.FromContext(ctx).Info("Start processing tasks...")
-	semaphore := make(chan struct{}, config.Cfg.Workers)
+	semaphore := make(chan struct{}, config.C().Workers)
 	if queueInstance == nil {
-		queueInstance = queue.NewTaskQueue[Exectable]()
+		queueInstance = queue.NewTaskQueue[Executable]()
 	}
-	for range config.Cfg.Workers {
+	for range config.C().Workers {
 		go worker(ctx, queueInstance, semaphore)
 	}
 
 }
 
-func AddTask(ctx context.Context, task Exectable) error {
+func AddTask(ctx context.Context, task Executable) error {
-	return queueInstance.Add(queue.NewTask(ctx, task.TaskID(), task))
+	return queueInstance.Add(queue.NewTask(ctx, task.TaskID(), task.Title(), task))
 }
 
 func CancelTask(ctx context.Context, id string) error {
@@ -78,8 +79,13 @@ func CancelTask(ctx context.Context, id string) error {
 }
 
 func GetLength(ctx context.Context) int {
-	if queueInstance == nil {
-		return 0
-	}
 	return queueInstance.ActiveLength()
 }
+
+func GetRunningTasks(ctx context.Context) []queue.TaskInfo {
+	return queueInstance.RunningTasks()
+}
+
+func GetQueuedTasks(ctx context.Context) []queue.TaskInfo {
+	return queueInstance.QueuedTasks()
+}

core/tasks/batchtfile/execute.go

@@ -1,4 +1,4 @@
-package batchtftask
+package batchtfile
 
 import (
 	"context"
@@ -9,11 +9,11 @@ import (
 
 	"github.com/charmbracelet/log"
 	"github.com/duke-git/lancet/v2/retry"
+	"github.com/krau/SaveAny-Bot/common/tdler"
 	"github.com/krau/SaveAny-Bot/common/utils/fsutil"
 	"github.com/krau/SaveAny-Bot/common/utils/ioutil"
 	"github.com/krau/SaveAny-Bot/config"
 	"github.com/krau/SaveAny-Bot/pkg/enums/ctxkey"
-	"github.com/krau/SaveAny-Bot/pkg/tfile"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -21,18 +21,23 @@ func (t *Task) Execute(ctx context.Context) error {
 	logger := log.FromContext(ctx).WithPrefix(fmt.Sprintf("batch_file[%s]", t.ID))
 	logger.Info("Starting batch file task")
 	t.Progress.OnStart(ctx, t)
-	workers := config.Cfg.Workers
+	workers := config.C().Workers
 	eg, gctx := errgroup.WithContext(ctx)
 	eg.SetLimit(workers)
-	for _, elem := range t.Elems {
+	for _, elem := range t.elems {
-		elem := elem
 		eg.Go(func() error {
+			t.processingMu.RLock()
 			if t.processing[elem.ID] != nil {
 				return fmt.Errorf("element with ID %s is already being processed", elem.ID)
 			}
+			t.processingMu.RUnlock()
+			t.processingMu.Lock()
 			t.processing[elem.ID] = &elem
+			t.processingMu.Unlock()
 			defer func() {
+				t.processingMu.Lock()
 				delete(t.processing, elem.ID)
+				t.processingMu.Unlock()
 			}()
 			return t.processElement(gctx, elem)
 		})
@@ -61,10 +66,12 @@ func (t *Task) processElement(ctx context.Context, elem TaskElement) error {
 			t.Progress.OnProgress(ctx, t)
 		})
 		errg.Go(func() error {
+			defer pw.Close()
 			logger.Info("Starting file download in stream mode")
-			_, err := tfile.NewDownloader(elem.File).Stream(uploadCtx, wr)
+			_, err := tdler.NewDownloader(elem.File).Stream(uploadCtx, wr)
-			if closeErr := pw.CloseWithError(err); closeErr != nil {
+			if err != nil {
-				logger.Errorf("Failed to close pipe writer: %v", closeErr)
+				logger.Errorf("Failed to download file: %v", err)
+				pw.CloseWithError(err)
 			}
 			return err
 		})
@@ -88,7 +95,7 @@ func (t *Task) processElement(ctx context.Context, elem TaskElement) error {
 		t.downloaded.Add(int64(n))
 		t.Progress.OnProgress(ctx, t)
 	})
-	_, err = tfile.NewDownloader(elem.File).Parallel(ctx, wrAt)
+	_, err = tdler.NewDownloader(elem.File).Parallel(ctx, wrAt)
 	if err != nil {
 		return fmt.Errorf("failed to download file: %w", err)
 	}
@@ -117,6 +124,6 @@ func (t *Task) processElement(ctx context.Context, elem TaskElement) error {
 			return err
 		}
 		return nil
-	}, retry.Context(vctx), retry.RetryTimes(uint(config.Cfg.Retry)))
+	}, retry.Context(vctx), retry.RetryTimes(uint(config.C().Retry)))
 	return err
 }

core/tasks/batchtfile/progress.go

@@ -1,4 +1,4 @@
-package batchtftask
+package batchtfile
 
 import (
 	"context"

core/tasks/batchtfile/task.go

@@ -1,18 +1,22 @@
-package batchtftask
+package batchtfile
 
 import (
 	"context"
 	"fmt"
 	"path/filepath"
+	"sync"
 	"sync/atomic"
 
 	"github.com/krau/SaveAny-Bot/config"
+	"github.com/krau/SaveAny-Bot/core"
 	"github.com/krau/SaveAny-Bot/pkg/enums/tasktype"
 	"github.com/krau/SaveAny-Bot/pkg/tfile"
 	"github.com/krau/SaveAny-Bot/storage"
 	"github.com/rs/xid"
 )
 
+var _ core.Executable = (*Task)(nil)
+
 type TaskElement struct {
 	ID        string
 	Storage   storage.Storage
@@ -24,14 +28,20 @@ type TaskElement struct {
 
 type Task struct {
 	ID           string
-	Ctx          context.Context
+	ctx          context.Context
-	Elems        []TaskElement
+	elems        []TaskElement
 	Progress     ProgressTracker
 	IgnoreErrors bool // if true, errors during processing will be ignored
 	downloaded   atomic.Int64
 	totalSize    int64
 	processing   map[string]TaskElementInfo
-	failed       map[string]error // errors for each element
+	processingMu sync.RWMutex
+	failed       map[string]error // [TODO] errors for each element
+}
+
+// Title implements core.Exectable.
+func (t *Task) Title() string {
+	return fmt.Sprintf("[%s](%d files/%.2fMB)", t.Type(), len(t.elems), float64(t.totalSize)/(1024*1024))
 }
 
 func (t *Task) Type() tasktype.TaskType {
@@ -45,8 +55,8 @@ func NewTaskElement(
 ) (*TaskElement, error) {
 	id := xid.New().String()
 	_, ok := stor.(storage.StorageCannotStream)
-	if !config.Cfg.Stream || ok {
+	if !config.C().Stream || ok {
-		cachePath, err := filepath.Abs(filepath.Join(config.Cfg.Temp.BasePath, fmt.Sprintf("%s_%s", id, file.Name())))
+		cachePath, err := filepath.Abs(filepath.Join(config.C().Temp.BasePath, fmt.Sprintf("%s_%s", id, file.Name())))
 		if err != nil {
 			return nil, fmt.Errorf("failed to get absolute path for cache: %w", err)
 		}
@@ -76,8 +86,8 @@ func NewBatchTGFileTask(
 ) *Task {
 	task := &Task{
 		ID:         id,
-		Ctx:        ctx,
+		ctx:        ctx,
-		Elems:      files,
+		elems:      files,
 		Progress:   progress,
 		downloaded: atomic.Int64{},
 		totalSize: func() int64 {
@@ -89,6 +99,7 @@ func NewBatchTGFileTask(
 		}(),
 		processing:   make(map[string]TaskElementInfo),
 		IgnoreErrors: ignoreErrors,
+		processingMu: sync.RWMutex{},
 		failed:       make(map[string]error),
 	}
 	return task

core/tasks/batchtfile/taskinfo.go

@@ -1,4 +1,4 @@
-package batchtftask
+package batchtfile
 
 type TaskElementInfo interface {
 	FileName() string
@@ -44,11 +44,11 @@ func (t *Task) Downloaded() int64 {
 }
 
 func (t *Task) Count() int {
-	return len(t.Elems)
+	return len(t.elems)
 }
 
 func (t *Task) Processing() []TaskElementInfo {
-	processing := make([]TaskElementInfo, 0, len(t.Elems))
+	processing := make([]TaskElementInfo, 0, len(t.elems))
 	for _, elem := range t.processing {
 		processing = append(processing, elem)
 	}

core/tasks/batchtfile/utils.go

@@ -1,4 +1,4 @@
-package batchtftask
+package batchtfile
 
 var progressUpdatesLevels = []struct {
 	size        int64 // 文件大小阈值

core/tasks/directlinks/execute.go

@@ -0,0 +1,167 @@
+package directlinks
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"path/filepath"
+	"sync/atomic"
+
+	"github.com/charmbracelet/log"
+	"github.com/duke-git/lancet/v2/retry"
+	"github.com/krau/SaveAny-Bot/common/utils/fsutil"
+	"github.com/krau/SaveAny-Bot/common/utils/ioutil"
+	"github.com/krau/SaveAny-Bot/config"
+	"github.com/krau/SaveAny-Bot/pkg/enums/ctxkey"
+	"golang.org/x/sync/errgroup"
+)
+
+func (t *Task) Execute(ctx context.Context) error {
+	logger := log.FromContext(ctx)
+	logger.Infof("Starting directlinks task %s", t.ID)
+	if t.Progress != nil {
+		t.Progress.OnStart(ctx, t)
+	}
+	// head all links to get file info
+	eg, gctx := errgroup.WithContext(ctx)
+	eg.SetLimit(config.C().Workers)
+	fetchedTotalBytes := atomic.Int64{}
+	for _, file := range t.files {
+		eg.Go(func() error {
+			req, err := http.NewRequestWithContext(ctx, http.MethodHead, file.URL, nil)
+			if err != nil {
+				return fmt.Errorf("failed to create HEAD request for %s: %w", file.URL, err)
+			}
+			resp, err := t.client.Do(req)
+			if err != nil {
+				return fmt.Errorf("failed to HEAD %s: %w", file.URL, err)
+			}
+			defer resp.Body.Close()
+			if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+				return fmt.Errorf("HEAD %s returned status %d", file.URL, resp.StatusCode)
+			}
+			fetchedTotalBytes.Add(resp.ContentLength)
+			file.Size = resp.ContentLength
+			if name := resp.Header.Get("Content-Disposition"); name != "" {
+				// Set file name
+				filename := parseFilename(name)
+				file.Name = filename
+			}
+
+			return nil
+		})
+	}
+	err := eg.Wait()
+	if err != nil {
+		logger.Errorf("Error during HEAD requests: %v", err)
+		if t.Progress != nil {
+			t.Progress.OnDone(ctx, t, err)
+		}
+		return err
+	}
+	t.totalBytes = fetchedTotalBytes.Load()
+	// start downloading
+	eg, gctx = errgroup.WithContext(ctx)
+	eg.SetLimit(config.C().Workers)
+	for _, file := range t.files {
+		eg.Go(func() error {
+			t.processingMu.RLock()
+			if _, ok := t.processing[file.URL]; ok {
+				return fmt.Errorf("file %s is already being processed", file.URL)
+			}
+			t.processingMu.RUnlock()
+			t.processingMu.Lock()
+			t.processing[file.URL] = file
+			t.processingMu.Unlock()
+			defer func() {
+				t.processingMu.Lock()
+				delete(t.processing, file.URL)
+				t.processingMu.Unlock()
+			}()
+			err := t.processLink(gctx, file)
+			t.downloaded.Add(1)
+			if errors.Is(err, context.Canceled) {
+				logger.Debug("Link processing canceled")
+				return err
+			}
+			if err != nil {
+				logger.Errorf("Error processing link %s: %v", file.URL, err)
+				return fmt.Errorf("failed to process link %s: %w", file.URL, err)
+			}
+			return nil
+		})
+	}
+	err = eg.Wait()
+	if err != nil {
+		logger.Errorf("Error during directlinks task execution: %v", err)
+	} else {
+		logger.Infof("Directlinks task %s completed successfully", t.ID)
+	}
+	if t.Progress != nil {
+		t.Progress.OnDone(ctx, t, err)
+	}
+	return err
+}
+
+func (t *Task) processLink(ctx context.Context, file *File) error {
+	logger := log.FromContext(ctx)
+	err := retry.Retry(func() error {
+		req, err := http.NewRequestWithContext(ctx, http.MethodGet, file.URL, nil)
+		if err != nil {
+			return fmt.Errorf("failed to create GET request for %s: %w", file.URL, err)
+		}
+		resp, err := t.client.Do(req)
+		if err != nil {
+			return fmt.Errorf("failed to GET %s: %w", file.URL, err)
+		}
+		defer resp.Body.Close()
+		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+			return fmt.Errorf("GET %s returned status %d", file.URL, resp.StatusCode)
+		}
+		ctx = context.WithValue(ctx, ctxkey.ContentLength, file.Size)
+		if t.stream {
+			return t.Storage.Save(ctx, resp.Body, filepath.Join(t.StorPath, file.Name))
+		}
+		cacheFile, err := fsutil.CreateFile(filepath.Join(config.C().Temp.BasePath,
+			fmt.Sprintf("direct_%s_%s", t.ID, file.Name)))
+		if err != nil {
+			return fmt.Errorf("failed to create temp file: %w", err)
+		}
+		defer func() {
+			if err := cacheFile.CloseAndRemove(); err != nil {
+				logger.Errorf("Failed to close and remove cache file: %v", err)
+			}
+		}()
+		wr := ioutil.NewProgressWriter(cacheFile, func(n int) {
+			t.downloadedBytes.Add(int64(n))
+			if t.Progress != nil {
+				t.Progress.OnProgress(ctx, t)
+			}
+		})
+
+		copyResultCh := make(chan error, 1)
+		go func() {
+			_, err := io.Copy(wr, resp.Body)
+			copyResultCh <- err
+		}()
+		select {
+		case err := <-copyResultCh:
+			if err != nil {
+				return fmt.Errorf("failed to copy file %s to cache file: %w", file.URL, err)
+			}
+		case <-ctx.Done():
+			return ctx.Err()
+		}
+		_, err = cacheFile.Seek(0, 0)
+		if err != nil {
+			return fmt.Errorf("failed to seek cache file for resource %s: %w", file.URL, err)
+		}
+		return t.Storage.Save(ctx, cacheFile, filepath.Join(t.StorPath, file.Name))
+	}, retry.RetryTimes(uint(config.C().Retry)), retry.Context(ctx))
+	if ctx.Err() != nil {
+		return ctx.Err()
+	}
+	return err
+}

core/tasks/directlinks/progress.go

@@ -0,0 +1,196 @@
+package directlinks
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"sync/atomic"
+	"time"
+
+	"github.com/charmbracelet/log"
+	"github.com/duke-git/lancet/v2/slice"
+	"github.com/gotd/td/telegram/message/entity"
+	"github.com/gotd/td/telegram/message/styling"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/common/utils/dlutil"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+)
+
+type TaskInfo interface {
+	TotalBytes() int64
+	TotalFiles() int
+	TaskID() string
+	StorageName() string
+	StoragePath() string
+	DownloadedBytes() int64
+	Processing() []FileInfo
+}
+
+type FileInfo interface {
+	FileName() string
+	FileSize() int64
+}
+
+type ProgressTracker interface {
+	OnStart(ctx context.Context, info TaskInfo)
+	OnProgress(ctx context.Context, info TaskInfo)
+	OnDone(ctx context.Context, info TaskInfo, err error)
+}
+
+type Progress struct {
+	msgID             int
+	chatID            int64
+	start             time.Time
+	lastUpdatePercent atomic.Int32
+}
+
+// OnDone implements ProgressTracker.
+func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) {
+	logger := log.FromContext(ctx)
+	if err != nil {
+		if errors.Is(err, context.Canceled) {
+			logger.Infof("Parsed task %s was canceled", info.TaskID())
+			ext := tgutil.ExtFromContext(ctx)
+			if ext != nil {
+				ext.EditMessage(p.chatID, &tg.MessagesEditMessageRequest{
+					ID:      p.msgID,
+					Message: fmt.Sprintf("处理已取消: %s", info.TaskID()),
+				})
+			}
+		} else {
+			logger.Errorf("Parsed task %s failed: %s", info.TaskID(), err)
+			ext := tgutil.ExtFromContext(ctx)
+			if ext != nil {
+				ext.EditMessage(p.chatID, &tg.MessagesEditMessageRequest{
+					ID:      p.msgID,
+					Message: fmt.Sprintf("处理失败: %s", err.Error()),
+				})
+			}
+		}
+		return
+	}
+	logger.Infof("Parsed task %s completed successfully", info.TaskID())
+
+	entityBuilder := entity.Builder{}
+	if err := styling.Perform(&entityBuilder,
+		styling.Plain("处理完成, 文件数量: "),
+		styling.Code(fmt.Sprintf("%d", info.TotalFiles())),
+		styling.Plain("\n保存路径: "),
+		styling.Code(fmt.Sprintf("[%s]:%s", info.StorageName(), info.StoragePath())),
+	); err != nil {
+		logger.Errorf("Failed to build entities: %s", err)
+		return
+	}
+	text, entities := entityBuilder.Complete()
+	req := &tg.MessagesEditMessageRequest{
+		ID: p.msgID,
+	}
+	req.SetMessage(text)
+	req.SetEntities(entities)
+
+	ext := tgutil.ExtFromContext(ctx)
+	if ext != nil {
+		ext.EditMessage(p.chatID, req)
+	}
+}
+
+// OnProgress implements ProgressTracker.
+func (p *Progress) OnProgress(ctx context.Context, info TaskInfo) {
+	if !shouldUpdateProgress(info.TotalBytes(), info.DownloadedBytes(), int(p.lastUpdatePercent.Load())) {
+		return
+	}
+	percent := int((info.DownloadedBytes() * 100) / info.TotalBytes())
+	if p.lastUpdatePercent.Load() == int32(percent) {
+		return
+	}
+	p.lastUpdatePercent.Store(int32(percent))
+	log.FromContext(ctx).Debugf("Progress update: %s, %d/%d", info.TaskID(), info.DownloadedBytes(), info.TotalBytes())
+	entityBuilder := entity.Builder{}
+	var entities []tg.MessageEntityClass
+	if err := styling.Perform(&entityBuilder,
+		styling.Plain("正在下载\n总大小: "),
+		styling.Code(fmt.Sprintf("%.2f MB (%d个文件)", float64(info.TotalBytes())/(1024*1024), info.TotalFiles())),
+		styling.Plain("\n正在处理:\n"),
+		func() styling.StyledTextOption {
+			var lines []string
+			for _, elem := range info.Processing() {
+				lines = append(lines, fmt.Sprintf("  - %s (%.2f MB)", elem.FileName(), float64(elem.FileSize())/(1024*1024)))
+			}
+			if len(lines) == 0 {
+				lines = append(lines, "  - 无")
+			}
+			return styling.Plain(slice.Join(lines, "\n"))
+		}(),
+		styling.Plain("\n平均速度: "),
+		styling.Bold(fmt.Sprintf("%.2f MB/s", dlutil.GetSpeed(info.DownloadedBytes(), p.start)/(1024*1024))),
+		styling.Plain("\n当前进度: "),
+		styling.Bold(fmt.Sprintf("%.2f%%", float64(info.DownloadedBytes())/float64(info.TotalBytes())*100)),
+	); err != nil {
+		log.FromContext(ctx).Errorf("Failed to build entities: %s", err)
+		return
+	}
+	text, entities := entityBuilder.Complete()
+	req := &tg.MessagesEditMessageRequest{
+		ID: p.msgID,
+	}
+	req.SetMessage(text)
+	req.SetEntities(entities)
+	req.SetReplyMarkup(&tg.ReplyInlineMarkup{
+		Rows: []tg.KeyboardButtonRow{
+			{
+				Buttons: []tg.KeyboardButtonClass{
+					tgutil.BuildCancelButton(info.TaskID()),
+				},
+			},
+		}},
+	)
+	ext := tgutil.ExtFromContext(ctx)
+	if ext != nil {
+		ext.EditMessage(p.chatID, req)
+		return
+	}
+}
+
+// OnStart implements ProgressTracker.
+func (p *Progress) OnStart(ctx context.Context, info TaskInfo) {
+	logger := log.FromContext(ctx)
+	p.start = time.Now()
+	p.lastUpdatePercent.Store(0)
+	logger.Infof("Direct links task started: message_id=%d, chat_id=%d", p.msgID, p.chatID)
+	ext := tgutil.ExtFromContext(ctx)
+	if ext == nil {
+		return
+	}
+	entityBuilder := entity.Builder{}
+	var entities []tg.MessageEntityClass
+	if err := styling.Perform(&entityBuilder,
+		styling.Plain(fmt.Sprintf("开始下载, 总大小: %.2f MB (%d 个文件)", float64(info.TotalBytes())/(1024*1024), info.TotalFiles()))); err != nil {
+		log.FromContext(ctx).Errorf("Failed to build entities: %s", err)
+		return
+	}
+	text, entities := entityBuilder.Complete()
+	req := &tg.MessagesEditMessageRequest{
+		ID: p.msgID,
+	}
+	req.SetMessage(text)
+	req.SetEntities(entities)
+	req.SetReplyMarkup(&tg.ReplyInlineMarkup{
+		Rows: []tg.KeyboardButtonRow{
+			{
+				Buttons: []tg.KeyboardButtonClass{
+					tgutil.BuildCancelButton(info.TaskID()),
+				},
+			},
+		}},
+	)
+	ext.EditMessage(p.chatID, req)
+}
+
+var _ ProgressTracker = (*Progress)(nil)
+
+func NewProgress(msgID int, userID int64) ProgressTracker {
+	return &Progress{
+		msgID:  msgID,
+		chatID: userID,
+	}
+}

core/tasks/directlinks/task.go

@@ -0,0 +1,130 @@
+package directlinks
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"sync"
+	"sync/atomic"
+
+	"github.com/krau/SaveAny-Bot/config"
+	"github.com/krau/SaveAny-Bot/core"
+	"github.com/krau/SaveAny-Bot/pkg/enums/tasktype"
+	"github.com/krau/SaveAny-Bot/storage"
+)
+
+type File struct {
+	Name string
+	URL  string
+	Size int64
+}
+
+func (f *File) FileName() string {
+	return f.Name
+}
+
+func (f *File) FileSize() int64 {
+	return f.Size
+}
+
+var _ core.Executable = (*Task)(nil)
+
+type Task struct {
+	ID       string
+	ctx      context.Context
+	files    []*File
+	Storage  storage.Storage
+	StorPath string
+	Progress ProgressTracker
+
+	client          *http.Client // [TODO] parallel download
+	stream          bool
+	totalBytes      int64            // total bytes to download
+	downloadedBytes atomic.Int64     // downloaded bytes
+	totalFiles      int64            // total files to download
+	downloaded      atomic.Int64     // downloaded files count
+	processing      map[string]*File // {"url": File}
+	processingMu    sync.RWMutex
+	failed          map[string]error // [TODO] errors for each file
+}
+
+// Title implements core.Exectable.
+func (t *Task) Title() string {
+	return fmt.Sprintf("[%s](%s...->%s:%s)", t.Type(), t.files[0].Name, t.Storage.Name(), t.StorPath)
+}
+
+// DownloadedBytes implements TaskInfo.
+func (t *Task) DownloadedBytes() int64 {
+	return t.downloadedBytes.Load()
+}
+
+// Processing implements TaskInfo.
+func (t *Task) Processing() []FileInfo {
+	t.processingMu.RLock()
+	defer t.processingMu.RUnlock()
+	infos := make([]FileInfo, 0, len(t.processing))
+	for _, f := range t.processing {
+		infos = append(infos, f)
+	}
+	return infos
+}
+
+// StorageName implements TaskInfo.
+func (t *Task) StorageName() string {
+	return t.Storage.Name()
+}
+
+// StoragePath implements TaskInfo.
+func (t *Task) StoragePath() string {
+	return t.StorPath
+}
+
+// TotalBytes implements TaskInfo.
+func (t *Task) TotalBytes() int64 {
+	return t.totalBytes
+}
+
+// TotalFiles implements TaskInfo.
+func (t *Task) TotalFiles() int {
+	return int(t.totalFiles)
+}
+
+func (t *Task) Type() tasktype.TaskType {
+	return tasktype.TaskTypeDirectlinks
+}
+
+func (t *Task) TaskID() string {
+	return t.ID
+}
+
+func NewTask(
+	id string,
+	ctx context.Context,
+	links []string,
+	stor storage.Storage,
+	storPath string,
+	progressTracker ProgressTracker,
+) *Task {
+	_, ok := stor.(storage.StorageCannotStream)
+	stream := config.C().Stream && !ok
+	files := make([]*File, 0, len(links))
+	for _, link := range links {
+		files = append(files, &File{
+			URL: link,
+		})
+	}
+	return &Task{
+		ID:           id,
+		ctx:          ctx,
+		files:        files,
+		Storage:      stor,
+		StorPath:     storPath,
+		Progress:     progressTracker,
+		stream:       stream,
+		client:       http.DefaultClient,
+		processing:   make(map[string]*File),
+		processingMu: sync.RWMutex{},
+		failed:       make(map[string]error),
+		totalFiles:   int64(len(files)),
+	}
+}

core/tasks/directlinks/util.go

@@ -0,0 +1,205 @@
+package directlinks
+
+import (
+	"mime"
+	"net/url"
+	"strings"
+	"unicode/utf8"
+
+	"golang.org/x/text/encoding/simplifiedchinese"
+)
+
+// parseFilename extracts filename from Content-Disposition header
+// It handles multiple encoding scenarios:
+// 1. RFC 5987/RFC 2231 format: filename*=UTF-8”%E6%B5%8B%E8%AF%95.zip (preferred, checked first)
+// 2. MIME encoded-word: filename="=?UTF-8?B?5rWL6K+VLnppcA==?="
+// 3. URL-encoded: filename="%E6%B5%8B%E8%AF%95.zip"
+// 4. Plain ASCII filename
+//
+// The key fix is checking filename*= first before mime.ParseMediaType, because
+// some servers send Content-Disposition headers with invalid characters that cause
+// mime.ParseMediaType to fail, but the filename*= parameter is still valid.
+func parseFilename(contentDisposition string) string {
+	// First, try to find filename*= (RFC 5987 format, most reliable for non-ASCII)
+	if filename := parseFilenameExtended(contentDisposition); filename != "" {
+		return filename
+	}
+
+	// Try standard MIME parsing for regular filename= parameter
+	_, params, err := mime.ParseMediaType(contentDisposition)
+	if err == nil {
+		if filename := params["filename"]; filename != "" {
+			return decodeFilenameParam(filename)
+		}
+	}
+
+	// Fallback: manual parsing if mime.ParseMediaType fails
+	return parseFilenameFallback(contentDisposition)
+}
+
+// parseFilenameExtended parses RFC 5987/RFC 2231 extended parameter format
+// Format: filename*=charset'language'value (e.g., UTF-8”%E6%B5%8B%E8%AF%95.zip)
+func parseFilenameExtended(cd string) string {
+	// Look for filename*= (case-insensitive)
+	lower := strings.ToLower(cd)
+	idx := strings.Index(lower, "filename*=")
+	if idx == -1 {
+		return ""
+	}
+
+	// Extract the value after filename*=
+	value := cd[idx+len("filename*="):]
+
+	// Find the end of the value (next ; or end of string)
+	if endIdx := strings.Index(value, ";"); endIdx != -1 {
+		value = value[:endIdx]
+	}
+	value = strings.TrimSpace(value)
+
+	// Parse charset'language'encoded-value format
+	// Common format: UTF-8''%E6%B5%8B%E8%AF%95.zip
+	parts := strings.SplitN(value, "''", 2)
+	if len(parts) == 2 {
+		// parts[0] is charset (e.g., "UTF-8")
+		// parts[1] is percent-encoded value
+		decoded, err := url.QueryUnescape(parts[1])
+		if err == nil {
+			return decoded
+		}
+	}
+
+	// Try with single quote delimiter as well (some servers use this)
+	parts = strings.SplitN(value, "'", 3)
+	if len(parts) >= 3 {
+		decoded, err := url.QueryUnescape(parts[2])
+		if err == nil {
+			return decoded
+		}
+	}
+
+	return ""
+}
+
+// TryUrlQueryUnescape tries to unescape a URL-encoded string.
+//
+// If unescaping fails, it returns the original string.
+func tryUrlQueryUnescape(s string) string {
+	if decoded, err := url.QueryUnescape(s); err == nil {
+		return decoded
+	}
+	return s
+}
+
+// decodeFilenameParam decodes a filename parameter value
+// Handles MIME encoded-word, URL encoding, and GBK encoding fallback
+func decodeFilenameParam(filename string) string {
+	// Check if the filename is MIME encoded-word (e.g., =?UTF-8?B?...?=)
+	if strings.HasPrefix(filename, "=?") {
+		decoder := new(mime.WordDecoder)
+		// Some servers use "UTF8" instead of "UTF-8", create a normalized copy
+		normalizedFilename := strings.Replace(filename, "UTF8", "UTF-8", 1)
+		if decoded, err := decoder.Decode(normalizedFilename); err == nil {
+			return decoded
+		}
+	}
+
+	// Try URL decoding
+	decoded := tryUrlQueryUnescape(filename)
+
+	// Check if the result is valid UTF-8. If not, try GBK decoding.
+	// This handles the case where Chinese Windows servers send GBK-encoded filenames
+	// which appear as garbled characters (e.g., "下载地址.zip" -> "<22><><EFBFBD>ص<EFBFBD>ַ.zip")
+	if !utf8.ValidString(decoded) {
+		if gbkDecoded := tryDecodeGBK(decoded); gbkDecoded != "" {
+			return gbkDecoded
+		}
+	}
+
+	return decoded
+}
+
+// gbkDecoder is a reusable GBK decoder for better performance
+var gbkDecoder = simplifiedchinese.GBK.NewDecoder()
+
+// tryDecodeGBK attempts to decode a string as GBK/GB2312/GB18030 encoding
+// Returns empty string if decoding fails or result is not valid UTF-8
+func tryDecodeGBK(s string) string {
+	// GBK uses 1-2 bytes per character. Single-byte chars are 0x00-0x7F (ASCII compatible).
+	// Double-byte chars have first byte 0x81-0xFE and second byte 0x40-0xFE.
+	// Skip if string is empty or all ASCII (valid UTF-8)
+	if len(s) == 0 {
+		return ""
+	}
+
+	// Create a fresh decoder since the transform state may be corrupted
+	decoder := gbkDecoder
+	decoded, err := decoder.Bytes([]byte(s))
+	if err != nil {
+		return ""
+	}
+	result := string(decoded)
+	if utf8.ValidString(result) {
+		return result
+	}
+	return ""
+}
+
+// parseFilenameFallback manually parses filename= when mime.ParseMediaType fails
+func parseFilenameFallback(cd string) string {
+	// Look for filename= (case-insensitive)
+	lower := strings.ToLower(cd)
+	idx := strings.Index(lower, "filename=")
+	if idx == -1 {
+		return ""
+	}
+
+	// Skip "filename=" prefix
+	value := cd[idx+len("filename="):]
+
+	// Find the end of the value
+	if endIdx := strings.Index(value, ";"); endIdx != -1 {
+		value = value[:endIdx]
+	}
+	value = strings.TrimSpace(value)
+
+	// Remove quotes if present
+	if len(value) >= 2 {
+		if (value[0] == '"' && value[len(value)-1] == '"') ||
+			(value[0] == '\'' && value[len(value)-1] == '\'') {
+			value = value[1 : len(value)-1]
+		}
+	}
+
+	return decodeFilenameParam(value)
+}
+
+var progressUpdatesLevels = []struct {
+	size        int64 // 文件大小阈值
+	stepPercent int   // 每多少 % 更新一次
+}{
+	{10 << 20, 100},
+	{50 << 20, 50},
+	{200 << 20, 20},
+	{500 << 20, 10},
+}
+
+func shouldUpdateProgress(total, downloaded int64, lastUpdatePercent int) bool {
+	if total <= 0 || downloaded <= 0 {
+		return false
+	}
+
+	percent := int((downloaded * 100) / total)
+	if percent <= lastUpdatePercent {
+		return false
+	}
+
+	step := progressUpdatesLevels[len(progressUpdatesLevels)-1].stepPercent
+	for _, lvl := range progressUpdatesLevels {
+		if total < lvl.size {
+			step = lvl.stepPercent
+			break
+		}
+	}
+
+	return percent >= lastUpdatePercent+step
+}

core/tasks/parsed/execute.go

@@ -0,0 +1,139 @@
+package parsed
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"path"
+	"path/filepath"
+
+	"github.com/charmbracelet/log"
+	"github.com/duke-git/lancet/v2/retry"
+	"github.com/krau/SaveAny-Bot/common/utils/fsutil"
+	"github.com/krau/SaveAny-Bot/common/utils/ioutil"
+	"github.com/krau/SaveAny-Bot/config"
+	"github.com/krau/SaveAny-Bot/pkg/enums/ctxkey"
+	"github.com/krau/SaveAny-Bot/pkg/parser"
+	"golang.org/x/sync/errgroup"
+)
+
+func (t *Task) Execute(ctx context.Context) error {
+	logger := log.FromContext(ctx)
+	logger.Infof("Starting Parsed item task %s", t.item.Title)
+	if t.progress != nil {
+		t.progress.OnStart(ctx, t)
+	}
+	eg, gctx := errgroup.WithContext(ctx)
+	eg.SetLimit(config.C().Workers)
+	for _, resource := range t.item.Resources {
+		eg.Go(func() error {
+			t.processingMu.RLock()
+			if t.processing[resource.ID()] != nil {
+				return fmt.Errorf("resource %s is already being processed", resource.ID())
+			}
+			t.processingMu.RUnlock()
+			t.processingMu.Lock()
+			t.processing[resource.ID()] = &resource
+			t.processingMu.Unlock()
+			defer func() {
+				t.processingMu.Lock()
+				delete(t.processing, resource.URL)
+				t.processingMu.Unlock()
+			}()
+			err := t.processResource(gctx, resource)
+			t.downloaded.Add(1)
+			if errors.Is(err, context.Canceled) {
+				logger.Debug("Resource processing canceled")
+				return err
+			}
+			if err != nil {
+				logger.Errorf("Error processing resource %s: %v", resource.URL, err)
+				return fmt.Errorf("failed to process resource %s: %w", resource.URL, err)
+			}
+			return nil
+		})
+	}
+	err := eg.Wait()
+	if err != nil {
+		logger.Errorf("Error during Parsed item task execution: %v", err)
+	} else {
+		logger.Infof("Parsed item task %s completed successfully", t.item.Title)
+	}
+	if t.progress != nil {
+		t.progress.OnDone(ctx, t, err)
+	}
+	return err
+}
+
+func (t *Task) processResource(ctx context.Context, resource parser.Resource) error {
+	logger := log.FromContext(ctx)
+	err := retry.Retry(func() error {
+		req, err := http.NewRequestWithContext(ctx, http.MethodGet, resource.URL, nil)
+		if err != nil {
+			return err
+		}
+		if resource.Headers != nil {
+			for k, v := range resource.Headers {
+				req.Header.Set(k, v)
+			}
+		}
+		resp, err := t.httpClient.Do(req)
+		if err != nil {
+			return fmt.Errorf("failed to download resource %s: %w", resource.URL, err)
+		}
+		defer resp.Body.Close()
+		if resp.StatusCode != http.StatusOK {
+			return fmt.Errorf("failed to download resource %s: %s", resource.URL, resp.Status)
+		}
+		ctx = context.WithValue(ctx, ctxkey.ContentLength, func() int64 {
+			if resource.Size > 0 {
+				return resource.Size
+			}
+			return resp.ContentLength
+		}())
+		if t.stream {
+			return t.Stor.Save(ctx, resp.Body, path.Join(t.StorPath, resource.Filename))
+		}
+		cacheFile, err := fsutil.CreateFile(filepath.Join(config.C().Temp.BasePath,
+			fmt.Sprintf("resource_%s_%s", t.ID, resource.Filename)))
+		if err != nil {
+			return fmt.Errorf("failed to create cache file for resource %s: %w", resource.URL, err)
+		}
+		defer func() {
+			if err := cacheFile.CloseAndRemove(); err != nil {
+				logger.Errorf("Failed to close and remove cache file: %v", err)
+			}
+		}()
+		wr := ioutil.NewProgressWriter(cacheFile, func(n int) {
+			t.downloadedBytes.Add(int64(n))
+			if t.progress != nil {
+				t.progress.OnProgress(ctx, t)
+			}
+		})
+
+		copyResultCh := make(chan error, 1)
+		go func() {
+			_, err := io.Copy(wr, resp.Body)
+			copyResultCh <- err
+		}()
+		select {
+		case err := <-copyResultCh:
+			if err != nil {
+				return fmt.Errorf("failed to copy resource %s to cache file: %w", resource.URL, err)
+			}
+		case <-ctx.Done():
+			return ctx.Err()
+		}
+		_, err = cacheFile.Seek(0, 0)
+		if err != nil {
+			return fmt.Errorf("failed to seek cache file for resource %s: %w", resource.URL, err)
+		}
+		return t.Stor.Save(ctx, cacheFile, path.Join(t.StorPath, resource.Filename))
+	}, retry.Context(ctx), retry.RetryTimes(uint(config.C().Retry)))
+	if ctx.Err() != nil {
+		return ctx.Err()
+	}
+	return err
+}

core/tasks/parsed/progress.go

@@ -0,0 +1,209 @@
+package parsed
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"sync/atomic"
+	"time"
+
+	"github.com/charmbracelet/log"
+	"github.com/duke-git/lancet/v2/slice"
+	"github.com/gotd/td/telegram/message/entity"
+	"github.com/gotd/td/telegram/message/styling"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/common/utils/dlutil"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+)
+
+var progressUpdatesLevels = []struct {
+	size        int64 // 文件大小阈值
+	stepPercent int   // 每多少 % 更新一次
+}{
+	{10 << 20, 100},
+	{50 << 20, 50},
+	{200 << 20, 20},
+	{500 << 20, 10},
+}
+
+func shouldUpdateProgress(total, downloaded int64, lastUpdatePercent int) bool {
+	if total <= 0 || downloaded <= 0 {
+		return false
+	}
+
+	percent := int((downloaded * 100) / total)
+	if percent <= lastUpdatePercent {
+		return false
+	}
+
+	step := progressUpdatesLevels[len(progressUpdatesLevels)-1].stepPercent
+	for _, lvl := range progressUpdatesLevels {
+		if total < lvl.size {
+			step = lvl.stepPercent
+			break
+		}
+	}
+
+	return percent >= lastUpdatePercent+step
+}
+
+type ProgressTracker interface {
+	OnStart(ctx context.Context, info TaskInfo)
+	OnProgress(ctx context.Context, info TaskInfo)
+	OnDone(ctx context.Context, info TaskInfo, err error)
+}
+
+type Progress struct {
+	MessageID         int
+	ChatID            int64
+	start             time.Time
+	lastUpdatePercent atomic.Int32
+}
+
+func (p *Progress) OnStart(ctx context.Context, info TaskInfo) {
+	logger := log.FromContext(ctx)
+	p.start = time.Now()
+	p.lastUpdatePercent.Store(0)
+	logger.Debugf("Parsed task progress tracking started for message %d in chat %d", p.MessageID, p.ChatID)
+	entityBuilder := entity.Builder{}
+	var entities []tg.MessageEntityClass
+	if err := styling.Perform(&entityBuilder,
+		styling.Plain(fmt.Sprintf("开始下载 %s 的资源\n总大小: ", info.Site())),
+		styling.Code(fmt.Sprintf("%.2f MB (%d个资源)", float64(info.TotalBytes())/(1024*1024), info.TotalResources())),
+	); err != nil {
+		log.FromContext(ctx).Errorf("Failed to build entities: %s", err)
+		return
+	}
+	text, entities := entityBuilder.Complete()
+	req := &tg.MessagesEditMessageRequest{
+		ID: p.MessageID,
+	}
+	req.SetMessage(text)
+	req.SetEntities(entities)
+	req.SetReplyMarkup(&tg.ReplyInlineMarkup{
+		Rows: []tg.KeyboardButtonRow{
+			{
+				Buttons: []tg.KeyboardButtonClass{
+					tgutil.BuildCancelButton(info.TaskID()),
+				},
+			},
+		}},
+	)
+	ext := tgutil.ExtFromContext(ctx)
+	if ext != nil {
+		ext.EditMessage(p.ChatID, req)
+		return
+	}
+}
+
+func (p *Progress) OnProgress(ctx context.Context, info TaskInfo) {
+	if !shouldUpdateProgress(info.TotalBytes(), info.DownloadedBytes(), int(p.lastUpdatePercent.Load())) {
+		return
+	}
+	percent := int((info.DownloadedBytes() * 100) / info.TotalBytes())
+	if p.lastUpdatePercent.Load() == int32(percent) {
+		return
+	}
+	p.lastUpdatePercent.Store(int32(percent))
+	log.FromContext(ctx).Debugf("Progress update: %s, %d/%d", info.TaskID(), info.DownloadedBytes(), info.TotalBytes())
+	entityBuilder := entity.Builder{}
+	var entities []tg.MessageEntityClass
+	if err := styling.Perform(&entityBuilder,
+		styling.Plain("正在下载\n总大小: "),
+		styling.Code(fmt.Sprintf("%.2f MB (%d个文件)", float64(info.TotalBytes())/(1024*1024), info.TotalResources())),
+		styling.Plain("\n正在处理:\n"),
+		func() styling.StyledTextOption {
+			var lines []string
+			for _, elem := range info.Processing() {
+				lines = append(lines, fmt.Sprintf("  - %s (%.2f MB)", elem.FileName(), float64(elem.FileSize())/(1024*1024)))
+			}
+			if len(lines) == 0 {
+				lines = append(lines, "  - 无")
+			}
+			return styling.Plain(slice.Join(lines, "\n"))
+		}(),
+		styling.Plain("\n平均速度: "),
+		styling.Bold(fmt.Sprintf("%.2f MB/s", dlutil.GetSpeed(info.DownloadedBytes(), p.start)/(1024*1024))),
+		styling.Plain("\n当前进度: "),
+		styling.Bold(fmt.Sprintf("%.2f%%", float64(info.DownloadedBytes())/float64(info.TotalBytes())*100)),
+	); err != nil {
+		log.FromContext(ctx).Errorf("Failed to build entities: %s", err)
+		return
+	}
+	text, entities := entityBuilder.Complete()
+	req := &tg.MessagesEditMessageRequest{
+		ID: p.MessageID,
+	}
+	req.SetMessage(text)
+	req.SetEntities(entities)
+	req.SetReplyMarkup(&tg.ReplyInlineMarkup{
+		Rows: []tg.KeyboardButtonRow{
+			{
+				Buttons: []tg.KeyboardButtonClass{
+					tgutil.BuildCancelButton(info.TaskID()),
+				},
+			},
+		}},
+	)
+	ext := tgutil.ExtFromContext(ctx)
+	if ext != nil {
+		ext.EditMessage(p.ChatID, req)
+		return
+	}
+}
+
+func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) {
+	logger := log.FromContext(ctx)
+	if err != nil {
+		if errors.Is(err, context.Canceled) {
+			logger.Infof("Parsed task %s was canceled", info.TaskID())
+			ext := tgutil.ExtFromContext(ctx)
+			if ext != nil {
+				ext.EditMessage(p.ChatID, &tg.MessagesEditMessageRequest{
+					ID:      p.MessageID,
+					Message: fmt.Sprintf("处理已取消: %s", info.TaskID()),
+				})
+			}
+		} else {
+			logger.Errorf("Parsed task %s failed: %s", info.TaskID(), err)
+			ext := tgutil.ExtFromContext(ctx)
+			if ext != nil {
+				ext.EditMessage(p.ChatID, &tg.MessagesEditMessageRequest{
+					ID:      p.MessageID,
+					Message: fmt.Sprintf("处理失败: %s", err.Error()),
+				})
+			}
+		}
+		return
+	}
+	logger.Infof("Parsed task %s completed successfully", info.TaskID())
+
+	entityBuilder := entity.Builder{}
+	if err := styling.Perform(&entityBuilder,
+		styling.Plain("处理完成, 资源数量: "),
+		styling.Code(fmt.Sprintf("%d", info.TotalResources())),
+		styling.Plain("\n保存路径: "),
+		styling.Code(fmt.Sprintf("[%s]:%s", info.StorageName(), info.StoragePath())),
+	); err != nil {
+		logger.Errorf("Failed to build entities: %s", err)
+		return
+	}
+	text, entities := entityBuilder.Complete()
+	req := &tg.MessagesEditMessageRequest{
+		ID: p.MessageID,
+	}
+	req.SetMessage(text)
+	req.SetEntities(entities)
+
+	ext := tgutil.ExtFromContext(ctx)
+	if ext != nil {
+		ext.EditMessage(p.ChatID, req)
+	}
+}
+
+func NewProgress(messageID int, chatID int64) *Progress {
+	return &Progress{
+		MessageID: messageID,
+		ChatID:    chatID,
+	}
+}

core/tasks/parsed/task.go

@@ -0,0 +1,89 @@
+package parsed
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"sync"
+	"sync/atomic"
+
+	"github.com/krau/SaveAny-Bot/common/utils/netutil"
+	"github.com/krau/SaveAny-Bot/config"
+	"github.com/krau/SaveAny-Bot/core"
+	"github.com/krau/SaveAny-Bot/pkg/enums/tasktype"
+	"github.com/krau/SaveAny-Bot/pkg/parser"
+	"github.com/krau/SaveAny-Bot/storage"
+)
+
+var _ core.Executable = (*Task)(nil)
+
+type Task struct {
+	ID         string
+	Ctx        context.Context
+	Stor       storage.Storage
+	StorPath   string
+	item       *parser.Item
+	httpClient *http.Client // [TODO] btorrent support?
+	progress   ProgressTracker
+	stream     bool
+
+	totalResources  int64
+	downloaded      atomic.Int64 // downloaded resources count
+	totalBytes      int64        // total bytes to download
+	downloadedBytes atomic.Int64 // downloaded bytes count
+	processing      map[string]ResourceInfo
+	processingMu    sync.RWMutex
+	failed          map[string]error // [TODO] errors for each resource
+}
+
+// Title implements core.Exectable.
+func (t *Task) Title() string {
+	return fmt.Sprintf("[%s](%s->%s:%s)", t.Type(), t.item.Title, t.Stor.Name(), t.StorPath)
+}
+
+func (t *Task) Type() tasktype.TaskType {
+	return tasktype.TaskTypeParseditem
+}
+
+func (t *Task) TaskID() string {
+	return t.ID
+}
+
+func NewTask(
+	id string,
+	ctx context.Context,
+	stor storage.Storage,
+	storPath string,
+	item *parser.Item,
+	progressTracker ProgressTracker,
+) *Task {
+	client := netutil.DefaultParserHTTPClient()
+	_, ok := stor.(storage.StorageCannotStream)
+	stream := config.C().Stream && !ok
+	return &Task{
+		ID:             id,
+		Ctx:            ctx,
+		Stor:           stor,
+		StorPath:       storPath,
+		item:           item,
+		totalResources: int64(len(item.Resources)),
+		downloaded:     atomic.Int64{},
+		totalBytes: func() int64 {
+			var total int64
+			for _, res := range item.Resources {
+				if res.Size < 0 {
+					continue // skip resources with unknown size
+				}
+				total += res.Size
+			}
+			return total
+		}(),
+		stream:          stream,
+		downloadedBytes: atomic.Int64{},
+		httpClient:      client,
+		progress:        progressTracker,
+		processing:      make(map[string]ResourceInfo),
+		processingMu:    sync.RWMutex{},
+		failed:          make(map[string]error),
+	}
+}

core/tasks/parsed/taskinfo.go

@@ -0,0 +1,51 @@
+package parsed
+
+type TaskInfo interface {
+	TaskID() string
+	Site() string
+	TotalResources() int64
+	Downloaded() int64
+	TotalBytes() int64
+	DownloadedBytes() int64
+	Processing() map[string]ResourceInfo
+	StorageName() string
+	StoragePath() string
+}
+
+func (t *Task) StoragePath() string {
+	return t.StorPath
+}
+func (t *Task) TotalResources() int64 {
+	return t.totalResources
+}
+
+func (t *Task) Downloaded() int64 {
+	return t.downloaded.Load()
+}
+
+func (t *Task) StorageName() string {
+	return t.Stor.Name()
+}
+
+func (t *Task) Site() string {
+	return t.item.Site
+}
+
+func (t *Task) TotalBytes() int64 {
+	return t.totalBytes
+}
+
+func (t *Task) DownloadedBytes() int64 {
+	return t.downloadedBytes.Load()
+}
+
+func (t *Task) Processing() map[string]ResourceInfo {
+	t.processingMu.RLock()
+	defer t.processingMu.RUnlock()
+	return t.processing
+}
+
+type ResourceInfo interface {
+	FileName() string
+	FileSize() int64
+}

core/tasks/telegraph/execute.go

@@ -1,4 +1,4 @@
-package tphtask
+package telegraph
 
 import (
 	"context"
@@ -11,7 +11,6 @@ import (
 	"github.com/duke-git/lancet/v2/retry"
 	"github.com/krau/SaveAny-Bot/common/utils/fsutil"
 	"github.com/krau/SaveAny-Bot/config"
-	"go.uber.org/multierr"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -20,10 +19,8 @@ func (t *Task) Execute(ctx context.Context) error {
 	logger.Infof("Starting Telegraph task %s", t.PhPath)
 	t.progress.OnStart(ctx, t)
 	eg, gctx := errgroup.WithContext(ctx)
-	eg.SetLimit(config.Cfg.Workers)
+	eg.SetLimit(config.C().Workers)
 	for i, pic := range t.Pics {
-		pic := pic
-		i := i
 		eg.Go(func() error {
 			err := t.processPic(gctx, pic, i)
 			if err != nil {
@@ -48,25 +45,21 @@ func (t *Task) Execute(ctx context.Context) error {
 func (t *Task) processPic(ctx context.Context, picUrl string, index int) error {
 	retryOpts := []retry.Option{
 		retry.Context(ctx),
-		retry.RetryTimes(uint(config.Cfg.Retry)),
+		retry.RetryTimes(uint(config.C().Retry)),
 	}
-	var lastErr error
 	err := retry.Retry(func() error {
-		var body io.ReadCloser
+		body, err := t.client.Download(ctx, picUrl)
-		body, lastErr = t.client.Download(ctx, picUrl)
+		if err != nil {
-		if lastErr != nil {
+			return fmt.Errorf("failed to download picture %s: %w", picUrl, err)
-			lastErr = fmt.Errorf("failed to download picture %s: %w", picUrl, lastErr)
-			return lastErr
 		}
 		defer body.Close()
 		filename := fmt.Sprintf("%d%s", index+1, path.Ext(picUrl))
 		if t.cannotStream {
-			cacheFile, err := fsutil.CreateFile(filepath.Join(config.Cfg.Temp.BasePath,
+			cacheFile, err := fsutil.CreateFile(filepath.Join(config.C().Temp.BasePath,
 				fmt.Sprintf("tph_%s_%s", t.TaskID(), filename),
 			))
 			if err != nil {
-				lastErr = fmt.Errorf("failed to create cache file for picture %s: %w", filename, err)
+				return fmt.Errorf("failed to create cache file for picture %s: %w", filename, err)
-				return lastErr
 			}
 			defer func() {
 				if err := cacheFile.CloseAndRemove(); err != nil {
@@ -74,21 +67,26 @@ func (t *Task) processPic(ctx context.Context, picUrl string, index int) error {
 					logger.Errorf("Failed to close and remove cache file for picture %s: %v", filename, err)
 				}
 			}()
-			_, lastErr = io.Copy(cacheFile, body)
+			_, err = io.Copy(cacheFile, body)
-			if lastErr != nil {
+			if err != nil {
-				lastErr = fmt.Errorf("failed to copy picture %s to cache file: %w", filename, lastErr)
+				return fmt.Errorf("failed to copy picture %s to cache file: %w", filename, err)
-				return lastErr
+			}
+			_, err = cacheFile.Seek(0, 0)
+			if err != nil {
+				return fmt.Errorf("failed to seek cache file for picture %s: %w", filename, err)
+			}
+			err = t.Stor.Save(ctx, cacheFile, path.Join(t.StorPath, filename))
+			if err != nil {
+				return fmt.Errorf("failed to save picture %s: %w", filename, err)
 			}
-			lastErr = t.Stor.Save(ctx, cacheFile, path.Join(t.StorPath, filename))
 		} else {
-			lastErr = t.Stor.Save(ctx, body, path.Join(t.StorPath, filename))
+			err = t.Stor.Save(ctx, body, path.Join(t.StorPath, filename))
 		}
 
-		if lastErr != nil {
+		if err != nil {
-			lastErr = fmt.Errorf("failed to save picture %s: %w", filename, lastErr)
+			return fmt.Errorf("failed to save picture %s: %w", filename, err)
-			return lastErr
 		}
 		return nil
 	}, retryOpts...)
-	return multierr.Combine(err, lastErr)
+	return err
 }

core/tasks/telegraph/progress.go

@@ -1,4 +1,4 @@
-package tphtask
+package telegraph
 
 import (
 	"context"

core/tasks/telegraph/task.go

@@ -1,14 +1,18 @@
-package tphtask
+package telegraph
 
 import (
 	"context"
+	"fmt"
 	"sync/atomic"
 
+	"github.com/krau/SaveAny-Bot/core"
 	"github.com/krau/SaveAny-Bot/pkg/enums/tasktype"
 	"github.com/krau/SaveAny-Bot/pkg/telegraph"
 	"github.com/krau/SaveAny-Bot/storage"
 )
 
+var _ core.Executable = (*Task)(nil)
+
 type Task struct {
 	ID       string
 	Ctx      context.Context
@@ -24,6 +28,11 @@ type Task struct {
 	downloaded   atomic.Int64
 }
 
+// Title implements core.Exectable.
+func (t *Task) Title() string {
+	return fmt.Sprintf("[%s](%s->%s:%s)", t.Type(), t.PhPath, t.Stor.Name(), t.StorPath)
+}
+
 func (t *Task) Type() tasktype.TaskType {
 	return tasktype.TaskTypeTphpics
 }
@@ -39,7 +48,7 @@ func NewTask(
 	progress ProgressTracker,
 ) *Task {
 	_, cannotStream := stor.(storage.StorageCannotStream)
-	tphtask := &Task{
+	telegraph := &Task{
 		ID:           id,
 		Ctx:          ctx,
 		PhPath:       phPath,
@@ -52,5 +61,5 @@ func NewTask(
 		totalpics:    len(pics),
 		downloaded:   atomic.Int64{},
 	}
-	return tphtask
+	return telegraph
 }

core/tasks/telegraph/taskinfo.go

@@ -1,4 +1,4 @@
-package tphtask
+package telegraph
 
 type TaskInfo interface {
 	TaskID() string

core/tasks/telegraph/utils.go

@@ -1,4 +1,4 @@
-package tphtask
+package telegraph
 
 func shouldUpdateProgress(downloaded int64, total int64) bool {
 	if total <= 0 || downloaded <= 0 {

core/tasks/tfile/execute.go

@@ -1,22 +1,24 @@
-package tftask
+package tfile
 
 import (
 	"context"
 	"fmt"
 	"os"
 	"path"
-	"time"
 
 	"github.com/charmbracelet/log"
+	"github.com/duke-git/lancet/v2/retry"
+	"github.com/krau/SaveAny-Bot/common/tdler"
 	"github.com/krau/SaveAny-Bot/common/utils/fsutil"
 	"github.com/krau/SaveAny-Bot/config"
 	"github.com/krau/SaveAny-Bot/pkg/enums/ctxkey"
-	"github.com/krau/SaveAny-Bot/pkg/tfile"
 )
 
 func (t *Task) Execute(ctx context.Context) error {
 	logger := log.FromContext(ctx).WithPrefix(fmt.Sprintf("file[%s]", t.File.Name()))
-	t.Progress.OnStart(ctx, t)
+	if t.Progress != nil {
+		t.Progress.OnStart(ctx, t)
+	}
 	if t.stream {
 		return executeStream(ctx, t)
 	}
@@ -34,9 +36,11 @@ func (t *Task) Execute(ctx context.Context) error {
 	wrAt := newWriterAt(ctx, localFile, t.Progress, t)
 
 	defer func() {
-		t.Progress.OnDone(ctx, t, err)
+		if t.Progress != nil {
+			t.Progress.OnDone(ctx, t, err)
+		}
 	}()
-	_, err = tfile.NewDownloader(t.File).Parallel(ctx, wrAt)
+	_, err = tdler.NewDownloader(t.File).Parallel(ctx, wrAt)
 	if err != nil {
 		return fmt.Errorf("failed to download file: %w", err)
 	}
@@ -53,30 +57,19 @@ func (t *Task) Execute(ctx context.Context) error {
 		return fmt.Errorf("failed to get file stat: %w", err)
 	}
 	vctx := context.WithValue(ctx, ctxkey.ContentLength, fileStat.Size())
-	for i := range config.Cfg.Retry + 1 {
+	err = retry.Retry(func() error {
-		if err = vctx.Err(); err != nil {
+		file, err := os.Open(t.localPath)
-			return fmt.Errorf("context canceled while saving file: %w", err)
-		}
-		var file *os.File
-		file, err = os.Open(t.localPath)
 		if err != nil {
 			return fmt.Errorf("failed to open cache file: %w", err)
 		}
 		defer file.Close()
 		if err = t.Storage.Save(vctx, file, t.Path); err != nil {
-			if i == config.Cfg.Retry {
+			return fmt.Errorf("failed to save file: %w", err)
-				return fmt.Errorf("failed to save file: %w", err)
-			}
-			logger.Errorf("Failed to save file: %s, retrying...", err)
-			select {
-			case <-vctx.Done():
-				return fmt.Errorf("context canceled during retry delay: %w", vctx.Err())
-			case <-time.After(time.Duration(i*500) * time.Millisecond):
-			}
-			continue
 		}
 		return nil
+	}, retry.RetryTimes(uint(config.C().Retry)), retry.Context(vctx))
+	if err != nil {
+		return fmt.Errorf("failed to save file after retries: %w", err)
 	}
-	return fmt.Errorf("failed to save file after retries")
+	return nil
-
 }

core/tasks/tfile/progress.go

@@ -1,4 +1,4 @@
-package tftask
+package tfile
 
 import (
 	"context"

core/tasks/tfile/stream.go

@@ -1,4 +1,4 @@
-package tftask
+package tfile
 
 import (
 	"context"
@@ -6,7 +6,7 @@ import (
 	"io"
 
 	"github.com/charmbracelet/log"
-	"github.com/krau/SaveAny-Bot/pkg/tfile"
+	"github.com/krau/SaveAny-Bot/common/tdler"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -21,16 +21,20 @@ func executeStream(ctx context.Context, task *Task) error {
 	})
 	wr := newWriter(ctx, pw, task.Progress, task)
 	errg.Go(func() error {
+		defer pw.Close()
 		logger.Info("Starting file download in stream mode")
-		_, err := tfile.NewDownloader(task.File).Stream(uploadCtx, wr)
+		_, err := tdler.NewDownloader(task.File).Stream(uploadCtx, wr)
-		if closeErr := pw.CloseWithError(err); closeErr != nil {
+		if err != nil {
-			logger.Errorf("Failed to close pipe writer: %v", closeErr)
+			logger.Errorf("Failed to download file: %v", err)
+			pw.CloseWithError(err)
 		}
 		return err
 	})
 	var err error
 	defer func() {
-		task.Progress.OnDone(ctx, task, err)
+		if task.Progress != nil {
+			task.Progress.OnDone(ctx, task, err)
+		}
 	}()
 	if err = errg.Wait(); err != nil {
 		return err

core/tasks/tfile/taskinfo.go

@@ -1,4 +1,4 @@
-package tftask
+package tfile
 
 type TaskInfo interface {
 	TaskID() string

core/tasks/tfile/tftask.go

@@ -1,4 +1,4 @@
-package tftask
+package tfile
 
 import (
 	"context"
@@ -6,11 +6,14 @@ import (
 	"path/filepath"
 
 	"github.com/krau/SaveAny-Bot/config"
+	"github.com/krau/SaveAny-Bot/core"
 	"github.com/krau/SaveAny-Bot/pkg/enums/tasktype"
 	"github.com/krau/SaveAny-Bot/pkg/tfile"
 	"github.com/krau/SaveAny-Bot/storage"
 )
 
+var _ core.Executable = (*Task)(nil)
+
 type Task struct {
 	ID        string
 	Ctx       context.Context
@@ -22,6 +25,11 @@ type Task struct {
 	localPath string
 }
 
+// Title implements core.Exectable.
+func (t *Task) Title() string {
+	return fmt.Sprintf("[%s](%s->%s:%s)", t.Type(), t.File.Name(), t.Storage.Name(), t.Path)
+}
+
 func (t *Task) Type() tasktype.TaskType {
 	return tasktype.TaskTypeTgfiles
 }
@@ -35,12 +43,12 @@ func NewTGFileTask(
 	progress ProgressTracker,
 ) (*Task, error) {
 	_, ok := stor.(storage.StorageCannotStream)
-	if !config.Cfg.Stream || ok {
+	if !config.C().Stream || ok {
-		cachePath, err := filepath.Abs(filepath.Join(config.Cfg.Temp.BasePath, fmt.Sprintf("%s_%s", id, file.Name())))
+		cachePath, err := filepath.Abs(filepath.Join(config.C().Temp.BasePath, fmt.Sprintf("%s_%s", id, file.Name())))
 		if err != nil {
 			return nil, fmt.Errorf("failed to get absolute path for cache: %w", err)
 		}
-		tftask := &Task{
+		tfile := &Task{
 			ID:        id,
 			Ctx:       ctx,
 			File:      file,
@@ -49,7 +57,7 @@ func NewTGFileTask(
 			Progress:  progress,
 			localPath: cachePath,
 		}
-		return tftask, nil
+		return tfile, nil
 	}
 	tfileTask := &Task{
 		ID:       id,

core/tasks/tfile/util.go

@@ -1,4 +1,4 @@
-package tftask
+package tfile
 
 var progressUpdatesLevels = []struct {
 	size        int64 // 文件大小阈值