From 7a9aabfc6c0dc3649e2a04efeb2b868949e62484 Mon Sep 17 00:00:00 2001
From: ramzcaca <ramzcaca@localhost.localdomain>
Date: Thu, 22 Jan 2026 15:58:31 +0100
Subject: [PATCH] grabber+uvicorn works yay

---
 __pycache__/app.cpython-313.pyc     | Bin 2728 -> 2728 bytes
 __pycache__/grabber.cpython-313.pyc | Bin 1508 -> 1508 bytes
 grabber.sh                          |  73 +++++++++++++++++-----------
 grabberman.db                       | Bin 0 -> 12288 bytes
 4 files changed, 44 insertions(+), 29 deletions(-)
 create mode 100644 grabberman.db

diff --git a/__pycache__/app.cpython-313.pyc b/__pycache__/app.cpython-313.pyc
index 8b50d5f2e74b516c31f21d982ae31b17821f78e3..01a69c765890f575683e7fbf1e51051531dc4683 100644
GIT binary patch
delta 19
ZcmZ1>x<ZueGcPX}0}yaXZRDEA1pqGU1R($b

delta 19
ZcmZ1>x<ZueGcPX}0}xDL*vK`H3ji^g1djj!

diff --git a/__pycache__/grabber.cpython-313.pyc b/__pycache__/grabber.cpython-313.pyc
index 215b08e485c327fe21eb9bb42147f364b6435567..875efdcd61570aec61d03c77adb7194008e00e06 100644
GIT binary patch
delta 19
ZcmaFD{e+wAGcPX}0}yaXZREPe3IH~F1iSzM

delta 19
ZcmaFD{e+wAGcPX}0}y;=+{kr{6#zSm1&{y$

diff --git a/grabber.sh b/grabber.sh
index eb0a28a..876439f 100755
--- a/grabber.sh
+++ b/grabber.sh
@@ -306,7 +306,6 @@ software() {
 ##### JSON PART ###############################
 json_file() { 
     json_data=$(jq -n \
-        --arg hostname "$HOSTNAME" \
         --arg motherboard "$MB_SERIAL" \
         --arg cpu_model "$CPU_MODEL" \
         --arg cpu_id "$CPU_ID" \
@@ -317,6 +316,7 @@ json_file() {
         --arg cpu_frequency_max "$CPU_FREQUENCY_MAX" \
         --arg gpu_model "$GPU_MODEL" \
         --arg ram_slots "$RAM_SLOTS" \
+        --arg hostname "$HOSTNAME" \
         --arg os "$OS" \
         --arg arch "$ARCH" \
         --arg desktop_env "$XDG_CURRENT_DESKTOP" \
@@ -324,31 +324,32 @@ json_file() {
         --arg kernel "$KERNEL" \
         '{
         HARDWARE: {
-            hostname:$hostname,
-            mb_serial:$motherboard,
-            cpu_model:$cpu_model,
-            cpu_id:$cpu_id,
-            cpu_cores:$cpu_cores,
-            cpu_threads:$cpu_threads,
-            cpu_frequency_min:$cpu_frequency_min,
-            cpu_frequency_cur:$cpu_frequency_cur,
-            cpu_frequency_max:$cpu_frequency_max,
-            gpu_model:$gpu_model,
-            ram_slots:$ram_slots
+            motherboard: $motherboard,
+            cpu_model: $cpu_model,
+            cpu_id: $cpu_id,
+            cpu_cores: $cpu_cores,
+            cpu_threads: $cpu_threads,
+            cpu_frequency_min: $cpu_frequency_min,
+            cpu_frequency_cur: $cpu_frequency_cur,
+            cpu_frequency_max: $cpu_frequency_max,
+            gpu_model: $gpu_model,
+            ram_slots: $ram_slots
         },
         SOFTWARE: {
-            os:$os,
-            architecture:$arch,
-            desktop_environment:$desktop_env,
-            window_manager:$window_manager,
-            kernel:$kernel
+            hostname: $hostname,
+            os: $os,
+            arch: $arch,
+            desktop_env: $desktop_env,
+            window_manager: $window_manager,
+            kernel: $kernel
         }
         }'
     )
-    #SIMPLE LOCAL
-    curl	-X POST http://localhost:8000/endpoint \
-            -H "Content-Type: application/json" \
-            -d "$json_data"
+    
+    # Envoi au serveur
+    curl -X POST http://localhost:8000/endpoint \
+         -H "Content-Type: application/json" \
+         -d "$json_data"
 }
 
 python_venv() {
@@ -371,13 +372,27 @@ echo "Fetching software data..."
 software
 echo "Writing everything in summary.txt"
 if [ "$choice" = "1" ]; then 
-echo "Grabber has complete his mission! Find every logs saved in your home repository inside the /grabber folder."
-echo "See you space cowboy..."
+    echo "Grabber has complete his mission! Find every logs saved in your home repository inside the /grabber folder."
+    echo "See you space cowboy..."
 else
-echo "Pushing fetch data into json file..."
-json_file
-echo "Creating a python virtual environement..."
-python_venv
-echo "Grabber has complete his mission! Find every logs saved in your home repository inside the /grabber folder."
-echo "See you space cowboy..."
+    echo "Creating a python virtual environement and starting server..."
+    # 1. On lance la fonction python_venv en arrière-plan avec '&'
+    python_venv &
+    
+    # On récupère l'ID du processus du serveur pour pouvoir l'attendre plus tard
+    SERVER_PID=$!
+
+    echo "Waiting for server to initialize (10s)..."
+    # 2. On attend quelques secondes que uvicorn soit bien démarré
+    sleep 10
+
+    echo "Pushing fetch data into json file..."
+    # 3. Maintenant que le serveur tourne, on envoie le JSON
+    json_file
+
+    echo "Grabber has complete his mission! Find every logs saved in your home repository inside the /grabber folder."
+    echo "Server is running on http://localhost:8000. Press Ctrl+C to stop."
+    
+    # 4. On empêche le script de se fermer (ce qui tuerait le serveur si configuré ainsi)
+    wait $SERVER_PID
 fi
\ No newline at end of file
diff --git a/grabberman.db b/grabberman.db
new file mode 100644
index 0000000000000000000000000000000000000000..9fc86f9d166c9d8b7245f3125a6f1bddbeb465bb
GIT binary patch
literal 12288
zcmeI#K}*9h6bJC66FtfFH1PDcQ_G47;@vod3%2QusnC<uSwUzwYU{<@zPYJ5rn`8R
z@qdsukL0D~*VDVdi(cD;UY2iF-qJZcVw|%}BE}eZqvystx_ob)xObQT6`Y-Z)Q4`D
z*FRzX(mfCmfB*y_009U<00Izz00bZafqx}1^Y#bhG0)oksVthhbZzouQ`GOpV!oaB
zCPoS?$%?B;($-#okyl0NDudNAKNt*$d{up&nV4&(U0G^2Gw;_)qs_vIeDzF9TX`c5
z&5VkL$>>&QBvP9w?doEwZAjB)({^8^2Vo{tVf>4;fOKL>r%@DAoX>x*1YK|LntlWX
zAOHafKmY;|fB*y_009U<00KKKfc}4ne=e>D0SG_<0uX=z1Rwwb2tWV=5cn4O1c|Cl
A?f?J)

literal 0
HcmV?d00001