Merge branch 'LC044:master' into master

This commit is contained in:
STDquantum 2024-01-14 18:28:37 +08:00 committed by GitHub
commit 9acd74d459
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 4 deletions

View File

@ -1,12 +1,15 @@
import os.path import os.path
import subprocess import subprocess
import sys import sys
import traceback
from os import system from os import system
import sqlite3 import sqlite3
import threading import threading
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from pilk import decode from pilk import decode
from app.log import logger
lock = threading.Lock() lock = threading.Lock()
db_path = "./app/Database/Msg/MediaMSG.db" db_path = "./app/Database/Msg/MediaMSG.db"
@ -95,15 +98,17 @@ class MediaMsg:
# system(cmd) # system(cmd)
# 使用subprocess.run()执行命令 # 使用subprocess.run()执行命令
subprocess.run(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) subprocess.run(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
os.remove(silk_path)
os.remove(pcm_path)
except Exception as e: except Exception as e:
print(f"Error: {e}") print(f"Error: {e}")
logger.error(f'语音发送错误\n{traceback.format_exc()}')
cmd = f'''"{os.path.join(os.getcwd(), 'app', 'resources', 'data', 'ffmpeg.exe')}" -loglevel quiet -y -f s16le -i "{pcm_path}" -ar 44100 -ac 1 "{mp3_path}"''' cmd = f'''"{os.path.join(os.getcwd(), 'app', 'resources', 'data', 'ffmpeg.exe')}" -loglevel quiet -y -f s16le -i "{pcm_path}" -ar 44100 -ac 1 "{mp3_path}"'''
# system(cmd) # system(cmd)
# 使用subprocess.run()执行命令 # 使用subprocess.run()执行命令
subprocess.run(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) subprocess.run(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
os.remove(silk_path) finally:
os.remove(pcm_path) print(mp3_path)
print(mp3_path)
return mp3_path return mp3_path
def get_audio_path(self, reserved0, output_path): def get_audio_path(self, reserved0, output_path):

View File

@ -578,7 +578,7 @@ input {
// Sample chat messages (replace this with your actual data) // Sample chat messages (replace this with your actual data)
const chatMessages = [ const chatMessages = [
/*注意看这是分割线*/ /*注意看这是分割线*/
];
function checkEnter(event) { function checkEnter(event) {
if (event.keyCode === 13) { if (event.keyCode === 13) {
gotoPage(); gotoPage();

View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1705163866087" class="icon" viewBox="0 0 1792 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="20689" xmlns:xlink="http://www.w3.org/1999/xlink" width="56" height="32"><path d="M320 192h1152a320 320 0 0 1 0 640H320A320 320 0 0 1 320 192z" fill="#CCCCCC" p-id="20690"></path><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#FFFFFF" p-id="20691"></path></svg>

After

Width:  |  Height:  |  Size: 539 B

View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1705163839362" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15502" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M294.912 245.76C141.312 245.76 18.432 370.688 18.432 522.24 18.432 675.84 143.36 798.72 294.912 798.72h430.08c153.6 2.048 278.528-122.88 278.528-276.48C1003.52 370.688 878.592 245.76 727.04 245.76H294.912z m0 507.904c-126.976 0-231.424-102.4-231.424-231.424 0-126.976 102.4-231.424 231.424-231.424h430.08c126.976 0 231.424 102.4 231.424 231.424 0 126.976-102.4 231.424-231.424 231.424h-430.08z m174.08-231.424c0-94.208-75.776-169.984-169.984-169.984S131.072 430.08 131.072 522.24c0 94.208 75.776 169.984 169.984 169.984s167.936-75.776 167.936-169.984z m0 0" fill="#CCCCCC" p-id="15503"></path></svg>

After

Width:  |  Height:  |  Size: 931 B

View File

@ -0,0 +1,8 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg t="1705163819393" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
p-id="12840" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64">
<path fill="#e1e1e1" d="M699.7 284.2H326.3C200.2 284.2 98 386.4 98 512.4c0 126.1 102.2 228.3 228.3 228.3h373.5c126.1 0 228.3-102.2 228.3-228.3-0.1-126-102.3-228.2-228.4-228.2zM326.3 719.9c-114.6 0-207.5-92.9-207.5-207.5s92.9-207.5 207.5-207.5 207.5 92.9 207.5 207.5c-0.1 114.6-93 207.5-207.5 207.5z" p-id="12841">
</path>
</svg>

After

Width:  |  Height:  |  Size: 669 B

View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1705163901927" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="24319" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M98 512.4c0 126.1 102.2 228.3 228.3 228.3h373.5c126.1 0 228.3-102.2 228.3-228.3 0-126.1-102.2-228.2-228.3-228.2H326.3C200.2 284.2 98 386.4 98 512.4z m394.3 0c0-114.6 92.9-207.5 207.5-207.5s207.5 92.9 207.5 207.5-92.9 207.5-207.5 207.5S492.3 627 492.3 512.4z" p-id="24320"></path></svg>

After

Width:  |  Height:  |  Size: 617 B