refactor: Decompose main and use Docker CMD

Author: xg4

Dockerfile

@@ -14,9 +14,8 @@ RUN go mod download
 COPY . .
 
 # 构建静态二进制文件
-RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o vault-backup .
-RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o backup ./cmd/backup
-RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o restore ./cmd/restore
+RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o vaultb ./cmd/backup
+RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o vaultr ./cmd/restore
 
 # 运行阶段
 FROM alpine:latest
@@ -25,16 +24,10 @@ RUN apk add --no-cache \
     sqlite
 
 # 复制构建的二进制文件
-COPY --from=builder /app/vault-backup /usr/local/bin/vault-backup
-COPY --from=builder /app/backup /usr/local/bin/backup
-COPY --from=builder /app/restore /usr/local/bin/restore
+COPY --from=builder /app/vaultb /usr/local/bin/vaultb
+COPY --from=builder /app/vaultr /usr/local/bin/vaultr
 
-# 复制入口脚本
-COPY entrypoint.sh /
+RUN chmod +x /usr/local/bin/vaultb && \
+    chmod +x /usr/local/bin/vaultr
 
-RUN chmod +x /entrypoint.sh && \
-    chmod +x /usr/local/bin/vault-backup && \
-    chmod +x /usr/local/bin/backup && \
-    chmod +x /usr/local/bin/restore
-
-ENTRYPOINT ["/entrypoint.sh"]
+CMD ["/usr/local/bin/vaultb"]

cmd/backup/main.go

