From 1dbf9f3f981a7b286d20ca7660e6d349d3f3c657 Mon Sep 17 00:00:00 2001 From: sxyazi Date: Fri, 20 Mar 2026 15:19:22 +0800 Subject: [PATCH] Use `--discard` --- yazi-cli/src/args.rs | 16 ++++++++-------- yazi-cli/src/main.rs | 6 +++--- yazi-cli/src/package/add.rs | 4 ++-- yazi-cli/src/package/delete.rs | 4 ++-- yazi-cli/src/package/deploy.rs | 4 ++-- yazi-cli/src/package/hash.rs | 2 +- yazi-cli/src/package/install.rs | 4 ++-- yazi-cli/src/package/package.rs | 16 ++++++++-------- yazi-cli/src/package/upgrade.rs | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/yazi-cli/src/args.rs b/yazi-cli/src/args.rs index 46125131..e87e259b 100644 --- a/yazi-cli/src/args.rs +++ b/yazi-cli/src/args.rs @@ -77,16 +77,16 @@ pub(super) enum CommandPkg { Delete { /// Packages to delete. #[arg(index = 1, num_args = 1..)] - ids: Vec, - /// Overwrite any local changes made to packages. + ids: Vec, + /// Discard any local changes made to packages. #[arg(long)] - overwrite: bool, + discard: bool, }, /// Install all packages. Install { - /// Overwrite any local changes made to packages. + /// Discard any local changes made to packages. #[arg(long)] - overwrite: bool, + discard: bool, }, /// List all packages. List, @@ -94,10 +94,10 @@ pub(super) enum CommandPkg { Upgrade { /// Packages to upgrade, upgrade all if unspecified. #[arg(index = 1, num_args = 0..)] - ids: Vec, - /// Overwrite any local changes made to packages. + ids: Vec, + /// Discard any local changes made to packages. #[arg(short, long)] - overwrite: bool, + discard: bool, }, } diff --git a/yazi-cli/src/main.rs b/yazi-cli/src/main.rs index 5a3e2722..b971ab9f 100644 --- a/yazi-cli/src/main.rs +++ b/yazi-cli/src/main.rs @@ -78,10 +78,10 @@ async fn run() -> anyhow::Result<()> { let mut pkg = package::Package::load().await?; match cmd { CommandPkg::Add { ids } => pkg.add_many(&ids).await?, - CommandPkg::Delete { ids, overwrite } => pkg.delete_many(&ids, overwrite).await?, - CommandPkg::Install { overwrite } => pkg.install(overwrite).await?, + CommandPkg::Delete { ids, discard } => pkg.delete_many(&ids, discard).await?, + CommandPkg::Install { discard } => pkg.install(discard).await?, CommandPkg::List => pkg.print()?, - CommandPkg::Upgrade { ids, overwrite } => pkg.upgrade_many(&ids, overwrite).await?, + CommandPkg::Upgrade { ids, discard } => pkg.upgrade_many(&ids, discard).await?, } } diff --git a/yazi-cli/src/package/add.rs b/yazi-cli/src/package/add.rs index aeaebbb7..6ae7a42c 100644 --- a/yazi-cli/src/package/add.rs +++ b/yazi-cli/src/package/add.rs @@ -4,7 +4,7 @@ use super::{Dependency, Git}; use crate::shared::must_exists; impl Dependency { - pub(super) async fn add(&mut self, overwrite: bool) -> Result<()> { + pub(super) async fn add(&mut self, discard: bool) -> Result<()> { self.header("Upgrading package `{name}`")?; let path = self.local(); @@ -14,7 +14,7 @@ impl Dependency { Git::clone(&self.remote(), &path).await?; }; - self.deploy(overwrite).await?; + self.deploy(discard).await?; self.rev = Git::revision(&path).await?; Ok(()) } diff --git a/yazi-cli/src/package/delete.rs b/yazi-cli/src/package/delete.rs index e66879d8..9f548c1f 100644 --- a/yazi-cli/src/package/delete.rs +++ b/yazi-cli/src/package/delete.rs @@ -6,13 +6,13 @@ use super::Dependency; use crate::shared::{maybe_exists, remove_sealed}; impl Dependency { - pub(super) async fn delete(&self, overwrite: bool) -> Result<()> { + pub(super) async fn delete(&self, discard: bool) -> Result<()> { self.header("Deleting package `{name}`")?; let dir = self.target(); if !maybe_exists(&dir).await { return Ok(outln!("Not found, skipping")?); - } else if !overwrite { + } else if !discard { self.hash_check().await?; } diff --git a/yazi-cli/src/package/deploy.rs b/yazi-cli/src/package/deploy.rs index 1f56a647..ffbe5f5e 100644 --- a/yazi-cli/src/package/deploy.rs +++ b/yazi-cli/src/package/deploy.rs @@ -8,7 +8,7 @@ use super::Dependency; use crate::shared::{copy_and_seal, maybe_exists}; impl Dependency { - pub(super) async fn deploy(&mut self, overwrite: bool) -> Result<()> { + pub(super) async fn deploy(&mut self, discard: bool) -> Result<()> { let from = self.local().join(&self.child); self.header("Deploying package `{name}`")?; @@ -16,7 +16,7 @@ impl Dependency { let to = self.target(); let exists = maybe_exists(&to).await; - if exists && !overwrite { + if exists && !discard { self.hash_check().await?; } diff --git a/yazi-cli/src/package/hash.rs b/yazi-cli/src/package/hash.rs index 1d4b66cf..e6e073c6 100644 --- a/yazi-cli/src/package/hash.rs +++ b/yazi-cli/src/package/hash.rs @@ -46,7 +46,7 @@ impl Dependency { if self.hash != self.hash().await? { bail!( "You have modified the contents of the `{}` {}. For safety, the operation has been aborted. -Please manually delete it from `{}` and re-run the command, or add `--overwrite` to overwrite any local changes.", +Please manually delete it from `{}` and re-run the command, or add `--discard` to discard any local changes.", self.name, if self.is_flavor { "flavor" } else { "plugin" }, self.target().display() diff --git a/yazi-cli/src/package/install.rs b/yazi-cli/src/package/install.rs index b79000c0..4ebda2da 100644 --- a/yazi-cli/src/package/install.rs +++ b/yazi-cli/src/package/install.rs @@ -4,7 +4,7 @@ use super::{Dependency, Git}; use crate::shared::must_exists; impl Dependency { - pub(super) async fn install(&mut self, overwrite: bool) -> Result<()> { + pub(super) async fn install(&mut self, discard: bool) -> Result<()> { self.header("Fetching package `{name}`")?; let path = self.local(); @@ -18,7 +18,7 @@ impl Dependency { Git::checkout(&path, self.rev.trim_start_matches('=')).await?; } - self.deploy(overwrite).await?; + self.deploy(discard).await?; if self.rev.is_empty() { self.rev = Git::revision(&path).await?; } diff --git a/yazi-cli/src/package/package.rs b/yazi-cli/src/package/package.rs index c58255d3..40deb14b 100644 --- a/yazi-cli/src/package/package.rs +++ b/yazi-cli/src/package/package.rs @@ -28,19 +28,19 @@ impl Package { Ok(()) } - pub(crate) async fn delete_many(&mut self, uses: &[String], overwrite: bool) -> Result<()> { + pub(crate) async fn delete_many(&mut self, uses: &[String], discard: bool) -> Result<()> { for u in uses { - let r = self.delete(u, overwrite).await; + let r = self.delete(u, discard).await; self.save().await?; r?; } Ok(()) } - pub(crate) async fn install(&mut self, overwrite: bool) -> Result<()> { + pub(crate) async fn install(&mut self, discard: bool) -> Result<()> { macro_rules! go { ($dep:expr) => { - let r = $dep.install(overwrite).await; + let r = $dep.install(discard).await; self.save().await?; r?; }; @@ -55,11 +55,11 @@ impl Package { Ok(()) } - pub(crate) async fn upgrade_many(&mut self, uses: &[String], overwrite: bool) -> Result<()> { + pub(crate) async fn upgrade_many(&mut self, uses: &[String], discard: bool) -> Result<()> { macro_rules! go { ($dep:expr) => { if uses.is_empty() || uses.contains(&$dep.r#use) { - let r = $dep.upgrade(overwrite).await; + let r = $dep.upgrade(discard).await; self.save().await?; r?; } @@ -116,12 +116,12 @@ impl Package { Ok(()) } - async fn delete(&mut self, r#use: &str, overwrite: bool) -> Result<()> { + async fn delete(&mut self, r#use: &str, discard: bool) -> Result<()> { let Some(dep) = self.identical(&Dependency::from_str(r#use)?).cloned() else { bail!("`{}` was not found in package.toml", r#use) }; - dep.delete(overwrite).await?; + dep.delete(discard).await?; if dep.is_flavor { self.flavors.retain(|d| !d.identical(&dep)); } else { diff --git a/yazi-cli/src/package/upgrade.rs b/yazi-cli/src/package/upgrade.rs index 9d3df04e..304d8ba8 100644 --- a/yazi-cli/src/package/upgrade.rs +++ b/yazi-cli/src/package/upgrade.rs @@ -3,7 +3,7 @@ use anyhow::Result; use super::Dependency; impl Dependency { - pub(super) async fn upgrade(&mut self, overwrite: bool) -> Result<()> { - if self.rev.starts_with('=') { Ok(()) } else { self.add(overwrite).await } + pub(super) async fn upgrade(&mut self, discard: bool) -> Result<()> { + if self.rev.starts_with('=') { Ok(()) } else { self.add(discard).await } } }