trial test

OpenshotService/openshot_video_generator.py

@@ -863,7 +863,7 @@ def anchor_video_v2(name_hash,name,text_content, image_urls,multiLang,avatar,fre
     title_clip = video_photo_clip(vid=title, layer=4,location_x=-0.047, location_y=0.801,position=0,end=head_duration+main_timer)
     t.AddClip(title_clip)
 
-    if freeTrial:
+    if freeTrial==1:
         wm = openshot.QtImageReader(dir_video+"freeTrialWatermark.png")
         wm.Open()     
         wm = video_photo_clip(wm,layer=6,position=int(head_duration+main_timer+ED_duration),end=left_time)
@@ -1012,7 +1012,7 @@ def anchor_video_eng(name_hash,name,text_content, image_urls,sub_titles,avatar,f
     title_clip = video_photo_clip(vid=title, layer=4,location_x=-0.047, location_y=0.801,position=0,end=head_duration+main_timer)
     t.AddClip(title_clip)
 
-    if freeTrial:
+    if freeTrial==1:
         wm = openshot.QtImageReader(dir_video+"freeTrialWatermark.png")
         wm.Open()     
         wm = video_photo_clip(wm,layer=6,position=0,end=int(head_duration+main_timer+ED_duration))

api/main.py

@@ -492,7 +492,10 @@ async def make_anchor_video_gSlide(req:util.models.gSlide_req,token: str = Depen
     proto_req.avatar = req.avatar
     proto_req.multiLang = req.multiLang
     video_id = save_history(proto_req,name_hash,user_id)
-    freeTrial = 6 in util.user.get_user_role_list(user_id)
+    freeTrial = 0
+    if 6 in util.user.get_user_role_list(user_id):
+        freeTrial = 1
+    print(freeTrial)
     x = threading.Thread(target=gen_video_queue, args=(name_hash,name, text_content, image_urls,int(req.avatar),req.multiLang,video_id,user_id,freeTrial))
     x.start()
     return {"msg":"ok"} 
@@ -564,7 +567,10 @@ async def make_anchor_video(req:util.models.request,token: str = Depends(oauth2_
             return {'msg':{'eng':req.imgurl+'cant be proccessed','zh':"無法辨別圖片網址"+req.imgurl}}
     user_id = get_user_id(token)
     video_id = save_history(req,name_hash,user_id)
-    freeTrial = 6 in util.user.get_user_role_list(user_id)
+    freeTrial = 0
+    if 6 in util.user.get_user_role_list(user_id):
+        freeTrial = 1
+    print(freeTrial)
     x = threading.Thread(target=gen_video_queue, args=(name_hash,req.name, req.text_content, req.image_urls,int(req.avatar),req.multiLang,video_id,user_id,freeTrial))
     x.start()
      
@@ -602,7 +608,10 @@ async def make_anchor_video_noAuth(req:util.models.request):
             return {'msg':{'eng':req.imgurl+'cant be proccessed','zh':"無法辨別圖片網址"+req.imgurl}}
     user_id = get_user_id(token)
     video_id = save_history(req,name_hash,user_id)
-    freeTrial = 6 in util.user.get_user_role_list(user_id)
+    freeTrial = 0
+    if 6 in util.user.get_user_role_list(user_id):
+        freeTrial = 1
+    print(freeTrial)
     x = threading.Thread(target=gen_video_queue, args=(name_hash,req.name, req.text_content, req.image_urls,int(req.avatar),req.multiLang,video_id,user_id,freeTrial))
     x.start()
      
@@ -640,7 +649,7 @@ async def make_anchor_video_noAuth2(req:util.models.request):
             return {'msg':{'eng':req.imgurl+'cant be proccessed','zh':"無法辨別圖片網址"+req.imgurl}}
 
     video_id = save_history(req,name_hash,-1)
-    freeTrial = True
+    freeTrial = 0
     x = threading.Thread(target=gen_video_queue, args=(name_hash,req.name, req.text_content, req.image_urls,int(req.avatar),req.multiLang,video_id,-1,freeTrial))
     x.start()
      
@@ -670,7 +679,10 @@ async def make_anchor_video_eng(req:util.models.request_eng,token: str = Depends
             return {'msg':{'eng':req.imgurl+'cant be proccessed','zh':"無法辨別圖片網址"+req.imgurl}}
     user_id = get_user_id(token)
     video_id = save_history(req,name_hash, user_id)
-    freeTrial = 6 in util.user.get_user_role_list(user_id)
+    freeTrial = 0
+    if 6 in util.user.get_user_role_list(user_id):
+        freeTrial = 1
+    print(freeTrial)
     x = threading.Thread(target=gen_video_queue_eng, args=(name_hash,req.name, req.text_content, req.image_urls,req.sub_titles,int(req.avatar),video_id,freeTrial))
     x.start()
      
@@ -700,7 +712,7 @@ async def make_anchor_video_eng(req:util.models.request_eng):
             return {'msg':{'eng':req.imgurl+'cant be proccessed','zh':"無法辨別圖片網址"+req.imgurl}}
  
     video_id = save_history(req,name_hash, -1)
-    freeTrial = True
+    freeTrial = 1
     x = threading.Thread(target=gen_video_queue_eng, args=(name_hash,req.name, req.text_content, req.image_urls,req.sub_titles,int(req.avatar),video_id,freeTrial))
     x.start()
      
@@ -730,7 +742,7 @@ async def make_anchor_video_eng(req:util.models.request_eng):
             return {'msg':{'eng':req.imgurl+'cant be proccessed','zh':"無法辨別圖片網址"+req.imgurl}}
  
     video_id = save_history(req,name_hash, -1)
-    freeTrial = True
+    freeTrial = 1
     x = threading.Thread(target=gen_video_queue_eng, args=(name_hash,req.name, req.text_content, req.image_urls,req.sub_titles,int(req.avatar),video_id,freeTrial))
     x.start()