From c27f8285f34c9b5822f5bb5edb0363f71e9ae7a5 Mon Sep 17 00:00:00 2001
From: Eric Lay <ericlaytm@gmail.com>
Date: Mon, 24 Apr 2023 19:18:00 -0500
Subject: [PATCH] Merge changes to main complete

---
 PKGBUILD            | 12 +++---
 keybindings-preview |  6 +--
 pokedex-dev         | 97 ---------------------------------------------
 3 files changed, 9 insertions(+), 106 deletions(-)
 delete mode 100755 pokedex-dev

diff --git a/PKGBUILD b/PKGBUILD
index d8771b2..88e32d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Eric Lay <ericlaytm@gmail.com>
-pkgname=fuzzy-pokedex-dev
+pkgname=fuzzy-pokedex
 pkgver=r49.aeb1671
 pkgrel=1
-pkgdesc="A Pokedex for your terminal -DEV VERSION"
+pkgdesc="The Pokédex for your terminal"
 arch=('any')
 url="https://github.com/ericlay/fuzzy-pokedex"
 license=('GPL3')
@@ -13,18 +13,18 @@ depends=('fzf'
     'pokemon-colorscripts-git'
     'ttf-font-nerd')
 makedepends=('git')
-source=("git+https://github.com/ericlay/fuzzy-pokedex.git#branch=dev")
+source=("git+https://github.com/ericlay/fuzzy-pokedex.git")
 md5sums=('SKIP')
 
 pkgver(){
-    cd "${pkgname:0:-4}"
+    cd "${pkgname}"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 package() {
-	cd "$srcdir/${pkgname:0:-4}"
+	cd "$srcdir/${pkgname}"
     install -Dm666 pokeData/* -t "$pkgdir/usr/share/$pkgname/pokeData"
     install -Dm666 keybindings-preview -t "$pkgdir/usr/share/$pkgname"
     install -Dm755 pokeParse -t "$pkgdir/usr/bin"
-	install -Dm755 pokedex-dev -t "$pkgdir/usr/bin"
+	install -Dm755 pokedex -t "$pkgdir/usr/bin"
 }
diff --git a/keybindings-preview b/keybindings-preview
index 67fdeb6..f0e9890 100644
--- a/keybindings-preview
+++ b/keybindings-preview
@@ -1,8 +1,8 @@
 
-				KEYBINDS
+			    Pokédex KEYBINDS
 
-  	space        	Reads the Pokedex entry
-  	ctrl-space   	Stops reading the Pokedex entry
+  	space        	Reads the Pokédex entry
+  	ctrl-space   	Stops reading the Pokédex entry
   	ctrl-n       	Shows small sprite version
   	ctrl-b       	Shows large sprite version
   	ctrl-s       	Shows shiny sprite version
diff --git a/pokedex-dev b/pokedex-dev
deleted file mode 100755
index e00102c..0000000
--- a/pokedex-dev
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-
-### Overhad preparation
-shopt -s extglob
-KBINDS="/usr/share/fuzzy-pokedex-dev/keybindings-preview"
-POKEDATA="/usr/share/fuzzy-pokedex-dev/pokeData"
-indent="\n\t\t\t\t\t"
-
-### Help 
-help() {
-    printf "\n%s\n%s\n\n" "Use fzf to search Pokemon stats" "Can optionally search by name"
-	printf "%s\n\t%s\n\n" "EXAMPLE" "pokedex [pokemon name]"
-	printf "%s\n" "OPTIONS"
-	printf "%-25s\t%s\n" "  -q, --quick [pokemon]" "Prints single pokedex entry to terminal" \
-		"  -u, --update [N/+N/-N/N%]" "Scrape web for updated Pokemon stats" "" \
-		"  WARNING: update function is resource heavy" "" "  See Parallel job control (-j) for options" "" \
-		"  Default is 200%" \
-		"  -h, --help" "Print this help screen"
-	printf "\n%s\n" "KEYBINDS"
-	printf "%-15s\t%s\n" "  space" "Reads the Pokedex entry" \
-		"  ctrl-space" "Stops reading the Pokedex entry" \
-		"  ctrl-n" "Shows small sprite version" \
-		"  ctrl-b" "Shows large sprite version" \
-		"  ctrl-s" "Shows shiny sprite version" \
-		"  ctrl-h" "Shows this help screen in preview window"
-	printf "\n"
-}
-
-### Pokedex viewer using pokemon-colorscripts and fzf
-pokedex() {
-	pokemon-colorscripts -l |
-	fzf -q "$1" +m -s -i \
-	--cycle \
-	--reverse \
-	--prompt=' ' \
-	--pointer='󰐝 ' \
-	--border=rounded \
-	--border-label="╢ Fuzzy-Pokedex ╟" \
-	--margin=4% \
-	--padding=4% \
-	--header="$(echo -e '  Choose a Pokemon to view info\n\t     ctrl+h to for help')" \
-	--info=inline:'  󰨉 ' \
-  	--color='fg+:15,fg:42,preview-fg:15,label:9,preview-label:15,hl+:134,hl:123,query:134,gutter:0,border:9,prompt:15,pointer:15,marker:15' \
-	--tiebreak=begin,chunk,length \
-	--preview="printf '${indent}%s${indent}    %s\n' 'Press space to hear entry' 'ctrl+space to stop'; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1}" \
-	--preview-window=68%:wrap:border-rounded \
-	--bind=focus:transform-preview-label:'echo [ {1} ] ' \
-	--bind=ctrl-h:preview:"cat $KBINDS" \
-	--bind=space:preview:"printf '${indent::-2} %s${indent}   %s\n' 'Select another Pokemon to stop audio' 'Or press ctrl+space'; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1}; espeak-ng -f $POKEDATA/{1} -g 4 -p 50 -s 145 -l 250 -ven+m3 &" \
-	--bind=ctrl-space:preview:"printf '${indent}%s${indent}   %s\n' 'Press space to hear entry' 'ctrl+space to stop'; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1};" \
-	--bind=ctrl-b:preview:"echo; pokemon-colorscripts -b -n {1} --no-title; cat $POKEDATA/{1};" \
-	--bind=ctrl-s:preview:"echo; pokemon-colorscripts -s -n {1} --no-title; cat $POKEDATA/{1};" \
-	--bind=ctrl-n:preview:"printf '${indent}%s${indent}   %s\n' 'Press space to hear entry' 'ctrl+space to stop'; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1};" |
-	parallel pokemon-colorscripts --no-title -n {} "&&" cat "$POKEDATA/{}" 
-}
-
-### Quick view returns single Pokemon stat instead of opening pokedex 
-quick_view() {
-	parallel pokemon-colorscripts --no-title -n {} "&&" cat "$POKEDATA/{}" <<<"$1"
-}
-
-### Update Pokemon stats file set
-update_pokeData() {
-	printf "\n\t\t%s\n\t%s\n\n" "WARNING!!!" "This WILL take a long time"
-	pokemon-colorscripts -l | sort | parallel --bar --retry-failed -color -j "${1:-200%}" pokeParse
-}
-
-if ! (( $# )); then
-	pokedex
-fi
-
-while (( $# )); do
-    arg=$1
-	shift
-    case "$arg" in
-		-q|--quick)
-			quick_view "$1"
-			shift
-			;;
-    	-u|--update)
-			update_pokeData "$1"
-			shift
-			;;
-    	-h|--help)
-    		help
-    		shift
-   			;;
-    	!(^-) )
-    		pokedex "$arg"
-    		shift
-    		;;			
-    	-* )
-    		echo "Invalid Usage"
-   			help
-   			;;
-    esac
-done