Merge pull request #126 from HexmosTech/b2m-v4-migration

B2m v2 migration

Author: Amazing-Stardom

b2-manager/Makefile

@@ -1,2 +1,2 @@
 build:
-	go build -o b2m main.go
+	go build -o b2m main.go

b2-manager/README.md

@@ -19,7 +19,10 @@
 3.  **b3sum**: Install `b3sum` for fast hashing.
     - Rust: `cargo install b3sum`.
     - See also: [BLAKE3](https://github.com/BLAKE3-team/BLAKE3?tab=readme-ov-file).
-
+    - Download binary (Linux x64):
+      `curl -L -o b3sum https://github.com/BLAKE3-team/BLAKE3/releases/download/1.8.3/b3sum_linux_x64_bin`
+    - Make executable & move to path:
+      `chmod +x b3sum && sudo mv b3sum /usr/local/bin/`
 ### Installation
 
 1.  Move the binary to your `frontend` directory (recommended) or add to `/frontend/`.

b2-manager/config/config.go

@@ -3,12 +3,14 @@ package config
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"os/user"
 	"path/filepath"
 	"strings"
 
 	"github.com/BurntSushi/toml"
 
+	"b2m/core"
 	"b2m/model"
 )
 
@@ -41,6 +43,7 @@ func InitializeConfig() error {
 	model.AppConfig.LocalB2MDir = filepath.Join(model.AppConfig.ProjectRoot, ".b2m")
 	model.AppConfig.LocalVersionDir = filepath.Join(model.AppConfig.LocalB2MDir, "version")
 	model.AppConfig.LocalAnchorDir = filepath.Join(model.AppConfig.LocalB2MDir, "local-version")
+	model.AppConfig.MigrationsDir = filepath.Join(model.AppConfig.ProjectRoot, "b2m-migration")
 
 	return nil
 }
@@ -124,3 +127,47 @@ func fetchUserDetails() {
 		model.AppConfig.Hostname = h
 	}
 }
+
+// CheckB3SumAvailability verifies that b3sum is installed and runnable
+// CheckB3SumAvailability verifies that b3sum is installed and runnable.
+// If not found, it attempts to install it automatically.
+func checkB3SumAvailability() error {
+	path, err := exec.LookPath("b3sum")
+	if err == nil {
+		core.LogInfo("b3sum found at: %s", path)
+		return nil
+	}
+	core.LogInfo("b3sum not found.")
+	return fmt.Errorf(`b3sum is missing. Please install it manually:
+
+1. Download binary (Linux x64):
+   curl -L -o b3sum https://github.com/BLAKE3-team/BLAKE3/releases/download/1.8.3/b3sum_linux_x64_bin
+
+2. Make executable & move to path:
+   chmod +x b3sum && sudo mv b3sum /usr/local/bin/
+
+Or use cargo:
+   cargo install b3sum`)
+}
+
+// Cleanup saves the hash cache and closes the logger.
+// This should be called (usually deferred) by the main function.
+func Cleanup() {
+	if err := core.SaveHashCache(); err != nil {
+		core.LogError("Failed to save hash cache: %v", err)
+	}
+	core.CloseLogger()
+}
+
+func CheckDependencies() error {
+	if err := checkB3SumAvailability(); err != nil {
+		return err
+	}
+	if err := core.CheckRclone(); err != nil {
+		return fmt.Errorf("rclone not found or error: %w", err)
+	}
+	if !core.CheckRcloneConfig() {
+		return fmt.Errorf("rclone config not found. Run 'init' or check setup")
+	}
+	return nil
+}

b2-manager/config/init.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"context"
 	"fmt"
 	"os"
 
@@ -24,9 +23,6 @@ func InitSystem() *core.SignalHandler {
 		os.Exit(1)
 	}
 
