qcopy

commit 4eb9248427514bd6b780a9d988fbc3e353bff95b

Author: Connor Etherington <[email protected]>

Date:   Sat May 28 19:50:49 2022 +0200

    Auto-Commit Update - 20220528

---

 PKGBUILD      |  4 ++--

 usr/bin/qcopy | 38 ++++++++++++++++++++++++++------------

 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD

index bff4208..cf39e3f 100644

--- a/PKGBUILD

+++ b/PKGBUILD

@@ -1,13 +1,13 @@

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=qcopy

-pkgver=1.3

+pkgver=1.4

 pkgrel=1

 pkgdesc="Easily set variables and their respective values for easy access at any point"

 arch=(any)

 url="https://gitlab.com/a4to/${pkgname}"

 license=('MIT')

-depends=(fzf dialog xclip bat)

+depends=(fzf dialog xsel bat)

 install="qcopy.install"

 source=(

   "https://concise.cc/pkg/${pkgname}-${pkgver}-${pkgrel}-$arch.pkg.tar.zst"

diff --git a/usr/bin/qcopy b/usr/bin/qcopy

index c658cbe..9f853d6 100755

--- a/usr/bin/qcopy

+++ b/usr/bin/qcopy

@@ -8,12 +8,22 @@

 # Global Variables:

+TMP=`mktemp -qu`

+

 NEWENTRY="\\n You have not yet set any qcopy variables. Would you like to create one now?\\n "

 ENTRIESFILE="${XDG_DATA_HOME:-$HOME/.local/share}/qcopy/entries"

-TMP=`mktemp -qu`

+FZFPREVIEW="cat $ENTRIESFILE|grep {} | grep 'YESPREVIEW' >/dev/null 2>&1 && 

+  cat $ENTRIESFILE | grep ^{}= | cut -d\= -f3- | bat --style=numbers,grid --color=always || 

+  echo -e '\n\e[1;31m

+    ▗▄▄ ▗▄▄ ▗▄▄ ▗  ▖ ▗▖ ▄▄▄▖▗▄▄▖

+    ▐ ▝▌▐ ▝▌ ▐  ▝▖▗▘ ▐▌  ▐  ▐

+    ▐▄▟▘▐▄▄▘ ▐   ▌▐  ▌▐  ▐  ▐▄▄▖

+    ▐   ▐ ▝▖ ▐   ▚▞  ▙▟  ▐  ▐

+    ▐   ▐  ▘▗▟▄  ▐▌ ▐  ▌ ▐  ▐▄▄▖

+\e[0m '"

 # Functions:

@@ -24,8 +34,7 @@ FIRSTLOOP(){ [ -f $ENTRIESFILE ] && [ $(cat $ENTRIESFILE | wc -w) -ge 1 ] || FIR

 FIRST(){ dialog --title " ~ First Run ~ " --yesno "$NEWENTRY" 8 82 && NEW && return 0 || clear && exit 1 ; }

-

-

+  

 function NEW {

   ! [ -d  "${XDG_DATA_HOME:-$HOME/.local/share}/qcopy" ] && 

@@ -34,15 +43,21 @@ function NEW {

   dialog \

     --stdout --title " ~ NEW ENTRY ~ " \

     --form "\n                  Please fill in the required information :\n " 13 81 3 \

-    " Entry Name  :" 1 1 "" 1 16 59 0 \

-    " Entry Value :" 2 1 "" 2 16 59 0 >${TMP}

+    " Entry Name   :" 1 1 "" 1 16 59 0 \

+    " Entry Value  :" 2 1 "" 2 16 59 0  >${TMP}

   ENTRYNAME=$(head -n1 ${TMP} | tail -n1)

   ENTRYVALUE=$(head -n2 ${TMP} | tail -n1)

+

+  dialog \

+    --yes-label "Preview" \

+    --no-label "No Preview" \

+    --title " ~ QCopy ~ " \

+    --yesno "\\n         Would you like to preview this entries value upon future selection?\\n " 7 90

-  [[ -n $ENTRYNAME ]] && [[ -n $ENTRYVALUE ]] &&

-    echo "${ENTRYNAME}=${ENTRYVALUE}" >> $ENTRIESFILE || 

-    MAIN && exit 0

+  PREVIEW=${?} && [ ${PREVIEW} -eq "0" ] && PREVIEW="YESPREVIEW" || PREVIEW="NOPREVIEW"

+  

+  [[ -n $ENTRYNAME ]] && [[ -n $ENTRYVALUE ]] && echo "${ENTRYNAME}=${PREVIEW}=${ENTRYVALUE}" >> $ENTRIESFILE && MAIN && exit 0 || exit 1

 }  

@@ -55,7 +70,7 @@ function DEL {

     --prompt="Select for Deletion :" \

     --header " " \

     --height 99% \

-    --preview="cat $ENTRIESFILE|grep {}|cut -d=  -f2-|bat --style=numbers,grid --color=always" \

+    --preview "${FZFPREVIEW}" \

     --preview-window=70% ) || exit 1

    sed -i "/${VALUE[@]}/d" $ENTRIESFILE

@@ -71,10 +86,10 @@ function MAIN {

     --prompt="Select for Copying :" \

     --header " " \

     --height 99% \

-    --preview="cat $ENTRIESFILE|grep {}|cut -d=  -f2-|bat --style=numbers,grid --color=always" \

+    --preview "${FZFPREVIEW}" \

     --preview-window=70% ) || exit 1

-   cat $ENTRIESFILE| grep "${VALUE}"| awk -F= '{print $2}'| sed 's/\s*//g'| xclip -selection clipboard -i

+   cat $ENTRIESFILE| grep "${VALUE}"| awk -F\= '{print $3}'| sed 's/\s*//g' | xsel -ib

 }

@@ -91,4 +106,3 @@ FIRSTLOOP && case ${1} in

 esac

-