preserve-emulation/gopher64
1
0
Fork 0
mirror of https://github.com/gopher64/gopher64.git synced 2026-07-11 01:25:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

guards around postcard (#838)

Browse Source
This commit is contained in:
Logan McNaughton
2026-05-04 13:52:46 +02:00
committed by GitHub
parent f45f951af8
commit a4f635265b
2 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/savestates.rs
+24 -18
View File
@@ -76,32 +76,38 @@ pub fn create_savestate(device: &device::Device) {
let mut ra_state: Vec<u8> = vec![0; retroachievements::state_size()];
retroachievements::save_state(ra_state.as_mut_ptr(), ra_state.len());
let data: &[(&[u8], &str)] = &[
(&postcard::to_stdvec(device).unwrap(), "device"),
(
&postcard::to_stdvec(&device.ui.storage.saves).unwrap(),
"saves",
),
(&rdp_state, "rdp_state"),
(&ra_state, "ra_state"),
];
let save_path = device.ui.storage.paths.savestate_file_path.clone();
if let Ok(compressed_file) = ui::storage::compress_file(data) {
if let Ok(device_data) = postcard::to_stdvec(device)
&& let Ok(saves_data) = postcard::to_stdvec(&device.ui.storage.saves)
&& let Ok(compressed_file) = ui::storage::compress_file(&[
(&device_data, "device"),
(&saves_data, "saves"),
(&rdp_state, "rdp_state"),
(&ra_state, "ra_state"),
])
{
tokio::spawn(async move {
if let Err(e) = tokio::fs::write(save_path, compressed_file).await {
eprintln!("Error writing savestate: {}", e);
}
});
ui::video::onscreen_message(
&format!(
"Savestate created in slot {}",
device.ui.storage.save_state_slot
),
ui::video::MESSAGE_LENGTH_MESSAGE_SHORT,
);
} else {
eprintln!("Error compressing savestate");
ui::video::onscreen_message(
&format!(
"Failed to create savestate in slot {}",
device.ui.storage.save_state_slot
),
ui::video::MESSAGE_LENGTH_MESSAGE_SHORT,
);
}
ui::video::onscreen_message(
&format!(
"Savestate created in slot {}",
device.ui.storage.save_state_slot
),
ui::video::MESSAGE_LENGTH_MESSAGE_SHORT,
);
}
pub fn load_savestate(device: &mut device::Device) {
src/ui/storage.rs
+22 -23
View File
@@ -278,12 +278,10 @@ pub fn load_saves(ui: &mut ui::Ui, netplay: &mut Option<netplay::Netplay>) {
let mut compressed_romsave = Vec::new();
if !ui.storage.saves.romsave.data.is_empty()
&& let Ok(file_data) = compress_file(&[(
&postcard::to_stdvec(&ui.storage.saves.romsave.data).unwrap(),
"save",
)])
&& let Ok(file_data) = postcard::to_stdvec(&ui.storage.saves.romsave.data)
&& let Ok(compressed_file_data) = compress_file(&[(&file_data, "save")])
{
compressed_romsave = file_data;
compressed_romsave = compressed_file_data;
}
netplay::send_save(
netplay.as_mut().unwrap(),
@@ -471,44 +469,45 @@ pub fn schedule_save(device: &mut device::Device, save_type: SaveTypes) {
}
fn write_save(ui: &mut ui::Ui, save_type: SaveTypes) {
let path: &std::path::Path;
let data: &Vec<u8>;
let rom_save_data: Vec<u8>;
let save_path: std::path::PathBuf;
let save_data: Vec<u8>;
match save_type {
SaveTypes::Eeprom4k | SaveTypes::Eeprom16k => {
path = ui.storage.paths.eep_file_path.as_ref();
data = ui.storage.saves.eeprom.data.as_ref();
save_path = ui.storage.paths.eep_file_path.clone();
save_data = ui.storage.saves.eeprom.data.clone();
ui.storage.saves.eeprom.write_pending = false;
}
SaveTypes::Sram => {
path = ui.storage.paths.sra_file_path.as_ref();
data = ui.storage.saves.sram.data.as_ref();
save_path = ui.storage.paths.sra_file_path.clone();
save_data = ui.storage.saves.sram.data.clone();
ui.storage.saves.sram.write_pending = false;
}
SaveTypes::Flash => {
path = ui.storage.paths.fla_file_path.as_ref();
data = ui.storage.saves.flash.data.as_ref();
save_path = ui.storage.paths.fla_file_path.clone();
save_data = ui.storage.saves.flash.data.clone();
ui.storage.saves.flash.write_pending = false;
}
SaveTypes::Mempak => {
path = ui.storage.paths.pak_file_path.as_ref();
data = ui.storage.saves.mempak.data.as_ref();
save_path = ui.storage.paths.pak_file_path.clone();
save_data = ui.storage.saves.mempak.data.clone();
ui.storage.saves.mempak.write_pending = false;
}
SaveTypes::Sdcard => {
path = ui.storage.paths.sdcard_file_path.as_ref();
data = ui.storage.saves.sdcard.data.as_ref();
save_path = ui.storage.paths.sdcard_file_path.clone();
save_data = ui.storage.saves.sdcard.data.clone();
ui.storage.saves.sdcard.write_pending = false;
}
SaveTypes::Romsave => {
path = ui.storage.paths.romsave_file_path.as_ref();
rom_save_data = postcard::to_stdvec(&ui.storage.saves.romsave.data).unwrap();
data = rom_save_data.as_ref();
save_path = ui.storage.paths.romsave_file_path.clone();
ui.storage.saves.romsave.write_pending = false;
if let Ok(rom_save) = postcard::to_stdvec(&ui.storage.saves.romsave.data) {
save_data = rom_save;
} else {
eprintln!("Error serializing rom save data");
return;
};
}
}
let save_data = data.clone();
let save_path = path.to_path_buf();
tokio::spawn(async move {
if let Err(e) = tokio::fs::write(save_path, save_data).await {
eprintln!("Error writing save: {}", e);