Modularize for use with Dash Docset Builder

3 files changed, 40 insertions, 129 deletions

diff --git a/config.mk b/config.mk
index 8a6a2ad..66d8138 100644
--- a/config.mk
+++ b/config.mk
@@ -1,56 +1,16 @@
-DOCSET_NAME = GNU_Bison
-
-DOCSET_DIR    = $(DOCSET_NAME).docset
-CONTENTS_DIR  = $(DOCSET_DIR)/Contents
-RESOURCES_DIR = $(CONTENTS_DIR)/Resources
-DOCUMENTS_DIR = $(RESOURCES_DIR)/Documents
-
-INFO_PLIST_FILE = $(CONTENTS_DIR)/Info.plist
-INDEX_FILE      = $(RESOURCES_DIR)/docSet.dsidx
-ICON_FILE       = $(DOCSET_DIR)/icon.png
-ARCHIVE_FILE    = $(DOCSET_NAME).tgz
+SRC_ICON_FILE=$(SOURCE_DIR)/icon.png
 
 MANUAL_URL  = https://www.gnu.org/software/bison/manual/bison.html_node.tar.gz
 MANUAL_FILE = tmp/bison.html_node.tar.gz
 
-DOCSET = $(INFO_PLIST_FILE) $(INDEX_FILE) $(ICON_FILE)
-
-all: $(DOCSET)
-
-archive: $(ARCHIVE_FILE)
-
-clean:
-	rm -rf $(DOCSET_DIR) $(ARCHIVE_FILE)
-
-tmp:
-	mkdir -p $@
-
-$(ARCHIVE_FILE): $(DOCSET)
-	tar --exclude='.DS_Store' -czf $@ $(DOCSET_DIR)
-
 $(MANUAL_FILE): tmp
 	curl -o $@ $(MANUAL_URL)
 
-$(DOCSET_DIR):
-	mkdir -p $@
-
-$(CONTENTS_DIR): $(DOCSET_DIR)
-	mkdir -p $@
-
-$(RESOURCES_DIR): $(CONTENTS_DIR)
-	mkdir -p $@
-
 $(DOCUMENTS_DIR): $(RESOURCES_DIR) $(MANUAL_FILE)
 	mkdir -p $@
 	tar -x -z -f $(MANUAL_FILE) -C $@
 
-$(INFO_PLIST_FILE): src/Info.plist $(CONTENTS_DIR)
-	cp src/Info.plist $@
-
-$(INDEX_FILE): src/index.sh $(DOCUMENTS_DIR)
+$(INDEX_FILE): $(SOURCE_DIR)/src/index-pages.sh $(SCRIPTS_DIR)/gnu/index-terms.sh $(DOCUMENTS_DIR)
 	rm -f $@
-	src/index.sh $@ $(DOCUMENTS_DIR)/*.html
-	src/index.sh -i $@ $(DOCUMENTS_DIR)/Index-of-Terms.html
-
-$(ICON_FILE): src/icon.png $(DOCSET_DIR)
-	cp src/icon.png $@
+	$(SOURCE_DIR)/src/index-pages.sh $@ $(DOCUMENTS_DIR)/*.html
+	$(SCRIPTS_DIR)/gnu/index-terms.sh "Entry" $@ $(DOCUMENTS_DIR)/Index-of-Terms.html
diff --git a/src/index-pages.sh b/src/index-pages.sh
new file mode 100755
index 0000000..14618cb
--- /dev/null
+++ b/src/index-pages.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env sh
+
+# shellcheck source=../../../scripts/create_table.sh
+. "$(dirname "$0")"/../../../scripts/create_table.sh
+# shellcheck source=../../../scripts/get_title.sh
+. "$(dirname "$0")"/../../../scripts/get_title.sh
+# shellcheck source=../../../scripts/insert.sh
+. "$(dirname "$0")"/../../../scripts/insert.sh
+
+#get_title() {
+#	FILE="$1"
+#
+#	pup -p -f "$FILE" 'title text{}' | \
+#		sed 's/(Bison.*)//g' | \
+#		sed 's/\"/\"\"/g'
+#}
+
+DB_PATH="$1"
+shift
+
+insert_pages() {
+	# Get title and insert into table for each html file
+	while [ -n "$1" ]; do
+		unset PAGE_NAME
+		unset PAGE_TYPE
+		PAGE_NAME="$(get_title "$1" | sed 's/(Bison.*)//g')"
+		PAGE_TYPE="Guide"
+		if [ -n "$PAGE_NAME" ]; then
+			insert "$DB_PATH" "$PAGE_NAME" "$PAGE_TYPE" "$(basename "$1")"
+		fi
+		shift
+	done
+}
+
+create_table "$DB_PATH"
+insert_pages "$@"
diff --git a/src/index.sh b/src/index.sh
deleted file mode 100755
index 93ee727..0000000
--- a/src/index.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env sh
-
-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"
-
-	pup -p -f "$FILE" 'title text{}' | \
-		sed 's/(Bison.*)//g' | \
-		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_term() {
-	LINK="$1"
-	NAME="$(echo "$LINK" | pup -p 'a text{}' | sed 's/"/\"\"/g' | tr -d \\n)"
-	TYPE="Entry"
-	PAGE_PATH="$(echo "$LINK" | pup -p 'a attr{href}')"
-
-	insert "$NAME" "$TYPE" "$PAGE_PATH"
-}
-
-
-insert_index_terms() {
-	# Get each term from an index page and insert
-	while [ -n "$1" ]; do
-		grep -Eo "<a href.*></a>:" "$1" | while read -r line; do
-			insert_term "$line"
-		done
-
-		shift
-	done
-}
-
-
-insert_pages() {
-	# Get title and insert into table for each html file
-	while [ -n "$1" ]; do
-		unset PAGE_NAME
-		PAGE_NAME="$(get_title "$1")"
-		if [ -n "$PAGE_NAME" ]; then
-			insert "$PAGE_NAME" "Guide" "$(basename "$1")"
-		fi
-
-
-		shift
-	done
-}
-
-TYPE="PAGES"
-
-# Check flags
-while true; do
-	case "$1" in
-		-i|--index)
-			TYPE="INDEX"
-			shift
-			;;
-		*)
-			break
-	esac
-done
-
-DB_PATH="$1"
-shift
-
-create_table
-case "$TYPE" in
-	PAGES)
-		insert_pages "$@"
-		;;
-	INDEX)
-		insert_index_terms "$@"
-		;;
-esac