storytold/craft-anything
2
0
Fork 0
mirror of https://github.com/storytold/craft-anything.git synced 2026-11-02 18:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow packaged programs with crash in their names (#376)

Browse Source 
Play's packaged-program choice skips crash reporters by name (crashreport, crashhandler, crashpad), not every name containing crash. Fixes #275.
This commit is contained in:
Max Mittelstädt
2026-11-02 08:38:48 -08:00
committed by GitHub
parent 54bef1e6e2
commit df18c969b2
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/outputs.rs
+24 -1
View File
@@ -185,7 +185,7 @@ pub fn packaged_program(dir: &Path) -> Option<PathBuf> {
continue;
}
let name = p.file_name().and_then(|n| n.to_str()).unwrap_or_default().to_ascii_lowercase();
let helper = ["crash", "-cmd", "unrealpak", "shadercompile"].iter().any(|s| name.contains(s));
let helper = ["crashreport", "crashhandler", "crashpad", "-cmd", "unrealpak", "shadercompile"].iter().any(|s| name.contains(s));
let at = e.metadata().and_then(|m| m.modified()).unwrap_or(std::time::UNIX_EPOCH);
if is_program(&p) && !helper && best.as_ref().is_none_or(|(b, _)| at > *b) {
best = Some((at, p));
@@ -195,6 +195,29 @@ pub fn packaged_program(dir: &Path) -> Option<PathBuf> {
best.map(|(_, p)| p)
}
#[cfg(all(test, unix))]
mod tests {
use super::packaged_program;
use std::os::unix::fs::PermissionsExt;
use std::time::{Duration, UNIX_EPOCH};
#[test]
fn packaged_program_finds_executable_with_crash_in_name() {
let build = tempfile::tempdir().unwrap();
let reporter = build.path().join("CrashReportClient");
let game = build.path().join("CrashSample");
std::fs::write(&reporter, b"reporter").unwrap();
std::fs::write(&game, b"game").unwrap();
for path in [&reporter, &game] {
std::fs::set_permissions(path, std::fs::Permissions::from_mode(0o755)).unwrap();
}
std::fs::File::open(&reporter).unwrap().set_times(std::fs::FileTimes::new().set_modified(UNIX_EPOCH + Duration::from_secs(1))).unwrap();
std::fs::File::open(&game).unwrap().set_times(std::fs::FileTimes::new().set_modified(UNIX_EPOCH + Duration::from_secs(2))).unwrap();
assert_eq!(packaged_program(build.path()), Some(game));
}
}
/// Whether `p` is a program this computer can start.
#[cfg(windows)]
pub fn is_program(p: &Path) -> bool {