Merge pull request #26 from TinyToolSH/dmenu_tbm

Added dmenu wrapper

Author: calebe94

CHANGELOG.md

@@ -9,10 +9,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+* Added a `dmenu` wrapper called `dmenu_tbm` to manager your bookmarks;
+    * If a `TBM_FILE` is empty or `/dev/stdout` the default file will be `$HOME/.tbookmarks`;
+    * With `dmenu_tbm` you can:
+        * create a `new` bookmark;
+        * `open`, `delete` or copy (to clipboard) an existing one;
+* Added target to install `dmenu_tbm` script;
+
 ### Fixed
 
 ### Changed
 
+* Updated `README.md` with `dmenu_tbm` reference;
+
 ### Removed
 
 ## [0.8.0]

Makefile

@@ -9,6 +9,7 @@ all:
 install:
 	@echo "Installing ${name}..."
 	install -m 555 ${name} $(DESTDIR)/$(prefix)/bin/
+	install -m 555 dmenu_${name} $(DESTDIR)/$(prefix)/bin/
 	@echo "done!"
 
 clean:
@@ -19,6 +20,7 @@ distclean: clean
 uninstall:
 	@echo "Uninstall ${name}"
 	rm -f $(DESTDIR)/$(prefix)/bin/${name}
+	rm -f $(DESTDIR)/$(prefix)/bin/dmenu_${name}
 	@echo "done!"
 
 .PHONY: all install clean distclean uninstall

README.md

@@ -82,13 +82,16 @@ $ echo "export TBM_FILE=/path/to/tbm/storage/destination" >> $HOME/.zshrc
 
 ## dmenu
 
-You can integrate `tbm` to `dmenu` if you want. We are using it as follows:
+You can integrate `tbm` to `dmenu` if you want. You can use it as follows:
 
 ```bash
 $ tbm -lt | dmenu -p "Bookmarks" | { read title; tbm -luf $title } | { read url; xdg-open $url }
 ```
 
-We recommend you to apply the [case-insensitive](https://tools.suckless.org/dmenu/patches/case-insensitive/) patch to your `dmenu`.
+Or, you can use our [dmenu_tbm](https://github.com/TinyToolSH/tbm/blob/main/dmenu_tbm) wrapper,
+which gives you some management options like `new` bookmark, `remove` an existing bookmark or `copy` to clipboard.
+
+We'd recommend you to apply the [case-insensitive](https://tools.suckless.org/dmenu/patches/case-insensitive/) patch to your `dmenu`.
 
 # Team
 

dmenu_tbm

@@ -0,0 +1,93 @@
+#!/bin/sh
+
+#This file is part of the TinyTools distribution (https://github.com/Calebe94/TinyTools).
+#Copyright (C) 2021 TinyTools
+#
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation, either version 3 of the License, or
+#(at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+####################################################################################################
+# Variables used in the script.
+####################################################################################################
+DMENU_ARGS=$@
+TBM=tbm
+[ -z "$TBM_FILE" ] || [ "$TBM_FILE" = "/dev/stdout" ] && export TBM_FILE=$HOME/.tbookmarks
+
+get_bookmark_url()
+{
+    $TBM -l | grep "$1" | awk '{print $1}'
+}
+
+get_bookmark_id()
+{
+    $TBM -li | grep "$1" | awk '{print $1}' | rev | cut -c 2- | rev
+}
+
+bookmark_action()
+{
+    bookmark="$1"
+    actions="[open]\n[copy]\n[delete]\n[back]\n[close]"
+    selection=$(echo "$actions" | dmenu -p "$bookmark" $DMENU_ARGS)
+    if [ ! -z "$selection" ]; then
+        case "$selection" in
+            "[open]")
+                url=$(get_bookmark_url "$bookmark")
+                [ -z "$url" ] && echo "No url given!" | dmenu -p "Error" $DMENU_ARGS || xdg-open "$url"
+                ;;
+            "[copy]")
+                url=$(get_bookmark_url "$bookmark")
+                echo "$url" | xclip -selection clipboard
+                ;;
+            "[delete]")
+                choice=$(echo "no\nyes" | dmenu -p "Are you sure?" $DMENU_ARGS)
+                if [ "$choice" = "yes" ]; then
+                    id=$(get_bookmark_id "$bookmark")
+                    [ -z "$id" ] && echo "No id given!" | dmenu -p "Error" $DMENU_ARGS || tbm -d "$id"
+                else
+                    bookmark_action "$bookmark"
+                fi
+                ;;
+            "[back]") show_bookmarks ;;
+            *) exit 0 ;;
+        esac
+    fi
+}
+
+list_bookmarks_titles()
+{
+    $TBM -lt
+}
+
+show_bookmarks()
+{
+    actions="[new]\n[close]\n"
+    bookmarks="$actions$(list_bookmarks_titles)"
+    selection=$(echo "$bookmarks" | dmenu -p "Bookmarks" $DMENU_ARGS)
+    if [ ! -z "$selection" ]; then
+        case "$selection" in
+        "[new]")
+            status=$($TBM "$(xclip -o -selection clipboard)")
+            [ -z "$status" ] && echo "No url on clipboard!" | dmenu -p "Error" $DMENU_ARGS || echo "$status"
+            ;;
+        "[close]") exit 0 ;;
+        *) bookmark_action "$selection" ;;
+        esac
+    fi
+}
+
+###################################################################################################
+############################################## MAIN ###############################################
+###################################################################################################
+
+show_bookmarks

tbm

@@ -63,7 +63,7 @@ list_by_title()
     if [ $id -eq 1 ]; then
         awk '{out=$1""; for(i=3; i<=NF; i++){out=out" "$i}; print out}'
     else
-        awk '{$1=""; print $0}'
+        awk '{$1=""; print $0}' | cut -c 2-
     fi
 }