chore: reorganize Docker build workflow and enhance build arguments for versioning

.dockerignore

@@ -0,0 +1,11 @@
+*.md
+.git
+.github/
+.gitignore
+.vscode/
+downloads/
+data/
+cache/
+docs
+config.example.toml
+docker-compose.*

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,7 +1,7 @@
 name: "👾 报告 bug"
 description: "报告 bug"
 labels:
-  - ":space_invader: Bug"
+  - "bug"
 assignees:
   - krau
 body:

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,7 +1,7 @@
 name: "⭐️ 功能请求"
 description: "功能请求"
 labels:
-  - ":fire: Enhancement"
+  - "enhancement"
 assignees:
   - krau
 body:

.github/workflows/build-docker.yml

@@ -20,19 +20,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Extract metadata for Docker
         id: meta
         uses: docker/metadata-action@v5
@@ -50,11 +37,36 @@ jobs:
             org.opencontainers.image.source=https://github.com/krau/SaveAny-Bot
             org.opencontainers.image.url=https://github.com/krau/SaveAny-Bot
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract version from Git Ref
+        id: extract_version
+        run: |
+          VERSION=$(echo "${{ github.ref }}" | sed 's/refs\/tags\/v//')
+          echo "VERSION=${VERSION}" >> $GITHUB_ENV
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          build-args: |
+            VERSION=${{ steps.meta.outputs.version }}
+            GitCommit=${{ github.sha }}
+            BuildTime=${{ format(github.event.repository.updated_at, 'yyyy-MM-dd HH:mm:ss') }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,27 +1,27 @@
 FROM golang:alpine AS builder
 
-WORKDIR /app
+ARG VERSION="dev"
+ARG GiTCommit="Unknown"
+ARG BuildTime="Unknown"
 
-COPY go.* ./
-RUN go mod download
+WORKDIR /app
 
 COPY . .
 
-RUN CGO_ENABLED=0 GOOS=linux go build -o saveany-bot .
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/go/pkg \
+    CGO_ENABLED=0 \ 
+    go build -trimpath \ 
+    -ldflags "-s -w \ 
+    -X github.com/krau/SaveAny-Bot/common.Version=${VERSION} \
+    -X github.com/krau/SaveAny-Bot/common.GitCommit=${GiTCommit} \
+    -X github.com/krau/SaveAny-Bot/common.BuildTime=${BuildTime}" \
+    -o saveany-bot .
 
 FROM alpine:latest
 
-RUN addgroup -S saveany && adduser -S saveany -G saveany
-
 WORKDIR /app
 
-RUN mkdir -p /app/data /app/downloads /app/cache && \
-    chown -R saveany:saveany /app
-
 COPY --from=builder /app/saveany-bot .
 
-RUN chmod +x /app/saveany-bot
-
-USER saveany
-
-CMD ["./saveany-bot"]
+ENTRYPOINT  ["/app/saveany-bot"]

bot/bot.go

@@ -3,7 +3,6 @@ package bot
 import (
 	"context"
 	"net/url"
-	"os"
 	"time"
 
 	"github.com/celestix/gotgproto"
@@ -90,12 +89,10 @@ func Init() {
 
 	select {
 	case <-ctx.Done():
-		common.Log.Fatal("初始化客户端失败: 超时")
-		os.Exit(1)
+		common.Log.Panic("初始化客户端失败: 超时")
 	case result := <-resultChan:
 		if result.err != nil {
-			common.Log.Fatalf("初始化客户端失败: %s", result.err)
-			os.Exit(1)
+			common.Log.Panicf("初始化客户端失败: %s", result.err)
 		}
 		Client = result.client
 		RegisterHandlers(Client.Dispatcher)

bot/handle_add_task.go

@@ -22,7 +22,6 @@ import (
 )
 
 func AddToQueue(ctx *ext.Context, update *ext.Update) error {
-	// TODO: 回调数据用户独立鉴权 (处理 bot 在群聊中的情况)
 	if !slice.Contain(config.Cfg.GetUsersID(), update.CallbackQuery.UserID) {
 		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
 			QueryID:   update.CallbackQuery.QueryID,
@@ -117,7 +116,7 @@ func AddToQueue(ctx *ext.Context, update *ext.Update) error {
 	if update.CallbackQuery.MsgID != record.ReplyMessageID {
 		record.ReplyMessageID = update.CallbackQuery.MsgID
 		if err := dao.SaveReceivedFile(record); err != nil {
-			common.Log.Errorf("更新接收的文件失败: %s", err)
+			common.Log.Errorf("更新记录失败: %s", err)
 		}
 	}
 
@@ -169,6 +168,7 @@ func AddToQueue(ctx *ext.Context, update *ext.Update) error {
 		task = types.Task{
 			Ctx:            ctx,
 			Status:         types.Pending,
+			FileDBID:       record.ID,
 			File:           file,
 			StorageName:    storageName,
 			FileChatID:     record.ChatID,

bot/handle_conversation.go

@@ -1,75 +0,0 @@
-package bot
-
-import (
-	"sync"
-)
-
-type ConversationType string
-
-type ConversationState struct {
-	sync.Mutex
-	conversationType ConversationType
-	InConversation   bool
-	data             map[ConversationType]map[string]interface{}
-}
-
-func (c *ConversationState) Reset() {
-	c.Lock()
-	defer c.Unlock()
-	c.InConversation = false
-	c.conversationType = ""
-	c.data = make(map[ConversationType]map[string]interface{})
-}
-
-func (c *ConversationState) SetConversationType(t ConversationType) {
-	c.Lock()
-	defer c.Unlock()
-	c.conversationType = t
-}
-
-func (c *ConversationState) GetData(key string) interface{} {
-	if c.data == nil || c.data[c.conversationType] == nil {
-		return nil
-	}
-	return c.data[c.conversationType][key]
-}
-
-func (c *ConversationState) SetData(key string, value interface{}) {
-	c.Lock()
-	defer c.Unlock()
-	if c.data == nil {
-		c.data = make(map[ConversationType]map[string]interface{})
-	}
-	if c.data[c.conversationType] == nil {
-		c.data[c.conversationType] = make(map[string]interface{})
-	}
-	c.data[c.conversationType][key] = value
-}
-
-// TODO: Implement conversation handling
-// var userConversationState = make(map[int64]*ConversationState)
-
-// func handleConversation(ctx *ext.Context, update *ext.Update) error {
-// 	userID := update.EffectiveUser().GetID()
-// 	state, ok := userConversationState[userID]
-// 	if !ok {
-// 		return dispatcher.ContinueGroups
-// 	}
-// 	if update.EffectiveMessage.Text == "/cancel" {
-// 		state.Reset()
-// 		ctx.Reply(update, ext.ReplyTextString("已取消"), nil)
-// 		return dispatcher.EndGroups
-// 	}
-// 	if !state.InConversation {
-// 		return dispatcher.ContinueGroups
-// 	}
-// 	return handleConversationState(ctx, update, state)
-// }
-
-// func handleConversationState(ctx *ext.Context, update *ext.Update, state *ConversationState) error {
-// 	switch state.conversationType {
-// 	default:
-// 		common.Log.Errorf("Unknown conversation type: %s", state.conversationType)
-// 	}
-// 	return dispatcher.EndGroups
-// }

bot/handle_dir.go

@@ -77,7 +77,7 @@ func dirCmd(ctx *ext.Context, update *ext.Update) error {
 			ctx.Reply(update, ext.ReplyTextString("路径ID无效"), nil)
 			return dispatcher.EndGroups
 		}
-		return delDir(ctx, update, user, dirID)
+		return delDir(ctx, update, dirID)
 	default:
 		ctx.Reply(update, ext.ReplyTextString("未知操作"), nil)
 		return dispatcher.EndGroups
@@ -99,7 +99,7 @@ func addDir(ctx *ext.Context, update *ext.Update, user *dao.User, storageName, p
 	return dispatcher.EndGroups
 }
 
-func delDir(ctx *ext.Context, update *ext.Update, user *dao.User, dirID int) error {
+func delDir(ctx *ext.Context, update *ext.Update, dirID int) error {
 	if err := dao.DeleteDirByID(uint(dirID)); err != nil {
 		common.Log.Errorf("删除路径失败: %s", err)
 		ctx.Reply(update, ext.ReplyTextString("删除路径失败"), nil)

bot/handle_save.go

@@ -256,7 +256,7 @@ func handleBatchSave(ctx *ext.Context, update *ext.Update, args []string) error
 		successadd++
 	}
 	ctx.EditMessage(update.EffectiveChat().GetID(), &tg.MessagesEditMessageRequest{
-		Message: fmt.Sprintf("批量保存完成\n成功添加: %d/%d\n获取文件失败: %d\n获取消息失败: %d\n保存数据库失败: %d", successadd, total, failedGetFile, failedGetMsg, failedSaveDB),
+		Message: fmt.Sprintf("批量添加任务完成\n成功添加: %d/%d\n获取文件失败: %d\n获取消息失败: %d\n保存数据库失败: %d", successadd, total, failedGetFile, failedGetMsg, failedSaveDB),
 		ID:      replied.ID,
 	})
 	return dispatcher.EndGroups

cmd/run.go

@@ -47,7 +47,7 @@ func Run(_ *cobra.Command, _ []string) {
 			return
 		}
 		common.Log.Info("正在清理缓存文件夹: ", cachePath)
-		if err := os.RemoveAll(cachePath); err != nil {
+		if err := common.RemoveAllInDir(cachePath); err != nil {
 			common.Log.Error("清理缓存失败: ", err)
 		}
 	}

common/os.go

@@ -1,31 +1,11 @@
 package common
 
 import (
-	"errors"
 	"os"
 	"path/filepath"
 	"time"
 )
 
-// 创建文件, 自动创建目录
-func MkFile(path string, data []byte) error {
-	err := os.MkdirAll(filepath.Dir(path), os.ModePerm)
-	if err != nil {
-		return err
-	}
-	return os.WriteFile(path, data, os.ModePerm)
-}
-
-// 删除文件, 并清理空目录. 如果文件不存在则返回 nil
-func PurgeFile(path string) error {
-	if err := os.Remove(path); err != nil {
-		if !errors.Is(err, os.ErrNotExist) {
-			return err
-		}
-	}
-	return RemoveEmptyDirectories(filepath.Dir(path))
-}
-
 func RmFileAfter(path string, td time.Duration) {
 	_, err := os.Stat(path)
 	if err != nil {
@@ -34,22 +14,23 @@ func RmFileAfter(path string, td time.Duration) {
 	}
 	Log.Debugf("Remove file after %s: %s", td, path)
 	time.AfterFunc(td, func() {
-		PurgeFile(path)
+		if err := os.Remove(path); err != nil {
+			Log.Errorf("Failed to remove file %s: %s", path, err)
+		}
 	})
 }
 
-// 递归删除空目录
-func RemoveEmptyDirectories(dirPath string) error {
+// 删除目录下的所有内容, 但不删除目录本身
+func RemoveAllInDir(dirPath string) error {
 	entries, err := os.ReadDir(dirPath)
 	if err != nil {
 		return err
 	}
-	if len(entries) == 0 {
-		err := os.Remove(dirPath)
-		if err != nil {
+	for _, entry := range entries {
+		entryPath := filepath.Join(dirPath, entry.Name())
+		if err := os.RemoveAll(entryPath); err != nil {
 			return err
 		}
-		return RemoveEmptyDirectories(filepath.Dir(dirPath))
 	}
 	return nil
 }

core/download.go

@@ -27,6 +27,13 @@ import (
 
 func processPendingTask(task *types.Task) error {
 	common.Log.Debugf("Start processing task: %s", task.String())
+
+	if task.FileName() != "" && !task.IsTelegraph && task.File.FileSize != 0 && task.FileDBID != 0 {
+		ext := path.Ext(task.FileName())
+		name := task.FileName()[:len(task.FileName())-len(ext)]
+		task.File.FileName = fmt.Sprintf("%s_%d%s", name, task.FileDBID, ext)
+	}
+
 	if task.FileName() == "" {
 		task.File.FileName = fmt.Sprintf("%d_%d_%s", task.FileChatID, task.FileMessageID, task.File.Hash())
 	}
@@ -60,6 +67,7 @@ func processPendingTask(task *types.Task) error {
 
 	notsupportStreamStorage, notsupportStream := taskStorage.(storage.StorageNotSupportStream)
 	cancelMarkUp := getCancelTaskMarkup(task)
+
 	if config.Cfg.Stream {
 		if !notsupportStream {
 			text, entities := buildProgressMessageEntity(task, 0, task.StartTime, 0)

docker-compose.local.yml

@@ -0,0 +1,13 @@
+services:
+  saveany-bot:
+    build: .
+    container_name: saveany-bot
+    restart: unless-stopped
+    volumes:
+      - ./data:/app/data
+      - ./config.toml:/app/config.toml
+      - ./downloads:/app/downloads
+      - ./cache:/app/cache
+    # 使用 host 模式以便访问宿主机服务 (如代理)
+    # 如果你对 Docker 网络模式熟悉, 可以自行修改
+    network_mode: host

types/task.go

@@ -20,6 +20,7 @@ type Task struct {
 	StorageName string
 	StoragePath string
 	StartTime   time.Time
+	FileDBID    uint
 
 	File          *File
 	FileMessageID int