|
@@ -42,6 +42,7 @@ import traceback
|
|
|
import logging
|
|
|
import gSlide
|
|
|
import aiofiles
|
|
|
+import json
|
|
|
pymysql.install_as_MySQLdb()
|
|
|
|
|
|
app = FastAPI()
|
|
@@ -129,8 +130,8 @@ def protected(request: Request, Authorize: AuthJWT = Depends()):
|
|
|
Authorize.jwt_required()
|
|
|
current_user = Authorize.get_jwt_subject()
|
|
|
user_obj = first(db.query('SELECT * FROM users where username ="'+str(current_user)+'"'))
|
|
|
- video_num = first(db.query('SELECT COUNT(*) FROM history_input WHERE user_id ='+str(user_obj['id'])))
|
|
|
- total_sec = first(db.query('SELECT SUM(duration) FROM history_input where user_id='+str(user_obj['id'])))
|
|
|
+ video_num = first(db.query('SELECT COUNT(*) FROM history_input WHERE user_id ='+str(user_obj['id'])))[1]
|
|
|
+ total_sec = first(db.query('SELECT SUM(duration) FROM history_input where user_id='+str(user_obj['id'])))[1]
|
|
|
left_sec = user_obj['left_time']
|
|
|
|
|
|
video_info_list = []
|
|
@@ -138,7 +139,8 @@ def protected(request: Request, Authorize: AuthJWT = Depends()):
|
|
|
for row in db.query(statement):
|
|
|
video_info_list.append({'id':row['id'],'title':row['name'],'duration':row['duration'],'url':row['url']})
|
|
|
dic_return = {'user_info':{'userName':current_user,'email':user_obj['email'],'video_num':video_num,'total_sec':total_sec,'left_sec':user_obj['left_time']},'video_info':video_info_list}
|
|
|
- return str(dic_return)
|
|
|
+ str_return = json.dumps(dic_return)
|
|
|
+ return str_return
|
|
|
|
|
|
# login & register page
|
|
|
@app.get("/login", response_class=HTMLResponse)
|