output print added for generate script

ChristianHohlfeld · ChristianHohlfeld · commit 3ba902837a20 · 2024-10-24T23:36:23.000+02:00
diff --git a/scripts/generate_site.sh b/scripts/generate_site.sh
@@ -7,34 +7,26 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"  # Assuming the project root is one level up from scripts
 
-# Get the project directory passed as an argument, default to current directory if not provided
+# Get the project directory and theme from arguments
 PROJECT_DIR="${1:-$(pwd)}"
+THEME_NAME="${2:-default}"
 
 # Define the template and output files within the project directory
 TEMPLATE_FILE="$PROJECT_DIR/template_default.html"
 OUTPUT_FILE="$PROJECT_DIR/index.html"  # Output file set to index.html
 
-# Default theme if not provided (optional)
-THEME_NAME="$2"
-
-# Check if a theme name was passed as an argument
-if [[ ! -z "$THEME_NAME" ]]; then
-    echo "Using theme: $THEME_NAME"
-else
-    THEME_NAME="default"
-    echo "No theme provided, proceeding with default theme."
-fi
+echo "Adding data-theme attribute with theme: $THEME_NAME"
 
 # Check if the template file exists in the project directory
 if [[ ! -f "$TEMPLATE_FILE" ]]; then
-    echo "Error: Template file '$TEMPLATE_FILE' not found in project directory. Use './run_add.sh template_default.html' to add the default template file."
+    echo "Error: Template file '$TEMPLATE_FILE' not found. Use './run_add.sh template_default.html' to add the default template file."
     exit 1
 fi
 
 # Function to ensure required components exist in the project directory
 ensure_components() {
     local missing=()
-    for component in sidebar_default content_default footer_default; do
+    for component in sidebar_default content_default header_default themecontroller_default hero_default; do
         local component_file="$PROJECT_DIR/${component}.html"
         if [[ ! -f "$component_file" ]]; then
             missing+=("$component")
@@ -63,33 +55,51 @@ missing_components=()
 # Read the template file line by line
 while IFS= read -r line || [[ -n "$line" ]]; do
     # Replace the <title> tag with the user-provided title, if provided
-    if [[ "$line" =~ \<title\>(.*)\<\/title\> ]] && [[ ! -z "$PAGE_TITLE" ]]; then
-        echo "Replacing <title> tag with user-provided title."
-        line="<title>${PAGE_TITLE}</title>"
+    if [[ "$line" =~ \<title\>(.*)\<\/title\> ]]; then
+        echo "Replacing <title> tag."
+        line="<title>✍️ MiniTemplate - Simple Template Engine</title>"
     fi
 
-    # Replace the <body> tag with the data-theme attribute if a theme is specified
+    # Replace the <body> tag with the data-theme attribute
     if [[ "$line" =~ \<body ]]; then
         echo "Adding data-theme attribute with theme: $THEME_NAME"
         line="<body class=\"flex flex-col min-h-screen\" data-theme=\"$THEME_NAME\">"
     fi
 
-    # Process components
+    # Use regex to find all placeholders in the format {{component_name}}
     while [[ "$line" =~ \{\{([a-zA-Z0-9_]+)\}\} ]]; do
         COMPONENT_ID="${BASH_REMATCH[1]}"
         COMPONENT_FILE="$PROJECT_DIR/${COMPONENT_ID}.html"
 
+        # Check if the component file exists in the project directory
         if [[ -f "$COMPONENT_FILE" ]]; then
+            echo "Processing component: $COMPONENT_ID"
             COMPONENT_CONTENT=$(<"$COMPONENT_FILE")
+
+            # Safely escape special characters like &
             COMPONENT_CONTENT=$(echo "$COMPONENT_CONTENT" | sed 's/&/\\&/g')
+
+            # Replace the placeholder with the component content
             line="${line/\{\{$COMPONENT_ID\}\}/$COMPONENT_CONTENT}"
+            echo "Replaced {{${COMPONENT_ID}}} successfully."
         else
-            line="${line/\{\{$COMPONENT_ID\}\}/}"
+            echo "Warning: Component file '$COMPONENT_ID.html' not found in '$PROJECT_DIR'. Leaving placeholder unchanged."
+            missing_components+=("$COMPONENT_ID")
+            # Optionally, keep the placeholder or replace it with an empty string
+            line="${line/\{\{$COMPONENT_ID\}\}/{{${COMPONENT_ID}}}}"
         fi
     done
 
     # Write the processed line to the output file
     echo "$line" >> "$OUTPUT_FILE"
 done < "$TEMPLATE_FILE"
 
+# Check for any missing components
+if [[ ${#missing_components[@]} -gt 0 ]]; then
+    echo "The following components were not found and left unchanged:"
+    for missing in "${missing_components[@]}"; do
+        echo "- {{${missing}}}"
+    done
+fi
+
 echo "Template processing complete. Check '$OUTPUT_FILE'."
diff --git a/scripts/run_generate.sh b/scripts/run_generate.sh
@@ -18,10 +18,7 @@ find_project_root() {
     return 1  # Return error if no root found
 }
 
-# Get the current directory where the script is executed
-current_dir=$(pwd)
-
-# Find the project root directory (if needed for other purposes)
+# Find the project root directory
 project_root=$(find_project_root "$(dirname "${BASH_SOURCE[0]}")")
 
 # Check if the project root was found
@@ -33,20 +30,23 @@ fi
 # Append the scripts directory to the root path
 scripts_dir="$project_root/scripts"
 
+# Print the final scripts directory for verification
+echo "Scripts directory path: $scripts_dir"
+
 # Check if the generate_site.sh script exists in the scripts directory
 if [[ ! -f "$scripts_dir/generate_site.sh" ]]; then
     echo "Error: generate_site.sh not found in $scripts_dir"
     exit 1
 fi
 
-# Check if a theme was provided as an argument, default to empty string if none
+# Check if a theme was provided as an argument, default to "default" if none
 if [[ -n "$1" ]]; then
     theme="$1"
-    echo "Theme '$theme' will be used."
+    echo "Using theme: $theme"
 else
     theme="default"
     echo "No theme provided, proceeding with default theme."
 fi
 
-# Run the generate_site.sh script and pass the current directory and theme as parameters
-"$scripts_dir/generate_site.sh" "$current_dir" "$theme"
+# Run the generate_site.sh script and pass the theme as a parameter
+"$scripts_dir/generate_site.sh" "$project_root" "$theme"
