添加上传构件到Artifacts的步骤，优化更新状态检查逻辑，重构配置读取功能

Author: wjz304

.github/workflows/ci.yml

@@ -46,6 +46,12 @@ jobs:
               -w /spksrc/spk/rr-manager \
               ghcr.io/synocommunity/spksrc \
               make arch-${{ matrix.target }}
+      - name: Upload to Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: packages-${{ matrix.target }}
+          path: |
+            packages/*.spk
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
@@ -57,4 +63,4 @@ jobs:
         with:
           path: |
             /home/runner/work/spksrc/distrib
-          key: ${{ steps.cache-primes-restore.outputs.cache-primary-key }}
+          key: ${{ steps.cache-primes-restore.outputs.cache-primary-key }}

src/scripts/checkUpdateStatus.cgi

@@ -43,20 +43,25 @@ if __name__ == "__main__":
         rr_manager_config = read_rrmanager_config(
             "/var/packages/rr-manager/target/app/config.txt"
         )
-        filename = rr_manager_config.get("RR_UPDATE_PROGRESS_FILE")
+        RR_TMP_DIR = rr_manager_config.get("RR_TMP_DIR")
+        RR_UPDATE_PROGRESS_FILE = rr_manager_config.get("RR_UPDATE_PROGRESS_FILE")
 
-        if filename:
+        if RR_TMP_DIR and RR_UPDATE_PROGRESS_FILE:
             # Construct file path
-            file_path = os.path.join("/tmp", filename)
+            file_path = os.path.join("/", RR_TMP_DIR, RR_UPDATE_PROGRESS_FILE)
 
             if os.path.abspath(file_path).startswith("/tmp/"):
                 try:
-                    with open(file_path, "r") as file:
-                        content = file.read()
-                        # Attempt to parse the content as JSON
-                        parsed_content = json.loads(content)
-                        # Success, set the result
-                        response["result"] = parsed_content
+                    if os.path.exists(file_path):
+                        with open(file_path, "r") as file:
+                            content = file.read()
+                            # Attempt to parse the content as JSON
+                            parsed_content = json.loads(content)
+                            # Success, set the result
+                            response["result"] = parsed_content
+                            response["success"] = True
+                    else:
+                        response["result"] = '{"progress": "--", "progressmsg": "--"}'
                         response["success"] = True
                 except json.JSONDecodeError:
                     response["status"] = "File content is not valid JSON."

src/scripts/runRrUpdate.cgi

@@ -25,6 +25,22 @@ def call_mount_loader_script(action):
     )
 
 
+def read_config(file_path):
+    try:
+        config = {}
+        with open(file_path, "r") as file:
+            for line in file:
+                line = line.strip()
+                if line and not line.startswith("#"):
+                    key, value = line.split("=")
+                    config[key.strip()] = value.strip()
+        return config
+    except IOError as e:
+        return f"Error reading user-config.yml: {e}"
+    except e:
+        return "{}"
+
+
 def rmove_file(path, default=None):
     try:
         if os.path.exists("/usr/sbin/rrmdo"):
@@ -81,8 +97,11 @@ if __name__ == "__main__":
                 if not file_update:
                     raise Exception("file is empty")
 
+                rr_manager_config = read_config("/var/packages/rr-manager/target/app/config.txt")
+                RR_TMP_DIR = rr_manager_config.get("RR_TMP_DIR")
+                RR_UPDATE_PROGRESS_FILE = rr_manager_config.get("RR_UPDATE_PROGRESS_FILE")
                 # 删除文件
-                file_progress = "/tmp/rr_update_progress"
+                file_progress = os.path.join("/", RR_TMP_DIR, RR_UPDATE_PROGRESS_FILE)
                 rmove_file(file_progress)
                 # call_mount_loader_script("mountLoaderDisk")
                 updateRR(file_update, file_progress)