From 9ce1938539567e1ba44733ee6005e3717ce621b1 Mon Sep 17 00:00:00 2001 From: Daniils Petrovs Date: Sun, 23 Oct 2022 00:18:07 +0200 Subject: [PATCH 1/4] Move HoloCure related logic into sep package --- holocure/holocure.go | 52 +++++++++++++++++++++++++++++++++++++++++++ main.go | 53 +++++++++++--------------------------------- 2 files changed, 65 insertions(+), 40 deletions(-) create mode 100644 holocure/holocure.go diff --git a/holocure/holocure.go b/holocure/holocure.go new file mode 100644 index 0000000..4c60e71 --- /dev/null +++ b/holocure/holocure.go @@ -0,0 +1,52 @@ +package holocure + +import ( + b64 "encoding/base64" + "os" + "path/filepath" +) + +const defaultSaveFileName = "save.dat" + +// Returns the default HoloCure save file location for the current platform. +func SaveFilePath() string { + dir, err := os.UserCacheDir() + check(err) + return filepath.Join(dir, "HoloCure", defaultSaveFileName) +} + +// It seems that the start offset will always be the same +// across machines, but safer to find save block dynamically +func FindSaveBlockStartEnd(data *[]byte) (start, end int) { + for offset, char := range *data { + if char == 0x7B && (*data)[offset+1] == 0x20 { + start = offset + } + if char == 0x7D && (*data)[offset+1] == 0x00 { + end = offset + } + } + return +} + +func Decode(data []byte) ([]byte, error) { + return b64.URLEncoding.DecodeString(string(data)) +} + +func DecodeSaveFile(filePath string) ([]byte, error) { + srcDat, err := os.ReadFile(filePath) + check(err) + srcDec, err := Decode(srcDat) + return srcDec, err +} + +func WriteSaveFile(filePath string, data []byte) error { + targetEnc := b64.URLEncoding.EncodeToString(data) + return os.WriteFile(filePath, []byte(targetEnc), 0644) +} + +func check(e error) { + if e != nil { + panic(e) + } +} diff --git a/main.go b/main.go index f06d4a2..de8bf07 100644 --- a/main.go +++ b/main.go @@ -1,15 +1,13 @@ package main import ( - b64 "encoding/base64" "fmt" "os" - "path/filepath" + "github.com/DaniruKun/tasukeru/holocure" "github.com/Songmu/prompter" ) -const defaultSaveFileName = "save.dat" const version = "1.0" func check(e error) { @@ -44,31 +42,14 @@ I am not affiliated with Cover Corp. or Kay Yu in any way. fmt.Printf(header, version) } -func holoCureSaveFilePath() string { - dir, err := os.UserCacheDir() - check(err) - return filepath.Join(dir, "HoloCure", defaultSaveFileName) -} - -// generally it seems that the start offset will always be the same -// across machines, but safer to find save block dynamically -func getSaveBlockStartEnd(srcDec *[]byte) (start, end int) { - for offset, char := range *srcDec { - if char == 0x7B && (*srcDec)[offset+1] == 0x20 { - start = offset - } - if char == 0x7D && (*srcDec)[offset+1] == 0x00 { - end = offset - } - } - return -} - func main() { printHeader() args := os.Args if len(args) < 2 { + + // Run the UI + // normally when used as drag n drop on windows, will be exactly 2 fmt.Println("not enough arguments provided") fmt.Println("did you Drag n Drop the source save file onto tasukeru.exe ?") @@ -79,34 +60,27 @@ func main() { } var start, end int + var sourceSaveFilePath, targetSaveFilePath string - sourceSaveFilePath := args[1] - + sourceSaveFilePath = args[1] fmt.Println("reading origin save file", sourceSaveFilePath) - srcDat, err := os.ReadFile(sourceSaveFilePath) - check(err) - srcDec, err := b64.URLEncoding.DecodeString(string(srcDat)) + srcDec, err := holocure.DecodeSaveFile(sourceSaveFilePath) check(err) - start, end = getSaveBlockStartEnd(&srcDec) - + start, end = holocure.FindSaveBlockStartEnd(&srcDec) srcSaveBlock := srcDec[start : end+1] - var targetFilePath string - if len(args) == 3 { - targetFilePath = args[2] + targetSaveFilePath = args[2] } else { - targetFilePath = holoCureSaveFilePath() + targetSaveFilePath = holocure.SaveFilePath() } - targetDat, err := os.ReadFile(targetFilePath) - check(err) - targetDec, err := b64.URLEncoding.DecodeString(string(targetDat)) + targetDec, err := holocure.DecodeSaveFile(targetSaveFilePath) check(err) - start, _ = getSaveBlockStartEnd(&targetDec) + start, _ = holocure.FindSaveBlockStartEnd(&targetDec) // iterate over the source save block and overwrite the dst save block with its data for i, char := range srcSaveBlock { @@ -125,8 +99,7 @@ func main() { var confirmed bool = prompter.YN("import new save file? インポートOK？", true) if confirmed { - targetEnc := b64.URLEncoding.EncodeToString(targetDec) - err = os.WriteFile(targetFilePath, []byte(targetEnc), 0644) + err = holocure.WriteSaveFile(targetSaveFilePath, targetDec) check(err) fmt.Println("save file imported succesfully!") waitQuit() From 55b1df6458e2b4e1da4a6b631548ced3c3ae8ce2 Mon Sep 17 00:00:00 2001 From: Daniils Petrovs Date: Sun, 23 Oct 2022 01:28:59 +0200 Subject: [PATCH 2/4] Move merging functionality to `holocure` --- README.md | 2 +- holocure/holocure.go | 32 +++++++++++++++++++++++++++++++- main.go | 26 ++------------------------ 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 91f5945..750a807 100644 --- a/README.md +++ b/README.md @@ -33,5 +33,5 @@ E.g. `tasukeru-windows-amd64.exe saveA.dat save.dat` will produce the patched `s On Unix systems you can quickly inspect a save file with ```sh -base64 --decode -i save.dat` +base64 --decode -i save.dat ``` diff --git a/holocure/holocure.go b/holocure/holocure.go index 4c60e71..8f225ee 100644 --- a/holocure/holocure.go +++ b/holocure/holocure.go @@ -2,6 +2,7 @@ package holocure import ( b64 "encoding/base64" + "fmt" "os" "path/filepath" ) @@ -22,7 +23,7 @@ func FindSaveBlockStartEnd(data *[]byte) (start, end int) { if char == 0x7B && (*data)[offset+1] == 0x20 { start = offset } - if char == 0x7D && (*data)[offset+1] == 0x00 { + if char == 0x7D && (*data)[offset-1] == 0x20 { end = offset } } @@ -45,6 +46,35 @@ func WriteSaveFile(filePath string, data []byte) error { return os.WriteFile(filePath, []byte(targetEnc), 0644) } +// Merges the source save file path into the target one. +// Returns the raw bytes of the patches save. +func MergeSaves(sourceSaveFilePath, targetSaveFilePath string) []byte { + fmt.Println("reading origin save file", sourceSaveFilePath) + srcDec, err := DecodeSaveFile(sourceSaveFilePath) + check(err) + var start, end int + + start, end = FindSaveBlockStartEnd(&srcDec) + srcSaveBlock := srcDec[start : end+1] + + targetDec, err := DecodeSaveFile(targetSaveFilePath) + check(err) + + start, _ = FindSaveBlockStartEnd(&targetDec) + + // iterate over the source save block and overwrite the dst save block with its data + for i, char := range srcSaveBlock { + targetOffset := start + i + + if targetOffset >= len(targetDec) { + targetDec = append(targetDec, char) + } else { + targetDec[targetOffset] = char + } + } + return targetDec +} + func check(e error) { if e != nil { panic(e) diff --git a/main.go b/main.go index de8bf07..67d177f 100644 --- a/main.go +++ b/main.go @@ -59,17 +59,9 @@ func main() { os.Exit(1) } - var start, end int var sourceSaveFilePath, targetSaveFilePath string sourceSaveFilePath = args[1] - fmt.Println("reading origin save file", sourceSaveFilePath) - - srcDec, err := holocure.DecodeSaveFile(sourceSaveFilePath) - check(err) - - start, end = holocure.FindSaveBlockStartEnd(&srcDec) - srcSaveBlock := srcDec[start : end+1] if len(args) == 3 { targetSaveFilePath = args[2] @@ -77,21 +69,7 @@ func main() { targetSaveFilePath = holocure.SaveFilePath() } - targetDec, err := holocure.DecodeSaveFile(targetSaveFilePath) - check(err) - - start, _ = holocure.FindSaveBlockStartEnd(&targetDec) - - // iterate over the source save block and overwrite the dst save block with its data - for i, char := range srcSaveBlock { - targetOffset := start + i - - if targetOffset >= len(targetDec) { - targetDec = append(targetDec, char) - } else { - targetDec[targetOffset] = char - } - } + targetDec := holocure.MergeSaves(sourceSaveFilePath, targetSaveFilePath) // fmt.Println("patched save:", string(targetDec)) fmt.Println() @@ -99,7 +77,7 @@ func main() { var confirmed bool = prompter.YN("import new save file? インポートOK？", true) if confirmed { - err = holocure.WriteSaveFile(targetSaveFilePath, targetDec) + err := holocure.WriteSaveFile(targetSaveFilePath, targetDec) check(err) fmt.Println("save file imported succesfully!") waitQuit() From 4678f39cf3d99047e8ac192c9f5fc06ffb665014 Mon Sep 17 00:00:00 2001 From: Daniils Petrovs Date: Sun, 23 Oct 2022 02:31:38 +0200 Subject: [PATCH 3/4] Initial GUI version --- FyneApp.toml | 8 ++++ go.mod | 23 ++++++++++- go.sum | 84 ++++++++++++++++++++++++++++++++++++++ gui.go | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++ main.go | 24 +++++------ 5 files changed, 237 insertions(+), 15 deletions(-) create mode 100644 FyneApp.toml create mode 100644 gui.go diff --git a/FyneApp.toml b/FyneApp.toml new file mode 100644 index 0000000..de073de --- /dev/null +++ b/FyneApp.toml @@ -0,0 +1,8 @@ +Website = "https://danpetrov.xyz/tasukeru" + +[Details] +Icon = "Icon.png" +Name = "Tasukeru" +ID = "com.tasukeru.app" +Version = "1.1.0" +Build = 1 \ No newline at end of file diff --git a/go.mod b/go.mod index 57a40de..915e9c6 100644 --- a/go.mod +++ b/go.mod @@ -2,10 +2,31 @@ module github.com/DaniruKun/tasukeru go 1.18 -require github.com/Songmu/prompter v0.5.1 +require ( + fyne.io/fyne v1.4.3 + github.com/Songmu/prompter v0.5.1 +) require ( + github.com/BurntSushi/toml v1.0.0 // indirect + github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/fyne-io/fyne-cross v1.3.0 // indirect + github.com/fyne-io/mobile v0.1.2 // indirect + github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 // indirect + github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200625191551-73d3c3675aa3 // indirect + github.com/godbus/dbus/v5 v5.0.3 // indirect + github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff // indirect github.com/mattn/go-isatty v0.0.14 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564 // indirect + github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9 // indirect + github.com/stretchr/testify v1.7.0 // indirect + golang.org/x/image v0.0.0-20200430140353-33d19683fad8 // indirect + golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect + golang.org/x/text v0.3.2 // indirect + gopkg.in/yaml.v2 v2.2.8 // indirect ) diff --git a/go.sum b/go.sum index 7fec01a..11d8471 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,93 @@ +fyne.io/fyne v1.4.3 h1:356CnXCiYrrfaLGsB7qLK3c6ktzyh8WR05v/2RBu51I= +fyne.io/fyne v1.4.3/go.mod h1:8kiPBNSDmuplxs9WnKCkaWYqbcXFy0DeAzwa6PBO9Z8= +github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= +github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9 h1:1ltqoej5GtaWF8jaiA49HwsZD459jqm9YFz9ZtMFpQA= +github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I= github.com/Songmu/prompter v0.5.1 h1:IAsttKsOZWSDw7bV1mtGn9TAmLFAjXbp9I/eYmUUogo= github.com/Songmu/prompter v0.5.1/go.mod h1:CS3jEPD6h9IaLaG6afrl1orTgII9+uDWuw95dr6xHSw= +github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fyne-io/fyne-cross v1.3.0 h1:pU8+B0J1+xYQJ27TNRjXiV9qsGHuHFXTDlqp0zfEyWo= +github.com/fyne-io/fyne-cross v1.3.0/go.mod h1:Kp7K91rS+2lmoa9g2kYolExO2I3BB/80no1wplc6mIw= +github.com/fyne-io/mobile v0.1.2 h1:0HaXDtOOwyOTn3Umi0uKVCOgJtfX73c6unC4U8i5VZU= +github.com/fyne-io/mobile v0.1.2/go.mod h1:/kOrWrZB6sasLbEy2JIvr4arEzQTXBTZGb3Y96yWbHY= +github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw= +github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200625191551-73d3c3675aa3 h1:q521PfSp5/z6/sD9FZZOWj4d1MLmfQW8PkRnI9M6PCE= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200625191551-73d3c3675aa3/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= +github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff h1:W71vTCKoxtdXgnm1ECDFkfQnpdqAO00zzGXLA5yaEX8= +github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff/go.mod h1:wfqRWLHRBsRgkp5dmbG56SA0DmVtwrF5N3oPdI8t+Aw= +github.com/jackmordaunt/icns v0.0.0-20181231085925-4f16af745526/go.mod h1:UQkeMHVoNcyXYq9otUupF7/h/2tmHlhrS2zw7ZVvUqc= +github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod h1:eJTEwMjXb7kZ633hO3Ln9mBUCOjX2+FlTljvpl9SYdE= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lucor/goinfo v0.0.0-20200401173949-526b5363a13a/go.mod h1:ORP3/rB5IsulLEBwQZCJyyV6niqmI7P4EWSmkug+1Ng= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564 h1:HunZiaEKNGVdhTRQOVpMmj5MQnGnv+e8uZNu3xFLgyM= +github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564/go.mod h1:afMbS0qvv1m5tfENCwnOdZGOF8RGR/FsZ7bvBxQGZG4= +github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9 h1:m59mIOBO4kfcNCEzJNy71UkeF4XIx2EVmL9KLwDQdmM= +github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9/go.mod h1:mvWM0+15UqyrFKqdRjY6LuAVJR0HOVhJlEgZ5JWtSWU= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20200430140353-33d19683fad8 h1:6WW6V3x1P/jokJBpRQYUJnMHRP6isStQwCozxnU7XQw= +golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190808195139-e713427fea3f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200328031815-3db5fc6bac03/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/gui.go b/gui.go new file mode 100644 index 0000000..74dd82f --- /dev/null +++ b/gui.go @@ -0,0 +1,113 @@ +package main + +import ( + "io" + "log" + "net/url" + + "fyne.io/fyne" + "fyne.io/fyne/app" + "fyne.io/fyne/container" + "fyne.io/fyne/dialog" + "fyne.io/fyne/storage" + "fyne.io/fyne/theme" + "fyne.io/fyne/widget" + "github.com/DaniruKun/tasukeru/holocure" +) + +// Starts a blocking event loop of the GUI. +func RunGUI() { + a := app.New() + w := a.NewWindow("Tasukeru") + w.Resize(fyne.NewSize(800, 600)) + + var srcDec []byte + + targetSaveFilePath := holocure.SaveFilePath() + + confirmButton := widget.NewButtonWithIcon("Import", theme.ConfirmIcon(), func() { + targetDec := mergeFiles(srcDec, targetSaveFilePath) + err := holocure.WriteSaveFile(targetSaveFilePath, targetDec) + if err != nil { + dialog.ShowError(err, w) + return + } + dialog.NewInformation("Result", "Save imported successfully!", w).Show() + }) + confirmButton.Hide() + + openFileButtonLabel := widget.NewLabel("Select save file to import") + openFileButtonLabel.Alignment = fyne.TextAlignCenter + openFileButton := widget.NewButton("Open file", func() { + fd := dialog.NewFileOpen(func(reader fyne.URIReadCloser, err error) { + if err != nil { + dialog.ShowError(err, w) + return + } + if reader == nil { + log.Println("Cancelled") + return + } + + srcDec, err = holocure.Decode(loadFile(reader)) + if err != nil { + dialog.ShowError(err, w) + return + } + + confirmButton.Show() + }, w) + + fd.SetFilter(storage.NewExtensionFileFilter([]string{".dat"})) + fd.Resize(fyne.NewSize(1000, 800)) + fd.Show() + }) + openFileButton.Icon = theme.FileIcon() + + aboutUrl, err := url.Parse(HomePage) + check(err) + aboutHyperLink := widget.NewHyperlink("About", aboutUrl) + + box := container.NewVBox( + openFileButtonLabel, + openFileButton, + confirmButton, + aboutHyperLink, + ) + + w.SetContent(box) + w.ShowAndRun() +} + +func loadFile(f fyne.URIReadCloser) []byte { + data, err := io.ReadAll(f) + if err != nil { + fyne.LogError("Failed to load file data", err) + return nil + } + return data +} + +func mergeFiles(srcDec []byte, targetSaveFilePath string) []byte { + var start, end int + + start, end = holocure.FindSaveBlockStartEnd(&srcDec) + srcSaveBlock := srcDec[start : end+1] + + targetDec, err := holocure.DecodeSaveFile(targetSaveFilePath) + check(err) + + start, _ = holocure.FindSaveBlockStartEnd(&targetDec) + + for i, char := range srcSaveBlock { + targetOffset := start + i + + if targetOffset >= len(targetDec) { + targetDec = append(targetDec, char) + } else { + targetDec[targetOffset] = char + } + } + + return targetDec +} diff --git a/main.go b/main.go index 67d177f..0dcae0c 100644 --- a/main.go +++ b/main.go @@ -8,7 +8,8 @@ import ( "github.com/Songmu/prompter" ) -const version = "1.0" +const Version = "1.1.0" +const HomePage = "https://danpetrov.xyz/tasukeru" func check(e error) { if e != nil { @@ -35,30 +36,26 @@ This program comes with ABSOLUTELY NO WARRANTY; for details see the Github link. This is free software, and you are welcome to redistribute it under certain conditions. -Website: https://danpetrov.xyz/tasukeru +Website: %s I am not affiliated with Cover Corp. or Kay Yu in any way. ` - fmt.Printf(header, version) + fmt.Printf(header, Version, HomePage) } func main() { - printHeader() args := os.Args if len(args) < 2 { - // Run the UI - - // normally when used as drag n drop on windows, will be exactly 2 - fmt.Println("not enough arguments provided") - fmt.Println("did you Drag n Drop the source save file onto tasukeru.exe ?") - fmt.Println("do not forget to Drag n Drop the new save.dat onto tasukeru.exe") - - waitQuit() - os.Exit(1) + RunGUI() + } else { + CLI(args) } +} +func CLI(args []string) { + printHeader() var sourceSaveFilePath, targetSaveFilePath string sourceSaveFilePath = args[1] @@ -71,7 +68,6 @@ func main() { targetDec := holocure.MergeSaves(sourceSaveFilePath, targetSaveFilePath) - // fmt.Println("patched save:", string(targetDec)) fmt.Println() var confirmed bool = prompter.YN("import new save file? インポートOK？", true) From 143a83adccd93cecd32b4cb2c34184dcd316fa94 Mon Sep 17 00:00:00 2001 From: Daniils Petrovs Date: Sun, 23 Oct 2022 21:43:24 +0200 Subject: [PATCH 4/4] Build system updates --- FyneApp.toml | 10 +++++----- Makefile | 32 ++++++++++++++++++++------------ README.md | 33 ++++++++++++++++++++++++++++----- Tasukeru.png | Bin 0 -> 6976 bytes go.mod | 5 +---- go.sum | 10 ++-------- gui.go | 5 +++-- 7 files changed, 59 insertions(+), 36 deletions(-) create mode 100644 Tasukeru.png diff --git a/FyneApp.toml b/FyneApp.toml index de073de..250684e 100644 --- a/FyneApp.toml +++ b/FyneApp.toml @@ -1,8 +1,8 @@ Website = "https://danpetrov.xyz/tasukeru" [Details] -Icon = "Icon.png" -Name = "Tasukeru" -ID = "com.tasukeru.app" -Version = "1.1.0" -Build = 1 \ No newline at end of file + Icon = "Tasukeru.png" + Name = "Tasukeru" + ID = "com.tasukeru.app" + Version = "1.1.0" + Build = 17 diff --git a/Makefile b/Makefile index c6b6538..b626290 100644 --- a/Makefile +++ b/Makefile @@ -1,25 +1,33 @@ -BINARY_NAME=tasukeru +BINARY_NAME := tasukeru -all: build +.PHONY: all build compile-cli compile-windows compile-mac clean run format build: - go build -o bin/${BINARY_NAME} . + @echo "Building tasukeru build for the current platform" + go build -o bin/${BINARY_NAME} -ldflags '-s -w' . -compile: - @echo "Compiling for every OS and Platform" +compile-cli: + @echo "Compiling simple CLI for every OS and Platform" GOOS=darwin GOARCH=amd64 go build -o bin/${BINARY_NAME}-darwin-amd64 . - GOOS=darwin GOARCH=arm64 go build -o bin/${BINARY_NAME}-darwin-arm64 . - GOOS=windows GOARCH=amd64 go build -o bin/${BINARY_NAME}-windows-amd64.exe . - GOOS=windows GOARCH=arm64 go build -o bin/${BINARY_NAME}-windows-arm64.exe . - GOOS=linux GOARCH=amd64 go build -o bin/${BINARY_NAME}-linux-amd64 . - GOOS=linux GOARCH=arm64 go build -o bin/${BINARY_NAME}-linux-arm64 . + fyne-cross windows -ldflags '-s -w' -arch amd64 -console -name tasukeru-cli.exe + +compile-windows: FyneApp.toml + @echo "Building native Windows cross compiled build" + fyne-cross windows -ldflags '-s -w' + +compile-mac: FyneApp.toml + @echo "Building native Mac app" + fyne-cross darwin -ldflags '-s -w' + +all: compile-cli compile-windows compile-mac clean: go clean rm ./bin/* -run: - go run main.go +run: build + @echo "Running dev build of Tasukeru" + ./bin/${BINARY_NAME} format: @echo "Formatting the entire project" diff --git a/README.md b/README.md index 750a807..7bd1c44 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # HoloCure Save File Transfer Tool +![Tasukeru GUI demo](https://i.imgur.com/HDohzzB.png) + This is a small tool to import [HoloCure](https://kay-yu.itch.io/holocure) save files from one PC to another. ## Download @@ -9,13 +11,34 @@ Pick the executable matching your architecture (note: HoloCure currently only ru ## Usage -1. Build a release by running `make` or download a release for your platform from [Releases](https://github.com/DaniruKun/tasukeru/releases) -2. Get the save file from the source PC at `Users\[your username]\AppData\Local\HoloCure\save.dat` and move it to the target PC -3. Play HoloCure **at least once** one the target PC -4. On the target PC, drag and drop the `save.dat` onto `tasukeru-*.exe` -5. When prompted, press `Enter` +1. Get the save file from the source PC at `Users\[your username]\AppData\Local\HoloCure\save.dat` and move it to the target PC +2. Play HoloCure **at least once** one the target PC +3. Launch `Tasukeru.exe` +4. Open the save file you want to import +5. Press `Import` 6. The save should now be imported +## Build + +There are 2 build options: as a GUI app, and as a CLI: + +### GUI + +Install [fyne-cross](https://github.com/fyne-io/fyne-cross). +Then run + +```shell +make compile-windows +``` + +### CLI + +```shell +make compile-cli +``` + +This will produce binaries for each platform in the `bin` directory. + ## Advanced You can manually call the executable and pass arguments directly. diff --git a/Tasukeru.png b/Tasukeru.png new file mode 100644 index 0000000000000000000000000000000000000000..63414aa766e55d850f657a51e2de5fe83376bcc5 GIT binary patch literal 6976 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 literal 0 HcmV?d00001 diff --git a/go.mod b/go.mod index 915e9c6..1424a07 100644 --- a/go.mod +++ b/go.mod @@ -8,11 +8,8 @@ require ( ) require ( - github.com/BurntSushi/toml v1.0.0 // indirect - github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect - github.com/fyne-io/fyne-cross v1.3.0 // indirect github.com/fyne-io/mobile v0.1.2 // indirect github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 // indirect github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200625191551-73d3c3675aa3 // indirect @@ -28,5 +25,5 @@ require ( golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect golang.org/x/text v0.3.2 // indirect - gopkg.in/yaml.v2 v2.2.8 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect ) diff --git a/go.sum b/go.sum index 11d8471..f18a5c3 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,5 @@ fyne.io/fyne v1.4.3 h1:356CnXCiYrrfaLGsB7qLK3c6ktzyh8WR05v/2RBu51I= fyne.io/fyne v1.4.3/go.mod h1:8kiPBNSDmuplxs9WnKCkaWYqbcXFy0DeAzwa6PBO9Z8= -github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= -github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9 h1:1ltqoej5GtaWF8jaiA49HwsZD459jqm9YFz9ZtMFpQA= github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I= github.com/Songmu/prompter v0.5.1 h1:IAsttKsOZWSDw7bV1mtGn9TAmLFAjXbp9I/eYmUUogo= github.com/Songmu/prompter v0.5.1/go.mod h1:CS3jEPD6h9IaLaG6afrl1orTgII9+uDWuw95dr6xHSw= @@ -12,8 +9,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fyne-io/fyne-cross v1.3.0 h1:pU8+B0J1+xYQJ27TNRjXiV9qsGHuHFXTDlqp0zfEyWo= -github.com/fyne-io/fyne-cross v1.3.0/go.mod h1:Kp7K91rS+2lmoa9g2kYolExO2I3BB/80no1wplc6mIw= github.com/fyne-io/mobile v0.1.2 h1:0HaXDtOOwyOTn3Umi0uKVCOgJtfX73c6unC4U8i5VZU= github.com/fyne-io/mobile v0.1.2/go.mod h1:/kOrWrZB6sasLbEy2JIvr4arEzQTXBTZGb3Y96yWbHY= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw= @@ -46,8 +41,8 @@ github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564/go.mod h1:afMbS0qvv1 github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9 h1:m59mIOBO4kfcNCEzJNy71UkeF4XIx2EVmL9KLwDQdmM= github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9/go.mod h1:mvWM0+15UqyrFKqdRjY6LuAVJR0HOVhJlEgZ5JWtSWU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -69,7 +64,6 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM= @@ -88,6 +82,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/gui.go b/gui.go index 74dd82f..187d7b4 100644 --- a/gui.go +++ b/gui.go @@ -2,7 +2,6 @@ package main import ( "io" - "log" "net/url" "fyne.io/fyne" @@ -45,7 +44,6 @@ func RunGUI() { return } if reader == nil { - log.Println("Cancelled") return } @@ -67,12 +65,15 @@ func RunGUI() { aboutUrl, err := url.Parse(HomePage) check(err) aboutHyperLink := widget.NewHyperlink("About", aboutUrl) + aboutHyperLink.Alignment = fyne.TextAlignTrailing + versionLabel := widget.NewLabelWithStyle("Version "+Version, fyne.TextAlignTrailing, fyne.TextStyle{Monospace: true}) box := container.NewVBox( openFileButtonLabel, openFileButton, confirmButton, aboutHyperLink, + versionLabel, ) w.SetContent(box)