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

chrome: dont parse args twice

Browse Source 
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2025-01-02 07:33:48 -06:00
parent eeab1666e7
commit f5afdd04a6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/notedeck_chrome/src/app.rs
View File

@@ -114,10 +114,12 @@ impl Notedeck {
let data_path = parsed_args let data_path = parsed_args
.datapath .datapath
.clone()
.unwrap_or(data_path.as_ref().to_str().expect("db path ok").to_string()); .unwrap_or(data_path.as_ref().to_str().expect("db path ok").to_string());
let path = DataPath::new(&data_path); let path = DataPath::new(&data_path);
let dbpath_str = parsed_args let dbpath_str = parsed_args
.dbpath .dbpath
.clone()
.unwrap_or_else(|| path.path(DataPathType::Db).to_str().unwrap().to_string()); .unwrap_or_else(|| path.path(DataPathType::Db).to_str().unwrap().to_string());
let _ = std::fs::create_dir_all(&dbpath_str); let _ = std::fs::create_dir_all(&dbpath_str);
@@ -158,7 +160,7 @@ impl Notedeck {
KeyStorageType::None KeyStorageType::None
}; };
let mut accounts = Accounts::new(keystore, parsed_args.relays); let mut accounts = Accounts::new(keystore, parsed_args.relays.clone());
let num_keys = parsed_args.keys.len(); let num_keys = parsed_args.keys.len();
@@ -167,10 +169,10 @@ impl Notedeck {
{ {
let txn = Transaction::new(&ndb).expect("txn"); let txn = Transaction::new(&ndb).expect("txn");
for key in parsed_args.keys { for key in &parsed_args.keys {
info!("adding account: {}", key.pubkey); info!("adding account: {}", &key.pubkey);
accounts accounts
.add_account(key) .add_account(key.clone())
.process_action(&mut unknown_ids, &ndb, &txn); .process_action(&mut unknown_ids, &ndb, &txn);
} }
} }
@@ -186,7 +188,6 @@ impl Notedeck {
let note_cache = NoteCache::default(); let note_cache = NoteCache::default();
let unknown_ids = UnknownIds::default(); let unknown_ids = UnknownIds::default();
let tabs = Tabs::new(None); let tabs = Tabs::new(None);
let parsed_args = Args::parse(args);
let app_rect_handler = AppSizeHandler::new(&path); let app_rect_handler = AppSizeHandler::new(&path);
Self { Self {