Startsida Utforska Hjälp
Registrera dig Logga in
choozmo
/
AI_Anchor
2
0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Bläddra i källkod

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

aaron-1015 3 år sedan
förälder
c42ae9d6fe 73a370d9b6
incheckning
cbd3e08c98
4 ändrade filer med 25 tillägg och 27 borttagningar
Delad Vy Visa Diff Statistik
  1. 6 6
      OpenshotService/openshot_video_generator.py
  2. 0 1
      api/main.py
  3. 1 1
      api/static/script_util.js
  4. 18 19
      api/templates/index.html

+ 6 - 6
OpenshotService/openshot_video_generator.py
Visa fil 

@@ -157,7 +157,7 @@ def file_prepare(name, name_hash,text_content,image_urls,lang='zh'):
 
     language = 'zh-tw'
 
     txt_idx = 0
 
     for txt in text_content:
 
-        if lang==1:
 
+        if lang!='zh':
 
             tts = gTTS(txt)
 
             tts.save(dir_sound+name_hash+"/"+str(txt_idx)+".mp3")
 
         else:
 
@@ -167,14 +167,14 @@ def file_prepare(name, name_hash,text_content,image_urls,lang='zh'):
 
     print("mp3 file made")
 
     #make title as image
 
     txt2image_title(name, dir_title+name_hash+".png",lang)
 
-
 
+    
 def txt2image(content, save_target,lang='zh'):
 
     unicode_text = trim_punctuation(content)
 
     font = ''
 
     if lang=='zh':
 
         font = ImageFont.truetype(font="font/DFT_B7.ttc", size=38)
 
     else :
 
-        font = ImageFont.load("arial.pil")
 
+        font = ImageFont.truetype(font="font/arial.ttf", size=38)
 
     text_width, text_height = font.getsize(unicode_text)
 
     canvas = Image.new('RGBA', (700, 500), (255, 0, 0, 0) )
 
     draw = ImageDraw.Draw(canvas)
 
@@ -186,9 +186,9 @@ def txt2image_title(content, save_target, lang='zh'):
 
     unicode_text = trim_punctuation(content)
 
     font = ''
 
     if lang=='zh':
 
-        font = ImageFont.truetype(font="font/DFT_B7.ttc", size=38)
 
+        font = ImageFont.truetype(font="font/DFT_B7.ttc", size=22)
 
     else :
 
-        font = ImageFont.load("arial.pil")
 
+        font = ImageFont.truetype(font="font/arial.ttf", size=22)
 
     text_width, text_height = font.getsize(unicode_text)
 
     canvas = Image.new('RGBA', (510, 500), (255, 0, 0, 0) )
 
     draw = ImageDraw.Draw(canvas)
 
@@ -276,7 +276,7 @@ def anchor_video_v2(name_hash,name,text_content, image_urls,avatar):
 
     """ 影片產生主程式。 """
 
     print(os.getcwd())
 
     print('sub image made')
 
-    file_prepare(name, name_hash, text_content,image_urls,0)
 
+    file_prepare(name, name_hash, text_content,image_urls)
 
     sub_list=generate_subtitle_image(name_hash,text_content)
 
     
     for fname in range(len(text_content)):

+ 0 - 1
api/main.py
Visa fil 

@@ -36,7 +36,6 @@ from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
 
 import models
 
 import pymysql
 
 from first import first
 
-from mail import mail_to_users
 
 pymysql.install_as_MySQLdb()
 
 
 app = FastAPI()

+ 1 - 1
api/static/script_util.js
Visa fil 

@@ -108,7 +108,7 @@ $(".next").click(function () {
 
   xhr.open("POST", "http://192.168.1.106:8007/make_anchor_video");
 
   xhr.setRequestHeader("accept", "application/json");
 
   xhr.setRequestHeader("Authorization","Bearer "+jwt_token)
 
-  xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
 
+  xhr.setRequestHeader("Content-Type", "application/json");
 
   xhr.onreadystatechange = function () {
 
     if (xhr.readyState === 4) {
 
       Swal.fire({

+ 18 - 19
api/templates/index.html
Visa fil 

@@ -4,25 +4,23 @@
 
 <head>
 
     {% block head %}
 
     <meta charset="UTF-8">
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js"
 
-        integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM"
 
-        crossorigin="anonymous"></script>
 
-        <title>AI spokes girl</title>
 
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/meyer-reset/2.0/reset.min.css">
 
-        <link rel="stylesheet"
 
-          href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt"
 
-          crossorigin="anonymous">
 
-          <link rel="preconnect" href="https://fonts.googleapis.com">
 
-          <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 
-          <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap" rel="stylesheet"> 
-        <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
 
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/sweetalert2@11.0.18/dist/sweetalert2.min.css">
 
-        <link rel="stylesheet" href="static/owl.carousel.min.css">
 
-        <link rel="stylesheet" href="static/owl.theme.default.min.css">
 
-        <link rel="stylesheet" href="static/style.css">
 
-        <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
 
+    <title>AI ANCHOR GO</title>
 
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/meyer-reset/2.0/reset.min.css">
 
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp"
 
+      crossorigin="anonymous">
 
+    <link rel="stylesheet"
 
+      href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt"
 
+      crossorigin="anonymous">
 
+      <link rel="preconnect" href="https://fonts.googleapis.com">
 
+      <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 
+      <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap" rel="stylesheet"> 
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
 
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/sweetalert2@11.0.18/dist/sweetalert2.min.css">
 
+    <link rel="stylesheet" href="static/owl.carousel.min.css">
 
+    <link rel="stylesheet" href="static/owl.theme.default.min.css">
 
+    <link rel="stylesheet" href="static/style.css">
 
+    <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
 
     <!-- <title>Login</title> -->
 
     <title>{% block title %}{% endblock %} - My Webpage</title>
 
     {% endblock %}
 
@@ -82,6 +80,7 @@
 
         {% endblock %}
 
     </footer>
 
     <!-- ================================================================= -->
 
+  
     <script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js'></script>
 
     <script src='https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js'></script>
 
     <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.2/dist/umd/popper.min.js" integrity="sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p" crossorigin="anonymous"></script>
 
@@ -89,8 +88,8 @@
 
     <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.0.18/dist/sweetalert2.all.min.js"></script>
 
     <script src="//cdnjs.cloudflare.com/ajax/libs/validate.js/0.13.1/validate.min.js"></script>
 
     <script src="static/owl.carousel.min.js"></script>
 
-    <script src="templates/script_index.js"></script>
 
     <script src="static/script_util.js"></script>
 
+    <script src="templates/script_index.js"></script>
 
 </body>
 
 
 </html>