From 1cb012c891d79a1c75e630dab91fcd8124f3264d Mon Sep 17 00:00:00 2001
From: rabbitali <wenxin32@foxmail.com>
Date: Mon, 26 Aug 2024 17:53:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0os=E4=BF=A1=E6=81=AF=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84arch=E4=BF=A1=E6=81=AF=E5=92=8Cos=20name=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ceres/manages/collect_manage.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/ceres/manages/collect_manage.py b/ceres/manages/collect_manage.py
index 9aaf0cb..68b8a08 100644
--- a/ceres/manages/collect_manage.py
+++ b/ceres/manages/collect_manage.py
@@ -55,6 +55,8 @@ class Collect:
                                 'os_version': os_version,
                                 'bios_version': bios_version,
                                 'kernel': kernel_version
+                                'os_name': os_name,
+                                "os_arch": arch info
                                 },
                             "cpu": {
                                 "architecture": string,
@@ -127,12 +129,36 @@ class Collect:
         kernel_info = re.search(r'[\d\.]+-[\d\.]+[\d]', self.get_current_kernel_version())
 
         res = {
+            'os_arch': platform.machine(),
+            'os_name': self.get_os_name(),
             'os_version': self.get_os_version(),
             'bios_version': self.__get_bios_version(),
             'kernel': kernel_info.group() if kernel_info else "",
         }
         return res
 
+    @staticmethod
+    def get_os_name() -> str:
+        """
+        get os name
+
+        Returns:
+            str
+        """
+        os_release_path = "/etc/os-release"
+        name_value = None
+
+        try:
+            with open(os_release_path, "r") as file:
+                for line in file:
+                    if line.startswith("NAME="):
+                        name_value = line.strip().split("=")[1].strip('"')
+                        break
+        except OSError:
+            LOGGER.error(f"Error reading {os_release_path}: {e}")
+
+        return name_value
+
     @staticmethod
     def __get_bios_version() -> str:
         """
-- 
Gitee