From 496305bc58e387eace691e7f509719f3ca3bd54c Mon Sep 17 00:00:00 2001
From: MarkusJoe <markushammered@gmail.com>
Date: Fri, 11 Nov 2022 18:48:02 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E7=BB=9F=E4=B8=80=E4=BA=86=E9=99=A4/?=
 =?UTF-8?q?export/api=E8=BF=94=E5=9B=9E=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=A3=8E=E6=A0=BC=E6=9B=B4=E6=96=B0=E4=B8=BARESTFul=E9=A3=8E?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/view.py | 45 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/api/view.py b/src/api/view.py
index 8622112..4574d82 100644
--- a/src/api/view.py
+++ b/src/api/view.py
@@ -5,25 +5,46 @@
 # @Create Time: 2022/9/2
 # @File Name: view.py
 
+import time
 
 from src.api import api
 from src.db import Database
 from fastapi.responses import FileResponse
+from fastapi.responses import JSONResponse
+
+
+async def _time():
+    return time.time()
 
 
 @api.get('/query/{name}')
 async def query(name: str):
-    times = Database().query(name)[1]
-    return {name: times}
+    data = Database().query(name)
+    response = {
+        'code': 200,
+        'time': await _time(),
+        'data': {
+            'name': data[0],
+            'times': data[1]
+        }
+    }
+    return response
 
 
 @api.get('/query-all/')
 async def query_all(limit: int = 30):
     data = Database().query_all()[:limit]
-    result = {}
+    response = {
+        'code': 200,
+        'time': await _time(),
+        'data': []
+    }
     for i in data:
-        result[i[0]] = i[1]
-    return result
+        response['data'].append({
+            'name': i[0],
+            'times': i[1]
+        })
+    return response
 
 
 @api.get('/export/')
@@ -34,4 +55,16 @@ async def export():
 @api.get('/query-theme/{name}')
 async def query_theme(name: str):
     data = Database().query_image(name)
-    return data
+    response = {
+        'code': 200,
+        'time': await _time(),
+        'data': []
+    }
+    for i in data:
+        response['data'].append({
+            'index': i[0],
+            'image': i[1],
+            'width': i[2],
+            'height': i[3]
+        })
+    return JSONResponse(response)