From a39705afd7ecea778a3be130b6ad5b9f1d770c53 Mon Sep 17 00:00:00 2001
From: chenmozhijin <110812055+chenmozhijin@users.noreply.github.com>
Date: Tue, 17 Sep 2024 01:58:33 +0800
Subject: [PATCH] update

---
 build_helper/utils/network.py | 15 +++++++--------
 build_helper/utils/repo.py    |  7 ++++++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build_helper/utils/network.py b/build_helper/utils/network.py
index 53860b3b..409ebbff 100644
--- a/build_helper/utils/network.py
+++ b/build_helper/utils/network.py
@@ -4,7 +4,7 @@
 
 import requests
 from pySmartDL import SmartDL
-
+import urllib.error
 from .logger import logger
 
 HEADER = {
@@ -46,24 +46,23 @@ def dl2(url: str, path: str, retry: int = 6, headers: dict | None = None) -> Sma
 def wait_dl_tasks(dl_tasks: list[SmartDL]) -> None:
     for task in dl_tasks:
         task.wait()
-        while not task.isSuccessful() or task.attemps_limit < task.current_attemp:
-            logger.warning("下载: %s 失败，重试第%s/%s次...", task.url, task.current_attemp, task.attemps_limit)
-            task.retry()
-            task.wait()
         if task.isSuccessful():
             logger.info("下载: %s 成功", task.url)
         else:
             logger.error("下载: %s 失败", task.url)
+            raise task.errors[-1]
     dl_tasks.clear()
 
 def get_gh_repo_last_releases(repo: str, token: str | None = None) -> dict | None:
     return gh_api_request(f"https://api.github.com/repos/{repo}/releases/latest", token)
 
 def gh_api_request(url: str, token: str | None = None) -> dict | None:
-    headers = {"Accept": "application/vnd.github+json",
-               "X-GitHub-Api-Version": "2022-11-28"}
+    headers = {
+                "Accept": "application/vnd.github+json",
+                "X-GitHub-Api-Version": "2022-11-28",
+                }
     if token:
-        headers["Authorization"] = f'Bearer {token}'
+        headers["Authorization"] = f'token {token}'
     response = request_get(url, headers=headers)
     if isinstance(response, str):
         obj = json.loads(response)
diff --git a/build_helper/utils/repo.py b/build_helper/utils/repo.py
index 071ab09e..8a7eccae 100644
--- a/build_helper/utils/repo.py
+++ b/build_helper/utils/repo.py
@@ -37,7 +37,12 @@ def dl_artifact(name: str, path: str) -> str:
     if not token:
         msg = "没有可用的token"
         raise KeyError(msg)
-    dl = dl2(dl_url, path, headers={"Authorization": f"Bearer {token}"})
+    headers = {
+                "Accept": "application/vnd.github+json",
+                "X-GitHub-Api-Version": "2022-11-28",
+                "Authorization": f'token {token}',
+            }
+    dl = dl2(dl_url, path, headers=headers)
     wait_dl_tasks([dl])
     return dl.get_dest()