cli: add `rad unblock` command
Add the `rad unblock` command for reversing the effect of blocking an NID or RID. In both cases, the entry is removed from the DB, if the policy was set to block -- otherwise it is a no-op.
This commit is contained in:
parent
468d5a46ee
commit
52554af4f1
|
|
@ -41,3 +41,15 @@ $ rad seed
|
||||||
│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji block all │
|
│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji block all │
|
||||||
╰───────────────────────────────────────────────────────────╯
|
╰───────────────────────────────────────────────────────────╯
|
||||||
```
|
```
|
||||||
|
|
||||||
|
If we want to reverse the blocking of the RID we can use `rad unblock`:
|
||||||
|
|
||||||
|
```
|
||||||
|
$ rad unblock rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
|
||||||
|
✓ The 'block' policy for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji is removed
|
||||||
|
```
|
||||||
|
|
||||||
|
```
|
||||||
|
$ rad seed
|
||||||
|
No seeding policies to show.
|
||||||
|
```
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,8 @@ pub mod rad_self;
|
||||||
pub mod rad_stats;
|
pub mod rad_stats;
|
||||||
#[path = "commands/sync.rs"]
|
#[path = "commands/sync.rs"]
|
||||||
pub mod rad_sync;
|
pub mod rad_sync;
|
||||||
|
#[path = "commands/unblock.rs"]
|
||||||
|
pub mod rad_unblock;
|
||||||
#[path = "commands/unfollow.rs"]
|
#[path = "commands/unfollow.rs"]
|
||||||
pub mod rad_unfollow;
|
pub mod rad_unfollow;
|
||||||
#[path = "commands/unseed.rs"]
|
#[path = "commands/unseed.rs"]
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ const COMMANDS: &[Help] = &[
|
||||||
rad_self::HELP,
|
rad_self::HELP,
|
||||||
rad_seed::HELP,
|
rad_seed::HELP,
|
||||||
rad_follow::HELP,
|
rad_follow::HELP,
|
||||||
|
rad_unblock::HELP,
|
||||||
rad_unfollow::HELP,
|
rad_unfollow::HELP,
|
||||||
rad_unseed::HELP,
|
rad_unseed::HELP,
|
||||||
rad_remote::HELP,
|
rad_remote::HELP,
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,98 @@
|
||||||
|
use std::ffi::OsString;
|
||||||
|
|
||||||
|
use radicle::prelude::{NodeId, RepoId};
|
||||||
|
|
||||||
|
use crate::terminal as term;
|
||||||
|
use crate::terminal::args;
|
||||||
|
use crate::terminal::args::{Args, Error, Help};
|
||||||
|
|
||||||
|
pub const HELP: Help = Help {
|
||||||
|
name: "unblock",
|
||||||
|
description: "Unblock repositories or nodes to allow them to be seeded or followed",
|
||||||
|
version: env!("RADICLE_VERSION"),
|
||||||
|
usage: r#"
|
||||||
|
Usage
|
||||||
|
|
||||||
|
rad unblock <rid> [<option>...]
|
||||||
|
rad unblock <nid> [<option>...]
|
||||||
|
|
||||||
|
Unblock a repository or remote to allow it to be seeded or followed.
|
||||||
|
|
||||||
|
Options
|
||||||
|
|
||||||
|
--help Print help
|
||||||
|
"#,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum Target {
|
||||||
|
Node(NodeId),
|
||||||
|
Repo(RepoId),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::fmt::Display for Target {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
match self {
|
||||||
|
Self::Node(nid) => nid.fmt(f),
|
||||||
|
Self::Repo(rid) => rid.fmt(f),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct Options {
|
||||||
|
target: Target,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Args for Options {
|
||||||
|
fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
|
||||||
|
use lexopt::prelude::*;
|
||||||
|
|
||||||
|
let mut parser = lexopt::Parser::from_args(args);
|
||||||
|
let mut target = None;
|
||||||
|
|
||||||
|
while let Some(arg) = parser.next()? {
|
||||||
|
match arg {
|
||||||
|
Long("help") | Short('h') => {
|
||||||
|
return Err(Error::Help.into());
|
||||||
|
}
|
||||||
|
Value(val) if target.is_none() => {
|
||||||
|
if let Ok(rid) = args::rid(&val) {
|
||||||
|
target = Some(Target::Repo(rid));
|
||||||
|
} else if let Ok(nid) = args::nid(&val) {
|
||||||
|
target = Some(Target::Node(nid));
|
||||||
|
} else {
|
||||||
|
return Err(anyhow::anyhow!(
|
||||||
|
"invalid repository or remote specified, see `rad unblock --help`"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => return Err(anyhow::anyhow!(arg.unexpected())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok((
|
||||||
|
Options {
|
||||||
|
target: target.ok_or(anyhow::anyhow!(
|
||||||
|
"a repository or remote to unblock must be specified, see `rad unblock --help`"
|
||||||
|
))?,
|
||||||
|
},
|
||||||
|
vec![],
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
||||||
|
let profile = ctx.profile()?;
|
||||||
|
let mut policies = profile.policies_mut()?;
|
||||||
|
|
||||||
|
let updated = match options.target {
|
||||||
|
Target::Node(nid) => policies.unblock_nid(&nid)?,
|
||||||
|
Target::Repo(rid) => policies.unblock_rid(&rid)?,
|
||||||
|
};
|
||||||
|
|
||||||
|
if updated {
|
||||||
|
term::success!("The 'block' policy for {} is removed", options.target);
|
||||||
|
} else {
|
||||||
|
term::info!("No 'block' policy exists for {}", options.target)
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
@ -291,6 +291,13 @@ fn run_other(exe: &str, args: &[OsString]) -> Result<(), Option<anyhow::Error>>
|
||||||
args.to_vec(),
|
args.to_vec(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
"unblock" => {
|
||||||
|
term::run_command_args::<rad_unblock::Options, _>(
|
||||||
|
rad_unblock::HELP,
|
||||||
|
rad_unblock::run,
|
||||||
|
args.to_vec(),
|
||||||
|
);
|
||||||
|
}
|
||||||
"unfollow" => {
|
"unfollow" => {
|
||||||
term::run_command_args::<rad_unfollow::Options, _>(
|
term::run_command_args::<rad_unfollow::Options, _>(
|
||||||
rad_unfollow::HELP,
|
rad_unfollow::HELP,
|
||||||
|
|
|
||||||
|
|
@ -139,11 +139,15 @@ impl TryFrom<&sqlite::Value> for Policy {
|
||||||
type Error = sqlite::Error;
|
type Error = sqlite::Error;
|
||||||
|
|
||||||
fn try_from(value: &sqlite::Value) -> Result<Self, Self::Error> {
|
fn try_from(value: &sqlite::Value) -> Result<Self, Self::Error> {
|
||||||
let message = Some("sql: invalid policy".to_owned());
|
let message = Some("sql: invalid policy value".to_owned());
|
||||||
|
|
||||||
match value {
|
match value {
|
||||||
sqlite::Value::String(s) if s == "allow" => Ok(Policy::Allow),
|
sqlite::Value::String(s) if s == "allow" => Ok(Policy::Allow),
|
||||||
sqlite::Value::String(s) if s == "block" => Ok(Policy::Block),
|
sqlite::Value::String(s) if s == "block" => Ok(Policy::Block),
|
||||||
|
sqlite::Value::String(s) => Err(sqlite::Error {
|
||||||
|
code: None,
|
||||||
|
message: Some(format!("sql: invalid policy '{s}'")),
|
||||||
|
}),
|
||||||
_ => Err(sqlite::Error {
|
_ => Err(sqlite::Error {
|
||||||
code: None,
|
code: None,
|
||||||
message,
|
message,
|
||||||
|
|
|
||||||
|
|
@ -198,6 +198,30 @@ impl Store<Write> {
|
||||||
|
|
||||||
Ok(self.db.change_count() > 0)
|
Ok(self.db.change_count() > 0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Unblock a repository.
|
||||||
|
pub fn unblock_rid(&mut self, id: &RepoId) -> Result<bool, Error> {
|
||||||
|
let mut stmt = self
|
||||||
|
.db
|
||||||
|
.prepare("DELETE FROM `seeding` WHERE id = ? AND policy = 'block'")?;
|
||||||
|
|
||||||
|
stmt.bind((1, id))?;
|
||||||
|
stmt.next()?;
|
||||||
|
|
||||||
|
Ok(self.db.change_count() > 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Unblock a remote.
|
||||||
|
pub fn unblock_nid(&mut self, id: &NodeId) -> Result<bool, Error> {
|
||||||
|
let mut stmt = self
|
||||||
|
.db
|
||||||
|
.prepare("DELETE FROM `following` WHERE id = ? AND policy = 'block'")?;
|
||||||
|
|
||||||
|
stmt.bind((1, id))?;
|
||||||
|
stmt.next()?;
|
||||||
|
|
||||||
|
Ok(self.db.change_count() > 0)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// `Read` methods for `Config`. This implies that a
|
/// `Read` methods for `Config`. This implies that a
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue