Skip to content

fix(scanner): add missing RetroDECK single-word Sega dir hints (fixes #5) #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
terafin wants to merge 1 commit into from
Closed

fix(scanner): add missing RetroDECK single-word Sega dir hints (fixes #5) #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions helpers/mister/src/scanner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,19 +657,24 @@ pub fn classify_supported_save(
&save_lower,
&[
"master system",
"mastersystem",
"/sms/",
"\\sms\\",
"game gear",
"gamegear",
"/gg/",
"\\gg\\",
"sega 32x",
"sega-32x",
"sega32x",
"sega32xjp",
"sega32xna",
"/32x/",
"\\32x\\",
"mega cd",
"mega-cd",
"megacd",
"megacdjp",
"sega cd",
"sega-cd",
"segacd",
Expand All @@ -684,11 +689,13 @@ pub fn classify_supported_save(
"genesis",
"mega drive",
"megadrive",
"megadrivejp",
"/md/",
"\\md\\",
"/gen/",
"\\gen\\",
"saturn",
"saturnjp",
"dreamcast",
"sega",
],
Expand Down Expand Up @@ -2766,4 +2773,48 @@ mod tests {
fn write_be_u32(payload: &mut [u8], offset: usize, value: u32) {
payload[offset..offset + 4].copy_from_slice(&value.to_be_bytes());
}
#[test]
fn classify_recognizes_retrodeck_sega_single_word_dirs() {
// RetroDECK uses single-word lowercase directory names (gamegear,
// mastersystem, megadrive). The Sega classifier historically had
// some of these (megadrive, megacd, sega32x) but was missing
// gamegear and mastersystem. Issue #5 (filed alongside this commit).
// Tests cover both the fix and the previously-broken paths.
let tmp = tempfile::tempdir().unwrap();

// Build a 64K all-0x42 SRAM payload (battery save shape).
let payload = vec![0x42u8; 65536];

for (subdir, expected_slug) in &[
("gamegear", "game-gear"), // FIX — was broken
("mastersystem", "master-system"), // FIX — was broken
("megadrive", "genesis"), // regression guard
("megacd", "sega-cd"), // regression guard
("sega32x", "sega-32x"), // regression guard
("genesis", "genesis"), // regression guard (English name)
("megacdjp", "sega-cd"), // FIX — JP variant
("saturnjp", "saturn"), // FIX — JP variant
("sega32xjp", "sega-32x"), // FIX — JP variant
("sega32xna", "sega-32x"), // FIX — NA variant
("megadrivejp", "genesis"), // FIX — JP variant
] {
let dir = tmp.path().join("retrodeck/saves").join(subdir);
fs::create_dir_all(&dir).unwrap();
let save = dir.join("Test Game.srm");
fs::write(&save, &payload).unwrap();

let classification = classify_supported_save(&save, None);
assert!(
classification.is_some(),
"expected /{subdir}/ to classify (would skip in production with 'outside allowed console families' if None)",
);
let got = classification.unwrap().system_slug;
assert_eq!(
got, *expected_slug,
"/{subdir}/ classified as {got}, expected {expected_slug}",
);
}
}


}
50 changes: 50 additions & 0 deletions helpers/steamdeck/src/scanner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,19 +657,24 @@ pub fn classify_supported_save(
&save_lower,
&[
"master system",
"mastersystem",
"/sms/",
"\\sms\\",
"game gear",
"gamegear",
"/gg/",
"\\gg\\",
"sega 32x",
"sega-32x",
"sega32x",
"sega32xjp",
"sega32xna",
"/32x/",
"\\32x\\",
"mega cd",
"mega-cd",
"megacd",
"megacdjp",
"sega cd",
"sega-cd",
"segacd",
Expand All @@ -684,11 +689,13 @@ pub fn classify_supported_save(
"genesis",
"mega drive",
"megadrive",
"megadrivejp",
"/md/",
"\\md\\",
"/gen/",
"\\gen\\",
"saturn",
"saturnjp",
"dreamcast",
"sega",
],
Expand Down Expand Up @@ -2717,6 +2724,49 @@ mod tests {
assert_eq!(rewritten, encoded);
}

#[test]
fn classify_recognizes_retrodeck_sega_single_word_dirs() {
// RetroDECK uses single-word lowercase directory names (gamegear,
// mastersystem, megadrive). The Sega classifier historically had
// some of these (megadrive, megacd, sega32x) but was missing
// gamegear and mastersystem. Issue #5 (filed alongside this commit).
// Tests cover both the fix and the previously-broken paths.
let tmp = tempfile::tempdir().unwrap();

// Build a 64K all-0x42 SRAM payload (battery save shape).
let payload = vec![0x42u8; 65536];

for (subdir, expected_slug) in &[
("gamegear", "game-gear"), // FIX — was broken
("mastersystem", "master-system"), // FIX — was broken
("megadrive", "genesis"), // regression guard
("megacd", "sega-cd"), // regression guard
("sega32x", "sega-32x"), // regression guard
("genesis", "genesis"), // regression guard (English name)
("megacdjp", "sega-cd"), // FIX — JP variant
("saturnjp", "saturn"), // FIX — JP variant
("sega32xjp", "sega-32x"), // FIX — JP variant
("sega32xna", "sega-32x"), // FIX — NA variant
("megadrivejp", "genesis"), // FIX — JP variant
] {
let dir = tmp.path().join("retrodeck/saves").join(subdir);
fs::create_dir_all(&dir).unwrap();
let save = dir.join("Test Game.srm");
fs::write(&save, &payload).unwrap();

let classification = classify_supported_save(&save, None);
assert!(
classification.is_some(),
"expected /{subdir}/ to classify (would skip in production with 'outside allowed console families' if None)",
);
let got = classification.unwrap().system_slug;
assert_eq!(
got, *expected_slug,
"/{subdir}/ classified as {got}, expected {expected_slug}",
);
}
}

#[test]
fn non_ps1_saves_use_identity_adapter() {
let tmp = tempfile::tempdir().unwrap();
Expand Down
51 changes: 51 additions & 0 deletions helpers/windows/src/scanner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,19 +657,24 @@ pub fn classify_supported_save(
&save_lower,
&[
"master system",
"mastersystem",
"/sms/",
"\\sms\\",
"game gear",
"gamegear",
"/gg/",
"\\gg\\",
"sega 32x",
"sega-32x",
"sega32x",
"sega32xjp",
"sega32xna",
"/32x/",
"\\32x\\",
"mega cd",
"mega-cd",
"megacd",
"megacdjp",
"sega cd",
"sega-cd",
"segacd",
Expand All @@ -684,11 +689,13 @@ pub fn classify_supported_save(
"genesis",
"mega drive",
"megadrive",
"megadrivejp",
"/md/",
"\\md\\",
"/gen/",
"\\gen\\",
"saturn",
"saturnjp",
"dreamcast",
"sega",
],
Expand Down Expand Up @@ -2766,4 +2773,48 @@ mod tests {
fn write_be_u32(payload: &mut [u8], offset: usize, value: u32) {
payload[offset..offset + 4].copy_from_slice(&value.to_be_bytes());
}
#[test]
fn classify_recognizes_retrodeck_sega_single_word_dirs() {
// RetroDECK uses single-word lowercase directory names (gamegear,
// mastersystem, megadrive). The Sega classifier historically had
// some of these (megadrive, megacd, sega32x) but was missing
// gamegear and mastersystem. Issue #5 (filed alongside this commit).
// Tests cover both the fix and the previously-broken paths.
let tmp = tempfile::tempdir().unwrap();

// Build a 64K all-0x42 SRAM payload (battery save shape).
let payload = vec![0x42u8; 65536];

for (subdir, expected_slug) in &[
("gamegear", "game-gear"), // FIX — was broken
("mastersystem", "master-system"), // FIX — was broken
("megadrive", "genesis"), // regression guard
("megacd", "sega-cd"), // regression guard
("sega32x", "sega-32x"), // regression guard
("genesis", "genesis"), // regression guard (English name)
("megacdjp", "sega-cd"), // FIX — JP variant
("saturnjp", "saturn"), // FIX — JP variant
("sega32xjp", "sega-32x"), // FIX — JP variant
("sega32xna", "sega-32x"), // FIX — NA variant
("megadrivejp", "genesis"), // FIX — JP variant
] {
let dir = tmp.path().join("retrodeck/saves").join(subdir);
fs::create_dir_all(&dir).unwrap();
let save = dir.join("Test Game.srm");
fs::write(&save, &payload).unwrap();

let classification = classify_supported_save(&save, None);
assert!(
classification.is_some(),
"expected /{subdir}/ to classify (would skip in production with 'outside allowed console families' if None)",
);
let got = classification.unwrap().system_slug;
assert_eq!(
got, *expected_slug,
"/{subdir}/ classified as {got}, expected {expected_slug}",
);
}
}


}