From 794213ecd5ae2c4764167f8b128c780ce576cdbc Mon Sep 17 00:00:00 2001
From: fabolous005 <fabolous.e05@gmail.com>
Date: Fri, 13 Sep 2024 22:34:17 +0200
Subject: [PATCH] major performance changes + timing functions

---
 config.sh | 15 ++++++++-------
 helper.sh | 31 +++++++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/config.sh b/config.sh
index e372337..010b0e9 100755
--- a/config.sh
+++ b/config.sh
@@ -1,10 +1,11 @@
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
     # The script is being executed directly
-	for function in \
-		_configure;
-	do
-		unset $function || echo "failed to unset function: $function"
-	done
+	# for function in \
+	# 	_configure;
+	# do
+	# 	unset $function || echo "failed to unset function: $function"
+	# done
+	unset _configure || echo "failed to unset function: _configure"
 fi
 
 
@@ -22,9 +23,9 @@ function _configure() {
 	ETOOLS_FIND_CMD=${ETOOLS_FIND_CMD:-"fd"}
 	# The Argyments passed to the find command
 	ETOOLS_FIND_ARGS=${ETOOLS_FIND_ARGS:-'''
-	--exclude profile --exclude scripts --exclude eclass --exclude metadata
+	--exclude profiles --exclude scripts --exclude eclass --exclude metadata
 	--exclude app-emacs --exclude dev-ruby --exclude acct-user --exclude acct-group
-	--type directory --format '"\"{}\""''''}
+	--type directory --format '"\"{}\""' --max-depth 3'''}
 
 	# [ -z "${ETOOLS_FIND_CMD}" ] && ETOOLS_FIND_CMD="find"
 	# [ -z "${ETOOLS_FIND_ARGS}" ] && \
diff --git a/helper.sh b/helper.sh
index 8090ec9..1b633b6 100755
--- a/helper.sh
+++ b/helper.sh
@@ -6,6 +6,7 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
 		_formatted_find \
 		_set_weights \
 		_get_heighest \
+		_default_sort \
 		_etools_print_assoc_array \
 		_filter;
 	do
@@ -33,8 +34,8 @@ function _formatted_find() {
 function _set_weights() {
 	for package in "${!_etools_packages[@]}"; do
 		for regex in ${!package_weights[@]}; do
-			if [[ ${package//\"/} =~ ^*${regex}*$ ]]; then
-				_etools_packages[${package//\"/}]=${package_weights[$regex]}
+			if [[ $package =~ ^*${regex}*$ ]]; then
+				_etools_packages[$package]=${package_weights[$regex]}
 			fi
 		done
 	done
@@ -54,19 +55,40 @@ function _get_heighest() {
 	echo "$max_key"
 }
 
+function _default_sort() {
+	for package in "${!_etools_packages[@]}"; do
+		case $package in
+			*selinux*)
+				_etools_packages["$package"]=$((_etools_packages["$package"] - 30))
+				;;
+		esac
+	done
+}
+
 function _etools_print_assoc_array {
     for key in "${!_etools_packages[@]}"; do
         echo "$key: ${_etools_packages[$key]}"
     done
 }
 
+function _debug_time() {
+	local end_time=$(date +%s%3N)
+	echo $((end_time - start_time))
+}
+
 function _filter() {
+	# local start_time=$(date +%s%3N) && echo 0
+	# _debug_time "$start_time"
 	(( $# <= 1 )) && ewarn "No packages found, review config options" && return 1;
 	declare -Ag _etools_packages
 	for package in "$@"; do
 		# allow indirect reference
 		# shellcheck disable=SC2034
-		_etools_packages[$(echo "$package" | tr -d '"' | awk -F'/' '{print $(NF-1)"/"$NF}')]=0
+		package=${package//\"/}
+		base_name="${package##*/}"        # Get the last part
+		parent_name="${package%/*}"       # Remove the last part
+		parent_name="${parent_name##*/}"  # Get the second-to-last part
+		_etools_packages["$parent_name/$base_name"]=0
 	done
 	local functions=
 	functions="$(declare -F | "${ETOOLS_GREP_CMD}" 'etools_find_sort_' | awk '{print $3}')"
@@ -74,10 +96,11 @@ function _filter() {
 	# leave warning untils this is stable/fixed
 	for function in \
 		_set_weights \
+		_default_sort \
 		${functions[@]};
 	do
 		$function
 	done
-	_etools_print_assoc_array
+	# _etools_print_assoc_array
 	_get_heighest 
 }