RomanNum3ral
/
zoxide
mirror of https://github.com/ajeetdsouza/zoxide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add remove-alias command

This commit is contained in:
Tahaa-Dev 2026-07-21 05:00:17 +03:00 committed by Taha Mahmoud
parent 5528680cc6
commit 1b1100821f
11 changed files with 168 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/completions/_zoxide generated
View File

@ -220,6 +220,17 @@ _arguments "${_arguments_options[@]}" : \
'--version[Print version]' \
'*::paths:_files -/' \
&& ret=0
;;
(remove-alias)
_arguments "${_arguments_options[@]}" : \
'-p+[]:PATH:_files -/' \
'--path=[]:PATH:_files -/' \
'-h[Print help]' \
'--help[Print help]' \
'-V[Print version]' \
'--version[Print version]' \
'*::aliases:_default' \
&& ret=0
;;
esac
;;
@ -236,6 +247,7 @@ _zoxide_commands() {
'init:Generate shell configuration' \
'query:Search for a directory in the database' \
'remove:Remove a directory from the database' \
'remove-alias:Remove aliases from a directory' \
)
_describe -t commands 'zoxide commands' commands "$@"
}
@ -336,6 +348,11 @@ _zoxide__subcmd__remove_commands() {
local commands; commands=()
_describe -t commands 'zoxide remove commands' commands "$@"
}
(( $+functions[_zoxide__subcmd__remove-alias_commands] )) ||
_zoxide__subcmd__remove-alias_commands() {
local commands; commands=()
_describe -t commands 'zoxide remove-alias commands' commands "$@"
}
if [ "$funcstack[1]" = "_zoxide" ]; then
_zoxide "$@"

10
contrib/completions/_zoxide.ps1 generated
View File

@ -32,6 +32,7 @@ Register-ArgumentCompleter -Native -CommandName 'zoxide' -ScriptBlock {
[CompletionResult]::new('init', 'init', [CompletionResultType]::ParameterValue, 'Generate shell configuration')
[CompletionResult]::new('query', 'query', [CompletionResultType]::ParameterValue, 'Search for a directory in the database')
[CompletionResult]::new('remove', 'remove', [CompletionResultType]::ParameterValue, 'Remove a directory from the database')
[CompletionResult]::new('remove-alias', 'remove-alias', [CompletionResultType]::ParameterValue, 'Remove aliases from a directory')
break
}
'zoxide;add' {
@ -188,6 +189,15 @@ Register-ArgumentCompleter -Native -CommandName 'zoxide' -ScriptBlock {
[CompletionResult]::new('--version', '--version', [CompletionResultType]::ParameterName, 'Print version')
break
}
'zoxide;remove-alias' {
[CompletionResult]::new('-p', '-p', [CompletionResultType]::ParameterName, 'p')
[CompletionResult]::new('--path', '--path', [CompletionResultType]::ParameterName, 'path')
[CompletionResult]::new('-h', '-h', [CompletionResultType]::ParameterName, 'Print help')
[CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, 'Print help')
[CompletionResult]::new('-V', '-V ', [CompletionResultType]::ParameterName, 'Print version')
[CompletionResult]::new('--version', '--version', [CompletionResultType]::ParameterName, 'Print version')
break
}
})
$completions.Where{ $_.CompletionText -like "$wordToComplete*" } |

33
contrib/completions/zoxide.bash generated
View File

@ -37,6 +37,9 @@ _zoxide() {
zoxide,remove)
cmd="zoxide__subcmd__remove"
;;
zoxide,remove-alias)
cmd="zoxide__subcmd__remove__subcmd__alias"
;;
zoxide__subcmd__edit,decrement)
cmd="zoxide__subcmd__edit__subcmd__decrement"
;;
@ -74,7 +77,7 @@ _zoxide() {
case "${cmd}" in
zoxide)
opts="-h -V --help --version add add-alias edit import init query remove"
opts="-h -V --help --version add add-alias edit import init query remove remove-alias"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
@ -369,6 +372,34 @@ _zoxide() {
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
;;
zoxide__subcmd__remove__subcmd__alias)
opts="-p -h -V --path --help --version <ALIASES>..."
if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
fi
case "${prev}" in
--path)
COMPREPLY=()
if [[ "${BASH_VERSINFO[0]}" -ge 4 ]]; then
compopt -o plusdirs
fi
return 0
;;
-p)
COMPREPLY=()
if [[ "${BASH_VERSINFO[0]}" -ge 4 ]]; then
compopt -o plusdirs
fi
return 0
;;
*)
COMPREPLY=()
;;
esac
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
;;
esac
}

9
contrib/completions/zoxide.elv generated
View File

@ -29,6 +29,7 @@ set edit:completion:arg-completer[zoxide] = {|@words|
cand init 'Generate shell configuration'
cand query 'Search for a directory in the database'
cand remove 'Remove a directory from the database'
cand remove-alias 'Remove aliases from a directory'
}
&'zoxide;add'= {
cand -s 'The rank to increment the entry if it exists or initialize it with if it doesn''t'
@ -167,6 +168,14 @@ set edit:completion:arg-completer[zoxide] = {|@words|
cand -V 'Print version'
cand --version 'Print version'
}
&'zoxide;remove-alias'= {
cand -p 'p'
cand --path 'path'
cand -h 'Print help'
cand --help 'Print help'
cand -V 'Print version'
cand --version 'Print version'
}
]
$completions[$command]
}

4
contrib/completions/zoxide.fish generated
View File

