UPDATE: native with new hdiff type

internal/hdiffz-service.go

@@ -7,19 +7,30 @@ import (
 	"firefly-launcher/pkg/models"
 	"firefly-launcher/pkg/sevenzip"
 	"firefly-launcher/pkg/verifier"
+	"firefly-launcher/pkg/hpatchz"
 	"fmt"
 	"io"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strings"
-	"syscall"
 
 	"github.com/wailsapp/wails/v3/pkg/application"
 )
 
 type HdiffzService struct{}
 
+func (h *HdiffzService) CheckTypeHDiff(patchPath string) (bool, string, string) {
+	isFileInTxt, _ := sevenzip.IsFileIn7z(patchPath, "hdifffiles.txt")
+	if isFileInTxt {
+		return true, "hdifffiles.txt", ""
+	}
+	isFileInJson, _ := sevenzip.IsFileIn7z(patchPath, "hdiffmap.json")
+	if isFileInJson {
+		return true, "hdiffmap.json", ""
+	}
+	return false, "", "not found hdifffiles.txt or hdiffmap.json"
+}
+
 func (h *HdiffzService) VersionValidate(gamePath, patchPath string) (bool, string) {
 	oldVersionData, err := models.ParseBinaryVersion(filepath.Join(gamePath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes"))
 	if err != nil {
@@ -53,7 +64,8 @@ func (h *HdiffzService) VersionValidate(gamePath, patchPath string) (bool, strin
 
 	return true, "validated"
 }
-func (h *HdiffzService) DataExtract(gamePath, patchPath string) (bool, string) {
+
+func (h *HdiffzService) DataExtract(gamePath, patchPath string, isSkipVerify bool) (bool, string) {
 	if _, err := os.Stat(gamePath); err != nil {
 		return false, err.Error()
 	}
@@ -73,15 +85,17 @@ func (h *HdiffzService) DataExtract(gamePath, patchPath string) (bool, string) {
 		return false, err.Error()
 	}
 
-	validator, err := verifier.NewVerifier(gamePath, constant.TempUrl)
-	if err != nil {
-		os.RemoveAll(constant.TempUrl)
-		return false, err.Error()
-	}
+	if !isSkipVerify {
+		validator, err := verifier.NewVerifier(gamePath, constant.TempUrl)
+		if err != nil {
+			os.RemoveAll(constant.TempUrl)
+			return false, err.Error()
+		}
 
-	if err := validator.VerifyAll(); err != nil {
-		os.RemoveAll(constant.TempUrl)
-		return false, err.Error()
+		if err := validator.VerifyAll(); err != nil {
+			os.RemoveAll(constant.TempUrl)
+			return false, err.Error()
+		}
 	}
 
 	return true, "validated"
@@ -136,22 +150,42 @@ func (h *HdiffzService) CutData(gamePath string) (bool, string) {
 		return false, err.Error()
 	}
 
-	_ = os.RemoveAll(constant.TempUrl)
-
 	return true, "cut completed"
 }
 
 func (h *HdiffzService) PatchData(gamePath string) (bool, string) {
-	data, err := os.ReadFile(filepath.Join(gamePath, "hdiffmap.json"))
-	if err != nil {
-		return false, err.Error()
-	}
+	hdiffMapPath := filepath.Join(gamePath, "hdiffmap.json")
+	hdiffFilesPath := filepath.Join(gamePath, "hdifffiles.txt")
 
 	var jsonData struct {
-		DiffMap []*models.DiffMapType `json:"diff_map"`
+		DiffMap []*models.HDiffData `json:"diff_map"`
 	}
-	if err := json.Unmarshal(data, &jsonData); err != nil {
-		return false, err.Error()
+
+	if _, err := os.Stat(hdiffMapPath); err == nil {
+		data, err := os.ReadFile(hdiffMapPath)
+		if err != nil {
+			return false, err.Error()
+		}
+
+		var jsonDataDiffMap struct {
+			DiffMap []*models.DiffMapType `json:"diff_map"`
+		}
+		if err := json.Unmarshal(data, &jsonDataDiffMap); err != nil {
+			return false, err.Error()
+		}
+		for _, entry := range jsonDataDiffMap.DiffMap {
+			jsonData.DiffMap = append(jsonData.DiffMap, entry.ToHDiffData())
+		}
+	} else if _, err := os.Stat(hdiffFilesPath); err == nil {
+		files, err := models.LoadHDiffFiles(hdiffFilesPath)
+		if err != nil {
+			return false, err.Error()
+		}
+		for _, entry := range files {
+			jsonData.DiffMap = append(jsonData.DiffMap, entry.ToHDiffData())
+		}
+	} else {
+		return false, "no hdiff entries map exist"
 	}
 
 	for i, entry := range jsonData.DiffMap {
@@ -160,25 +194,48 @@ func (h *HdiffzService) PatchData(gamePath string) (bool, string) {
 				"progress":    i,
 				"maxProgress": len(jsonData.DiffMap),
 			})
+
 		sourceFile := filepath.Join(gamePath, entry.SourceFileName)
 		patchFile := filepath.Join(gamePath, entry.PatchFileName)
 		targetFile := filepath.Join(gamePath, entry.TargetFileName)
 
-		if _, err := os.Stat(sourceFile); os.IsNotExist(err) {
-			continue
-		}
+		// Check patch file tồn tại chưa
 		if _, err := os.Stat(patchFile); os.IsNotExist(err) {
 			continue
 		}
 
-		cmd := exec.Command(constant.ToolHPatchzExe.String(), sourceFile, patchFile, targetFile)
-		cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
-		_, err := cmd.CombinedOutput()
-		if err != nil {
+		// Nếu không có source file hoặc SourceFileName rỗng → apply_patch_empty
+		if entry.SourceFileName == "" {
+			err := hpatchz.ApplyPatchEmpty(patchFile, targetFile)
+			if err != nil {
+				fmt.Printf("%s failed to patch! %v\n", entry.TargetFileName, err)
+				_ = os.Remove(patchFile)
+				return false, err.Error()
+			}
+			_ = os.Remove(patchFile)
 			continue
 		}
+
+		if _, err := os.Stat(sourceFile); os.IsNotExist(err) {
+			continue
+		}
+
+		// Có source file → apply_patch
+		err := hpatchz.ApplyPatch(sourceFile, patchFile, targetFile)
+		if err != nil {
+			fmt.Printf("%s failed to patch! %v\n", entry.TargetFileName, err)
+			_ = os.Remove(patchFile)
+			return false, err.Error()
+		}
+
+		if entry.SourceFileName != entry.TargetFileName {
+			_ = os.Remove(sourceFile)
+		}
+		_ = os.Remove(patchFile)
 	}
 
+	os.Remove(filepath.Join(gamePath, "hdiffmap.json"))
+	os.Remove(filepath.Join(gamePath, "hdifffiles.txt"))
 	return true, "patching completed"
 }
 
@@ -200,13 +257,14 @@ func (h *HdiffzService) DeleteFiles(gamePath string) (bool, string) {
 	}
 
 	if err := scanner.Err(); err != nil {
-		return false, ""
+		return false, "no delete files exist"
 	}
 
 	for i, file := range deleteFiles {
 		os.Remove(filepath.Join(gamePath, file))
 		application.Get().EmitEvent("hdiffz:progress", map[string]int{"progress": i, "maxProgress": len(deleteFiles)})
 	}
-
+	_ = os.Remove(filepath.Join(gamePath, "deletefiles.txt"))
 	return true, ""
 }
+

internal/ldifff-service.go

@@ -0,0 +1 @@
+package internal