zhushenwudi/ew_author
1
0
Fork 0
mirror of https://git.ethanthesleepy.one/ethanaobrien/ew synced 2026-08-26 23:12:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Switch asset version flag to a public override

Browse Source
This commit is contained in:
Ethan O'Brien
2026-07-25 00:53:10 -05:00
parent 3a29fde575
commit e7d865ebb8
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/options.rs
View File

@@ -62,8 +62,8 @@ pub struct Args {
#[arg(long, default_value = "", help = "Asset hash for JP Android client.")] #[arg(long, default_value = "", help = "Asset hash for JP Android client.")]
pub jp_android_asset_hash: String, pub jp_android_asset_hash: String,
#[arg(long, default_value = "", help = "Asset version for windows client.")] #[arg(long, default_value = "", help = "Asset version for overridden asset hashes.")]
pub windows_asset_version: String, pub asset_version: String,
#[arg(long, default_value = "", help = "Asset hash for windows client.")] #[arg(long, default_value = "", help = "Asset hash for windows client.")]
pub windows_asset_hash: String, pub windows_asset_hash: String,

15
src/router/global.rs
View File

@@ -51,13 +51,14 @@ impl AssetVersion {
fn override_pair(&self) -> Option<(String, String)> { fn override_pair(&self) -> Option<(String, String)> {
let args = crate::get_args(); let args = crate::get_args();
let (ov, oh) = match (self.region, self.platform) { let ov = args.asset_version.as_str();
("JP", "Windows") => (args.windows_asset_version.as_str(), args.windows_asset_hash.as_str()), let oh = match (self.region, self.platform) {
("JP", "Android") => ("", args.jp_android_asset_hash.as_str()), ("JP", "Windows") => args.windows_asset_hash.as_str(),
("JP", "iOS") => ("", args.jp_ios_asset_hash.as_str()), ("JP", "Android") => args.jp_android_asset_hash.as_str(),
("GL", "Android") => ("", args.en_android_asset_hash.as_str()), ("JP", "iOS") => args.jp_ios_asset_hash.as_str(),
("GL", "iOS") => ("", args.en_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() { if ov.is_empty() && oh.is_empty() {
return None; return None;