@ -33,6 +33,7 @@ complete -c zoxide -n "__fish_zoxide_needs_command" -f -a "import" -d 'Import en
complete -c zoxide -n "__fish_zoxide_needs_command" -f -a "init" -d 'Generate shell configuration'
complete -c zoxide -n "__fish_zoxide_needs_command" -f -a "query" -d 'Search for a directory in the database'
complete -c zoxide -n "__fish_zoxide_needs_command" -f -a "remove" -d 'Remove a directory from the database'
complete -c zoxide -n "__fish_zoxide_needs_command" -f -a "remove-alias" -d 'Remove aliases from a directory'
complete -c zoxide -n "__fish_zoxide_using_subcommand add" -s s -l score -d 'The rank to increment the entry if it exists or initialize it with if it doesn\'t' -r
complete -c zoxide -n "__fish_zoxide_using_subcommand add" -s h -l help -d 'Print help'
complete -c zoxide -n "__fish_zoxide_using_subcommand add" -s V -l version -d 'Print version'
@ -98,3 +99,6 @@ complete -c zoxide -n "__fish_zoxide_using_subcommand query" -s h -l help -d 'Pr
complete -c zoxide -n "__fish_zoxide_using_subcommand query" -s V -l version -d 'Print version'
complete -c zoxide -n "__fish_zoxide_using_subcommand remove" -s h -l help -d 'Print help'
complete -c zoxide -n "__fish_zoxide_using_subcommand remove" -s V -l version -d 'Print version'
complete -c zoxide -n "__fish_zoxide_using_subcommand remove-alias" -s p -l path -r -f -a "(__fish_complete_directories)"
complete -c zoxide -n "__fish_zoxide_using_subcommand remove-alias" -s h -l help -d 'Print help'
complete -c zoxide -n "__fish_zoxide_using_subcommand remove-alias" -s V -l version -d 'Print version'

8
contrib/completions/zoxide.nu generated
View File

@ -139,6 +139,14 @@ module completions {
...paths: path
]
# Remove aliases from a directory
export extern "zoxide remove-alias" [
--path(-p): path
--help(-h) # Print help
--version(-V) # Print version
...aliases: string
]
}
export use completions *

26
contrib/completions/zoxide.ts generated
View File

@ -407,6 +407,32 @@ const completion: Fig.Spec = {
template: "folders",
},
},
{
name: "remove-alias",
description: "Remove aliases from a directory",
options: [
{
name: ["-p", "--path"],
isRepeatable: true,
args: {
name: "path",
template: "folders",
},
},
{
name: ["-h", "--help"],
description: "Print help",
},
{
name: ["-V", "--version"],
description: "Print version",
},
],
args: {
name: "aliases",
isVariadic: true,
},
},
],
options: [
{

15
src/cmd/cmd.rs
View File

@ -48,6 +48,7 @@ pub enum Cmd {
Init(Init),
Query(Query),
Remove(Remove),
RemoveAlias(RemoveAlias),
}
/// Add a new directory or increment its rank
@ -228,3 +229,17 @@ pub struct Remove {
#[clap(value_hint = ValueHint::DirPath)]
pub paths: Vec<String>,
}
/// Remove aliases from a directory
#[derive(Debug, Parser)]
#[clap(
author,
help_template = HelpTemplate,
)]
pub struct RemoveAlias {
#[clap(num_args = 1.., required = true)]
pub aliases: Vec<String>,
#[clap(short, long, required = true, value_hint = ValueHint::DirPath)]
pub path: String,
}

2
src/cmd/mod.rs
View File

@ -6,6 +6,7 @@ mod import;
mod init;
mod query;
mod remove;
mod remove_alias;
use anyhow::Result;
@ -25,6 +26,7 @@ impl Run for Cmd {
Cmd::Init(cmd) => cmd.run(),
Cmd::Query(cmd) => cmd.run(),
Cmd::Remove(cmd) => cmd.run(),
Cmd::RemoveAlias(cmd) => cmd.run(),
}
}
}

21
src/cmd/remove_alias.rs Normal file
View File

@ -0,0 +1,21 @@
use anyhow::{Result, bail};
use crate::cmd::{RemoveAlias, Run};
use crate::db::Database;
use crate::util;
impl Run for RemoveAlias {
fn run(&self) -> Result<()> {
let mut db = Database::open()?;
if !db.remove_alias(&self.path, self.aliases.iter()) {
let path_abs = util::resolve_path(&self.path)?;
let path_abs = util::path_to_str(&path_abs)?;
if path_abs == self.path || !db.remove_alias(path_abs, self.aliases.iter()) {
bail!("path not found in database: {}", &self.path)
}
}
db.save()
}
}

24
src/db/mod.rs
View File

@ -144,6 +144,7 @@ impl Database {
});
self.with_dirty_mut(|dirty| *dirty = true);
}
/// Removes the directory with `path` from the store. This does not preserve
/// ordering, but is O(1).
pub fn remove(&mut self, path: impl AsRef<str>) -> bool {
@ -161,6 +162,29 @@ impl Database {
self.with_dirty_mut(|dirty| *dirty = true);
}
/// Removes aliases from a directory
pub fn remove_alias(
&mut self,
path: impl AsRef<str>,
aliases: impl Iterator<Item = impl AsRef<str>>,
) -> bool {
let res = self.with_dirs_mut(|dirs| {
match dirs.iter_mut().find(|dir| dir.path == path.as_ref()) {
Some(dir) => {
let mut res = false;
aliases.for_each(|alias| {
dir.aliases.remove(alias.as_ref());
res = true;
});
res
}
None => false,
}
});
self.with_dirty_mut(|dirty| *dirty |= res);
res
}
pub fn age(&mut self, max_age: Rank) {
let mut dirty = false;
self.with_dirs_mut(|dirs| {