tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

decks structs: remove unnecesssary unwraps

Browse Source 
Signed-off-by: kernelkind <kernelkind@gmail.com>
This commit is contained in:
kernelkind
2024-12-10 12:47:09 -05:00
parent a24bd4cc43
commit deb08a5a9d
1 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/decks.rs
View File

@@ -1,4 +1,4 @@
use std::collections::HashMap; use std::collections::{hash_map::ValuesMut, HashMap};
use enostr::Pubkey; use enostr::Pubkey;
use nostrdb::Ndb; use nostrdb::Ndb;
@@ -12,7 +12,9 @@ use crate::{
ui::{add_column::AddColumnRoute, configure_deck::ConfigureDeckResponse}, ui::{add_column::AddColumnRoute, configure_deck::ConfigureDeckResponse},
}; };
static FALLBACK_PUBKEY: &str = "aa733081e4f0f79dd43023d8983265593f2b41a988671cfcef3f489b91ad93fe"; pub static FALLBACK_PUBKEY: fn() -> Pubkey = || {
Pubkey::from_hex("aa733081e4f0f79dd43023d8983265593f2b41a988671cfcef3f489b91ad93fe").unwrap()
};
//pub enum DecksAction { //pub enum DecksAction {
// Switch(usize), // Switch(usize),
@@ -20,21 +22,21 @@ static FALLBACK_PUBKEY: &str = "aa733081e4f0f79dd43023d8983265593f2b41a988671cfc
//} //}
pub struct DecksCache { pub struct DecksCache {
pub account_to_decks: HashMap<Pubkey, Decks>, account_to_decks: HashMap<Pubkey, Decks>,
pub fallback_pubkey: Pubkey, fallback_pubkey: Pubkey,
} }
impl Default for DecksCache { impl Default for DecksCache {
fn default() -> Self { fn default() -> Self {
let mut account_to_decks: HashMap<Pubkey, Decks> = Default::default(); let mut account_to_decks: HashMap<Pubkey, Decks> = Default::default();
account_to_decks.insert(Pubkey::from_hex(FALLBACK_PUBKEY).unwrap(), Decks::default()); account_to_decks.insert(FALLBACK_PUBKEY(), Decks::default());
DecksCache::new(account_to_decks) DecksCache::new(account_to_decks)
} }
} }
impl DecksCache { impl DecksCache {
pub fn new(account_to_decks: HashMap<Pubkey, Decks>) -> Self { pub fn new(account_to_decks: HashMap<Pubkey, Decks>) -> Self {
let fallback_pubkey = Pubkey::from_hex(FALLBACK_PUBKEY).unwrap(); let fallback_pubkey = FALLBACK_PUBKEY();
Self { Self {
account_to_decks, account_to_decks,
@@ -44,7 +46,7 @@ impl DecksCache {
pub fn new_with_demo_config(ndb: &Ndb) -> Self { pub fn new_with_demo_config(ndb: &Ndb) -> Self {
let mut account_to_decks: HashMap<Pubkey, Decks> = Default::default(); let mut account_to_decks: HashMap<Pubkey, Decks> = Default::default();
let fallback_pubkey = Pubkey::from_hex(FALLBACK_PUBKEY).unwrap(); let fallback_pubkey = FALLBACK_PUBKEY();
account_to_decks.insert(fallback_pubkey, demo_decks(fallback_pubkey, ndb)); account_to_decks.insert(fallback_pubkey, demo_decks(fallback_pubkey, ndb));
DecksCache::new(account_to_decks) DecksCache::new(account_to_decks)
} }
@@ -52,13 +54,17 @@ impl DecksCache {
pub fn decks(&self, key: &Pubkey) -> &Decks { pub fn decks(&self, key: &Pubkey) -> &Decks {
self.account_to_decks self.account_to_decks
.get(key) .get(key)
.unwrap_or_else(|| panic!("{:?} not found", key)) .unwrap_or_else(|| self.fallback())
} }
pub fn decks_mut(&mut self, key: &Pubkey) -> &mut Decks { pub fn decks_mut(&mut self, key: &Pubkey) -> &mut Decks {
self.account_to_decks.entry(*key).or_default()
}
pub fn fallback(&self) -> &Decks {
self.account_to_decks self.account_to_decks
.get_mut(key) .get(&self.fallback_pubkey)
.unwrap_or_else(|| panic!("{:?} not found", key)) .unwrap_or_else(|| panic!("fallback deck not found"))
} }
pub fn fallback_mut(&mut self) -> &mut Decks { pub fn fallback_mut(&mut self) -> &mut Decks {
@@ -107,6 +113,18 @@ impl DecksCache {
info!("Removing decks for {:?}", key); info!("Removing decks for {:?}", key);
self.account_to_decks.remove(key); self.account_to_decks.remove(key);
} }
pub fn get_fallback_pubkey(&self) -> &Pubkey {
&self.fallback_pubkey
}
pub fn get_all_decks_mut(&mut self) -> ValuesMut<Pubkey, Decks> {
self.account_to_decks.values_mut()
}
pub fn get_mapping(&self) -> &HashMap<Pubkey, Decks> {
&self.account_to_decks
}
} }
pub struct Decks { pub struct Decks {