test 2.1

Author: 0xAhmadYousuf

.github/workflows/daemon_version_check.yml

@@ -30,18 +30,37 @@ jobs:
         python -m pip install --upgrade pip
         pip install -r requirements.txt
 
+    - name: Make deamons.sh executable
+      run: chmod +x deamons.sh
+
     - name: Extract daemon versions
       run: |
-        python main.py --extract-daemon-versions
+        # Load the latest export versions
+        python -c "import json; f=open('data/json/latest_export_versions.json'); print(json.dumps(json.load(f)))" > latest_exports.json
+
+        # Iterate over each binary in the latest export versions
+        cat latest_exports.json | jq -r '.files[].url' | while read -r url; do
+          # Download the binary
+          wget "$url" -O binary_file
+
+          # Run the binary with deamons.sh to extract the daemon version
+          DAEMON_VERSION=$(./deamons.sh binary_file)
+
+          # Update the JSON with the daemon version
+          jq --arg url "$url" --arg daemon_version "$DAEMON_VERSION" '.files[] | select(.url == $url) | .daemon_version = $daemon_version' latest_exports.json > tmp.json && mv tmp.json latest_exports.json
+        done
+
+        # Save the updated JSON back to the file
+        mv latest_exports.json data/json/latest_export_versions.json
 
     - name: Commit and push changes
       run: |
-        git config --local user.email "action@github.com"
-        git config --local user.name "GitHub Action"
-        git add .
+        git add data/json/latest_export_versions.json
         if git diff --staged --quiet; then
           echo "No changes to commit"
         else
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
           git commit -m "[Auto] Update daemon versions - $(date)"
           git push
-        fi
+        fi

deamons.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# This script extracts the daemon version from a binary passed as an argument.
+# Usage: ./deamons.sh <binary_path>
+
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <binary_path>"
+    exit 1
+fi
+
+BINARY_PATH=$1
+
+if [ ! -x "$BINARY_PATH" ]; then
+    echo "Error: $BINARY_PATH is not executable or does not exist."
+    exit 1
+fi
+
+# Run the binary with --version and extract the daemon version using regex
+VERSION_OUTPUT=$($BINARY_PATH --version 2>&1)
+DAEMON_VERSION=$(echo "$VERSION_OUTPUT" | grep -oP '\d+\.\d+\.\d+')
+
+if [ -z "$DAEMON_VERSION" ]; then
+    echo "Error: Could not extract daemon version."
+    exit 1
+fi
+
+# Output the daemon version
+echo "$DAEMON_VERSION"

main.py

@@ -3,7 +3,6 @@
 import json
 import requests
 import time
-import subprocess
 from typing import List, Dict, Any
 # Removed custom zfill import as Python strings have a built-in zfill method
 
@@ -263,38 +262,6 @@ def get_latest_version(data: List[Dict[str, Any]]) -> Dict[str, Any]:
     sorted_data = sorted(numerical_only, key=lambda x: list(map(int, re.findall(r'\d+', x["version"]))))
     return sorted_data[-1] if sorted_data else {"version": None, "files": []}
 
-def extract_daemon_version(binary_path: str) -> str:
-    """Run the binary with --version and extract the daemon version using regex."""
-    try:
-        result = subprocess.run([binary_path, "--version"], capture_output=True, text=True, check=True)
-        version_output = result.stdout.strip()
-        match = re.search(r'version\s+(\d+\.\d+\.\d+)', version_output, re.IGNORECASE)
-        if match:
-            return match.group(1)
-        else:
-            print(f"No version found in output: {version_output}")
-            return "unknown"
-    except subprocess.CalledProcessError as e:
-        print(f"Error running binary {binary_path}: {e}")
-        return "error"
-
-def update_latest_export_with_daemon():
-    """Update the latest export list with daemon versions."""
-    try:
-        with open(LE_VERSIONS, "r") as file:
-            latest_export = json.load(file)
-
-        for entry in latest_export.get("files", []):
-            binary_path = os.path.join(CACHE_EXPORT_DIR, entry["file_name"])
-            daemon_version = extract_daemon_version(binary_path)
-            entry["daemon_version"] = daemon_version
-
-        with open(LE_VERSIONS, "w") as file:
-            json.dump(latest_export, file, indent=4)
-
-        print("Updated latest export list with daemon versions.")
-    except Exception as e:
-        print(f"Failed to update daemon versions: {e}")
 
 # development time code - create directories and initialize files
 try:
@@ -425,16 +392,4 @@ def update_latest_export_with_daemon():
 
 except Exception as e:
     print(f"Error building final data: {e}")
-    exit(1)
-
-if __name__ == "__main__":
-    import argparse
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--extract-daemon-versions", action="store_true", help="Extract daemon versions for the latest export list.")
-    args = parser.parse_args()
-
-    if args.extract_daemon_versions:
-        update_latest_export_with_daemon()
-    else:
-        pass
+    exit(1)