新增：视频合成增加本地文件选择，便于已有音频文件合成

Author: modstart

changelog.md

@@ -1,5 +1,6 @@
 ## v0.7.0
 
+- 新增：视频合成增加本地文件选择，便于已有音频文件合成
 - 修复：GPU识别显示优化，支持多GPU显示序号和内存大小
 - 修复：文件重命名跨设备异常问题
 - 优化：界面显示优化，部分界面显示错位问题

electron/mapi/db/migration.ts

@@ -85,6 +85,12 @@ const versions = [
             await db.execute(`ALTER TABLE data_video_gen ADD COLUMN result TEXT`);
         }
     },
+    {
+        version:3,
+        up: async (db: DB) => {
+            await db.execute(`ALTER TABLE data_video_gen ADD COLUMN soundCustomFile TEXT`);
+        }
+    },
 ]
 
 export default {

electron/mapi/file/index.ts

@@ -4,7 +4,6 @@ import fs from "node:fs";
 import {StrUtil, TimeUtil} from "../../lib/util";
 import Apps from "../app";
 import {Readable} from "node:stream";
-import {isWin} from "../../lib/env";
 
 const nodePath = path
 
@@ -355,6 +354,47 @@ const copy = async (pathOld: string, pathNew: string, option?: { isFullPath?: bo
     fs.copyFileSync(fullPathOld, fullPathNew)
 }
 
+const hubCreate = async (ext: string = 'bin') => {
+    return path.join(
+        'hub',
+        TimeUtil.replacePattern('{year}'),
+        TimeUtil.replacePattern('{month}'),
+        TimeUtil.replacePattern('{day}'),
+        TimeUtil.replacePattern('{hour}'),
+        [
+            TimeUtil.replacePattern('{minute}'),
+            TimeUtil.replacePattern('{second}'),
+            StrUtil.randomString(10),
+        ].join('_') + `.${ext}`
+    )
+}
+
+const hubSave = async (file: string, option?: {
+    isFullPath?: boolean,
+    returnFullPath?: boolean,
+}) => {
+    option = Object.assign({
+        isFullPath: false,
+        returnFullPath: false,
+    }, option)
+    let fp = file
+    if (!option.isFullPath) {
+        fp = await fullPath(file)
+    }
+    if (!fs.existsSync(fp)) {
+        throw `FileNotFound ${fp}`
+    }
+    const fileExt = ext(fp)
+    const hubFile = await hubCreate(fileExt)
+    await copy(fp, path.join(root(), hubFile), {
+        isFullPath: true,
+    })
+    if (option.returnFullPath) {
+        return path.join(root(), hubFile)
+    }
+    return hubFile
+}
+
 const tempRoot = async () => {
     await waitAppEnvReady()
     const tempDir = path.join(AppEnv.userData, 'temp')
@@ -594,6 +634,7 @@ export const FileIndex = {
     appendText,
     download,
     ext,
+    hubSave,
 }
 
 export default FileIndex

src/components/Video/VideoGenCreate.vue

@@ -26,6 +26,7 @@ const formData = ref({
     soundType: 'soundTts',
     soundTtsId: 0,
     soundCloneId: 0,
+    soundCustomFile: '',
     param: {},
 });
 const formDataParam = ref([])
@@ -81,6 +82,7 @@ const doSubmit = async () => {
     }
     let soundTtsRecord: SoundTtsRecord | null = null
     let soundCloneRecord: SoundCloneRecord | null = null
+    let soundCustomFile: string | null = null
     if (formData.value.soundType === 'soundTts') {
         if (!formData.value.soundTtsId) {
             Dialog.tipError(t('请选择声音'))
@@ -101,6 +103,16 @@ const doSubmit = async () => {
             Dialog.tipError(t('请选择声音'))
             return
         }
+    } else if (formData.value.soundType === 'soundCustom') {
+        soundCustomFile = formData.value.soundCustomFile
+        if (!soundCustomFile) {
+            Dialog.tipError(t('请选择声音'))
+            return
+        }
+        soundCustomFile = await window.$mapi.file.hubSave(soundCustomFile, {
+            isFullPath: true,
+            returnFullPath: true,
+        })
     }
     if (!formData.value.videoTemplateId) {
         Dialog.tipError(t('请选择视频'))
@@ -131,6 +143,7 @@ const doSubmit = async () => {
         soundTtsText: soundTtsRecord ? soundTtsRecord.text : '',
         soundCloneId: formData.value.soundCloneId,
         soundCloneText: soundCloneRecord ? soundCloneRecord.text : '',
+        soundCustomFile: soundCustomFile || '',
         param: formData.value.param,
     }
     if (!await PermissionService.checkForTask('VideoGen', record)) {
@@ -147,6 +160,22 @@ const refresh = async (type: 'videoTemplate') => {
     }
 }
 
+const doSoundCustomSelect = async () => {
+    const path = await window.$mapi.file.openFile({
+        filters: [
+            {name: '*.wav', extensions: ['wav']},
+        ],
+    })
+    if (!path) {
+        return
+    }
+    formData.value.soundCustomFile = path
+}
+
+const fileName = (fullPath: string) => {
+    return fullPath.replace(/\\/g, '/').split('/').pop() || ''
+}
+
 const emit = defineEmits({
     submitted: () => true
 })
@@ -187,13 +216,12 @@ defineExpose({
                         <i class="iconfont icon-sound-clone"></i>
                         {{ $t('声音克隆') }}
                     </a-radio>
+                    <a-radio value="soundCustom">
+                        <icon-file/>
+                        {{ $t('本地文件') }}
+                    </a-radio>
                 </a-radio-group>
             </div>
-            <div class="mr-1" v-if="formData.soundType==='soundTts'">
-                <a-tooltip :content="$t('声音合成')">
-                    <i class="iconfont icon-sound-generate"></i>
-                </a-tooltip>
-            </div>
             <div class="mr-3 w-56 flex-shrink-0" v-if="formData.soundType==='soundTts'">
                 <a-select v-model="formData.soundTtsId">
                     <a-option :value="0">{{ $t('请选择') }}</a-option>
@@ -204,11 +232,6 @@ defineExpose({
                     </a-option>
                 </a-select>
             </div>
-            <div class="mr-1" v-if="formData.soundType==='soundClone'">
-                <a-tooltip :content="$t('声音克隆')">
-                    <i class="iconfont icon-sound-clone"></i>
-                </a-tooltip>
-            </div>
             <div class="mr-3 w-56 flex-shrink-0" v-if="formData.soundType==='soundClone'">
                 <a-select v-model="formData.soundCloneId">
                     <a-option :value="0">{{ $t('请选择') }}</a-option>
@@ -219,6 +242,14 @@ defineExpose({
                     </a-option>
                 </a-select>
             </div>
+            <div class="mr-3 w-56 flex-shrink-0" v-if="formData.soundType==='soundCustom'">
+                <a-button @click="doSoundCustomSelect">
+                    <div v-if="formData.soundCustomFile">
+                        {{ fileName(formData.soundCustomFile) }}
+                    </div>
+                    <div v-else>{{ $t('选择本地文件') }}</div>
+                </a-button>
+            </div>
         </div>
         <div class="flex items-center h-12">
             <div class="mr-1">
@@ -245,7 +276,7 @@ defineExpose({
             <a-button class="mr-2" type="primary" @click="doSubmit">
                 {{ $t('开始生成视频') }}
             </a-button>
-            <ServerContentInfoAction :config="modelConfig as any" func="videoGen" />
+            <ServerContentInfoAction :config="modelConfig as any" func="videoGen"/>
         </div>
     </div>
 </template>

src/declarations/type.d.ts

@@ -151,6 +151,7 @@ declare interface Window {
             openDirectory: (options: {} = {}) => Promise<any>,
             openSave: (options: {} = {}) => Promise<any>,
             openPath: (path: string, options: {} = {}) => Promise<void>,
+            hubSave: (file: string, option?: { isFullPath?: boolean, returnFullPath?: boolean, }) => Promise<string>,
         },
         updater: {
             checkForUpdate: () => Promise<ApiResult<any>>,

src/lang/en-US.json

@@ -92,6 +92,7 @@
     "041b5a9a": "GPU Mode",
     "04f71f68": "Server",
     "075e53bc": "Cloud model",
+    "08a62bfe": "Please select video",
     "08ac1686": "Please select sound",
     "09e64baa": "Started at {time}",
     "0b2004f2": "Are you sure you want to exit the software?",
@@ -152,6 +153,7 @@
     "301d8708": "Service Port",
     "302416b0": "No Logs Available",
     "3034d991": "Coming soon",
+    "303a1ed3": "Local file",
     "303ab60e": "Local Model",
     "31450307": "Check for Updates",
     "3188fe53": "New version available",
@@ -230,6 +232,7 @@
     "65bc9692": "Select a voice file",
     "6a7ee8a1": "Use CPU",
     "6b5abd5b": "Please upgrade to the pro version",
+    "6b41f2d3": "Select local file",
     "6c9b6559": "Select Model File",
     "6e81e205": "Auto-detect updates",
     "6fdfdfff": "Add cloud model service",

src/lang/source.json

@@ -115,6 +115,7 @@
     "未检测到录音设备": "0cc262e2",
     "未登录": "0191fce4",
     "本产品为开源软件，遵循 AGPL-3.0 license 协议。": "1bb341a5",
+    "本地文件": "303a1ed3",
     "本地模型": "303ab60e",
     "本地模型目录": "0c7430b5",
     "标识": "000d249f",
@@ -196,6 +197,7 @@
     "请选择": "021f3e37",
     "请选择声音": "08ac1686",
     "请选择声音角色": "720a177b",
+    "请选择视频": "08a62bfe",
     "跟随系统": "42c281d4",
     "跨语种": "02261f68",
     "软件不满足模型版本要求": "218fecc1",
@@ -210,6 +212,7 @@
     "适配": "0012018b",
     "选择声音文件": "65bc9692",
     "选择声音角色": "65baa0c4",
+    "选择本地文件": "6b41f2d3",
     "选择本地模型": "26d1d59f",
     "选择模型": "42fa058a",
     "选择视频文件": "7bf1ff1a",

src/lang/zh-CN.json

@@ -92,6 +92,7 @@
     "041b5a9a": "GPU模式",
     "04f71f68": "服务",
     "075e53bc": "云端模型服务",
+    "08a62bfe": "请选择视频",
     "08ac1686": "请选择声音",
     "09e64baa": "已启动 {time}",
     "0b2004f2": "确定退出软件？",
@@ -149,6 +150,7 @@
     "301d8708": "服务端口",
     "302416b0": "暂无日志",
     "3034d991": "敬请期待",
+    "303a1ed3": "本地文件",
     "303ab60e": "本地模型",
     "31450307": "检测更新",
     "3188fe53": "新版本可用",
@@ -225,6 +227,7 @@
     "65baa0c4": "选择声音角色",
     "65bc9692": "选择声音文件",
     "6a7ee8a1": "使用CPU",
+    "6b41f2d3": "选择本地文件",
     "6b5abd5b": "请升级Pro版使用",
     "6e81e205": "自动检测更新",
     "6fdfdfff": "添加云端模型服务",

src/pages/Video/VideoGen.vue

@@ -11,6 +11,7 @@ import VideoGenActionDelete from "../../components/Video/VideoGenActionDelete.vu
 import VideoPlayer from "../../components/common/VideoPlayer.vue";
 import VideoDuration from "../../components/Video/VideoDuration.vue";
 import ServerTaskResultParam from "../../components/Server/ServerTaskResultParam.vue";
+import AudioPlayer from "../../components/common/AudioPlayer.vue";
 
 const videoTemplateDialog = ref<InstanceType<typeof VideoTemplateDialog> | null>(null)
 const videoGenCreate = ref<InstanceType<typeof VideoGenCreate> | null>(null)
@@ -118,10 +119,19 @@ onBeforeUnmount(() => {
                                         {{ r.soundCloneText }}
                                     </div>
                                 </div>
+                                <div v-if="r.soundType==='soundCustom'" class="flex items-start">
+                                    <div class="bg-gray-100 px-3 py-1 leading-6 rounded mr-2">
+                                        <icon-file/>
+                                        {{ $t('本地文件') }}
+                                    </div>
+                                    <div class="flex-grow">
+                                        <AudioPlayer :url="`file://${r.soundCustomFile}`" />
+                                    </div>
+                                </div>
                             </div>
                             <div class="flex-shrink-0 ml-8">
-                                <div class="p-2 rounded shadow bg-gray-300" v-if="r.resultMp4">
-                                    <div class="w-48 h-48" v-if="r.resultMp4">
+                                <div class="p-2 rounded shadow bg-gray-300" v-if="1||r.resultMp4">
+                                    <div class="w-48 h-48" v-if="1||r.resultMp4">
                                         <VideoPlayer :url="'file://'+r.resultMp4"/>
                                     </div>
                                 </div>

src/service/VideoGenService.ts

@@ -17,6 +17,7 @@ export type VideoGenRecord = {
     soundTtsText: string;
     soundCloneId: number;
     soundCloneText: string;
+    soundCustomFile: string;
 
     param?: any;
 
@@ -97,7 +98,7 @@ export const VideoGenService = {
         const fields = [
             'serverName', 'serverTitle', 'serverVersion',
             'videoTemplateId', 'videoTemplateName',
-            'soundType', 'soundTtsId', 'soundTtsText', 'soundCloneId', 'soundCloneText',
+            'soundType', 'soundTtsId', 'soundTtsText', 'soundCloneId', 'soundCloneText', 'soundCustomFile',
             'param',
             'status', 'statusMsg', 'startTime', 'endTime',
         ]
@@ -132,6 +133,11 @@ export const VideoGenService = {
             const resultMp4Abs = window.$mapi.file.absolutePath(record.resultMp4)
             await window.$mapi.file.deletes(resultMp4Abs)
         }
+        if (record.soundCustomFile) {
+            await window.$mapi.file.deletes(record.soundCustomFile, {
+                isFullPath: true
+            })
+        }
         await window.$mapi.db.delete(`DELETE
                                       FROM ${this.tableName()}
                                       WHERE id = ?`, [record.id])