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

Remove mod flag

Browse Source
This commit is contained in:
Ethan O'Brien
2026-07-24 21:16:21 -05:00
parent 6eec06e164
commit 59ac1f55c3
4 changed files with 6 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/router/asset_lists.rs
View File

@@ -7,7 +7,7 @@ use std::sync::Mutex;
use crate::include_file;
lazy_static! {
static ref MERGED_CACHE: Mutex<HashMap<String, String>> = Mutex::new(HashMap::new());
static ref LIST_CACHE: Mutex<HashMap<String, String>> = Mutex::new(HashMap::new());
}
pub fn routes(cfg: &mut web::ServiceConfig) {
@@ -32,11 +32,11 @@ async fn get(_req: HttpRequest) -> impl Responder {
}
fn load_list(name: &str) -> String {
if let Some(cached) = MERGED_CACHE.lock().unwrap().get(name) {
if let Some(cached) = LIST_CACHE.lock().unwrap().get(name) {
return cached.clone();
}
let rel = format!("asset_lists/{}.json", name);
let base = crate::runtime::read_masterdata_file(&rel)
let list = crate::runtime::read_masterdata_file(&rel)
.and_then(|b| String::from_utf8(b).ok())
.unwrap_or_else(|| match name {
"Bundle" => include_file!("src/router/asset_lists/Bundle.json"),
@@ -45,62 +45,8 @@ fn load_list(name: &str) -> String {
_ => unreachable!(),
});
let mod_files = crate::runtime::read_mod_files(&rel);
let merged = if mod_files.is_empty() {
base
} else {
merge_asset_list(name, base, mod_files)
};
MERGED_CACHE.lock().unwrap().insert(name.to_string(), merged.clone());
merged
}
fn merge_asset_list(name: &str, base: String, mod_files: Vec<(String, Vec<u8>)>) -> String {
let mut root = match jzon::parse(&base) {
Ok(v) => v,
Err(_) => return base,
};
let mut by_ident: HashMap<String, usize> = HashMap::new();
if let jzon::JsonValue::Array(ref arr) = root["m_manifestCollection"] {
for (i, e) in arr.iter().enumerate() {
let id = e["m_identifier"].to_string();
by_ident.insert(id.to_string(), i);
}
}
for (mod_dir, bytes) in mod_files {
let Ok(s) = String::from_utf8(bytes) else { continue };
let Ok(mod_root) = jzon::parse(&s) else { continue };
let mod_entries = match mod_root["m_manifestCollection"] {
jzon::JsonValue::Array(ref arr) => arr.clone(),
_ => continue,
};
let mut added = 0usize;
let mut replaced = 0usize;
for entry in mod_entries {
let ident = entry["m_identifier"].as_str().unwrap_or("").to_string();
if ident.is_empty() {
continue;
}
if let Some(&idx) = by_ident.get(&ident) {
root["m_manifestCollection"][idx] = entry;
replaced += 1;
} else {
let idx = root["m_manifestCollection"].len();
let _ = root["m_manifestCollection"].push(entry);
by_ident.insert(ident, idx);
added += 1;
}
}
if added > 0 || replaced > 0 {
println!(
"[mod {}] {}.json: +{} new entries, {} replaced",
mod_dir, name, added, replaced
);
}
}
jzon::stringify(root)
LIST_CACHE.lock().unwrap().insert(name.to_string(), list.clone());
list
}
async fn supported() -> impl Responder {