feat(i18n): Add progress tracking messages for various tasks and enhance error handling

2026-05-20 23:59:34 +08:00 · 2025-12-19 20:40:14 +08:00
parent 4ccbf8177e
commit 6db5633ca6
7 changed files with 142 additions and 55 deletions
--- a/core/tasks/batchtfile/progress.go
+++ b/core/tasks/batchtfile/progress.go
@@ -13,6 +13,8 @@ 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/common/i18n"
+	"github.com/krau/SaveAny-Bot/common/i18n/i18nk"
 	"github.com/krau/SaveAny-Bot/common/utils/dlutil"
 	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 )
@@ -37,7 +39,7 @@ func (p *Progress) OnStart(ctx context.Context, info TaskInfo) {
 	entityBuilder := entity.Builder{}
 	var entities []tg.MessageEntityClass
 	if err := styling.Perform(&entityBuilder,
-		styling.Plain("开始执行批量下载任务\n总大小: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressBatchStartPrefix, nil)),
 		styling.Code(fmt.Sprintf("%.2f MB (%d个文件)", float64(info.TotalSize())/(1024*1024), info.Count())),
 	); err != nil {
 		log.FromContext(ctx).Errorf("Failed to build entities: %s", err)
@@ -78,22 +80,22 @@ func (p *Progress) OnProgress(ctx context.Context, info TaskInfo) {
 	entityBuilder := entity.Builder{}
 	var entities []tg.MessageEntityClass
 	if err := styling.Perform(&entityBuilder,
-		styling.Plain("正在处理批量下载任务\n总大小: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressBatchProcessingPrefix, nil)),
 		styling.Code(fmt.Sprintf("%.2f MB (%d个文件)", float64(info.TotalSize())/(1024*1024), info.Count())),
-		styling.Plain("\n正在处理:\n"),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressProcessingListPrefix, nil)),
 		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, "  - 无")
+				lines = append(lines, i18n.T(i18nk.BotMsgProgressProcessingNone, nil))
 			}
 			return styling.Plain(slice.Join(lines, "\n"))
 		}(),
-		styling.Plain("\n平均速度: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressAvgSpeedPrefix, nil)),
 		styling.Bold(fmt.Sprintf("%.2f MB/s", dlutil.GetSpeed(info.Downloaded(), p.start)/(1024*1024))),
-		styling.Plain("\n当前进度: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressCurrentProgressPrefix, nil)),
 		styling.Bold(fmt.Sprintf("%.2f%%", float64(info.Downloaded())/float64(info.TotalSize())*100)),
 	); err != nil {
 		log.FromContext(ctx).Errorf("Failed to build entities: %s", err)
@@ -133,19 +135,21 @@ func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) {
 	if err != nil {
 		if errors.Is(err, context.Canceled) {
 			stylingErr = styling.Perform(&entityBuilder,
-				styling.Plain("任务已取消"),
+				styling.Plain(i18n.T(i18nk.BotMsgProgressTaskCanceled, nil)),
 			)
 		} else {
 			stylingErr = styling.Perform(&entityBuilder,
-				styling.Plain("处理失败, 错误:\n "),
+				styling.Plain(i18n.T(i18nk.BotMsgProgressTaskFailedWithError, map[string]any{
+					"Error": "",
+				})),
 				styling.Code(err.Error()),
 			)
 		}
 	} else {
 		stylingErr = styling.Perform(&entityBuilder,
-			styling.Plain("处理完成\n文件数: "),
+			styling.Plain(i18n.T(i18nk.BotMsgProgressBatchDonePrefix, nil)),
 			styling.Code(strconv.Itoa(info.Count())),
-			styling.Plain("\n总大小: "),
+			styling.Plain(i18n.T(i18nk.BotMsgProgressTotalSizePrefix, nil)),
 			styling.Code(fmt.Sprintf("%.2f MB", float64(info.TotalSize())/(1024*1024))),
 		)
 	}
--- a/core/tasks/directlinks/progress.go
+++ b/core/tasks/directlinks/progress.go
@@ -12,6 +12,8 @@ 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/common/i18n"
+	"github.com/krau/SaveAny-Bot/common/i18n/i18nk"
 	"github.com/krau/SaveAny-Bot/common/utils/dlutil"
 	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 )
@@ -53,8 +55,10 @@ func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) {
 			ext := tgutil.ExtFromContext(ctx)
 			if ext != nil {
 				ext.EditMessage(p.chatID, &tg.MessagesEditMessageRequest{
-					ID:      p.msgID,
-					Message: fmt.Sprintf("处理已取消: %s", info.TaskID()),
+					ID: p.msgID,
+					Message: i18n.T(i18nk.BotMsgProgressTaskCanceledWithId, map[string]any{
+						"TaskID": info.TaskID(),
+					}),
 				})
 			}
 		} else {
@@ -62,8 +66,10 @@ func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) {
 			ext := tgutil.ExtFromContext(ctx)
 			if ext != nil {
 				ext.EditMessage(p.chatID, &tg.MessagesEditMessageRequest{
-					ID:      p.msgID,
-					Message: fmt.Sprintf("处理失败: %s", err.Error()),
+					ID: p.msgID,
+					Message: i18n.T(i18nk.BotMsgProgressTaskFailedWithError, map[string]any{
+						"Error": err.Error(),
+					}),
 				})
 			}
 		}
@@ -73,9 +79,9 @@ func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) {

 	entityBuilder := entity.Builder{}
 	if err := styling.Perform(&entityBuilder,
-		styling.Plain("处理完成, 文件数量: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressDirectDonePrefix, nil)),
 		styling.Code(fmt.Sprintf("%d", info.TotalFiles())),
-		styling.Plain("\n保存路径: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressSavePathPrefix, nil)),
 		styling.Code(fmt.Sprintf("[%s]:%s", info.StorageName(), info.StoragePath())),
 	); err != nil {
 		logger.Errorf("Failed to build entities: %s", err)
@@ -108,22 +114,22 @@ func (p *Progress) OnProgress(ctx context.Context, info TaskInfo) {
 	entityBuilder := entity.Builder{}
 	var entities []tg.MessageEntityClass
 	if err := styling.Perform(&entityBuilder,
-		styling.Plain("正在下载\n总大小: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressDownloadingPrefix, nil)),
 		styling.Code(fmt.Sprintf("%.2f MB (%d个文件)", float64(info.TotalBytes())/(1024*1024), info.TotalFiles())),
-		styling.Plain("\n正在处理:\n"),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressProcessingListPrefix, nil)),
 		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, "  - 无")
+				lines = append(lines, i18n.T(i18nk.BotMsgProgressProcessingNone, nil))
 			}
 			return styling.Plain(slice.Join(lines, "\n"))
 		}(),
-		styling.Plain("\n平均速度: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressAvgSpeedPrefix, nil)),
 		styling.Bold(fmt.Sprintf("%.2f MB/s", dlutil.GetSpeed(info.DownloadedBytes(), p.start)/(1024*1024))),
-		styling.Plain("\n当前进度: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressCurrentProgressPrefix, nil)),
 		styling.Bold(fmt.Sprintf("%.2f%%", float64(info.DownloadedBytes())/float64(info.TotalBytes())*100)),
 	); err != nil {
 		log.FromContext(ctx).Errorf("Failed to build entities: %s", err)
@@ -164,7 +170,10 @@ func (p *Progress) OnStart(ctx context.Context, info TaskInfo) {
 	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 {
+		styling.Plain(i18n.T(i18nk.BotMsgProgressDirectStart, map[string]any{
+			"SizeMB": float64(info.TotalBytes()) / (1024 * 1024),
+			"Count":  info.TotalFiles(),
+		}))); err != nil {
 		log.FromContext(ctx).Errorf("Failed to build entities: %s", err)
 		return
 	}
--- a/core/tasks/parsed/progress.go
+++ b/core/tasks/parsed/progress.go
@@ -12,6 +12,8 @@ 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/common/i18n"
+	"github.com/krau/SaveAny-Bot/common/i18n/i18nk"
 	"github.com/krau/SaveAny-Bot/common/utils/dlutil"
 	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 )
@@ -68,7 +70,9 @@ func (p *Progress) OnStart(ctx context.Context, info TaskInfo) {
 	entityBuilder := entity.Builder{}
 	var entities []tg.MessageEntityClass
 	if err := styling.Perform(&entityBuilder,
-		styling.Plain(fmt.Sprintf("开始下载 %s 的资源\n总大小: ", info.Site())),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressParsedStartPrefix, map[string]any{
+			"Site": 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)
@@ -109,22 +113,22 @@ func (p *Progress) OnProgress(ctx context.Context, info TaskInfo) {
 	entityBuilder := entity.Builder{}
 	var entities []tg.MessageEntityClass
 	if err := styling.Perform(&entityBuilder,
-		styling.Plain("正在下载\n总大小: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressDownloadingPrefix, nil)),
 		styling.Code(fmt.Sprintf("%.2f MB (%d个文件)", float64(info.TotalBytes())/(1024*1024), info.TotalResources())),
-		styling.Plain("\n正在处理:\n"),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressProcessingListPrefix, nil)),
 		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, "  - 无")
+				lines = append(lines, i18n.T(i18nk.BotMsgProgressProcessingNone, nil))
 			}
 			return styling.Plain(slice.Join(lines, "\n"))
 		}(),
-		styling.Plain("\n平均速度: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressAvgSpeedPrefix, nil)),
 		styling.Bold(fmt.Sprintf("%.2f MB/s", dlutil.GetSpeed(info.DownloadedBytes(), p.start)/(1024*1024))),
-		styling.Plain("\n当前进度: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressCurrentProgressPrefix, nil)),
 		styling.Bold(fmt.Sprintf("%.2f%%", float64(info.DownloadedBytes())/float64(info.TotalBytes())*100)),
 	); err != nil {
 		log.FromContext(ctx).Errorf("Failed to build entities: %s", err)
@@ -160,8 +164,10 @@ func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) {
 			ext := tgutil.ExtFromContext(ctx)
 			if ext != nil {
 				ext.EditMessage(p.ChatID, &tg.MessagesEditMessageRequest{
-					ID:      p.MessageID,
-					Message: fmt.Sprintf("处理已取消: %s", info.TaskID()),
+					ID: p.MessageID,
+					Message: i18n.T(i18nk.BotMsgProgressTaskCanceledWithId, map[string]any{
+						"TaskID": info.TaskID(),
+					}),
 				})
 			}
 		} else {
@@ -169,8 +175,10 @@ func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) {
 			ext := tgutil.ExtFromContext(ctx)
 			if ext != nil {
 				ext.EditMessage(p.ChatID, &tg.MessagesEditMessageRequest{
-					ID:      p.MessageID,
-					Message: fmt.Sprintf("处理失败: %s", err.Error()),
+					ID: p.MessageID,
+					Message: i18n.T(i18nk.BotMsgProgressTaskFailedWithError, map[string]any{
+						"Error": err.Error(),
+					}),
 				})
 			}
 		}
@@ -180,9 +188,9 @@ func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) {

 	entityBuilder := entity.Builder{}
 	if err := styling.Perform(&entityBuilder,
-		styling.Plain("处理完成, 资源数量: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressParsedDonePrefix, nil)),
 		styling.Code(fmt.Sprintf("%d", info.TotalResources())),
-		styling.Plain("\n保存路径: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressSavePathPrefix, nil)),
 		styling.Code(fmt.Sprintf("[%s]:%s", info.StorageName(), info.StoragePath())),
 	); err != nil {
 		logger.Errorf("Failed to build entities: %s", err)
--- a/core/tasks/telegraph/progress.go
+++ b/core/tasks/telegraph/progress.go
@@ -9,6 +9,8 @@ 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/common/i18n"
+	"github.com/krau/SaveAny-Bot/common/i18n/i18nk"
 	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 )

@@ -29,7 +31,7 @@ func (p *Progress) OnStart(ctx context.Context, info TaskInfo) {
 	entityBuilder := entity.Builder{}
 	var entities []tg.MessageEntityClass
 	if err := styling.Perform(&entityBuilder,
-		styling.Plain("开始下载Telegraph\n图片数量: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressTelegraphStartPrefix, nil)),
 		styling.Code(fmt.Sprintf("%d", info.TotalPics())),
 	); err != nil {
 		log.FromContext(ctx).Errorf("Failed to build entities: %s", err)
@@ -65,7 +67,7 @@ func (p *Progress) OnProgress(ctx context.Context, info TaskInfo) {
 	entityBuilder := entity.Builder{}
 	var entities []tg.MessageEntityClass
 	if err := styling.Perform(&entityBuilder,
-		styling.Plain("正在下载\n当前进度: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressTelegraphProgressPrefix, nil)),
 		styling.Code(fmt.Sprintf("%d/%d", info.Downloaded(), info.TotalPics())),
 	); err != nil {
 		log.FromContext(ctx).Errorf("Failed to build entities: %s", err)
@@ -101,8 +103,10 @@ func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) {
 			ext := tgutil.ExtFromContext(ctx)
 			if ext != nil {
 				ext.EditMessage(p.ChatID, &tg.MessagesEditMessageRequest{
-					ID:      p.MessageID,
-					Message: fmt.Sprintf("处理已取消: %s", info.TaskID()),
+					ID: p.MessageID,
+					Message: i18n.T(i18nk.BotMsgProgressTaskCanceledWithId, map[string]any{
+						"TaskID": info.TaskID(),
+					}),
 				})
 			}
 		} else {
@@ -110,8 +114,10 @@ func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) {
 			ext := tgutil.ExtFromContext(ctx)
 			if ext != nil {
 				ext.EditMessage(p.ChatID, &tg.MessagesEditMessageRequest{
-					ID:      p.MessageID,
-					Message: fmt.Sprintf("处理失败: %s", err.Error()),
+					ID: p.MessageID,
+					Message: i18n.T(i18nk.BotMsgProgressTaskFailedWithError, map[string]any{
+						"Error": err.Error(),
+					}),
 				})
 			}
 		}
@@ -121,9 +127,9 @@ func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) {

 	entityBuilder := entity.Builder{}
 	if err := styling.Perform(&entityBuilder,
-		styling.Plain("处理完成\n图片数量: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressTelegraphDonePrefix, nil)),
 		styling.Code(fmt.Sprintf("%d", info.TotalPics())),
-		styling.Plain("\n保存路径: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressSavePathPrefix, nil)),
 		styling.Code(fmt.Sprintf("[%s]:%s", info.StorageName(), info.StoragePath())),
 	); err != nil {
 		logger.Errorf("Failed to build entities: %s", err)
--- a/core/tasks/tfile/progress.go
+++ b/core/tasks/tfile/progress.go
@@ -11,6 +11,8 @@ 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/common/i18n"
+	"github.com/krau/SaveAny-Bot/common/i18n/i18nk"
 	"github.com/krau/SaveAny-Bot/common/utils/dlutil"
 	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 )
@@ -35,11 +37,11 @@ func (p *Progress) OnStart(ctx context.Context, info TaskInfo) {
 	entityBuilder := entity.Builder{}
 	var entities []tg.MessageEntityClass
 	if err := styling.Perform(&entityBuilder,
-		styling.Plain("开始下载\n文件名: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressFileStartPrefix, nil)),
 		styling.Code(info.FileName()),
-		styling.Plain("\n保存路径: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressSavePathPrefix, nil)),
 		styling.Code(fmt.Sprintf("[%s]:%s", info.StorageName(), info.StoragePath())),
-		styling.Plain("\n文件大小: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressFileSizePrefix, nil)),
 		styling.Code(fmt.Sprintf("%.2f MB", float64(info.FileSize())/(1024*1024))),
 	); err != nil {
 		log.FromContext(ctx).Errorf("Failed to build entities: %s", err)
@@ -80,15 +82,15 @@ func (p *Progress) OnProgress(ctx context.Context, info TaskInfo, downloaded, to
 	entityBuilder := entity.Builder{}
 	var entities []tg.MessageEntityClass
 	if err := styling.Perform(&entityBuilder,
-		styling.Plain("正在处理下载任务\n文件名: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressFileProcessingPrefix, nil)),
 		styling.Code(info.FileName()),
-		styling.Plain("\n保存路径: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressSavePathPrefix, nil)),
 		styling.Code(fmt.Sprintf("[%s]:%s", info.StorageName(), info.StoragePath())),
-		styling.Plain("\n文件大小: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressFileSizePrefix, nil)),
 		styling.Code(fmt.Sprintf("%.2f MB", float64(total)/(1024*1024))),
-		styling.Plain("\n平均速度: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressAvgSpeedPrefix, nil)),
 		styling.Bold(fmt.Sprintf("%.2f MB/s", dlutil.GetSpeed(downloaded, p.start)/(1024*1024))),
-		styling.Plain("\n当前进度: "),
+		styling.Plain(i18n.T(i18nk.BotMsgProgressCurrentProgressPrefix, nil)),
 		styling.Bold(fmt.Sprintf("%.2f%%", float64(downloaded)/float64(total)*100)),
 	); err != nil {
 		log.FromContext(ctx).Errorf("Failed to build entities: %s", err)
@@ -130,22 +132,24 @@ func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) {
 	if err != nil {
 		if errors.Is(err, context.Canceled) {
 			stylingErr = styling.Perform(&entityBuilder,
-				styling.Plain("任务已取消\n文件名: "),
+				styling.Plain(i18n.T(i18nk.BotMsgProgressTaskCanceled, nil)),
+				styling.Plain("\n"),
+				styling.Plain(i18n.T(i18nk.BotMsgProgressFileNamePrefix, nil)),
 				styling.Code(info.FileName()),
 			)
 		} else {
 			stylingErr = styling.Perform(&entityBuilder,
-				styling.Plain("下载失败\n文件名: "),
+				styling.Plain(i18n.T(i18nk.BotMsgProgressDownloadFailedPrefix, nil)),
 				styling.Code(info.FileName()),
-				styling.Plain("\n错误: "),
+				styling.Plain(i18n.T(i18nk.BotMsgProgressErrorPrefix, nil)),
 				styling.Bold(err.Error()),
 			)
 		}
 	} else {
 		stylingErr = styling.Perform(&entityBuilder,
-			styling.Plain("下载完成\n文件名: "),
+			styling.Plain(i18n.T(i18nk.BotMsgProgressDownloadDonePrefix, nil)),
 			styling.Code(info.FileName()),
-			styling.Plain("\n保存路径: "),
+			styling.Plain(i18n.T(i18nk.BotMsgProgressSavePathPrefix, nil)),
 			styling.Code(fmt.Sprintf("[%s]:%s", info.StorageName(), info.StoragePath())),
 		)
 	}