refactor: 代码重构

Author: gizmo-ds

.gitignore

@@ -2,3 +2,4 @@
 .vscode/
 *.code-workspace
 dist/
+*.exe

.goreleaser.yml

@@ -11,8 +11,10 @@ builds:
     goarch:
       - amd64
     ldflags:
-      - -X main.Version={{.Tag}} -X main.BuildDate={{time "20060102"}}
+      - -w -s
     hooks:
+      pre:
+        - go run build/build.go
       post:
         - upx "{{ .Path }}"
 archives:

app/app.go

@@ -0,0 +1,46 @@
+package app
+
+import (
+	"fmt"
+
+	"github.com/project-vrcat/VRChatConfigurationEditor/pkg/utils"
+	"github.com/project-vrcat/VRChatConfigurationEditor/pkg/win32"
+	"github.com/zserge/lorca"
+)
+
+var ui lorca.UI
+
+func init() {
+	utils.HideConsoleWindow()
+}
+
+func bind() {
+	_ = ui.Bind("vrchatPath", BindVRChatPath)
+	_ = ui.Bind("readTextFile", BindReadTextFile)
+	_ = ui.Bind("writeTextFile", BindWriteTextFile)
+	_ = ui.Bind("selectDirectory", BindSelectDirectory)
+	_ = ui.Bind("removeAll", BindRemoveAll)
+	_ = ui.Bind("appVersion", BindAppVersion)
+	_ = ui.Bind("open", BindOpen)
+	_ = ui.Bind("checkUpdate", BindCheckUpdate)
+}
+
+// Run 运行App
+func Run() {
+	port := server()
+	if lorca.ChromeExecutable() == "" {
+		PromptDownload()
+		return
+	}
+	var err error
+	ui, err = lorca.New("", "", 800, 500)
+	if err != nil {
+		_ = win32.MessageBox(win32.HWND(0), err.Error(), "Error", win32.MB_OK|win32.MB_ICONERROR)
+		return
+	}
+	defer ui.Close()
+
+	bind()
+	_ = ui.Load(fmt.Sprintf("http://127.0.0.1:%d", port))
+	<-ui.Done()
+}

bind.go app/bind.go

@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"encoding/json"
@@ -13,7 +13,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/TheTitanrain/w32"
+	"github.com/project-vrcat/VRChatConfigurationEditor/pkg/win32"
 )
 
 // BindVRChatPath 获取VRChat配置目录
