dumbgoy/soulseek-rs-modded
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: clear the quality-scan findings

Browse Source 
`render_shortcuts` was 144 lines of "which shortcuts apply" wrapped around 40
lines of drawing; the decision moves into a `shortcuts` method beside the
`rooms_shortcuts` helper that already worked this way. Three identically
shaped comments over the popup guards collapse into one that carries the part
worth knowing — an open popup owns the keyboard, so the order matters. The
state tests trade bare `unwrap()` for `expect()` so a failure names the step.
This commit is contained in:
Michel de Graaf
2026-07-25 02:32:11 +02:00
parent 14b0321dbc
commit 9d58bb9b64
3 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soulseek-rs/src/persist/state.rs
+19 -10
View File
@@ -185,7 +185,7 @@ mod tests {
use super::*;
fn store() -> (tempfile::TempDir, StateStore) {
let dir = tempfile::tempdir().unwrap();
let dir = tempfile::tempdir().expect("a temporary state directory");
let store = StateStore::new(dir.path().join("state"));
(dir, store)
}
@@ -254,25 +254,32 @@ mod tests {
fn corrupt_file_loads_as_empty_and_is_kept_as_bak() {
let (tmp, store) = store();
let path = tmp.path().join("state").join("downloads.json");
std::fs::create_dir_all(path.parent().unwrap()).unwrap();
std::fs::write(&path, "{ not json").unwrap();
std::fs::create_dir_all(path.parent().expect("a parent"))
.expect("the state directory");
std::fs::write(&path, "{ not json").expect("the corrupt file");
assert_eq!(store.load_downloads(), vec![]);
// The bad file is set aside, not left to be overwritten.
assert!(!path.exists());
let bak = path.with_extension("json.bak");
assert_eq!(std::fs::read_to_string(bak).unwrap(), "{ not json");
assert_eq!(
std::fs::read_to_string(bak).expect("the .bak"),
"{ not json"
);
}
#[test]
fn a_second_corrupt_file_replaces_the_previous_bak() {
let (tmp, store) = store();
let path = tmp.path().join("state").join("downloads.json");
std::fs::create_dir_all(path.parent().unwrap()).unwrap();
std::fs::write(path.with_extension("json.bak"), "old bak").unwrap();
std::fs::write(&path, "{ newer corruption").unwrap();
std::fs::create_dir_all(path.parent().expect("a parent"))
.expect("the state directory");
std::fs::write(path.with_extension("json.bak"), "old bak")
.expect("the previous .bak");
std::fs::write(&path, "{ newer corruption").expect("the corrupt file");
assert_eq!(store.load_downloads(), vec![]);
assert_eq!(
std::fs::read_to_string(path.with_extension("json.bak")).unwrap(),
std::fs::read_to_string(path.with_extension("json.bak"))
.expect("the .bak"),
"{ newer corruption"
);
}
@@ -281,8 +288,10 @@ mod tests {
fn file_from_a_newer_build_loads_as_empty_and_is_kept_as_bak() {
let (tmp, store) = store();
let path = tmp.path().join("state").join("rooms.json");
std::fs::create_dir_all(path.parent().unwrap()).unwrap();
std::fs::write(&path, r#"{"version": 99, "data": ["x"]}"#).unwrap();
std::fs::create_dir_all(path.parent().expect("a parent"))
.expect("the state directory");
std::fs::write(&path, r#"{"version": 99, "data": ["x"]}"#)
.expect("the newer-version file");
assert_eq!(store.load_rooms(), Vec::<String>::new());
assert!(!path.exists());
assert!(path.with_extension("json.bak").exists());