修正禁用API的报错,更新了在线演示

AsakuraC · Jul 11, 2022 · f06142e · f06142e
1 parent 759b985
commit f06142e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
 # EXviewer
 
 E站的PWA客户端，于在线浏览，下载以及管理本地画廊。基于React与MaterialUI构建
+
+[在线演示](https://driverlin.github.io/EXviewerUI/)
+
+
 ## 截图
 
 <div style="display: flex;">

diff --git a/server/__main__.py b/server/__main__.py
@@ -173,7 +173,7 @@ async def websocket_endpoint(websocket: WebSocket):
 async def addFavorite(gid: int, token: str, index: int):
     if FAVORITE_DISABLED == "true":
         raise HTTPException(
-            status_code=403, detail="FAVORITE_DISABLED,该API已禁用")
+            status_code=403, detail=makeTrackableException(None, "FAVORITE_DISABLED,该API已禁用"))
     logger.info(f"添加收藏 {gid}_{token} {index}")
     try:
         await aioPa.addFavorite(gid, token, index)
@@ -188,7 +188,7 @@ async def addFavorite(gid: int, token: str, index: int):
 async def rmFavorite(gid: int, token: str):
     if FAVORITE_DISABLED == "true":
         raise HTTPException(
-            status_code=403, detail="FAVORITE_DISABLED,该API已禁用")
+            status_code=403, detail=makeTrackableException(None, "FAVORITE_DISABLED,该API已禁用"))
     logger.info(f"删除收藏 {gid}_{token}")
     try:
         await aioPa.rmFavorite(gid, token)
@@ -203,7 +203,7 @@ async def rmFavorite(gid: int, token: str):
 async def download(gid: int, token: str):
     if DOWNLOAD_DISABLED == "true":
         raise HTTPException(
-            status_code=403, detail="DOWNLOAD_DISABLED,该API已禁用")
+            status_code=403, detail=makeTrackableException(None, "DOWNLOAD_DISABLED,该API已禁用"))
     logger.info(f"添加下载 {gid}_{token}")
     try:
         await aioPa.addDownload([[gid, token]])
@@ -218,7 +218,7 @@ async def download(gid: int, token: str):
 async def delete(gid: int, token: str):
     if DOWNLOAD_DISABLED == "true":
         raise HTTPException(
-            status_code=403, detail="DOWNLOAD_DISABLED,该API已禁用")
+            status_code=403, detail=makeTrackableException(None, "DOWNLOAD_DISABLED,该API已禁用"))
     logger.info(f"请求删除 {gid}_{token}")
     try:
         await aioPa.deleteDownload([[gid, token]])
@@ -233,7 +233,7 @@ async def delete(gid: int, token: str):
 async def continueDownload():
     if DOWNLOAD_DISABLED == "true":
         raise HTTPException(
-            status_code=403, detail="DOWNLOAD_DISABLED,该API已禁用")
+            status_code=403, detail=makeTrackableException(None, "DOWNLOAD_DISABLED,该API已禁用"))
     reDownloadCount = await aioPa.continueDownload()
     return {"msg": f"已开始{reDownloadCount}项下载"}
 
@@ -377,7 +377,7 @@ async def handelUploadZipGallery(ws: WebSocket):
 async def rateGallery(gid: int, token: str, score: float):
     if EH_RATE_DISABLED == "true":
         raise HTTPException(
-            status_code=403, detail="EH_RATE_DISABLED,该API已禁用")
+            status_code=403, detail=makeTrackableException(None, "EH_RATE_DISABLED,该API已禁用"))
     try:
         return await aioPa.rateGallery(gid, token, score)
     except Exception as e:
@@ -390,7 +390,7 @@ async def rateGallery(gid: int, token: str, score: float):
 async def voteComment(gid: int, token: str, commentId: int, vote: int):
     if EH_COMMENT_DISABLED == "true":
         raise HTTPException(
-            status_code=403, detail="EH_COMMENT_DISABLED,该API已禁用")
+            status_code=403, detail=makeTrackableException(None, "EH_COMMENT_DISABLED,该API已禁用"))
     try:
         return await aioPa.voteComment(gid, token, commentId, vote)
     except Exception as e:
@@ -403,7 +403,7 @@ async def voteComment(gid: int, token: str, commentId: int, vote: int):
 async def postComment(comment: commentBody):
     if EH_COMMENT_DISABLED == "true":
         raise HTTPException(
-            status_code=403, detail="EH_COMMENT_DISABLED,该API已禁用")
+            status_code=403, detail=makeTrackableException(None, "EH_COMMENT_DISABLED,该API已禁用"))
     try:
         return await aioPa.postComment(comment)
     except Exception as e:

diff --git a/server/utils/tools.py b/server/utils/tools.py
@@ -33,12 +33,16 @@ def printTrackableException(e):
 
 
 def makeTrackableException(e, appendE):
-    try:
-        exceptions = json.loads(str(e))
-        exceptions.append(str(appendE))
-        return Exception(json.dumps(exceptions))
-    except Exception :
-        return Exception(json.dumps([str(e), str(appendE)]))
+    if e:
+        try:
+            exceptions = json.loads(str(e))
+            exceptions.append(str(appendE))
+            return Exception(json.dumps(exceptions))
+        except Exception :
+            return Exception(json.dumps([str(e), str(appendE)]))
+    else:
+        return Exception(json.dumps([str(appendE)]))
+
 
 printPerformance__log = {}
 printPerformance__lock = threading.Lock()