Add commands for patch management: create, apply, list, diff, backup, and restore

Author: builtbyjonas

README.md

@@ -1,2 +1,21 @@
 # PTC
 A easy to use patch CLI built for the [ThreadMC](https://github.com/threadmc) open-source projects
+
+## Commands
+
+- `ptc create <file> <patch>`: Create a patch from a file.
+- `ptc apply <patch> [--no-hash-check]`: Apply a patch to the target file. Use `--no-hash-check` to skip hash verification.
+- `ptc list <directory>`: List all patch files in a directory.
+- `ptc diff <patch>`: Show the diff between the current file and the patch content.
+- `ptc backup <file>`: Create a backup of a file.
+- `ptc restore <file>`: Restore a file from its backup.
+
+## Example
+
+```sh
+ptc create foo.txt foo.ptc
+ptc apply foo.ptc
+ptc diff foo.ptc
+ptc backup foo.txt
+ptc restore foo.txt
+```

cmd/apply.go

@@ -11,6 +11,8 @@ import (
 	"ptc/helpers"
 )
 
+var noHashCheck bool
+
 var applyCmd = &cobra.Command{
 	Use:   "apply <patch>",
 	Short: "Apply a patch to the target file",
@@ -65,11 +67,13 @@ var applyCmd = &cobra.Command{
 		}
 		currentHash := helpers.SHA256Sum(currentContent)
 
-		if currentHash != expectedHash {
+		if !noHashCheck && currentHash != expectedHash {
 			fmt.Println("ERROR: File hash mismatch! Patch cannot be safely applied.")
 			fmt.Println("Expected:", expectedHash)
 			fmt.Println("Found   :", currentHash)
 			os.Exit(1)
+		} else if noHashCheck && currentHash != expectedHash {
+			fmt.Println("WARNING: File hash mismatch, but --no-hash-check is set. Applying patch anyway.")
 		}
 
 		// Remove trailing newline if present (optional)
@@ -88,5 +92,6 @@ var applyCmd = &cobra.Command{
 }
 
 func init() {
+	applyCmd.Flags().BoolVar(&noHashCheck, "no-hash-check", false, "Disable hash check when applying patch")
 	rootCmd.AddCommand(applyCmd)
 }

cmd/backup.go

@@ -0,0 +1,29 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"ptc/helpers"
+
+	"github.com/spf13/cobra"
+)
+
+var backupCmd = &cobra.Command{
+	Use:   "backup <file>",
+	Short: "Create a backup of a file",
+	Args:  cobra.ExactArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		file := args[0]
+		backup := file + ".bak"
+		err := helpers.CopyFile(file, backup)
+		if err != nil {
+			fmt.Println("Error creating backup:", err)
+			os.Exit(1)
+		}
+		fmt.Println("Backup created:", backup)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(backupCmd)
+}

cmd/diff.go

@@ -0,0 +1,87 @@
+package cmd
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/spf13/cobra"
+)
+
+var diffCmd = &cobra.Command{
+	Use:   "diff <patch>",
+	Short: "Show the diff between the current file and the patch content",
+	Args:  cobra.ExactArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		patchFile := args[0]
+
+		f, err := os.Open(patchFile)
+		if err != nil {
+			fmt.Println("Error reading patch file:", err)
+			os.Exit(1)
+		}
+		defer f.Close()
+
+		var targetFile string
+		var inContent bool
+		var patchContent []byte
+
+		scanner := bufio.NewScanner(f)
+		for scanner.Scan() {
+			line := scanner.Text()
+			if strings.HasPrefix(line, "TARGET") {
+				parts := strings.SplitN(line, "=", 2)
+				targetFile = strings.TrimSpace(parts[1])
+			}
+			if strings.HasPrefix(line, "--- PATCH CONTENT ---") {
+				inContent = true
+				continue
+			}
+			if inContent {
+				patchContent = append(patchContent, []byte(line+"\n")...)
+			}
+		}
+		if err := scanner.Err(); err != nil {
+			fmt.Println("Error reading patch file:", err)
+			os.Exit(1)
+		}
+
+		if targetFile == "" {
+			fmt.Println("Malformed patch file: missing TARGET")
+			os.Exit(1)
+		}
+
+		currentContent, err := os.ReadFile(targetFile)
+		if err != nil {
+			fmt.Println("Error reading target file:", err)
+			os.Exit(1)
+		}
+
+		// Simple line-by-line diff
+		currentLines := bytes.Split(currentContent, []byte("\n"))
+		patchLines := bytes.Split(patchContent, []byte("\n"))
+
+		max := len(currentLines)
+		if len(patchLines) > max {
+			max = len(patchLines)
+		}
+		for i := 0; i < max; i++ {
+			var cur, pat []byte
+			if i < len(currentLines) {
+				cur = currentLines[i]
+			}
+			if i < len(patchLines) {
+				pat = patchLines[i]
+			}
+			if !bytes.Equal(cur, pat) {
+				fmt.Printf("-%s\n+%s\n", cur, pat)
+			}
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(diffCmd)
+}

cmd/restore.go

@@ -0,0 +1,33 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"ptc/helpers"
+
+	"github.com/spf13/cobra"
+)
+
+var restoreCmd = &cobra.Command{
+	Use:   "restore <file>",
+	Short: "Restore a file from its backup",
+	Args:  cobra.ExactArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		file := args[0]
+		backup := file + ".bak"
+		if _, err := os.Stat(backup); os.IsNotExist(err) {
+			fmt.Println("No backup found for", file)
+			os.Exit(1)
+		}
+		err := helpers.CopyFile(backup, file)
+		if err != nil {
+			fmt.Println("Error restoring file:", err)
+			os.Exit(1)
+		}
+		fmt.Println("File restored from backup:", backup)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(restoreCmd)
+}

cmd/root.go

@@ -7,9 +7,10 @@ import (
 )
 
 var rootCmd = &cobra.Command{
-	Use:   "ptc",
-	Short: "A lightweight patch manager for submodules",
-	Long:  "PTC creates and applies patches inside submodules without Git commits.",
+	Use:     "ptc",
+	Short:   "A lightweight patch manager for submodules",
+	Long:    "PTC creates and applies patches inside submodules without Git commits.",
+	Version: "1.1.0",
 }
 
 func Execute() {