[installreport] refractor

src/modules/installreport/main.py

@@ -3,31 +3,56 @@
 import subprocess
 import requests
 import libcalamares
+from libcalamares.utils import host_env_process_output
 
-def proc(cmd):
-    return subprocess.run(cmd, capture_output=True, text=True).stdout.replace("\n", "")
+timeout = 3
 
 def get_chassis():
-    return proc(['hostnamectl', '|', 'grep', 'Chassis']).replace("Chassis:\t", "")
+    result = []
+    try:
+        host_env_process_output(
+            ['hostnamectl'],
+            result,
+            timeout=timeout
+        )
+        for i in result:
+            if "Chassis" in i:
+                return i.replace("Chassis:", "").replace("\n", "").strip()
+        print("result",result)
+        return result
+    except subprocess.CalledProcessError as e:
+        libcalamares.utils.warning(f"InstallReport failed: {e.output}")
+        return e.returncode
 
 def pretty_name():
-    ## TODO
-    return "unknown"
-
-def get_cala_version():
     return ""
 
-def run():
-    libcalamares.job.setprogress(1.0)
-    version = get_cala_version()
-    headers = {'user-agent': f"Calamares/{version}"}
-    host = "https://ping.manjaro.org/calamares"
+def get_cala_version():
+    result = []
+    try:
+        host_env_process_output(
+            ['calamares', '-v'],
+            result,
+            timeout=timeout
+        )
+        return result[-1].split()[1]
+    except subprocess.CalledProcessError as e:
+        libcalamares.utils.warning(f"InstallReport failed: {e.output}")
+        return e.returncode
 
+def run():
+    libcalamares.job.setprogress(0.5)
+    headers = {'user-agent': f"Calamares/{get_cala_version()}"}
+    endpoint = "http://ping.manjaro.org/calamares"
+  
     if "vm" in get_chassis():
-        host = f"{host}vm"
+        endpoint = f"{endpoint}vm"
     
     try:
-        requests.get(host, headers=headers, timeout=3)
-        return "New installation successful"
+        res = requests.get(endpoint, headers=headers, timeout=3)
+        print(res)
     except Exception as e:
-        return str(e)
+        return ("error", e)
+    
+    libcalamares.job.setprogress(1.0)
+