mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: Add 'rad node inventory --nid <nid>' 

This gives the possibility to see the inventory of another node than self.
This does replicatee the functionality of 'rad node routing --nid', but
feels like a more intuitive command to try.
This commit is contained in:
Richard Levitte 2025-01-20 12:04:19 +01:00 committed by Fintan Halpenny
parent 8fd044833e
commit 10daedf96d
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
radicle-cli/src/commands/node.rs
View File

@ -37,7 +37,7 @@ Usage
rad node debug [<option>...] rad node debug [<option>...]
rad node connect <nid>@<addr> [<option>...] rad node connect <nid>@<addr> [<option>...]
rad node routing [--rid <rid>] [--nid <nid>] [--json] [<option>...] rad node routing [--rid <rid>] [--nid <nid>] [--json] [<option>...]
rad node inventory [<option>...] rad node inventory [--nid <nid>] [<option>...]
rad node events [--timeout <secs>] [-n <count>] [<option>...] rad node events [--timeout <secs>] [-n <count>] [<option>...]
rad node config [--addresses] rad node config [--addresses]
rad node db <command> [<option>..] rad node db <command> [<option>..]
@ -56,6 +56,10 @@ Routing options
--nid <nid> Show the routing table entries for the given NID --nid <nid> Show the routing table entries for the given NID
--json Output the routing table as json --json Output the routing table as json
Inventory options
--nid <nid> List the inventory of the given NID (default: self)
Events options Events options
--timeout <secs> How long to wait to receive an event before giving up --timeout <secs> How long to wait to receive an event before giving up
@ -101,7 +105,9 @@ pub enum Operation {
lines: usize, lines: usize,
}, },
Status, Status,
Inventory, Inventory {
nid: Option<NodeId>,
},
Debug, Debug,
Sessions, Sessions,
Stop, Stop,
@ -171,7 +177,10 @@ impl Args for Options {
let val = parser.value()?; let val = parser.value()?;
rid = term::args::rid(&val).ok(); rid = term::args::rid(&val).ok();
} }
Long("nid") if matches!(op, Some(OperationName::Routing)) => { Long("nid")
if matches!(op, Some(OperationName::Routing))
|| matches!(op, Some(OperationName::Inventory)) =>
{
let val = parser.value()?; let val = parser.value()?;
nid = term::args::nid(&val).ok(); nid = term::args::nid(&val).ok();
} }
@ -230,7 +239,7 @@ impl Args for Options {
options, options,
path: path.unwrap_or(PathBuf::from("radicle-node")), path: path.unwrap_or(PathBuf::from("radicle-node")),
}, },
OperationName::Inventory => Operation::Inventory, OperationName::Inventory => Operation::Inventory { nid },
OperationName::Status => Operation::Status, OperationName::Status => Operation::Status,
OperationName::Debug => Operation::Debug, OperationName::Debug => Operation::Debug,
OperationName::Sessions => Operation::Sessions, OperationName::Sessions => Operation::Sessions,
@ -286,8 +295,9 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
} => { } => {
control::start(node, !foreground, verbose, options, &path, &profile)?; control::start(node, !foreground, verbose, options, &path, &profile)?;
} }
Operation::Inventory => { Operation::Inventory { nid } => {
for rid in profile.routing()?.get_inventory(profile.id())? { let nid = nid.as_ref().unwrap_or(profile.id());
for rid in profile.routing()?.get_inventory(nid)? {
println!("{}", term::format::tertiary(rid)); println!("{}", term::format::tertiary(rid));
} }
} }

4
radicle-cli/src/commands/sync.rs
View File

@ -9,9 +9,7 @@ use anyhow::{anyhow, Context as _};
use radicle::node; use radicle::node;
use radicle::node::address::Store; use radicle::node::address::Store;
use radicle::node::{ use radicle::node::{AliasStore, FetchResult, FetchResults, Handle as _, Node, Seed, SyncStatus};
AliasStore, FetchResult, FetchResults, Handle as _, Node, Seed, Session, SyncStatus,
};
use radicle::prelude::{NodeId, Profile, RepoId}; use radicle::prelude::{NodeId, Profile, RepoId};
use radicle::storage::{ReadStorage, RemoteRepository}; use radicle::storage::{ReadStorage, RemoteRepository};
use radicle_term::Element; use radicle_term::Element;