Fixed:

- URL default location is empty
- Failing on --status and --stop

Author: John Smith III

CHANGELOG.md

@@ -26,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Cross platform paths are normalization
+- URL default location is empty
+- Failing on --status and --stop
 
 ## [1.0.2] - 2024-11-23
 

README.md

@@ -282,7 +282,7 @@ Run the script with the desired options. Below are some examples:
 
 ## Configuration
 
-NoirWatch uses a configuration file to store default settings. The default location is `$HOME/.config/noirwatch.conf`. You can initialize a configuration file with default settings using:
+NoirWatch uses a configuration file to store default settings. The default location is `~/.config/noirwatch.conf`. You can initialize a configuration file with default settings using:
 
 ```bash
 ./noirwatch --init
@@ -294,8 +294,8 @@ NoirWatch uses a configuration file to store default settings. The default locat
 # NoirWatch Configuration File
 CACHE_DIR="/tmp/noirwatch_cache"
 LOG_FILE="/tmp/noirwatch_cache/noirwatch.log"
-CONFIG_FILE="$HOME/.config/noirwatch.conf"
-URL_FILE="$HOME/.config/noirwatch_urls.conf"
+CONFIG_FILE="~/.config/noirwatch.conf"
+URL_FILE="~/.config/noirwatch_urls.conf"
 CHECK_INTERVAL=15
 TIMEOUT=5
 PUSHOVER_NOTIFICATION=false

noirwatch

@@ -9,8 +9,8 @@
 APP_NAME="NoirWatch"
 VERSION=1.1.0
 LAST_UPDATED="2024-11-26"
+
 # TODO:
-#  - Change: url default path to use normalization functions
 #  - Add more notification methods (email, slack, discord, etc.)
 
 # ==============================
@@ -80,8 +80,8 @@ NC='\033[0m' # No Color
 # Application Specific Variables
 # ==============================
 
-# Default URL list file location
-DEFAULT_URL_FILE="$HOME/.config/noirwatch_urls.conf"
+# Default URL list file location (full default path added during initialization)
+URL_FILE="noirwatch_urls.conf"
 
 # Initialize URLS as an empty array
 URLS=()
@@ -810,7 +810,7 @@ show_help() {
 
     # URL Management
     printf "\nURL Management:\n"
-    printf "  -f, --url-file <file>     Specify a file containing a list of URLs to monitor. (default: %s)\n" "$DEFAULT_URL_FILE"
+    printf "  -f, --url-file <file>     Specify a file containing a list of URLs to monitor. (default: %s)\n" "$URL_FILE"
     printf "  -U, --list-urls           List all watched URLs.\n"
     printf "  -C, --clean               Delete all cached files.\n"
 
@@ -1061,6 +1061,7 @@ process_arguments() {
     CACHE_DIR="$(get_temp_path "$CACHE_DIR")"
     LOG_FILE="$CACHE_DIR/$LOG_FILE"
     PID_FILE="$CACHE_DIR/$PID_FILE"
+    URL_FILE="$(get_config_path "$URL_FILE")"
 
     # Set default hostname
     SYSTEM_NAME="$(get_hostname)"
@@ -1103,7 +1104,7 @@ process_arguments() {
     process_urls
 
     # Check if the array is empty
-    if [ ${#URLS[@]} -eq 0 ]; then
+    if [ ! $SHOW_STATUS && ! $SHOW_STOP && ${#URLS[@]} -eq 0 ]; then
         log_message "ERROR" "Error: No URLS have been provided."
         exit 1
     fi
@@ -1132,8 +1133,6 @@ process_urls() {
     if [ ${#URLS[@]} -eq 0 ]; then
         if [ -n "$URL_FILE" ]; then
             process_url_file "$URL_FILE"
-        elif [ -f "$DEFAULT_URL_FILE" ]; then
-            process_url_file "$DEFAULT_URL_FILE"
         elif [[ "$SHOW_CONFIG" = false && "$SHOW_CONFIG_FILE" = false ]]; then
             log_message "INFO" "Usage: $(basename "$0") <website_url>... [options]" "$LINENO"
             log_message "INFO" "Try '$(basename "$0") --help' for more information." "$LINENO"
@@ -1266,6 +1265,7 @@ check_website() {
     local normalized_file="$CACHE_DIR/normalized_content_$encoded_url.txt"
     local hash_file="$CACHE_DIR/hash_$encoded_url.txt"
 
+    log_message "DEBUG" "" "$LINENO"
     log_message "DEBUG" "$SYSTEM_NAME Checking URL: $clean_url" "$LINENO"
     log_message "DEBUG" "- Submitted URL: $website_url" "$LINENO"
     log_message "DEBUG" "- Global threshold: $THRESHOLD%" "$LINENO"

noirwatch.1

@@ -16,7 +16,7 @@ Display this help message.
 Display the application version.
 .TP
 .B \-c, \--config <config_file>
-Specify a custom configuration file (default: $HOME/.config/noirwatch.conf).
+Specify a custom configuration file (default: ~/.config/noirwatch.conf).
 .TP
 .B \-I, \--init
 Initialize the configuration file.
@@ -64,7 +64,7 @@ Specify a custom log file location (default: /tmp/noirwatch_cache/noirwatch.log)
 Set the log level (FATAL, ERROR, WARN, INFO, DEBUG).
 .TP
 .B \-f, \--url-file <file>
-Specify a file containing a list of URLs to monitor (default: $HOME/.config/noirwatch_urls.conf).
+Specify a file containing a list of URLs to monitor (default: ~/.config/noirwatch_urls.conf).
 .TP
 .B \-U, \--list-urls
 List all watched URLs.
@@ -107,7 +107,7 @@ Stop the service:
 .B noirwatch --stop
 .SH FILES
 .TP
-.B $HOME/.config/noirwatch.conf
+.B ~/.config/noirwatch.conf
 Default configuration file.
 .TP
 .B /tmp/noirwatch_cache/