clipmenu

commit c7c894a0238d531aeb4aab8ec2361bd1b2a14768
parent a010dee360498ebf37b1a508a1b03dcb39569429
Author: Chris Down <chris@chrisdown.name>
Date:   Tue, 20 Feb 2018 10:29:23 +0000

Use separate line cache for each selection

Diffstat:
M
clipmenu
 | 
9
++++++---
M
clipmenud
 | 
10
++++++----

2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/clipmenu b/clipmenu
@@ -3,12 +3,12 @@
 : "${CM_LAUNCHER=dmenu}"
 : "${CM_DIR="${XDG_RUNTIME_DIR-"${TMPDIR-/tmp}"}"}"
 
-major_version=4
+major_version=5
 
 shopt -s nullglob
 
 cache_dir=$CM_DIR/clipmenu.$major_version.$USER
-cache_file=$cache_dir/line_cache
+cache_file_prefix=$cache_dir/line_cache
 
 if [[ $1 == --help ]] || [[ $1 == -h ]]; then
     cat << 'EOF'
@@ -34,7 +34,10 @@ fi
 # whether `-l` is also in "$@", because the way that dmenu works allows a later
 # argument to override an earlier one. That is, if the user passes in `-l`, our
 # one will be ignored.
-chosen_line=$(tac "$cache_file" | awk '!seen[$0]++' | "$CM_LAUNCHER" -l 8 "$@")
+chosen_line=$(
+    cat "$cache_file_prefix"_* /dev/null | sort -rnk 1 | cut -d' ' -f2- |
+        awk '!seen[$0]++' | "$CM_LAUNCHER" -l 8 "$@"
+)
 
 [[ $chosen_line ]] || exit 1
 
diff --git a/clipmenud b/clipmenud
@@ -7,9 +7,9 @@
 : "${CM_MAX_CLIPS=1000}"
 : "${CM_SELECTIONS=clipboard primary}"
 
-major_version=4
+major_version=5
 cache_dir=$CM_DIR/clipmenu.$major_version.$USER/
-cache_file=$cache_dir/line_cache
+cache_file_prefix=$cache_dir/line_cache
 lock_file=$cache_dir/lock
 lock_timeout=2
 has_clipnotify=0
@@ -166,6 +166,8 @@ while true; do
 
         debug "New clipboard entry on $selection selection: \"$first_line\""
 
+        cache_file=${cache_file_prefix}_$selection
+
         # Without checking ${last_data[any]}, we often double write since both
         # selections get the same content
         if [[ ${last_data[any]} != "$data" ]]; then
@@ -174,7 +176,7 @@ while true; do
             printf '%s' "$data" > "$filename"
 
             debug "Writing $first_line to $cache_file"
-            printf '%s\n' "$first_line" >> "$cache_file"
+            printf '%d %s\n' "$(date +%s)" "$first_line" >> "$cache_file"
         fi
 
         last_data[any]=$data
@@ -195,7 +197,7 @@ while true; do
             _xsel -k --"$selection"
         fi
 
-        if (( CM_MAX_CLIPS )); then
+        if (( CM_MAX_CLIPS )) && [[ -f $cache_file ]]; then
             mapfile -t to_remove < <(
                 head -n -"$CM_MAX_CLIPS" "$cache_file" |
                     while read -r line; do cksum <<< "$line"; done