From e7d865ebb80e9f9509631cecdc97646dcd0f0a6c Mon Sep 17 00:00:00 2001 From: Ethan O'Brien Date: Sat, 25 Jul 2026 00:53:10 -0500 Subject: [PATCH] Switch asset version flag to a public override --- src/options.rs | 4 ++-- src/router/global.rs | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/options.rs b/src/options.rs index d3dfd48..b871ac1 100644 --- a/src/options.rs +++ b/src/options.rs @@ -62,8 +62,8 @@ pub struct Args { #[arg(long, default_value = "", help = "Asset hash for JP Android client.")] pub jp_android_asset_hash: String, - #[arg(long, default_value = "", help = "Asset version for windows client.")] - pub windows_asset_version: String, + #[arg(long, default_value = "", help = "Asset version for overridden asset hashes.")] + pub asset_version: String, #[arg(long, default_value = "", help = "Asset hash for windows client.")] pub windows_asset_hash: String, diff --git a/src/router/global.rs b/src/router/global.rs index 3ca142f..b2b472f 100644 --- a/src/router/global.rs +++ b/src/router/global.rs @@ -51,13 +51,14 @@ impl AssetVersion { fn override_pair(&self) -> Option<(String, String)> { let args = crate::get_args(); - let (ov, oh) = match (self.region, self.platform) { - ("JP", "Windows") => (args.windows_asset_version.as_str(), args.windows_asset_hash.as_str()), - ("JP", "Android") => ("", args.jp_android_asset_hash.as_str()), - ("JP", "iOS") => ("", args.jp_ios_asset_hash.as_str()), - ("GL", "Android") => ("", args.en_android_asset_hash.as_str()), - ("GL", "iOS") => ("", args.en_ios_asset_hash.as_str()), - _ => ("", ""), + let ov = args.asset_version.as_str(); + let oh = match (self.region, self.platform) { + ("JP", "Windows") => args.windows_asset_hash.as_str(), + ("JP", "Android") => args.jp_android_asset_hash.as_str(), + ("JP", "iOS") => args.jp_ios_asset_hash.as_str(), + ("GL", "Android") => args.en_android_asset_hash.as_str(), + ("GL", "iOS") => args.en_ios_asset_hash.as_str(), + _ => "", }; if ov.is_empty() && oh.is_empty() { return None;