@@ -2,26 +2,51 @@ package main
 
 import (
 	"fmt"
+	"log/slog"
 	"os"
+	"time"
 
-	"github.com/xg4/vaultwarden-backup/internal/archive"
+	"github.com/xg4/vaultwarden-backup/internal/app"
+	"github.com/xg4/vaultwarden-backup/internal/config"
 )
 
 func main() {
-	if len(os.Args) != 4 {
-		fmt.Fprintf(os.Stderr, "Usage: %s <input_directory> <output_encrypted_file> <password>\n", os.Args[0])
+	// 初始化日志记录器
+	opts := &slog.HandlerOptions{
+		Level: slog.LevelInfo,
+	}
+
+	handler := slog.NewTextHandler(os.Stdout, opts)
+
+	slog.SetDefault(slog.New(handler))
+
+	// 加载配置
+	cfg, err := config.Load()
+	if err != nil {
+		slog.Error(fmt.Sprintf("配置加载失败: %v", err))
 		os.Exit(1)
 	}
 
-	inputDir := os.Args[1]
-	outEncryptedFile := os.Args[2]
-	password := os.Args[3]
+	// 打印关键配置
+	slog.Info("-------------------- 环境变量 --------------------")
+	slog.Info(fmt.Sprintf("备份目录 (BACKUP_DIR): %s", cfg.BackupDir))
+	slog.Info(fmt.Sprintf("数据目录 (DATA_DIR): %s", cfg.DataDir))
+	slog.Info(fmt.Sprintf("备份保留 (RETENTION_DAYS): %dd", cfg.RetentionDays))
+	slog.Info(fmt.Sprintf("备份间隔 (BACKUP_INTERVAL): %v", cfg.BackupInterval))
+	slog.Info("--------------------------------------------------")
 
-	if err := archive.EncryptedBackup(inputDir, password, outEncryptedFile); err != nil {
-		fmt.Fprintf(os.Stderr, "创建加密归档失败: %v\n", err)
+	// 创建并运行备份应用
+	backupApp := app.New(cfg)
+	if err := backupApp.Run(); err != nil {
 		os.Exit(1)
 	}
 
-	fmt.Println(" Done.")
-	fmt.Println("Backup complete.")
+	ticker := time.NewTicker(cfg.BackupInterval)
+	defer ticker.Stop()
+
+	for range ticker.C {
+		if err := backupApp.Run(); err != nil {
+			os.Exit(1)
+		}
+	}
 }

cmd/restore/main.go

@@ -1,27 +1,100 @@
 package main
 
 import (
+	"flag"
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/xg4/vaultwarden-backup/internal/archive"
 )
 
+var (
+	inputFile = flag.String("input", "", "输入的加密备份文件路径 (必需)")
+	outputDir = flag.String("output", "", "输出目录路径 (必需)")
+	password  = flag.String("password", "", "解密密码 (必需)")
+	verbose   = flag.Bool("verbose", false, "启用详细输出")
+	help      = flag.Bool("help", false, "显示帮助信息")
+)
+
+func init() {
+	// 添加简写选项
+	flag.StringVar(inputFile, "i", "", "输入的加密备份文件路径 (必需)")
+	flag.StringVar(outputDir, "o", "", "输出目录路径 (必需)")
+	flag.StringVar(password, "p", "", "解密密码 (必需)")
+	flag.BoolVar(verbose, "v", false, "启用详细输出")
+	flag.BoolVar(help, "h", false, "显示帮助信息")
+}
+
+func usage() {
+	fmt.Fprintf(os.Stderr, "Vaultwarden 备份解密工具\n\n")
+	fmt.Fprintf(os.Stderr, "用法: %s [选项]\n\n", filepath.Base(os.Args[0]))
+	fmt.Fprintf(os.Stderr, "选项:\n")
+	flag.PrintDefaults()
+	fmt.Fprintf(os.Stderr, "\n示例:\n")
+	fmt.Fprintf(os.Stderr, "  %s -i backup.enc -o ./restored -p mypassword\n", filepath.Base(os.Args[0]))
+	fmt.Fprintf(os.Stderr, "  %s -input backup.enc -output ./restored -password mypassword -verbose\n", filepath.Base(os.Args[0]))
+	fmt.Fprintf(os.Stderr, "  %s -i backup.enc -o ./restored -p mypassword -v\n", filepath.Base(os.Args[0]))
+}
+
+func validateArgs() error {
+	if *inputFile == "" {
+		return fmt.Errorf("必须指定输入文件 (-input)")
+	}
+
+	if *outputDir == "" {
+		return fmt.Errorf("必须指定输出目录 (-output)")
+	}
+
+	if *password == "" {
+		return fmt.Errorf("必须指定解密密码 (-password)")
+	}
+
+	// 检查输入文件是否存在
+	if _, err := os.Stat(*inputFile); os.IsNotExist(err) {
+		return fmt.Errorf("输入文件不存在: %s", *inputFile)
+	}
+
+	return nil
+}
+
 func main() {
-	if len(os.Args) != 4 {
-		fmt.Fprintf(os.Stderr, "Usage: %s <input_encrypted_file> <output_directory> <password>\n", os.Args[0])
+	// 自定义 usage 函数
+	flag.Usage = usage
+
+	// 解析命令行参数
+	flag.Parse()
+
+	// 如果指定了 help 标志，显示帮助并退出
+	if *help {
+		usage()
+		os.Exit(0)
+	}
+
+	// 验证参数
+	if err := validateArgs(); err != nil {
+		fmt.Fprintf(os.Stderr, "错误: %v\n\n", err)
+		usage()
 		os.Exit(1)
 	}
 
-	inputEncryptedFile := os.Args[1]
-	outputDir := os.Args[2]
-	password := os.Args[3]
+	// 详细输出模式
+	if *verbose {
+		fmt.Printf("输入文件: %s\n", *inputFile)
+		fmt.Printf("输出目录: %s\n", *outputDir)
+		fmt.Printf("开始解密...\n")
+	}
 
-	if err := archive.DecryptBackup(inputEncryptedFile, password, outputDir); err != nil {
+	// 执行解密
+	if err := archive.DecryptBackup(*inputFile, *password, *outputDir); err != nil {
 		fmt.Fprintf(os.Stderr, "解密归档失败: %v\n", err)
 		os.Exit(1)
 	}
 
-	fmt.Println(" Done.")
+	fmt.Println("Done.")
 	fmt.Println("Restore complete.")
+
+	if *verbose {
+		fmt.Printf("文件已成功解密到: %s\n", *outputDir)
+	}
 }