Refactor desired retention logic in Collection implementation

Updated the logic for retrieving deck-specific desired retention in both `memory_state.rs` and `mod.rs` to handle cases where the deck's normal state may not be available. This change ensures that the default configuration is used when necessary, improving the robustness of the retention handling.
This commit is contained in:
Jarrett Ye 2025-07-10 12:14:11 +08:00
parent eef199830e
commit 9d7dc2350f
No known key found for this signature in database
GPG key ID: EBFC55E0C1A352BB
2 changed files with 8 additions and 4 deletions

View file

@ -447,8 +447,10 @@ impl Collection {
// Get deck-specific desired retention if available, otherwise use config // Get deck-specific desired retention if available, otherwise use config
// default // default
let desired_retention = if let Some(deck_dr) = deck.normal()?.desired_retention { let desired_retention = if let Ok(normal_deck) = deck.normal() {
deck_dr normal_deck
.desired_retention
.unwrap_or(config.inner.desired_retention)
} else { } else {
config.inner.desired_retention config.inner.desired_retention
}; };

View file

@ -208,8 +208,10 @@ impl Collection {
// Get deck-specific desired retention if available, otherwise use config // Get deck-specific desired retention if available, otherwise use config
// default // default
let desired_retention = if let Some(deck_dr) = deck.normal()?.desired_retention { let desired_retention = if let Ok(normal_deck) = deck.normal() {
deck_dr normal_deck
.desired_retention
.unwrap_or(config.inner.desired_retention)
} else { } else {
config.inner.desired_retention config.inner.desired_retention
}; };