fix(vhost-import): apply code quality improvements (diffs 2-5)

Copilot · PDowney · web-flow · commit 5033db9abeaf · 2026-04-10T22:01:54.000Z
- Use mapfile + find -print0 | sort -z for deterministic SQL file detection - Extract URL_VALIDATION_REGEX to readonly variable at top of script - Improve WordPress salt fetch error message with troubleshooting guidance - Replace wp db search | grep -qF with --quiet flag to avoid double scan Agent-Logs-Url: https://github.com/EngineScript/EngineScript/sessions/d84282a4-c592-4316-a4c7-7fee044ea66d Co-authored-by: PDowney <11467177+PDowney@users.noreply.github.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,15 @@ All notable changes to EngineScript will be documented in this file.
 
 Changes are organized by date, with the most recent changes listed first.
 
+## 2026-04-10 (2)
+
+### 🔧 VHOST IMPORT CODE QUALITY IMPROVEMENTS (CONTINUED)
+
+- Replaced two-pass `find -print -quit` + second `find ! -samefile` SQL file detection with `mapfile` + `find -print0 | sort -z` in `scripts/functions/vhost/vhost-import.sh`, ensuring deterministic selection and a single-pass exact-count check.
+- Extracted the URL validation regex to a `readonly URL_VALIDATION_REGEX` variable at the top of `scripts/functions/vhost/vhost-import.sh` to eliminate duplication and simplify future maintenance.
+- Improved the WordPress salt fetch error message to include troubleshooting guidance (internet connection, DNS/firewall/proxy settings, retry instructions).
+- Replaced `wp db search … | grep -qF` with `wp db search … --quiet` so the exit status is used directly, eliminating a redundant full-database grep pass in `run_url_search_replace_if_present`.
+
 ## 2026-04-10
 
 ### 🔧 VHOST IMPORT CODE QUALITY IMPROVEMENTS
diff --git a/scripts/functions/vhost/vhost-import.sh b/scripts/functions/vhost/vhost-import.sh
@@ -29,6 +29,7 @@ WP_EXTRACTED_PATH="${IMPORT_BASE_DIR}/extracted-root" # Temporary path for extra
 
 # --- Supported DB Charset Configuration ---
 readonly ALLOWED_DB_CHARSETS=("utf8mb4" "utf8" "latin1")
+readonly URL_VALIDATION_REGEX="^https?://([A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?\.)*[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(:[0-9]{1,5})?([/?#].*)?$"
 
 # --- Instructions for Preparing Files ---
 echo ""
@@ -185,20 +186,14 @@ if [[ "$IMPORT_FORMAT" == "single_zip" ]]; then
     unzip -q "${SINGLE_ZIP_FILE}" -d "${WP_EXTRACTED_PATH}"
     EXTRACT_STATUS=$?
     if [[ $EXTRACT_STATUS -eq 0 ]]; then
-        # Find exactly one .sql file within the extracted content
-        DB_SOURCE_CANDIDATE=$(find "${WP_EXTRACTED_PATH}" -maxdepth 1 -type f -name "*.sql" -print -quit)
-        if [[ -z "$DB_SOURCE_CANDIDATE" ]]; then
+        # Find exactly one .sql file within the extracted content (deterministic order)
+        mapfile -d '' -t DB_SOURCE_CANDIDATES < <(find "${WP_EXTRACTED_PATH}" -maxdepth 1 -type f -name "*.sql" -print0 | sort -z)
+        if [[ ${#DB_SOURCE_CANDIDATES[@]} -ne 1 ]]; then
             echo "FAILED: Could not find exactly one .sql file within the extracted single zip content in ${WP_EXTRACTED_PATH}"
             EXTRACT_STATUS=1 # Mark as failure
         else
-            DB_SOURCE_SECOND_CANDIDATE=$(find "${WP_EXTRACTED_PATH}" -maxdepth 1 -type f -name "*.sql" ! -samefile "$DB_SOURCE_CANDIDATE" -print -quit)
-            if [[ -n "$DB_SOURCE_SECOND_CANDIDATE" ]]; then
-                echo "FAILED: Could not find exactly one .sql file within the extracted single zip content in ${WP_EXTRACTED_PATH}"
-                EXTRACT_STATUS=1 # Mark as failure
-            else
-                DB_SOURCE_PATH="$DB_SOURCE_CANDIDATE" # Set DB path for single_zip format
-                echo "PASSED: Found database file within extracted content: ${DB_SOURCE_PATH}"
-            fi
+            DB_SOURCE_PATH="${DB_SOURCE_CANDIDATES[0]}" # Set DB path for single_zip format
+            echo "PASSED: Found database file within extracted content: ${DB_SOURCE_PATH}"
         fi
     fi
 elif [[ "$IMPORT_FORMAT" == "two_file" ]]; then
@@ -309,7 +304,7 @@ while true; do
       
       # Site URL input with validation
       while true; do
-          new_site_url=$(prompt_input "Enter correct Site URL" "${SITE_URL}" 300 "^https?://([A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?\\.)*[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(:[0-9]{1,5})?([/?#].*)?$")
+          new_site_url=$(prompt_input "Enter correct Site URL" "${SITE_URL}" 300 "${URL_VALIDATION_REGEX}")
           if [[ -n "$new_site_url" ]]; then
               if validate_url "$new_site_url"; then
                   SITE_URL="$new_site_url"
@@ -488,7 +483,7 @@ configure_redis "${SITE_URL}" "${TARGET_WP_PATH}/wp-config.php"
 # WP Salt Creation (Generate new salts)
 echo "Generating new WordPress salts..."
 SALT=$(curl --fail --silent --show-error --location --retry 3 --connect-timeout 10 --max-time 30 "https://api.wordpress.org/secret-key/1.1/salt/") || {
-    echo "Error: Failed to fetch WordPress salts from api.wordpress.org" >&2
+    echo "Error: Failed to fetch WordPress salts from api.wordpress.org. Please check your internet connection, DNS/firewall/proxy settings, and try running the import again." >&2
     exit 1
 }
 
@@ -551,7 +546,8 @@ run_url_search_replace_if_present() {
     local original_url="$1"
 
     # Only run expensive full-table replacements when the source URL is present.
-    if wp db search "${original_url}" --all-tables --allow-root 2>/dev/null | grep -qF "${original_url}"; then
+    # Use `wp db search --quiet` exit status directly to avoid an extra grep pass.
+    if wp db search "${original_url}" --all-tables --allow-root --quiet 2>/dev/null; then
         wp search-replace "${original_url}" "${NEW_URL}" --all-tables --report-changed-only --allow-root
     else
         echo "Skipping search-replace: '${original_url}' not found in database text columns."
