Merge branch 'master' of http://git.choozmo.com:3000/choozmo/AI_Anchor_2

OpenshotService/openshot_video_generator.py

@@ -91,9 +91,13 @@ def myunichchar(unicode_char):
         return unicode_char
 
 def get_url_type(url):
+    print('---------------------------------------------')
+    print(url)
     req = urllib.request.Request(url, method='HEAD', headers={'User-Agent': 'Mozilla/5.0'})
     r = urllib.request.urlopen(req)
     contentType = r.getheader('Content-Type')
+    print(contentType)
+    print('-------------------------------------------------')
     return contentType
     
 def make_dir(name_hash):

api/main.py

@@ -61,6 +61,7 @@ ALGORITHM = "HS256"
 ACCESS_TOKEN_EXPIRE_DAYS = 5
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
+
 app.mount("/static", StaticFiles(directory="static"), name="static")
 app.mount("/static/img", StaticFiles(directory="static/img"), name="static/img")
 app.mount("/templates", StaticFiles(directory="templates"), name="templates")
@@ -405,8 +406,8 @@ async def make_anchor_video_eng(req:models.request_eng):
     x.start()
     return {"msg":"ok"} 
 
-@app.get("/history_input")
-async def history_input(request: Request, Authorize: AuthJWT = Depends()):
+@app.get("/history_input_old")
+async def history_input_old(request: Request, Authorize: AuthJWT = Depends()):
     Authorize.jwt_required()
     current_user = Authorize.get_jwt_subject()
 
@@ -420,6 +421,22 @@ async def history_input(request: Request, Authorize: AuthJWT = Depends()):
     return logs
 
 
+@app.get("/history_input")
+async def history_input(token: str = Depends(oauth2_scheme)):
+    Authorize.jwt_required()
+    current_user = Authorize.get_jwt_subject()
+
+    db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
+    user_id = get_user_id(token)
+    user_obj = first(db.query('SELECT * FROM users where id ="'+str(user_id)+'"'))
+    statement = 'SELECT * FROM history_input WHERE user_id="'+str(user_id)+'" ORDER BY timestamp DESC LIMIT 50'
+
+    logs = []
+    for row in db.query(statement):
+        logs.append({'id':row['id'],'name':row['name'],'text_content':row['text_content'].split(','),'link':row['link'],'image_urls':row['image_urls'].split(',')})
+    return logs
+
+
 
 @AuthJWT.load_config
 def get_config():

api/static/script_util.js

@@ -292,7 +292,7 @@ var loaded_data = ''
 function openNav() {
   document.getElementById("mySidenav").style.width = "250px";
   document.querySelector('.loader').style.display = "block";
-  $.get("/history_input", function (data, status) {
+  $.get("/history_input_old", function (data, status) {
     console.log(data)
     loaded_data = data
     for (var obj of data) {