From 3c6bd67b02dfb5dd7ac11455741530c3ebd034fa Mon Sep 17 00:00:00 2001 From: Louie S Date: Fri, 5 May 2023 19:25:50 -0700 Subject: Create lib subdirectory for common functions --- README.template | 3 ++- src/index.sh | 23 +++++++---------------- src/lib/create_table | 7 +++++++ src/lib/insert | 8 ++++++++ 4 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 src/lib/create_table create mode 100644 src/lib/insert diff --git a/README.template b/README.template index 8c254e4..c05bcf6 100644 --- a/README.template +++ b/README.template @@ -1,7 +1,8 @@ -Here is a script and a Makefile for generating a docset for Dash. The script is loosely based on benzado's script for GNU Make https://github.com/benzado/gnu-make-dash-docset. +Here is a script and a Makefile for generating a docset for Dash. The script is based on the dash-docset-generation-template - : - Dash: https://kapeli.com/dash +- dash-docset-generation-template: https://github.com/lshprung/dash-docset-generation-template To generate a docset from the latest edition of the Manual, simply execute `make` from the same directory as this README file. The latest edition diff --git a/src/index.sh b/src/index.sh index 35ed08c..0b6e693 100755 --- a/src/index.sh +++ b/src/index.sh @@ -1,14 +1,13 @@ #!/usr/bin/env sh +# shellcheck source=./lib/create_table +. "$(dirname "$0")"/lib/create_table +# shellcheck source=./lib/insert +. "$(dirname "$0")"/lib/insert + DB_PATH="$1" shift -create_table() { - sqlite3 "$DB_PATH" "CREATE TABLE IF NOT EXISTS searchIndex(id INTEGER PRIMARY KEY, name TEXT, type TEXT, path TEXT);" - sqlite3 "$DB_PATH" "CREATE UNIQUE INDEX IF NOT EXISTS anchor ON searchIndex (name, type, path);" -} - - get_title() { FILE="$1" @@ -17,14 +16,6 @@ get_title() { sed 's/\"/\"\"/g' } -insert() { - NAME="$1" - TYPE="$2" - PAGE_PATH="$3" - - sqlite3 "$DB_PATH" "INSERT INTO searchIndex(name, type, path) VALUES (\"$NAME\",\"$TYPE\",\"$PAGE_PATH\");" -} - insert_pages() { # Get title and insert into table for each html file while [ -n "$1" ]; do @@ -33,11 +24,11 @@ insert_pages() { PAGE_NAME="$(get_title "$1")" PAGE_TYPE="Guide" if [ -n "$PAGE_NAME" ]; then - insert "$PAGE_NAME" "$PAGE_TYPE" "$(basename "$1")" + insert "$DB_PATH" "$PAGE_NAME" "$PAGE_TYPE" "$(basename "$1")" fi shift done } -create_table +create_table "$DB_PATH" insert_pages "$@" diff --git a/src/lib/create_table b/src/lib/create_table new file mode 100644 index 0000000..a783c50 --- /dev/null +++ b/src/lib/create_table @@ -0,0 +1,7 @@ +create_table() { + DB_PATH="$1" + + sqlite3 "$DB_PATH" "CREATE TABLE IF NOT EXISTS searchIndex(id INTEGER PRIMARY KEY, name TEXT, type TEXT, path TEXT);" + sqlite3 "$DB_PATH" "CREATE UNIQUE INDEX IF NOT EXISTS anchor ON searchIndex (name, type, path);" +} + diff --git a/src/lib/insert b/src/lib/insert new file mode 100644 index 0000000..baa13bd --- /dev/null +++ b/src/lib/insert @@ -0,0 +1,8 @@ +insert() { + DB_PATH="$1" + NAME="$2" + TYPE="$3" + PAGE_PATH="$4" + + sqlite3 "$DB_PATH" "INSERT INTO searchIndex(name, type, path) VALUES (\"$NAME\",\"$TYPE\",\"libc/$PAGE_PATH\");" +} -- cgit