فهرست منبع

add redirect when registered

ming 3 سال پیش
والد
کامیت
5bcf34f2cd
3فایلهای تغییر یافته به همراه10 افزوده شده و 6 حذف شده
  1. 7 2
      OpenshotService/openshot_video_generator.py
  2. 2 1
      api/main.py
  3. 1 3
      api/templates/index.html

+ 7 - 2
OpenshotService/openshot_video_generator.py

@@ -534,6 +534,7 @@ def video_writer_init(path):
 
 
 def video_gen(name_hash,name,text_content, image_urls,multiLang,avatar):
+    name_hash = 'TESTER'
     file_prepare_long(name, name_hash, text_content,image_urls,multiLang)
     
     for fname in range(len(text_content)):
@@ -692,10 +693,14 @@ def video_gen(name_hash,name,text_content, image_urls,multiLang,avatar):
     f = open(path, 'r')
     print(f.read())
     f.close()
-    os.remove(tmp_video_dir+name_hash+"raw.mp4")
-    os.remove(tmp_video_dir+name_hash+"script.txt")
+    #os.remove(tmp_video_dir+name_hash+"raw.mp4")
+    #os.remove(tmp_video_dir+name_hash+"script.txt")
     print(name+"ALL DONE : www.choozmo.com:8168/"+video_sub_folder+name_hash+"raw.mp4")
 
+    Ctr_Autosub.init()
+    Ctr_Autosub.generate_subtitles(tmp_video_dir+name_hash+".mp4",'zh',listener_progress,output=tmp_video_dir+name_hash+"script.txt",concurrency=DEFAULT_CONCURRENCY,subtitle_file_format=DEFAULT_SUBTITLE_FORMAT)
+
+
 
 def anchor_video_v2(name_hash,name,text_content, image_urls,multiLang,avatar):
     print(os.getcwd())

+ 2 - 1
api/main.py

@@ -202,7 +202,8 @@ async def register_old(request: Request):
     user_obj = first(db.query('SELECT * FROM users where username ="'+str(user.username)+'"'))
     if user_obj == None:
         user_register(user)
-        return templates.TemplateResponse("login.html", {'request': request,"success": True}, status_code=status.HTTP_302_FOUND)
+        return templates.TemplateResponse("make_video.html", {"request": request, "response": response})
+        #return templates.TemplateResponse("login.html", {'request': request,"success": True}, status_code=status.HTTP_302_FOUND)
     else:
         return {'msg':user.username+'重複,請更改'}
 

+ 1 - 3
api/templates/index.html

@@ -45,9 +45,7 @@
                     <li class="nav-item">
                         <a class="nav-link active btn-gocreate text-white" aria-current="page" href="/make_video_slide" set-lan="html:make_slides">SLIDE製作影片</a>                        
                     </li>
-                    <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="/make_video_long" set-lan="html:make_slides">製作長影片</a>                        
-                    </li>
+
                 </ul>
                 
                 <ul class="navbar-nav mb-2 mb-lg-0">