Bruce/bin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up a little and improved trash -l output

Browse Source
This commit is contained in:
Bruce Hill 2020-04-06 23:46:42 -07:00
parent b9c1921b13
commit 70662147dc
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
trash
View File

@ -49,6 +49,16 @@ Options:
EOU EOU
} }
pick_trashfiles() {
td="$1"
shift
prompt="$1"
shift
ls -A "$td"/info | \
fzf -1 --prompt="$prompt" --query="$@" --multi \
--preview="sh -c 'f=\"$td/files/\${1%.trashinfo}\"; [ -d \"\$f\" ] && tree \"\$f\" || echo \"\$f\" && cat \"\$f\"' -- {}"
}
confirm() { confirm() {
[ "$force_flag" = "-f" ] && return 0 [ "$force_flag" = "-f" ] && return 0
if type ask >/dev/null; then if type ask >/dev/null; then
@ -132,6 +142,10 @@ path_from_trashinfo() {
sed -n 's/^Path=//p' "$1" | perl -MURI::Escape -ne 'print uri_unescape $_' sed -n 's/^Path=//p' "$1" | perl -MURI::Escape -ne 'print uri_unescape $_'
} }
date_from_trashinfo() {
sed -n 's/^DeletionDate=//p' "$1"
}
trashinfo_for_file() { trashinfo_for_file() {
#php -r 'echo urlencode($argv[1]);' -- "$1" #php -r 'echo urlencode($argv[1]);' -- "$1"
cat <<END cat <<END
@ -180,9 +194,7 @@ trash_file() {
untrash_files() { untrash_files() {
td="$(get_trashdir "$(readlink -f -- "${1:-$PWD}")")" td="$(get_trashdir "$(readlink -f -- "${1:-$PWD}")")"
[ -d "$td/info" ] || return 1 [ -d "$td/info" ] || return 1
ls -A "$td"/info | \ pick_trashfiles "$td" "Pick file(s) to untrash: " "$@" | \
fzf -1 --prompt="Pick file to untrash: " --query="$@" --multi \
--preview="sh -c 'f=\"$td/files/\${1%.trashinfo}\"; [ -d \"\$f\" ] && tree \"\$f\" || echo \"\$f\" && cat \"\$f\"' -- {}" | \
while read -r info; do while read -r info; do
orig="$(path_from_trashinfo "$td/info/$info")" orig="$(path_from_trashinfo "$td/info/$info")"
mv -i "$td/files/${info%.trashinfo}" "$orig" && rm -f "$td/info/$info" mv -i "$td/files/${info%.trashinfo}" "$orig" && rm -f "$td/info/$info"
@ -195,9 +207,7 @@ empty_files() {
echo "Nothing in the trash!" echo "Nothing in the trash!"
exit exit
fi fi
ls -A "$td"/info | \ pick_trashfiles "$td" "Pick file(s) to permanently delete: " "$@" | \
fzf -1 --prompt="Pick file(s) to permanently delete: " --query="$@" --multi \
--preview="sh -c 'f=\"$td/files/\${1%.trashinfo}\"; [ -d \"\$f\" ] && tree \"\$f\" || echo \"\$f\" && cat \"\$f\"' -- {}" | \
while read -r info; do while read -r info; do
orig="$(path_from_trashinfo "$td/info/$info")" orig="$(path_from_trashinfo "$td/info/$info")"
rm -r $verbose_flag "$td/info/$info" "$td/files/${info%.trashinfo}" || fail "Could not remove file" rm -r $verbose_flag "$td/info/$info" "$td/files/${info%.trashinfo}" || fail "Could not remove file"
@ -225,7 +235,9 @@ list_trash() {
echo "Nothing in the trash!" echo "Nothing in the trash!"
exit exit
fi fi
ls -A "$td/files" for f in $(ls -A "$td/files"); do
printf '%s\t%s\t%s\n' "$td/files/$f" "$(date_from_trashinfo "$td/info/$f.trashinfo")" "$(path_from_trashinfo "$td/info/$f.trashinfo")"
done
} }
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then