From eab78e0714ca5e304d97873a0f58126d39312aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?n=CE=B9c=D0=BDola=D1=95=20w=CE=B9lde?= <ncwilde43@gmail.com>
Date: Sun, 4 Sep 2022 02:32:56 -0700
Subject: [PATCH] refactor: move command functions to libbash
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nιcнolaѕ wιlde <ncwilde43@gmail.com>
---
 scripts/lib/libbash | 70 +++++++++++++++++++++++++++++++++++++++++++++
 scripts/move.sh     | 70 ++-------------------------------------------
 2 files changed, 73 insertions(+), 67 deletions(-)

diff --git a/scripts/lib/libbash b/scripts/lib/libbash
index e01bb6d84..f2937f1cf 100644
--- a/scripts/lib/libbash
+++ b/scripts/lib/libbash
@@ -1,10 +1,26 @@
 #!/bin/bash
 
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+DOCS_PATH="${ROOT_DIR}/docs"
+COOK_PATH="${ROOT_DIR}/cook"
+IMAGES_PATH="${DOCS_PATH}/assets/images"
+
+# readonly DIR
+readonly ROOT_DIR
+readonly DOCS_PATH
+readonly IMAGES_PATH
+readonly COOK_PATH
+
 # Check is variable is null
 function is_null {
   [ -z "${1}" ]
 }
 
