From 70662147dc249dbb1f47c6ab79edee1d65e111b6 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Mon, 6 Apr 2020 23:46:42 -0700
Subject: [PATCH] Cleaned up a little and improved `trash -l` output

---
 trash | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/trash b/trash
index e4ed5b1..737d6c7 100755
--- a/trash
+++ b/trash
@@ -49,6 +49,16 @@ Options:
 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() {
   [ "$force_flag" = "-f" ] && return 0
   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 $_'
 }
 
+date_from_trashinfo() {
+  sed -n 's/^DeletionDate=//p' "$1"
+}
+
 trashinfo_for_file() {
   #php -r 'echo urlencode($argv[1]);' -- "$1"
   cat <<END
@@ -180,9 +194,7 @@ trash_file() {
 untrash_files() {
   td="$(get_trashdir "$(readlink -f -- "${1:-$PWD}")")"
   [ -d "$td/info" ] || return 1
-  ls -A "$td"/info | \
-    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\"' -- {}" | \
+  pick_trashfiles "$td" "Pick file(s) to untrash: " "$@" | \
     while read -r info; do
       orig="$(path_from_trashinfo "$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!"
     exit
   fi
-  ls -A "$td"/info | \
-    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\"' -- {}" | \
+  pick_trashfiles "$td" "Pick file(s) to permanently delete: " "$@" | \
     while read -r info; do
       orig="$(path_from_trashinfo "$td/info/$info")"
       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!"
     exit
   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