-	// Set version
-	model.AppConfig.ToolVersion = "2.0"
-
 	// Load hash cache
 	if err := core.LoadHashCache(); err != nil {
 		core.LogInfo("Warning: Failed to load hash cache: %v", err)
@@ -36,130 +32,12 @@ func InitSystem() *core.SignalHandler {
 	core.LogInfo("RootBucket: %s", model.AppConfig.RootBucket)
 	core.LogInfo("DiscordWebhookURL: %s", model.AppConfig.DiscordWebhookURL)
 
-	// CLI Command Handling
-	if len(os.Args) > 1 {
-		command := os.Args[1]
-
-		switch command {
-		case "--help":
-			printUsage()
-			// We exit here because help is a standalone command
-			os.Exit(0)
-
-		case "--version":
-			fmt.Printf("b2m version %s\n", model.AppConfig.ToolVersion)
-			os.Exit(0)
-
-		case "--generate-hash":
-			// Common Dependencies check
-			if err := checkDependencies(); err != nil {
-				fmt.Printf("Error: %v\n", err)
-				os.Exit(1)
-			}
-
-			// Warning and Confirmation
-			fmt.Println("\nWARNING: This operation regenerates all metadata from local files.")
-			fmt.Println("Ensure your local databases are synced with remote to avoid data loss.")
-			fmt.Println("This should ONLY be done when changing hashing algorithms or recovering from corruption.")
-			fmt.Print("\nAre you sure you want to proceed? (y/N): ")
-
-			var confirmation string
-			fmt.Scanln(&confirmation)
-			if confirmation != "y" && confirmation != "Y" {
-				fmt.Println("Operation cancelled.")
-				os.Exit(0)
-			}
-
-			// Clean up .b2m before generating metadata
-			if err := core.CleanupLocalMetadata(); err != nil {
-				fmt.Printf("Error: failed to cleanup metadata: %v\n", err)
-				core.LogError("Generate-Hash: Failed to cleanup metadata: %v", err)
-				os.Exit(1)
-			}
-
-			// Explicitly clear hash cache
-			core.ClearHashCache()
-
-			// Bootstrap system minimal
-			// Use background context for CLI tool mode
-			cliCtx := context.Background()
-			if err := core.BootstrapSystem(cliCtx); err != nil {
-				core.LogError("Startup Warning: %v", err)
-			}
-			core.HandleBatchMetadataGeneration()
-			Cleanup()
-			os.Exit(0)
-
-		case "--reset":
-			fmt.Println("Resetting system state...")
-			// Clean up .b2m before starting normal execution
-			if err := core.CleanupLocalMetadata(); err != nil {
-				fmt.Printf("Error: failed to cleanup metadata: %v\n", err)
-				core.LogError("Reset: Failed to cleanup metadata: %v", err)
-				os.Exit(1)
-			}
-
-			// Explicitly clear hash cache
-			core.ClearHashCache()
-
-			Cleanup()
-			fmt.Println("Reset complete. Please restart the application.")
-			os.Exit(0)
-
-		default:
-			fmt.Printf("Unknown command: %s\n", command)
-			printUsage()
-			os.Exit(1)
-		}
-	}
-
 	// Setup cancellation handling
 	sigHandler := core.NewSignalHandler()
 
-	// Startup checks for TUI
-	if err := checkDependencies(); err != nil {
-		core.LogError("Startup Error: %v", err)
-		fmt.Printf("Startup Error: %v\n", err)
-		os.Exit(1)
-	}
-
 	if err := core.BootstrapSystem(sigHandler.Context()); err != nil {
 		core.LogError("Startup Warning: %v", err)
 	}
 
 	return sigHandler
 }
-
-// Cleanup saves the hash cache and closes the logger.
-// This should be called (usually deferred) by the main function.
-func Cleanup() {
-	if err := core.SaveHashCache(); err != nil {
-		core.LogError("Failed to save hash cache: %v", err)
-	}
-	core.CloseLogger()
-}
-
-func checkDependencies() error {
-	if err := core.CheckB3SumAvailability(); err != nil {
-		return err
-	}
-	if err := core.CheckRclone(); err != nil {
-		return fmt.Errorf("rclone not found or error: %w", err)
-	}
-	if !core.CheckRcloneConfig() {
-		return fmt.Errorf("rclone config not found. Run 'init' or check setup")
-	}
-	return nil
-}
-
-func printUsage() {
-	fmt.Println("b2-manager - Backblaze B2 Database Manager")
-	fmt.Println("\nUsage:")
-	fmt.Println("  b2-manager [command]")
-	fmt.Println("\nCommands:")
-	fmt.Println("  --help            Show this help message")
-	fmt.Println("  --version         Show version information")
-	fmt.Println("  --generate-hash   Generate new hash and create metadata in remote")
-	fmt.Println("  --reset           Remove local metadata caches and start fresh UI session")
-	fmt.Println("\nIf no command is provided, the TUI application starts normally.")
-}