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

Merge relay debug view fixes & more strict args #711

Browse Source 
Ken Sedgwick (5):
      drive-by compiler warning fixes
      drive-by clippy fixes
      add derive Debug to some things
      panic on unknown CLI arguments
      move RelayDebugView to notedeck crate and restore --relay-debug

William Casarin (4):
      clippy: fix lint
      args: skip creation of vec
      nix: fix android build

Link: https://github.com/damus-io/notedeck/pull/711
This commit is contained in:
William Casarin
2025-02-10 17:03:18 -08:00
parent 7f0d0106d9 353a3c87c3
commit d82d7fd00d
13 changed files with 129 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/notedeck_columns/src/app.rs
View File

@@ -22,7 +22,7 @@ use egui_extras::{Size, StripBuilder};
use nostrdb::{Ndb, Transaction};
use std::collections::HashMap;
use std::collections::{BTreeSet, HashMap};
use std::path::Path;
use std::time::Duration;
use tracing::{debug, error, info, trace, warn};
@@ -51,6 +51,8 @@ pub struct Damus {
pub debug: bool,
pub since_optimize: bool,
pub textmode: bool,
pub unrecognized_args: BTreeSet<String>,
}
fn handle_key_events(input: &egui::InputState, columns: &mut Columns) {
@@ -358,7 +360,7 @@ impl Damus {
pub fn new(ctx: &mut AppContext<'_>, args: &[String]) -> Self {
// arg parsing
let parsed_args = ColumnsArgs::parse(
let (parsed_args, unrecognized_args) = ColumnsArgs::parse(
args,
ctx.accounts
.get_selected_account()
@@ -434,6 +436,7 @@ impl Damus {
support,
decks_cache,
debug,
unrecognized_args,
}
}
@@ -476,12 +479,17 @@ impl Damus {
view_state: ViewState::default(),
support,
decks_cache,
unrecognized_args: BTreeSet::default(),
}
}
pub fn subscriptions(&mut self) -> &mut HashMap<String, SubKind> {
&mut self.subscriptions.subs
}
pub fn unrecognized_args(&self) -> &BTreeSet<String> {
&self.unrecognized_args
}
}
/*

9
crates/notedeck_columns/src/args.rs
View File

@@ -1,3 +1,5 @@
use std::collections::BTreeSet;
use crate::timeline::TimelineKind;
use enostr::{Filter, Pubkey};
use tracing::{debug, error, info};
@@ -9,7 +11,8 @@ pub struct ColumnsArgs {
}
impl ColumnsArgs {
pub fn parse(args: &[String], deck_author: Option<&Pubkey>) -> Self {
pub fn parse(args: &[String], deck_author: Option<&Pubkey>) -> (Self, BTreeSet<String>) {
let mut unrecognized_args = BTreeSet::new();
let mut res = Self {
columns: vec![],
since_optimize: true,
@@ -132,12 +135,14 @@ impl ColumnsArgs {
} else {
error!("failed to parse filter in '{}'", filter_file);
}
} else {
unrecognized_args.insert(arg.clone());
}
i += 1;
}
res
(res, unrecognized_args)
}
}

4
crates/notedeck_columns/src/column.rs
View File

@@ -9,7 +9,7 @@ use notedeck::NoteCache;
use std::iter::Iterator;
use tracing::warn;
#[derive(Clone)]
#[derive(Clone, Debug)]
pub struct Column {
router: Router<Route>,
}
@@ -29,7 +29,7 @@ impl Column {
}
}
#[derive(Default)]
#[derive(Default, Debug)]
pub struct Columns {
/// Columns are simply routers into settings, timelines, etc
columns: Vec<Column>,

2
crates/notedeck_columns/src/route.rs
View File

@@ -229,7 +229,7 @@ impl Route {
// TODO: add this to egui-nav so we don't have to deal with returning
// and navigating headaches
#[derive(Clone)]
#[derive(Clone, Debug)]
pub struct Router<R: Clone> {
routes: Vec<R>,
pub returning: bool,

1
crates/notedeck_columns/src/ui/mod.rs
View File

@@ -10,7 +10,6 @@ pub mod note;
pub mod preview;
pub mod profile;
pub mod relay;
pub mod relay_debug;
pub mod search_results;
pub mod side_panel;
pub mod support;

173
crates/notedeck_columns/src/ui/relay_debug.rs
View File

@@ -1,173 +0,0 @@
use egui::ScrollArea;
use enostr::{RelayLogEvent, SubsDebug};
pub struct RelayDebugView<'a> {
debug: &'a mut SubsDebug,
}
impl<'a> RelayDebugView<'a> {
pub fn new(debug: &'a mut SubsDebug) -> Self {
Self { debug }
}
}
impl RelayDebugView<'_> {
pub fn ui(&mut self, ui: &mut egui::Ui) {
ScrollArea::vertical()
.id_salt(ui.id().with("relays_debug"))
.max_height(ui.max_rect().height() / 2.0)
.show(ui, |ui| {
ui.label("Active Relays:");
for (relay_str, data) in self.debug.get_data() {
egui::CollapsingHeader::new(format!(
"{} {} {}",
relay_str,
format_total(&data.count),
format_sec(&data.count)
))
.default_open(true)
.show(ui, |ui| {
ui.horizontal_wrapped(|ui| {
for (i, sub_data) in data.sub_data.values().enumerate() {
ui.label(format!(
"Filter {} ({})",
i + 1,
format_sec(&sub_data.count)
))
.on_hover_cursor(egui::CursorIcon::Help)
.on_hover_text(sub_data.filter.to_string());
}
})
});
}
});
ui.separator();
egui::ComboBox::from_label("Show events from relay")
.selected_text(
self.debug
.relay_events_selection
.as_ref()
.map_or(String::new(), |s| s.clone()),
)
.show_ui(ui, |ui| {
let mut make_selection = None;
for relay in self.debug.get_data().keys() {
if ui
.selectable_label(
if let Some(s) = &self.debug.relay_events_selection {
*s == *relay
} else {
false
},
relay,
)
.clicked()
{
make_selection = Some(relay.clone());
}
}
if make_selection.is_some() {
self.debug.relay_events_selection = make_selection
}
});
let show_relay_evs =
|ui: &mut egui::Ui, relay: Option<String>, events: Vec<RelayLogEvent>| {
for ev in events {
ui.horizontal_wrapped(|ui| {
if let Some(r) = &relay {
ui.label("relay").on_hover_text(r.clone());
}
match ev {
RelayLogEvent::Send(client_message) => {
ui.label("SEND: ");
let msg = &match client_message {
enostr::ClientMessage::Event { .. } => "Event",
enostr::ClientMessage::Req { .. } => "Req",
enostr::ClientMessage::Close { .. } => "Close",
enostr::ClientMessage::Raw(_) => "Raw",
};
if let Ok(json) = client_message.to_json() {
ui.label(*msg).on_hover_text(json)
} else {
ui.label(*msg)
}
}
RelayLogEvent::Recieve(e) => {
ui.label("RECIEVE: ");
match e {
enostr::OwnedRelayEvent::Opened => ui.label("Opened"),
enostr::OwnedRelayEvent::Closed => ui.label("Closed"),
enostr::OwnedRelayEvent::Other(s) => {
ui.label("Other").on_hover_text(s)
}
enostr::OwnedRelayEvent::Error(s) => {
ui.label("Error").on_hover_text(s)
}
enostr::OwnedRelayEvent::Message(s) => {
ui.label("Message").on_hover_text(s)
}
}
}
}
});
}
};
ScrollArea::vertical()
.id_salt(ui.id().with("events"))
.show(ui, |ui| {
if let Some(relay) = &self.debug.relay_events_selection {
if let Some(data) = self.debug.get_data().get(relay) {
show_relay_evs(ui, None, data.events.clone());
}
} else {
for (relay, data) in self.debug.get_data() {
show_relay_evs(ui, Some(relay.clone()), data.events.clone());
}
}
});
self.debug.try_increment_stats();
}
pub fn window(ctx: &egui::Context, debug: &mut SubsDebug) {
let mut open = true;
egui::Window::new("Relay Debugger")
.open(&mut open)
.show(ctx, |ui| {
RelayDebugView::new(debug).ui(ui);
});
}
}
fn format_sec(c: &enostr::TransferStats) -> String {
format!(
"⬇{} ⬆️{}",
byte_to_string(c.down_sec_prior),
byte_to_string(c.up_sec_prior)
)
}
fn format_total(c: &enostr::TransferStats) -> String {
format!(
"total: ⬇{} ⬆️{}",
byte_to_string(c.down_total),
byte_to_string(c.up_total)
)
}
const MB: usize = 1_048_576;
const KB: usize = 1024;
fn byte_to_string(b: usize) -> String {
if b >= MB {
let mbs = b as f32 / MB as f32;
format!("{:.2} MB", mbs)
} else if b >= KB {
let kbs = b as f32 / KB as f32;
format!("{:.2} KB", kbs)
} else {
format!("{} B", b)
}
}