Kieran/zap-stream-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: widget state

Browse Source
This commit is contained in:
kieran
2024-10-11 16:42:05 +01:00
parent 67d6381123
commit 9a8bb54e08
17 changed files with 447 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/app.rs
View File

@ -1,15 +1,12 @@
use crate::route::Router;
use eframe::{App, CreationContext, Frame};
use egui::{Color32, Context, ScrollArea};
use egui_inbox::UiInbox;
use log::warn;
use nostr_sdk::database::{MemoryDatabase, MemoryDatabaseOptions};
use nostr_sdk::{Client, Filter, JsonUtil, Kind, RelayPoolNotification};
use egui::{Color32, Context};
use nostr_sdk::database::MemoryDatabase;
use nostr_sdk::{Client, RelayPoolNotification};
use nostrdb::{Config, Ndb};
use tokio::sync::broadcast;
pub struct ZapStreamApp {
ndb: Ndb,
client: Client,
notifications: broadcast::Receiver<RelayPoolNotification>,
router: Router,
@ -17,10 +14,7 @@ pub struct ZapStreamApp {
impl ZapStreamApp {
pub fn new(cc: &CreationContext) -> Self {
let client = Client::builder().database(MemoryDatabase::with_opts(MemoryDatabaseOptions {
events: true,
..Default::default()
})).build();
let client = Client::builder().database(MemoryDatabase::with_opts(Default::default())).build();
let notifications = client.notifications();
let ctx_clone = cc.egui_ctx.clone();
@ -28,10 +22,6 @@ impl ZapStreamApp {
tokio::spawn(async move {
client_clone.add_relay("wss://nos.lol").await.expect("Failed to add relay");
client_clone.connect().await;
client_clone.subscribe(vec![
Filter::new()
.kind(Kind::LiveEvent)
], None).await.expect("Failed to subscribe");
let mut notifications = client_clone.notifications();
while let Ok(_) = notifications.recv().await {
ctx_clone.request_repaint();
@ -39,36 +29,18 @@ impl ZapStreamApp {
});
egui_extras::install_image_loaders(&cc.egui_ctx);
let inbox = UiInbox::new();
let ndb = Ndb::new(".", &Config::default()).unwrap();
Self {
ndb: ndb.clone(),
client: client.clone(),
notifications,
router: Router::new(inbox, cc.egui_ctx.clone(), client.clone(), ndb.clone()),
}
}
fn process_nostr(&mut self) {
while let Ok(msg) = self.notifications.try_recv() {
match msg {
RelayPoolNotification::Event { event, .. } => {
if let Err(e) = self.ndb.process_event(event.as_json().as_str()) {
warn!("Failed to process event: {:?}", e);
}
}
_ => {
// dont care
}
}
router: Router::new(cc.egui_ctx.clone(), client.clone(), ndb.clone()),
}
}
}
impl App for ZapStreamApp {
fn update(&mut self, ctx: &Context, frame: &mut Frame) {
self.process_nostr();
let mut app_frame = egui::containers::Frame::default();
app_frame.stroke.color = Color32::BLACK;