On branch rewrite-2022-03-26

Your branch is up to date with 'origin/rewrite-2022-03-26'.

 Changes to be committed:
modified:   hash-files
	Cleaning up comment lines

.env.default

@@ -1,2 +1,7 @@
 Working_Fullpath=$(pwd)
 Working_Directory=$(basename $Working_Fullpath)
+
+# IMPORTANT - The order of keys in keys_of_interest *must* match the order in
+# 	which mdls prints them or csv output will be incoherent
+
+keys_of_interest=("kMDItemFSCreationDate" "kMDItemFSName")

hash-files

@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
 log_file=/var/log/hash-files.log
+keys_of_interest=("kMDItemFSCreationDate" "kMDItemFSName")
 md5_bin=$(which md5sum)
 mktemp_bin=$(which mktemp)
 DateTimeStamp=$(date +\%D_\%T)
 
+IFS=$'\n'
+
 set -a
 source .env 2>&1 > /dev/null
 set +a
@@ -12,67 +15,40 @@ set +a
 ############
 
 write_log () {
-#echo "		++ Write to log.
-#		+++++++++++++++"
 ## Use on systems managed with systemd
 #	printf 'hash-files:	%s\n' "$1" | systemd-cat
 	printf '%s	hash-files:	%s\n' "$DateTimeStamp" "$1" >> $log_file
 }
 
-create_list_of_files () {
-#echo "=== Get list of files in $Working_Directory. ===
-#=================================================="
-	IFS=$'\n'
-	for file in $(find $Working_Fullpath -maxdepth 1 -type f); do
-		list_of_files+=( $file )
-	done	
-	write_log "List of files created successfully."
-	unset IFS
-}
 
-mdls_files () {
-	IFS=$'\n'
-	for file in $list_of_files; do
+
+mdls_per_file () {
+	file=$1
+	unset mdls_properties
 	for line in $(mdls $file); do
+		old_IFS=$IFS
+		unset IFS
 		mdls_key=$(printf "%s" $line | cut -d '=' -f 1)
 		mdls_value=$(printf "%s" $line | cut -d '=' -f 2)
-			printf "\n============================\nMDLS Key: %s\nMDLS Value: %s\n============================\n\n" $mdls_key $mdls_value
-		done
-
-	done
-}
-hash_files () {
-#echo "=== Hash files. ===
-#======================"
-	IFS=$'\n'
-	for file in ${list_of_files[@]}; do
-		hash=$($md5_bin $file | awk '{ print $1 }')
-		list_of_hashes+=( $hash )
-	done
-	write_log "Files hashed successfully."
+		if [[ " ${keys_of_interest[*]} " =~ " ${mdls_key} " ]];then
+			IFS=$old_IFS
+			mdls_properties+=( $mdls_value )
 			unset IFS
-}
-
-create_csv () {
-#echo "=== Create array of comma-separated-values. ===
-#=================================================="
-	for i in ${!list_of_files[@]}; do
-		csv_array+=( ${list_of_files[i]},${list_of_hashes[i]} )
+		else
+			: # "Did not print!"
+		fi
+		IFS=$old_IFS
 	done
-	export csv_array
-	write_log "CSV Array creation successful."
+	IFS=',';echo "${mdls_properties[*]}";IFS=$old_IFS
 }
 
-write_data () {
-#echo "=== Write data to a .csv file. ===
+
+write_per_file () {
+# "=== Write data to a .csv file. ===
 #===================================="
-	temp_csv_file=$($mktemp_bin)
-	printf '%s,%s\n' "File Path" "File Hash" >> $temp_csv_file
-	for line in ${csv_array[@]};do
-		printf '%s\n' $line
-	done >> $temp_csv_file
 #	cat $temp_csv_file
-	write_log "$temp_csv_file written successfully."
+#	write_log "$temp_csv_file written successfully."
+printf 'File: %s\nHash: %s\nMDLS Properties:\t%s\n' $1 $2 $3
 }
 
 cleanup () {
@@ -84,18 +60,26 @@ cleanup () {
 
 trap cleanup EXIT
 
-echo "Main Start"
-create_list_of_files
-mdls_files
-#hash_files
-#if [ ${#list_of_files[@]} != ${#list_of_hashes[@]} ];then
-#	echo "Error! Number of files and hashes differs. Exiting..." && exit
-#else
-#	create_csv
-#fi
-#write_data
-
-#while $list_of_files >=1; do
-#done
-
-
+## Create temp file
+temp_csv_file=$($mktemp_bin)
+## Initialize column names
+csv_columns=( "File Path" "File Hash" )
+## Populate Columns from keys of interest
+for key in ${keys_of_interest[@]};do
+	csv_columns+=( $key )
+done
+## Print columns to first line of csv
+# "======= CSV Column Headers ========"
+{ IFS=',';echo "${csv_columns[*]}";IFS=$'\n'
+## Loop through files, writing to csv
+for file in $(find $Working_Fullpath -maxdepth 1 -type f); do
+	## Set our hash value
+	hash=$($md5_bin $file | awk '{ print $4 }')
+#	Print csv row output
+#	"============= CSV Row =========="
+	echo "$file,$hash,$(mdls_per_file $file)"
+#	write_per_file $file $hash $mdls_properties
+done	
+} >> $temp_csv_file
+cat $temp_csv_file
+unset IFS