cli: Add `--from` and other options to `rad seed`
Gives the same options to `rad seed` as `rad sync --fetch`. Allows seeding and syncing from specific seeds in one command: rad seed <rid> --from <nid> Useful for seeding private repos on public nodes.
This commit is contained in:
parent
765fc48c84
commit
9edb633d98
|
|
@ -43,3 +43,11 @@ $ rad clone rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --seed z6MknSLrJoTcukLrE435hVNQT4J
|
||||||
╰────────────────────────────────────╯
|
╰────────────────────────────────────╯
|
||||||
Run `cd ./heartwood` to go to the repository directory.
|
Run `cd ./heartwood` to go to the repository directory.
|
||||||
```
|
```
|
||||||
|
|
||||||
|
We can also use `rad seed` to seed and fetch without creating a checkout.
|
||||||
|
|
||||||
|
``` ~bob
|
||||||
|
$ rad seed rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --timeout 1
|
||||||
|
✓ Seeding policy exists for rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu with scope 'all'
|
||||||
|
✓ Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from z6MknSL…StBU8Vi..
|
||||||
|
```
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
|
use std::collections::BTreeSet;
|
||||||
use std::ffi::OsString;
|
use std::ffi::OsString;
|
||||||
|
use std::time;
|
||||||
|
|
||||||
use anyhow::anyhow;
|
use anyhow::anyhow;
|
||||||
|
|
||||||
|
|
@ -20,7 +22,7 @@ pub const HELP: Help = Help {
|
||||||
usage: r#"
|
usage: r#"
|
||||||
Usage
|
Usage
|
||||||
|
|
||||||
rad seed [<rid>] [--[no-]fetch] [--scope <scope>] [<option>...]
|
rad seed [<rid>] [--[no-]fetch] [--from <nid>] [--scope <scope>] [<option>...]
|
||||||
|
|
||||||
The `seed` command, when no Repository ID (<rid>) is provided, will list the
|
The `seed` command, when no Repository ID (<rid>) is provided, will list the
|
||||||
repositories being seeded.
|
repositories being seeded.
|
||||||
|
|
@ -36,6 +38,8 @@ Usage
|
||||||
Options
|
Options
|
||||||
|
|
||||||
--[no-]fetch Fetch repository after updating seeding policy
|
--[no-]fetch Fetch repository after updating seeding policy
|
||||||
|
--from <nid> Fetch from the given node (may be specified multiple times)
|
||||||
|
--timeout <secs> Fetch timeout in seconds (default: 9)
|
||||||
--scope <scope> Peer follow scope for this repository
|
--scope <scope> Peer follow scope for this repository
|
||||||
--verbose, -v Verbose output
|
--verbose, -v Verbose output
|
||||||
--help Print help
|
--help Print help
|
||||||
|
|
@ -47,6 +51,8 @@ pub enum Operation {
|
||||||
Seed {
|
Seed {
|
||||||
rid: RepoId,
|
rid: RepoId,
|
||||||
fetch: bool,
|
fetch: bool,
|
||||||
|
seeds: BTreeSet<NodeId>,
|
||||||
|
timeout: time::Duration,
|
||||||
scope: Scope,
|
scope: Scope,
|
||||||
},
|
},
|
||||||
List,
|
List,
|
||||||
|
|
@ -66,6 +72,8 @@ impl Args for Options {
|
||||||
let mut rid: Option<RepoId> = None;
|
let mut rid: Option<RepoId> = None;
|
||||||
let mut scope: Option<Scope> = None;
|
let mut scope: Option<Scope> = None;
|
||||||
let mut fetch: Option<bool> = None;
|
let mut fetch: Option<bool> = None;
|
||||||
|
let mut timeout = time::Duration::from_secs(9);
|
||||||
|
let mut seeds: BTreeSet<NodeId> = BTreeSet::new();
|
||||||
let mut verbose = false;
|
let mut verbose = false;
|
||||||
|
|
||||||
while let Some(arg) = parser.next()? {
|
while let Some(arg) = parser.next()? {
|
||||||
|
|
@ -83,6 +91,18 @@ impl Args for Options {
|
||||||
Long("no-fetch") => {
|
Long("no-fetch") => {
|
||||||
fetch = Some(false);
|
fetch = Some(false);
|
||||||
}
|
}
|
||||||
|
Long("from") => {
|
||||||
|
let val = parser.value()?;
|
||||||
|
let nid = term::args::nid(&val)?;
|
||||||
|
|
||||||
|
seeds.insert(nid);
|
||||||
|
}
|
||||||
|
Long("timeout") | Short('t') => {
|
||||||
|
let value = parser.value()?;
|
||||||
|
let secs = term::args::parse_value("timeout", value)?;
|
||||||
|
|
||||||
|
timeout = time::Duration::from_secs(secs);
|
||||||
|
}
|
||||||
Long("verbose") | Short('v') => verbose = true,
|
Long("verbose") | Short('v') => verbose = true,
|
||||||
Long("help") | Short('h') => {
|
Long("help") | Short('h') => {
|
||||||
return Err(Error::Help.into());
|
return Err(Error::Help.into());
|
||||||
|
|
@ -98,6 +118,8 @@ impl Args for Options {
|
||||||
rid,
|
rid,
|
||||||
fetch: fetch.unwrap_or(true),
|
fetch: fetch.unwrap_or(true),
|
||||||
scope: scope.unwrap_or(Scope::All),
|
scope: scope.unwrap_or(Scope::All),
|
||||||
|
timeout,
|
||||||
|
seeds,
|
||||||
},
|
},
|
||||||
None => Operation::List,
|
None => Operation::List,
|
||||||
};
|
};
|
||||||
|
|
@ -111,13 +133,22 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
||||||
let mut node = radicle::Node::new(profile.socket());
|
let mut node = radicle::Node::new(profile.socket());
|
||||||
|
|
||||||
match options.op {
|
match options.op {
|
||||||
Operation::Seed { rid, fetch, scope } => {
|
Operation::Seed {
|
||||||
|
rid,
|
||||||
|
fetch,
|
||||||
|
scope,
|
||||||
|
timeout,
|
||||||
|
seeds,
|
||||||
|
} => {
|
||||||
update(rid, scope, &mut node, &profile)?;
|
update(rid, scope, &mut node, &profile)?;
|
||||||
|
|
||||||
if fetch && node.is_running() {
|
if fetch && node.is_running() {
|
||||||
sync::fetch(
|
sync::fetch(
|
||||||
rid,
|
rid,
|
||||||
SyncSettings::default().with_profile(&profile),
|
SyncSettings::default()
|
||||||
|
.seeds(seeds)
|
||||||
|
.timeout(timeout)
|
||||||
|
.with_profile(&profile),
|
||||||
&mut node,
|
&mut node,
|
||||||
)?;
|
)?;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,12 @@ impl SyncSettings {
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Set seeds.
|
||||||
|
pub fn seeds(mut self, seeds: impl IntoIterator<Item = NodeId>) -> Self {
|
||||||
|
self.seeds = seeds.into_iter().collect();
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
/// Use profile to populate sync settings, by adding preferred seeds if no seeds are specified,
|
/// Use profile to populate sync settings, by adding preferred seeds if no seeds are specified,
|
||||||
/// and removing the local node from the set.
|
/// and removing the local node from the set.
|
||||||
pub fn with_profile(mut self, profile: &Profile) -> Self {
|
pub fn with_profile(mut self, profile: &Profile) -> Self {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue