From 63700d9d29ffa41fa0c21838296a9ace8fd743ee Mon Sep 17 00:00:00 2001 From: every_holiday Date: Wed, 24 Jun 2026 03:08:30 +0900 Subject: [PATCH] Restore VRTW_Tool title; note discord mute regression --- VRWT_Tool/VRC_OSC/cmd/vrc_osc/main.go | 20 ++++++ VRWT_Tool/VRC_OSC/cmd/vrc_osc_gui/main.go | 70 ++++++++++++------ VRWT_Tool/VRC_OSC/internal/app/app.go | 2 +- VRWT_Tool/VRC_OSC/internal/app/discord.go | 72 +++++++++++++++---- .../VRC_OSC/internal/app/discord_mute.go | 1 - .../VRC_OSC/internal/app/guest_status.go | 27 +++++++ VRWT_Tool/VRC_OSC/internal/app/state.go | 52 ++++++++++++-- 7 files changed, 202 insertions(+), 42 deletions(-) diff --git a/VRWT_Tool/VRC_OSC/cmd/vrc_osc/main.go b/VRWT_Tool/VRC_OSC/cmd/vrc_osc/main.go index 6cb986e..67bca30 100644 --- a/VRWT_Tool/VRC_OSC/cmd/vrc_osc/main.go +++ b/VRWT_Tool/VRC_OSC/cmd/vrc_osc/main.go @@ -4,6 +4,8 @@ import ( "flag" "log" "os" + "os/exec" + "path/filepath" "vrc_osc_go/internal/app" ) @@ -11,12 +13,30 @@ import ( func main() { var configPath string var mode string + var noGUI bool flag.StringVar(&configPath, "config", "config/config.toml", "path to config.toml") flag.StringVar(&mode, "mode", "", "generate-json or extract-log") + flag.BoolVar(&noGUI, "no-gui", false, "do not launch the GUI companion") flag.Parse() + if mode == "" && !noGUI { + launchGUI() + } + if err := app.Run(configPath, mode); err != nil { log.SetOutput(os.Stderr) log.Fatalf("vrc_osc_go: %v", err) } } + +func launchGUI() { + exe, err := os.Executable() + if err != nil { + return + } + gui := filepath.Join(filepath.Dir(exe), "vrc_osc_gui.exe") + if _, err := os.Stat(gui); err != nil { + return + } + _ = exec.Command(gui).Start() +} diff --git a/VRWT_Tool/VRC_OSC/cmd/vrc_osc_gui/main.go b/VRWT_Tool/VRC_OSC/cmd/vrc_osc_gui/main.go index 2d6120d..6f8b833 100644 --- a/VRWT_Tool/VRC_OSC/cmd/vrc_osc_gui/main.go +++ b/VRWT_Tool/VRC_OSC/cmd/vrc_osc_gui/main.go @@ -5,20 +5,21 @@ import ( "fmt" "log" "net/http" + "os" "os/exec" + "path/filepath" "runtime" - "time" - - "vrc_osc_go/internal/app" ) -func main() { - go func() { - if err := app.Run("config/config.toml", ""); err != nil { - log.Printf("backend stopped: %v", err) - } - }() +func runtimeDir() string { + exe, err := os.Executable() + if err != nil { + return "runtime" + } + return filepath.Join(filepath.Dir(exe), "runtime") +} +func main() { mux := http.NewServeMux() mux.HandleFunc("/", handleIndex) mux.HandleFunc("/api/state", handleState) @@ -36,7 +37,7 @@ func handleIndex(w http.ResponseWriter, r *http.Request) { - VRC_OSC GUI + VRTW_Tool -

VRC_OSC GUI

+

VRTW_Tool

loading...