From aacc68a7431a18b325cf69e1a01f6676d6e9c467 Mon Sep 17 00:00:00 2001
From: generaldenmark <asger@weirsoe.dk>
Date: Fri, 13 Nov 2020 23:07:16 +0100
Subject: [PATCH] Fix qutedmenu, the same way as dmenu_qutebrowser was fixed,
 and applies the change requests made by @The-Compiler

---
 misc/userscripts/dmenu_qutebrowser |  2 +-
 misc/userscripts/qutedmenu         | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/misc/userscripts/dmenu_qutebrowser b/misc/userscripts/dmenu_qutebrowser
index ab218c0e6..57bdb805c 100755
--- a/misc/userscripts/dmenu_qutebrowser
+++ b/misc/userscripts/dmenu_qutebrowser
@@ -41,7 +41,7 @@
 
 [ -z "$QUTE_URL" ] && QUTE_URL='https://duckduckgo.com'
 
-url=$(printf "%s\n%s" "$QUTE_URL" "$(sqlite3 "$QUTE_DATA_DIR/history.sqlite" 'select url from CompletionHistory')" | cat "$QUTE_CONFIG_DIR/quickmarks" - | dmenu -l 15 -p qutebrowser)
+url=$(printf "%s\n%s" "$QUTE_URL" "$(sqlite3 -separator ' ' "$QUTE_DATA_DIR/history.sqlite" 'select title, url from CompletionHistory')" | cat "$QUTE_CONFIG_DIR/quickmarks" - | dmenu -l 15 -p qutebrowser)
 url=$(echo "$url" | sed -E 's/[^ ]+ +//g' | grep -E "https?:" || echo "$url")
 
 [ -z "${url// }" ] && exit
diff --git a/misc/userscripts/qutedmenu b/misc/userscripts/qutedmenu
index cc5a44413..bdd0d9b27 100755
--- a/misc/userscripts/qutedmenu
+++ b/misc/userscripts/qutedmenu
@@ -6,8 +6,9 @@
 
 # If you would like to set a custom colorscheme/font use these dirs.
 # https://github.com/halfwit/dotfiles/blob/master/.config/dmenu/bemenucolors
-readonly confdir=${XDG_CONFIG_HOME:-$HOME/.config}
 
+
+readonly confdir=${XDG_CONFIG_HOME:-$HOME/.config}
 readonly optsfile=$confdir/dmenu/bemenucolors
 
 create_menu() {
@@ -22,15 +23,13 @@ create_menu() {
     done < "$QUTE_CONFIG_DIR"/bookmarks/urls
 
     # Finally history
-    while read -r _ url; do
-        printf -- '%s\n' "$url"
-    done < "$QUTE_DATA_DIR"/history
+        printf -- '%s\n' "$(sqlite3 -separator ' ' "$QUTE_DATA_DIR/history.sqlite" 'select title, url from CompletionHistory')"
     }
 
 get_selection() {
     opts+=(-p qutebrowser)
-    #create_menu | dmenu -l 10 "${opts[@]}"
-    create_menu | bemenu -l 10 "${opts[@]}"
+    create_menu | dmenu -l 10 "${opts[@]}"
+    #create_menu | bemenu -l 10 "${opts[@]}"
 }
 
 # Main