+# Check if command exists
+function command_exists(){
+  command -v "${1}" &> /dev/null
+}
+
 # Check if file exists
 function file_exists(){
   [ -f "{1}" ]
@@ -75,3 +91,57 @@ function get_image() {
 function get_filename() {
   basename "${1}"
 }
+
+function get_recipe_path(){
+  s=$(readlink -f "${1}")
+  printf '%s\n' "${s}"
+}
+
+function get_recipe_filename(){
+  get_filename "${1}"
+}
+
+function get_recipe_name(){
+  recipe_filename=$(get_filename "${1}")
+  remove_extension "${recipe_filename}"
+}
+
+function get_markdown_path(){
+  recipe_name=$(get_recipe_name "${1}")
+  category=$(get_category "${1}")
+  lower=$(to_lower "${recipe_name}")
+  readlink -f "${COOK_PATH}/${category}/${lower}.md"
+}
+
+function get_image_path(){
+  category=$(get_category "${1}")
+  recipe_name=$(get_recipe_name "${1}")
+  get_image "${COOK_PATH}/${category}/${recipe_name}"
+}
+
+function get_new_image_path(){
+  recipe_name=$(get_recipe_name "${1}")
+  lower=$(to_lower "${recipe_name}")
+  image_path=$(get_image_path "${1}")
+  image_extension=$(get_extension "${image_path}")
+  printf "%s/%s.%s" "${IMAGES_PATH}" "${lower}" "${image_extension}"
+}
+
+function get_new_markdown_path(){
+  recipe_name=$(get_recipe_name "${1}")
+  category=$(get_category "${1}")
+  lower=$(to_lower "${recipe_name}")
+  printf "%s/%s/%s.md" "${DOCS_PATH}" "${category}" "${lower}"
+}
+
+function debug_print(){
+  recipe_path=$(get_recipe_path "${1}")
+  printf "recipe_path: %s\n" "${recipe_path}"
+  printf "category: %s\n" "$(get_category "${recipe_path}")"
+  printf "recipe_filename: %s\n" "$(get_filename "${recipe_path}")"
+  printf "recipe_name: %s\n" "$(get_recipe_name "${recipe_path}")"
+  printf "markdown_path: %s\n" "$(get_markdown_path "${recipe_path}")"
+  printf "image_path: %s\n" "$(get_image_path "${recipe_path}")"
+  printf "new_image_path: %s\n" "$(get_new_image_path "${recipe_path}")"
+  printf "new_markdown_path: %s\n" "$(get_new_markdown_path "${recipe_path}")"
+}
diff --git a/scripts/move.sh b/scripts/move.sh
index 65d7591f7..190e78fed 100755
--- a/scripts/move.sh
+++ b/scripts/move.sh
@@ -8,7 +8,7 @@
 #
 # @author Nicholas Wilde, 0x08b7d7a3
 # @date 02 Sep 2022
-# @version 0.2.0
+# @version 0.2.1
 #
 ################################################################################
 
@@ -16,25 +16,17 @@ set -e
 set -o pipefail
 
 # https://stackoverflow.com/a/246128/1061279
-
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-ROOT_DIR="$(git rev-parse --show-toplevel)"
-DOCS_PATH="${ROOT_DIR}/docs"
-COOK_PATH="${ROOT_DIR}/cook"
-IMAGES_PATH="${DOCS_PATH}/assets/images"
 SCRIPT_NAME=$(basename "${0}")
 SCRIPT_VERSION="$(grep "# @version" "${0}" | sed 's/\# \@version //'|\head -n1)"
 SCRIPT_DESC="Move recipes to their intended locations"
-DEBUG=true
+DEBUG=false
 
 readonly DIR
 readonly SCRIPT_NAME
 readonly SCRIPT_VERSION
-readonly ROOT_DIR
-readonly DOCS_PATH
+readonly SCRIPT_DESC
 readonly DEBUG
-readonly IMAGES_PATH
-readonly COOK_PATH
 
 # shellcheck source=/dev/null
 source "${DIR}/lib/libbash"
@@ -59,48 +51,6 @@ function links_check() {
   done
 }
 
-function get_recipe_path(){
-  s=$(readlink -f "${1}")
-  printf '%s\n' "${s}"
-}
-
-function get_recipe_filename(){
-  get_filename "${1}"
-}
-
-function get_recipe_name(){
-  recipe_filename=$(get_filename "${1}")
-  remove_extension "${recipe_filename}"
-}
-
-function get_markdown_path(){
-  recipe_name=$(get_recipe_name "${1}")
-  category=$(get_category "${1}")
-  lower=$(to_lower "${recipe_name}")
-  readlink -f "${COOK_PATH}/${category}/${lower}.md"
-}
-
-function get_image_path(){
-  category=$(get_category "${1}")
-  recipe_name=$(get_recipe_name "${1}")
-  get_image "${COOK_PATH}/${category}/${recipe_name}"
-}
-
-function get_new_image_path(){
-  recipe_name=$(get_recipe_name "${1}")
-  lower=$(to_lower "${recipe_name}")
-  image_path=$(get_image_path "${recipe_path}")
-  image_extension=$(get_extension "${image_path}")
-  printf "%s/%s.%s" "${IMAGES_PATH}" "${lower}" "${image_extension}"
-}
-
-function get_new_markdown_path(){
-  recipe_name=$(get_recipe_name "${1}")
-  category=$(get_category "${1}")
-  lower=$(to_lower "${recipe_name}")
-  printf "%s/%s/%s.md" "${DOCS_PATH}" "${category}" "${lower}"
-}
-
 function move_files(){
   # Check if file exists
   recipe_path="${1}"
@@ -114,8 +64,6 @@ function move_files(){
   recipe_filename=$(get_filename "${recipe_path}")
   is_null "${recipe_filename}" && printf "Could not get \`recipe_filename\`\n" && exit 1
 
-  recipe_name=$(get_recipe_name "${1}")
-
   markdown_path=$(get_markdown_path "${recipe_path}")
 
   if [ ! -f "${markdown_path}" ]; then
@@ -137,18 +85,6 @@ function move_files(){
   mv "${markdown_path}" "${new_markdown_path}"
 }
 
-function debug_print(){
-  recipe_path=$(get_recipe_path "${1}")
-  printf "recipe_path: %s\n" "${recipe_path}"
-  printf "category: %s\n" "$(get_category "${recipe_path}")"
-  printf "recipe_filename: %s\n" "$(get_filename "${recipe_path}")"
-  printf "recipe_name: %s\n" "$(get_recipe_name "${recipe_path}")"
-  printf "markdown_path: %s\n" "$(get_markdown_path "${recipe_path}")"
-  printf "image_path: %s\n" "$(get_image_path "${recipe_path}")"
-  printf "new_image_path: %s\n" "$(get_new_image_path "${recipe_path}")"
-  printf "new_markdown_path: %s\n" "$(get_new_markdown_path "${recipe_path}")"
-}
-
 function main(){
   for path in "${@}"; do
     [ "${DEBUG}" = true ] && debug_print "${path}"