From 64a04e927c1738e4c2f12d9074930a03133f4575 Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Fri, 21 Apr 2023 17:37:21 -0700 Subject: [PATCH] set host --- src-tauri/Cargo.lock | 1 + src-tauri/Cargo.toml | 1 + src-tauri/src/main.rs | 16 ++++++++++++++++ src-tauri/src/proxy.rs | 2 ++ 4 files changed, 20 insertions(+) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index ca97fd9..dcd6b4c 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -796,6 +796,7 @@ dependencies = [ "duct", "file_diff", "futures-util", + "getopts", "http", "hudsucker", "is_elevated", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 104d224..59f8012 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -28,6 +28,7 @@ tauri = { version = "1.0.7", features = ["api-all"] } # Arg parsing args = "2.0" +getopts = "0.2" # Access system process info. sysinfo = "0.24.6" diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index deee81e..b60a00a 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -3,9 +3,12 @@ windows_subsystem = "windows" )] +use args::validations::{Order, OrderValidation}; use args::{Args, ArgsError}; use file_helpers::dir_exists; +use getopts; use once_cell::sync::Lazy; +use proxy::set_proxy_addr; use std::fs; use std::io::Write; use std::{collections::HashMap, sync::Mutex}; @@ -53,6 +56,14 @@ async fn parse_args(inp: &Vec) -> Result { ); args.flag("g", "no-gui", "Run in CLI mode"); args.flag("s", "server", "Launch the configured GC server"); + args.option( + "H", + "host", + "Host to connect to (eg. 'localhost:443' or 'my.awesomeserver.com:6969)", + "SERVER_HOST", + getopts::Occur::Optional, + None, + ); args.parse(inp).unwrap(); @@ -82,6 +93,11 @@ async fn parse_args(inp: &Vec) -> Result { ); } + if !args.value_of::("host")?.is_empty() { + let host = args.value_of::("host")?; + set_proxy_addr(host); + } + if args.value_of("proxy")? { println!("Starting proxy server..."); let mut pathbuf = tauri::api::path::data_dir().unwrap(); diff --git a/src-tauri/src/proxy.rs b/src-tauri/src/proxy.rs index 87283ee..3aa6666 100644 --- a/src-tauri/src/proxy.rs +++ b/src-tauri/src/proxy.rs @@ -47,6 +47,8 @@ pub fn set_proxy_addr(addr: String) { } else { *SERVER.lock().unwrap() = addr; } + + println!("Set server to {}", SERVER.lock().unwrap()); } #[async_trait]