From 2b4cfa45225178655f01a0b78a68f908b4e41ca8 Mon Sep 17 00:00:00 2001
From: lunar-mining <ihateface@autistici.org>
Date: Sun, 6 Aug 2023 17:04:32 +0200
Subject: [PATCH] dnetview: sleep for 2 sec between poll instead of 2000 sec

also cargo fmt and cleanup
---
 bin/dnetview/src/main.rs   | 13 ++++---------
 bin/dnetview/src/parser.rs | 10 +++-------
 bin/dnetview/src/view.rs   | 15 ++++++---------
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/bin/dnetview/src/main.rs b/bin/dnetview/src/main.rs
index d8607e34b..1b78eb703 100644
--- a/bin/dnetview/src/main.rs
+++ b/bin/dnetview/src/main.rs
@@ -21,14 +21,14 @@ use std::{fs::File, io, io::Read};
 use async_std::sync::Arc;
 use clap::Parser;
 use easy_parallel::Parallel;
-use log::info;
-use simplelog::*;
-use smol::Executor;
-use termion::{async_stdin, event::Key, input::TermRead, raw::IntoRawMode};
+use log::{debug, info};
 use ratatui::{
     backend::{Backend, TermionBackend},
     Terminal,
 };
+use simplelog::*;
+use smol::Executor;
+use termion::{async_stdin, event::Key, input::TermRead, raw::IntoRawMode};
 
 use darkfi::util::{
     async_util,
@@ -76,12 +76,8 @@ impl DnetView {
             self.view.update(
                 self.model.msg_map.lock().await.clone(),
                 self.model.selectables.lock().await.clone(),
-                //self.model.selectables2.lock().await.clone(),
             );
 
-            //debug!(target: "dnetview::render_view()", "ID MENU: {:?}", self.view.id_menu.ids);
-            //debug!(target: "dnetview::render_view()", "SELECTABLES ID LIST: {:?}", self.model.selectables.lock().await.keys());
-
             let mut err: Option<DnetViewError> = None;
 
             terminal.draw(|f| match self.view.render(f) {
@@ -127,7 +123,6 @@ impl DnetView {
 
 #[async_std::main]
 async fn main() -> DnetViewResult<()> {
-    //debug!(target: "dnetview", "main() START");
     let args = Args::parse();
 
     let log_level = get_log_level(args.verbose);
diff --git a/bin/dnetview/src/parser.rs b/bin/dnetview/src/parser.rs
index f81ca1a4f..ca2d1e200 100644
--- a/bin/dnetview/src/parser.rs
+++ b/bin/dnetview/src/parser.rs
@@ -74,7 +74,7 @@ impl DataParser {
                 }
             }
             self.parse_offline(node.name.clone()).await?;
-            async_util::sleep(2000).await;
+            async_util::sleep(2).await;
         }
     }
 
@@ -114,14 +114,13 @@ impl DataParser {
             }
 
             // Sleep until next poll
-            async_util::sleep(2000).await;
+            async_util::sleep(2).await;
         }
     }
 
     // If poll times out, inititalize data structures with empty values.
     async fn parse_offline(&self, node_name: String) -> DnetViewResult<()> {
         debug!(target: "dnetview", "parse_offline() START");
-        //let name = "Offline".to_string();
         let sort = Session::Offline;
 
         let mut sessions: Vec<SessionInfo> = Vec::new();
@@ -190,7 +189,6 @@ impl DataParser {
                 true
             }
         };
-        debug!("dnet_enabled? {}", dnet_enabled);
 
         let hosts = self.parse_hosts(hosts).await?;
         let inbound = self.parse_session(inbound, &node_id, Session::Inbound).await?;
@@ -439,9 +437,7 @@ impl DataParser {
                         );
                         session_info.push(session);
                     }
-                    None => {
-                        return Err(DnetViewError::ValueIsNotObject)
-                    }
+                    None => return Err(DnetViewError::ValueIsNotObject),
                 }
             }
         }
diff --git a/bin/dnetview/src/view.rs b/bin/dnetview/src/view.rs
index a9ac60151..6be0bea8d 100644
--- a/bin/dnetview/src/view.rs
+++ b/bin/dnetview/src/view.rs
@@ -23,7 +23,7 @@ use ratatui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
-    text::{Span, Line},
+    text::{Line, Span},
     widgets::{Block, Borders, List, ListItem, ListState, Paragraph},
     Frame,
 };
@@ -71,6 +71,7 @@ impl<'a> View {
         self.make_ordered_list();
     }
 
+    // We copy the values into a string to initialize List as a StatefulObject.
     fn update_id_menu(&mut self, selectables: HashMap<String, SelectableObject>) {
         for id in selectables.keys() {
             if !self.id_menu.ids.iter().any(|i| i == id) {
@@ -79,6 +80,7 @@ impl<'a> View {
         }
     }
 
+    // We first add every selectable object into a hashmap to avoid duplicates.
     fn update_selectable(&mut self, selectables: HashMap<String, SelectableObject>) {
         for (id, obj) in selectables {
             self.selectables.insert(id, obj);
@@ -183,11 +185,7 @@ impl<'a> View {
         }
     }
 
-    fn render_left<B: Backend>(
-        &mut self,
-        f: &mut Frame<'_, B>,
-        slice: Rect,
-    ) -> DnetViewResult<()> {
+    fn render_left<B: Backend>(&mut self, f: &mut Frame<'_, B>, slice: Rect) -> DnetViewResult<()> {
         let style = Style::default();
         let mut nodes = Vec::new();
 
@@ -206,9 +204,8 @@ impl<'a> View {
                         nodes.push(names);
                     } else {
                         if !node.dnet_enabled {
-                            let style = Style::default()
-                                .fg(Color::LightBlue)
-                                .add_modifier(Modifier::BOLD);
+                            let style =
+                                Style::default().fg(Color::LightBlue).add_modifier(Modifier::BOLD);
                             let mut name = String::new();
                             name.push_str(&node.name);
                             name.push_str("(dnetview is not enabled)");