mirror of
https://github.com/damus-io/notedeck.git
synced 2024-09-16 11:53:30 +00:00
refactor: move args to its own file
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
parent
71259a8dd5
commit
2ea6473ae2
230
src/app.rs
230
src/app.rs
@ -2,6 +2,7 @@ use crate::account_manager::AccountManager;
|
||||
use crate::actionbar::BarResult;
|
||||
use crate::app_creation::setup_cc;
|
||||
use crate::app_style::user_requested_visuals_change;
|
||||
use crate::args::Args;
|
||||
use crate::draft::Drafts;
|
||||
use crate::frame_history::FrameHistory;
|
||||
use crate::imgcache::ImageCache;
|
||||
@ -11,13 +12,13 @@ use crate::notecache::{CachedNote, NoteCache};
|
||||
use crate::relay_pool_manager::RelayPoolManager;
|
||||
use crate::route::Route;
|
||||
use crate::thread::{DecrementResult, Threads};
|
||||
use crate::timeline::{ColumnKind, ListKind, PubkeySource, Timeline, TimelineSource, ViewFilter};
|
||||
use crate::timeline::{ColumnKind, Timeline, TimelineSource, ViewFilter};
|
||||
use crate::ui::note::PostAction;
|
||||
use crate::ui::{self, AccountSelectionWidget, DesktopGlobalPopup};
|
||||
use crate::ui::{DesktopSidePanel, RelayView, View};
|
||||
use crate::{Error, Result};
|
||||
use crate::Result;
|
||||
use egui_nav::{Nav, NavAction};
|
||||
use enostr::{ClientMessage, Keypair, Pubkey, RelayEvent, RelayMessage, RelayPool, SecretKey};
|
||||
use enostr::{ClientMessage, RelayEvent, RelayMessage, RelayPool};
|
||||
use std::cell::RefCell;
|
||||
use std::rc::Rc;
|
||||
|
||||
@ -108,6 +109,7 @@ fn send_initial_filters(damus: &mut Damus, relay_url: &str) {
|
||||
filter.clone()
|
||||
} else {
|
||||
// TODO: handle unloaded filters
|
||||
error!("TODO: handle unloaded filters");
|
||||
continue;
|
||||
};
|
||||
|
||||
@ -364,6 +366,7 @@ fn setup_initial_nostrdb_subs(damus: &mut Damus) -> Result<()> {
|
||||
} else {
|
||||
// TODO: for unloaded filters, we will need to fetch things like
|
||||
// the contact and relay list from remote relays.
|
||||
error!("TODO: handle unloaded filters");
|
||||
continue;
|
||||
};
|
||||
|
||||
@ -535,227 +538,6 @@ fn render_damus(damus: &mut Damus, ctx: &Context) {
|
||||
puffin_egui::profiler_window(ctx);
|
||||
}
|
||||
|
||||
enum ArgColumn {
|
||||
Column(ColumnKind),
|
||||
Generic(Vec<Filter>),
|
||||
}
|
||||
|
||||
impl ArgColumn {
|
||||
pub fn into_timeline(self, ndb: &Ndb, user: Option<&[u8; 32]>) -> Timeline {
|
||||
match self {
|
||||
ArgColumn::Generic(filters) => Timeline::new(ColumnKind::Generic, Some(filters)),
|
||||
|
||||
ArgColumn::Column(ColumnKind::Universe) => {
|
||||
Timeline::new(ColumnKind::Universe, Some(vec![]))
|
||||
}
|
||||
|
||||
ArgColumn::Column(ColumnKind::Generic) => {
|
||||
panic!("Not a valid ArgColumn")
|
||||
}
|
||||
|
||||
ArgColumn::Column(ColumnKind::List(ListKind::Contact(ref pk_src))) => {
|
||||
let pk = match pk_src {
|
||||
PubkeySource::DeckAuthor => {
|
||||
if let Some(user_pk) = user {
|
||||
user_pk
|
||||
} else {
|
||||
// No user loaded, so we have to return an unloaded
|
||||
// contact list columns
|
||||
return Timeline::new(
|
||||
ColumnKind::contact_list(PubkeySource::DeckAuthor),
|
||||
None,
|
||||
);
|
||||
}
|
||||
}
|
||||
PubkeySource::Explicit(pk) => pk.bytes(),
|
||||
};
|
||||
|
||||
let contact_filter = Filter::new().authors([pk]).kinds([3]).limit(1).build();
|
||||
let txn = Transaction::new(ndb).expect("txn");
|
||||
let results = ndb
|
||||
.query(&txn, vec![contact_filter], 1)
|
||||
.expect("contact query failed?");
|
||||
|
||||
if results.is_empty() {
|
||||
return Timeline::new(ColumnKind::contact_list(pk_src.to_owned()), None);
|
||||
}
|
||||
|
||||
match Timeline::contact_list(&results[0].note) {
|
||||
Err(Error::EmptyContactList) => {
|
||||
Timeline::new(ColumnKind::contact_list(pk_src.to_owned()), None)
|
||||
}
|
||||
Err(e) => panic!("Unexpected error: {e}"),
|
||||
Ok(tl) => tl,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct Args {
|
||||
columns: Vec<ArgColumn>,
|
||||
relays: Vec<String>,
|
||||
is_mobile: Option<bool>,
|
||||
keys: Vec<Keypair>,
|
||||
since_optimize: bool,
|
||||
light: bool,
|
||||
dbpath: Option<String>,
|
||||
}
|
||||
|
||||
impl Args {
|
||||
fn parse(args: &[String]) -> Self {
|
||||
let mut res = Args {
|
||||
columns: vec![],
|
||||
relays: vec![],
|
||||
is_mobile: None,
|
||||
keys: vec![],
|
||||
light: false,
|
||||
since_optimize: true,
|
||||
dbpath: None,
|
||||
};
|
||||
|
||||
let mut i = 0;
|
||||
let len = args.len();
|
||||
while i < len {
|
||||
let arg = &args[i];
|
||||
|
||||
if arg == "--mobile" {
|
||||
res.is_mobile = Some(true);
|
||||
} else if arg == "--light" {
|
||||
res.light = true;
|
||||
} else if arg == "--dark" {
|
||||
res.light = false;
|
||||
} else if arg == "--pub" || arg == "--npub" {
|
||||
i += 1;
|
||||
let pubstr = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("sec argument missing?");
|
||||
continue;
|
||||
};
|
||||
|
||||
if let Ok(pk) = Pubkey::parse(pubstr) {
|
||||
res.keys.push(Keypair::only_pubkey(pk));
|
||||
} else {
|
||||
error!(
|
||||
"failed to parse {} argument. Make sure to use hex or npub.",
|
||||
arg
|
||||
);
|
||||
}
|
||||
} else if arg == "--sec" || arg == "--nsec" {
|
||||
i += 1;
|
||||
let secstr = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("sec argument missing?");
|
||||
continue;
|
||||
};
|
||||
|
||||
if let Ok(sec) = SecretKey::parse(secstr) {
|
||||
res.keys.push(Keypair::from_secret(sec));
|
||||
} else {
|
||||
error!(
|
||||
"failed to parse {} argument. Make sure to use hex or nsec.",
|
||||
arg
|
||||
);
|
||||
}
|
||||
} else if arg == "--no-since-optimize" {
|
||||
res.since_optimize = false;
|
||||
} else if arg == "--filter" {
|
||||
i += 1;
|
||||
let filter = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("filter argument missing?");
|
||||
continue;
|
||||
};
|
||||
|
||||
if let Ok(filter) = Filter::from_json(filter) {
|
||||
res.columns.push(ArgColumn::Generic(vec![filter]));
|
||||
} else {
|
||||
error!("failed to parse filter '{}'", filter);
|
||||
}
|
||||
} else if arg == "--dbpath" {
|
||||
i += 1;
|
||||
let path = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("dbpath argument missing?");
|
||||
continue;
|
||||
};
|
||||
res.dbpath = Some(path.clone());
|
||||
} else if arg == "-r" || arg == "--relay" {
|
||||
i += 1;
|
||||
let relay = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("relay argument missing?");
|
||||
continue;
|
||||
};
|
||||
res.relays.push(relay.clone());
|
||||
} else if arg == "--column" || arg == "-c" {
|
||||
i += 1;
|
||||
let column_name = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("column argument missing");
|
||||
continue;
|
||||
};
|
||||
|
||||
if column_name.starts_with("contacts:") {
|
||||
if let Ok(pubkey) = Pubkey::parse(&column_name[9..]) {
|
||||
info!("got contact column for user {}", pubkey.hex());
|
||||
res.columns.push(ArgColumn::Column(ColumnKind::contact_list(
|
||||
PubkeySource::Explicit(pubkey),
|
||||
)))
|
||||
} else {
|
||||
error!("error parsing contacts pubkey {}", &column_name[9..]);
|
||||
continue;
|
||||
}
|
||||
} else if column_name == "contacts" {
|
||||
res.columns.push(ArgColumn::Column(ColumnKind::contact_list(
|
||||
PubkeySource::DeckAuthor,
|
||||
)))
|
||||
}
|
||||
} else if arg == "--filter-file" || arg == "-f" {
|
||||
i += 1;
|
||||
let filter_file = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("filter file argument missing?");
|
||||
continue;
|
||||
};
|
||||
|
||||
let data = if let Ok(data) = std::fs::read(filter_file) {
|
||||
data
|
||||
} else {
|
||||
error!("failed to read filter file '{}'", filter_file);
|
||||
continue;
|
||||
};
|
||||
|
||||
if let Some(filter) = std::str::from_utf8(&data)
|
||||
.ok()
|
||||
.and_then(|s| Filter::from_json(s).ok())
|
||||
{
|
||||
res.columns.push(ArgColumn::Generic(vec![filter]));
|
||||
} else {
|
||||
error!("failed to parse filter in '{}'", filter_file);
|
||||
}
|
||||
}
|
||||
|
||||
i += 1;
|
||||
}
|
||||
|
||||
if res.columns.is_empty() {
|
||||
let ck = ColumnKind::contact_list(PubkeySource::DeckAuthor);
|
||||
info!("No columns set, setting up defaults: {:?}", ck);
|
||||
res.columns.push(ArgColumn::Column(ck));
|
||||
}
|
||||
|
||||
res
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
fn determine_key_storage_type() -> KeyStorageType {
|
||||
#[cfg(target_os = "macos")]
|
||||
|
||||
228
src/args.rs
Normal file
228
src/args.rs
Normal file
@ -0,0 +1,228 @@
|
||||
use crate::timeline::{ColumnKind, ListKind, PubkeySource, Timeline};
|
||||
use crate::Error;
|
||||
use enostr::{Filter, Keypair, Pubkey, SecretKey};
|
||||
use nostrdb::{Ndb, Transaction};
|
||||
use tracing::{error, info};
|
||||
|
||||
pub struct Args {
|
||||
pub columns: Vec<ArgColumn>,
|
||||
pub relays: Vec<String>,
|
||||
pub is_mobile: Option<bool>,
|
||||
pub keys: Vec<Keypair>,
|
||||
pub since_optimize: bool,
|
||||
pub light: bool,
|
||||
pub dbpath: Option<String>,
|
||||
}
|
||||
|
||||
impl Args {
|
||||
pub fn parse(args: &[String]) -> Self {
|
||||
let mut res = Args {
|
||||
columns: vec![],
|
||||
relays: vec![],
|
||||
is_mobile: None,
|
||||
keys: vec![],
|
||||
light: false,
|
||||
since_optimize: true,
|
||||
dbpath: None,
|
||||
};
|
||||
|
||||
let mut i = 0;
|
||||
let len = args.len();
|
||||
while i < len {
|
||||
let arg = &args[i];
|
||||
|
||||
if arg == "--mobile" {
|
||||
res.is_mobile = Some(true);
|
||||
} else if arg == "--light" {
|
||||
res.light = true;
|
||||
} else if arg == "--dark" {
|
||||
res.light = false;
|
||||
} else if arg == "--pub" || arg == "--npub" {
|
||||
i += 1;
|
||||
let pubstr = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("sec argument missing?");
|
||||
continue;
|
||||
};
|
||||
|
||||
if let Ok(pk) = Pubkey::parse(pubstr) {
|
||||
res.keys.push(Keypair::only_pubkey(pk));
|
||||
} else {
|
||||
error!(
|
||||
"failed to parse {} argument. Make sure to use hex or npub.",
|
||||
arg
|
||||
);
|
||||
}
|
||||
} else if arg == "--sec" || arg == "--nsec" {
|
||||
i += 1;
|
||||
let secstr = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("sec argument missing?");
|
||||
continue;
|
||||
};
|
||||
|
||||
if let Ok(sec) = SecretKey::parse(secstr) {
|
||||
res.keys.push(Keypair::from_secret(sec));
|
||||
} else {
|
||||
error!(
|
||||
"failed to parse {} argument. Make sure to use hex or nsec.",
|
||||
arg
|
||||
);
|
||||
}
|
||||
} else if arg == "--no-since-optimize" {
|
||||
res.since_optimize = false;
|
||||
} else if arg == "--filter" {
|
||||
i += 1;
|
||||
let filter = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("filter argument missing?");
|
||||
continue;
|
||||
};
|
||||
|
||||
if let Ok(filter) = Filter::from_json(filter) {
|
||||
res.columns.push(ArgColumn::Generic(vec![filter]));
|
||||
} else {
|
||||
error!("failed to parse filter '{}'", filter);
|
||||
}
|
||||
} else if arg == "--dbpath" {
|
||||
i += 1;
|
||||
let path = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("dbpath argument missing?");
|
||||
continue;
|
||||
};
|
||||
res.dbpath = Some(path.clone());
|
||||
} else if arg == "-r" || arg == "--relay" {
|
||||
i += 1;
|
||||
let relay = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("relay argument missing?");
|
||||
continue;
|
||||
};
|
||||
res.relays.push(relay.clone());
|
||||
} else if arg == "--column" || arg == "-c" {
|
||||
i += 1;
|
||||
let column_name = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("column argument missing");
|
||||
continue;
|
||||
};
|
||||
|
||||
if let Some(rest) = column_name.strip_prefix("contacts:") {
|
||||
if let Ok(pubkey) = Pubkey::parse(rest) {
|
||||
info!("got contact column for user {}", pubkey.hex());
|
||||
res.columns.push(ArgColumn::Column(ColumnKind::contact_list(
|
||||
PubkeySource::Explicit(pubkey),
|
||||
)))
|
||||
} else {
|
||||
error!("error parsing contacts pubkey {}", &column_name[9..]);
|
||||
continue;
|
||||
}
|
||||
} else if column_name == "contacts" {
|
||||
res.columns.push(ArgColumn::Column(ColumnKind::contact_list(
|
||||
PubkeySource::DeckAuthor,
|
||||
)))
|
||||
}
|
||||
} else if arg == "--filter-file" || arg == "-f" {
|
||||
i += 1;
|
||||
let filter_file = if let Some(next_arg) = args.get(i) {
|
||||
next_arg
|
||||
} else {
|
||||
error!("filter file argument missing?");
|
||||
continue;
|
||||
};
|
||||
|
||||
let data = if let Ok(data) = std::fs::read(filter_file) {
|
||||
data
|
||||
} else {
|
||||
error!("failed to read filter file '{}'", filter_file);
|
||||
continue;
|
||||
};
|
||||
|
||||
if let Some(filter) = std::str::from_utf8(&data)
|
||||
.ok()
|
||||
.and_then(|s| Filter::from_json(s).ok())
|
||||
{
|
||||
res.columns.push(ArgColumn::Generic(vec![filter]));
|
||||
} else {
|
||||
error!("failed to parse filter in '{}'", filter_file);
|
||||
}
|
||||
}
|
||||
|
||||
i += 1;
|
||||
}
|
||||
|
||||
if res.columns.is_empty() {
|
||||
let ck = ColumnKind::contact_list(PubkeySource::DeckAuthor);
|
||||
info!("No columns set, setting up defaults: {:?}", ck);
|
||||
res.columns.push(ArgColumn::Column(ck));
|
||||
}
|
||||
|
||||
res
|
||||
}
|
||||
}
|
||||
|
||||
/// A way to define columns from the commandline. Can be column kinds or
|
||||
/// generic queries
|
||||
pub enum ArgColumn {
|
||||
Column(ColumnKind),
|
||||
Generic(Vec<Filter>),
|
||||
}
|
||||
|
||||
impl ArgColumn {
|
||||
pub fn into_timeline(self, ndb: &Ndb, user: Option<&[u8; 32]>) -> Timeline {
|
||||
match self {
|
||||
ArgColumn::Generic(filters) => Timeline::new(ColumnKind::Generic, Some(filters)),
|
||||
|
||||
ArgColumn::Column(ColumnKind::Universe) => {
|
||||
Timeline::new(ColumnKind::Universe, Some(vec![]))
|
||||
}
|
||||
|
||||
ArgColumn::Column(ColumnKind::Generic) => {
|
||||
panic!("Not a valid ArgColumn")
|
||||
}
|
||||
|
||||
ArgColumn::Column(ColumnKind::List(ListKind::Contact(ref pk_src))) => {
|
||||
let pk = match pk_src {
|
||||
PubkeySource::DeckAuthor => {
|
||||
if let Some(user_pk) = user {
|
||||
user_pk
|
||||
} else {
|
||||
// No user loaded, so we have to return an unloaded
|
||||
// contact list columns
|
||||
return Timeline::new(
|
||||
ColumnKind::contact_list(PubkeySource::DeckAuthor),
|
||||
None,
|
||||
);
|
||||
}
|
||||
}
|
||||
PubkeySource::Explicit(pk) => pk.bytes(),
|
||||
};
|
||||
|
||||
let contact_filter = Filter::new().authors([pk]).kinds([3]).limit(1).build();
|
||||
let txn = Transaction::new(ndb).expect("txn");
|
||||
let results = ndb
|
||||
.query(&txn, vec![contact_filter], 1)
|
||||
.expect("contact query failed?");
|
||||
|
||||
if results.is_empty() {
|
||||
return Timeline::new(ColumnKind::contact_list(pk_src.to_owned()), None);
|
||||
}
|
||||
|
||||
match Timeline::contact_list(&results[0].note) {
|
||||
Err(Error::EmptyContactList) => {
|
||||
Timeline::new(ColumnKind::contact_list(pk_src.to_owned()), None)
|
||||
}
|
||||
Err(e) => panic!("Unexpected error: {e}"),
|
||||
Ok(tl) => tl,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -8,6 +8,7 @@ pub mod account_manager;
|
||||
mod actionbar;
|
||||
pub mod app_creation;
|
||||
mod app_style;
|
||||
mod args;
|
||||
mod colors;
|
||||
mod draft;
|
||||
mod filter;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user