@@ -22,10 +22,10 @@ func BindVRChatPath() (_path string, err error) {
 	appdata := os.Getenv("LOCALAPPDATA")
 	if appdata == "" {
 		appdata = os.Getenv("APPDATA")
-		if appdata == "" {
-			err = errors.New("The AppData environment variable must be set for app to run correctly.")
-			return
-		}
+	}
+	if appdata == "" {
+		err = errors.New("the AppData environment variable must be set for app to run correctly")
+		return
 	}
 	localLow = filepath.Join(appdata, "../LocalLow")
 	_path = filepath.Join(localLow, "VRChat/VRChat")
@@ -51,18 +51,18 @@ func BindWriteTextFile(filename, content string) error {
 // BindSelectDirectory 弹出目录选择框
 func BindSelectDirectory(title string) (string, error) {
 	pid := ui.Getpid()
-	owner := FindWindowByProcessId(pid)
+	owner := win32.FindWindowByProcessId(pid)
 	_title, _ := syscall.UTF16PtrFromString(title)
 
-	res := w32.SHBrowseForFolder(&w32.BROWSEINFO{
+	res := win32.SHBrowseForFolder(&win32.BROWSEINFO{
 		Owner: owner,
-		Flags: w32.BIF_RETURNONLYFSDIRS | w32.BIF_NEWDIALOGSTYLE,
+		Flags: win32.BIF_RETURNONLYFSDIRS | win32.BIF_NEWDIALOGSTYLE,
 		Title: _title,
 	})
 	if res == 0 {
-		return "", errors.New("Cancelled")
+		return "", errors.New("cancelled")
 	}
-	return w32.SHGetPathFromIDList(res), nil
+	return win32.SHGetPathFromIDList(res), nil
 }
 
 // BindRemoveAll 清空指定目录
@@ -72,7 +72,7 @@ func BindRemoveAll(path string) error {
 
 // BindAppVersion 获取应用版本号及编译日期
 func BindAppVersion() string {
-	return fmt.Sprintf("%s build-%s", Version, BuildDate)
+	return fmt.Sprintf("%s build-%s", Version, GitHash)
 }
 
 // BindOpen 通过系统默认浏览器打开指定url

chrome.go app/chrome.go

@@ -1,9 +1,10 @@
-package main
+package app
 
 import (
 	"os/exec"
 
-	"github.com/TheTitanrain/w32"
+	"github.com/project-vrcat/VRChatConfigurationEditor/pkg/utils"
+	"github.com/project-vrcat/VRChatConfigurationEditor/pkg/win32"
 )
 
 // PromptDownload 弹出询问是否下载Chrome对话框
@@ -13,10 +14,10 @@ func PromptDownload() {
 	downloadUrl := "https://www.google.com/chrome/"
 	downloadUrlChina := "https://www.google.cn/chrome/"
 
-	r := w32.MessageBox(w32.HWND(0), message, title, w32.MB_YESNO|w32.MB_ICONQUESTION)
-	if r == w32.IDYES {
+	r := win32.MessageBox(0, message, title, win32.MB_YESNO|win32.MB_ICONQUESTION)
+	if r == win32.IDYES {
 		// 如果系统语言为简体中文, 使用中国专用Chrome下载链接
-		if IsChineseSimplified() {
+		if utils.IsChineseSimplified() {
 			downloadUrl = downloadUrlChina
 		}
 		_ = exec.Command("cmd", "/c", "start", downloadUrl).Start()

server.go app/server.go

@@ -1,14 +1,24 @@
-package main
+package app
 
 import (
 	"embed"
 	"fmt"
 	"io/fs"
+	"mime"
 	"net"
 	"net/http"
 	"os"
 )
 
+// PublicFiles 嵌入资源
+var PublicFiles embed.FS
+
+func init() {
+	// Good job Microsoft :)
+	// https://github.com/golang/go/issues/32350
+	_ = mime.AddExtensionType(".js", "application/javascript; charset=utf-8")
+}
+
 func server() int {
 	port := pickPort()
 	http.Handle("/", http.StripPrefix("/", http.FileServer(getFileSystem())))
@@ -29,13 +39,10 @@ func pickPort() int {
 	return addr.Port
 }
 
-//go:embed public
-var publicFiles embed.FS
-
 func getFileSystem() http.FileSystem {
 	if len(os.Args) > 1 && (os.Args[1] == "live" || os.Args[1] == "--live") {
 		return http.Dir("./public")
 	}
-	fSys, _ := fs.Sub(publicFiles, "public")
+	fSys, _ := fs.Sub(PublicFiles, "public")
 	return http.FS(fSys)
 }

app/version.go

@@ -0,0 +1,8 @@
+package app
+
+var (
+	// Version 应用版本号
+	Version = "v1.0.9"
+	// GitHash Git Commit Hash
+	GitHash = "55bc119"
+)

build/build.go

@@ -0,0 +1,51 @@
+//+build script
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+)
+
+func init() {
+	log.SetFlags(log.Lshortfile)
+}
+
+func main() {
+	pwd, _ := os.Getwd()
+	filename := filepath.Join(pwd, "app/version.go")
+	code := fmt.Sprintf(`package app
+
+var (
+	// Version 应用版本号
+	Version = "%s"
+	// GitHash Git Commit Hash
+	GitHash = "%s"
+)
+`, getGitTag(), getGitHash())
+	_ = ioutil.WriteFile(filename, []byte(code), 0666)
+}
+
+func getGitTag() string {
+	cmd := exec.Command("git", "describe", "--abbrev=0", "--tags")
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		log.Println(err)
+		return "v1.0.0"
+	}
+	return strings.Replace(string(out), "\n", "", -1)
+}
+
+func getGitHash() string {
+	cmd := exec.Command("git", "rev-parse", "--short", "HEAD")
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		log.Println(err)
+		return ""
+	}
+	return strings.Replace(string(out), "\n", "", -1)
+}

config.go

@@ -2,9 +2,6 @@ module github.com/project-vrcat/VRChatConfigurationEditor
 
 go 1.16
 
-require (
-	github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d
-	github.com/zserge/lorca v0.1.10
-)
+require github.com/zserge/lorca v0.1.10
 
 replace github.com/zserge/lorca v0.1.10 => github.com/project-vrcat/lorca v0.1.11-0.20210603092944-66a39a5d8b01

go.mod

@@ -1,5 +1,3 @@
-github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d h1:2xp1BQbqcDDaikHnASWpVZRjibOxu7y9LhAv04whugI=
-github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d/go.mod h1:peYoMncQljjNS6tZwI9WVyQB3qZS6u79/N3mBOcnd3I=
 github.com/project-vrcat/lorca v0.1.11-0.20210603092944-66a39a5d8b01 h1:TtRBMvGOPxncsARmEkanHyX5I/pKPHW6PHYs89YJlgs=
 github.com/project-vrcat/lorca v0.1.11-0.20210603092944-66a39a5d8b01/go.mod h1:TUOtEogaMwy0b+p9e4NxZC1jbPRUaNaEw5DnjQF//F8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

go.sum

@@ -2,50 +2,20 @@
 package main
 
 import (
-	"fmt"
+	"embed"
 	"log"
-	"mime"
 
-	"github.com/TheTitanrain/w32"
-	"github.com/zserge/lorca"
+	"github.com/project-vrcat/VRChatConfigurationEditor/app"
 )
 
-var ui lorca.UI
+//go:embed public
+var publicFiles embed.FS
 
 func init() {
-	log.SetFlags(log.Lshortfile)
-
-	// Good job Microsoft :)
-	// https://github.com/golang/go/issues/32350
-	_ = mime.AddExtensionType(".js", "application/javascript; charset=utf-8")
-
-	HideConsoleWindow()
+	log.SetFlags(log.Lshortfile | log.LstdFlags)
 }
 
 func main() {
-	port := server()
-	if lorca.ChromeExecutable() == "" {
-		PromptDownload()
-		return
-	}
-	var err error
-	ui, err = lorca.New("", "", 800, 500)
-	if err != nil {
-		w32.MessageBox(w32.HWND(0), err.Error(), "Error", w32.MB_OK|w32.MB_ICONERROR)
-		return
-	}
-	defer ui.Close()
-
-	_ = ui.Bind("vrchatPath", BindVRChatPath)
-	_ = ui.Bind("readTextFile", BindReadTextFile)
-	_ = ui.Bind("writeTextFile", BindWriteTextFile)
-	_ = ui.Bind("selectDirectory", BindSelectDirectory)
-	_ = ui.Bind("removeAll", BindRemoveAll)
-	_ = ui.Bind("appVersion", BindAppVersion)
-	_ = ui.Bind("open", BindOpen)
-	_ = ui.Bind("checkUpdate", BindCheckUpdate)
-
-	_ = ui.Load(fmt.Sprintf("http://127.0.0.1:%d", port))
-
-	<-ui.Done()
+	app.PublicFiles = publicFiles
+	app.Run()
 }

main.go

@@ -0,0 +1,28 @@
+package utils
+
+import (
+	"os"
+
+	"github.com/project-vrcat/VRChatConfigurationEditor/pkg/win32"
+)
+
+// IsChineseSimplified 当前操作系统语言是否为简体中文
+func IsChineseSimplified() bool {
+	switch win32.GetUserDefaultLCID() {
+	case 0x0804:
+		return true
+	}
+	return false
+}
+
+// HideConsoleWindow 隐藏控制台窗口
+func HideConsoleWindow() {
+	hwnd := win32.GetConsoleWindow()
+	if hwnd <= 0 {
+		return
+	}
+	_, pid := win32.GetWindowThreadProcessId(hwnd)
+	if pid == os.Getpid() {
+		win32.ShowWindow(hwnd, 0)
+	}
+}

pkg/utils/utils.go

@@ -0,0 +1,21 @@
+package win32
+
+import (
+	"syscall"
+)
+
+var (
+	kernel32               = syscall.NewLazyDLL("kernel32.dll")
+	procGetUserDefaultLCID = kernel32.NewProc("GetUserDefaultLCID")
+	procGetConsoleWindow   = kernel32.NewProc("GetConsoleWindow")
+)
+
+func GetUserDefaultLCID() uint32 {
+	ret, _, _ := procGetUserDefaultLCID.Call()
+	return uint32(ret)
+}
+
+func GetConsoleWindow() HWND {
+	ret, _, _ := procGetConsoleWindow.Call()
+	return HWND(ret)
+}