bugfix: sound replace task not success

Author: modstart

electron/aigcserver/EasyServer.ts

@@ -127,9 +127,7 @@ export const EasyServer = function (config: any) {
                     await Files.copy(validQueueFiles[0].pathname, configJson);
                     await Files.deletes(validQueueFiles[0].pathname);
                     this._controllerRunIfNeeded(configJson, option);
-                    return true;
                 }
-                return false;
             };
             let timer = null;
             if (option.timeout > 0) {
@@ -142,8 +140,8 @@ export const EasyServer = function (config: any) {
                         }
                     }
                     this.ServerApi.file.appendText(this.ServerInfo.logFile, "timeout", {isDataPath: true});
-                    if (controllerWatching.resolve) {
-                        controllerWatching.resolve(undefined);
+                    if (controllerWatching.reject) {
+                        controllerWatching.reject(undefined);
                     }
                 }, option.timeout * 1000);
             }
@@ -191,8 +189,9 @@ export const EasyServer = function (config: any) {
                     clearTimeout(timer);
                     controller = null;
                     hasMoreQueue()
-                    if (controllerWatching.reject && !controllerWatching.promiseResolved) {
-                        controllerWatching.reject(undefined);
+                    if (controllerWatching.resolve && !controllerWatching.promiseResolved) {
+                        controllerWatching.promiseResolved = true;
+                        controllerWatching.resolve(undefined);
                     }
                 },
                 error: (_data, code) => {
@@ -202,6 +201,7 @@ export const EasyServer = function (config: any) {
                     controller = null;
                     hasMoreQueue()
                     if (controllerWatching.reject && !controllerWatching.promiseResolved) {
+                        controllerWatching.promiseResolved = true;
                         controllerWatching.reject(undefined);
                     }
                 },

src/components/Server/ServerActionInfoDialog.vue

@@ -16,17 +16,21 @@ const visible = ref(false);
 const show = async () => {
     visible.value = true;
     const serverInfo = await serverStore.serverInfo(props.record);
-    const res = await window.$mapi.server.config(serverInfo);
+    const res = await $mapi.server.config(serverInfo);
     httpUrl.value = res.data?.httpUrl || "";
     content.value = buildServerContent(res.data);
 };
 
 const doOpenHttpUrl = () => {
     if (httpUrl.value) {
-        window.$mapi.app.openExternal(httpUrl.value);
+        $mapi.app.openExternal(httpUrl.value);
     }
 };
 
+const doOpenDir = (path: string) => {
+    $mapi.app.openPath(path);
+};
+
 defineExpose({
     show,
 });
@@ -73,7 +77,8 @@ defineExpose({
                         </div>
                         <div
                             v-if="record.type === EnumServerType.LOCAL_DIR"
-                            class="rounded py-1 px-1 text-xs bg-gray-100"
+                            class="rounded-lg py-1 px-1 text-xs bg-gray-100 cursor-pointer"
+                            @click="doOpenDir(props.record.localPath!)"
                         >
                             {{ props.record.localPath }}
                         </div>
@@ -82,7 +87,7 @@ defineExpose({
                 <div class="flex mb-4">
                     <div class="w-20">{{ $t("功能") }}</div>
                     <div>
-                        <a-tag v-for="label in functionToLabels(record.functions)" class="mr-1">
+                        <a-tag v-for="label in functionToLabels(record.functions)" class="mr-1 rounded-lg">
                             {{ label }}
                         </a-tag>
                     </div>

src/components/Server/ServerAddDialog.vue

@@ -31,6 +31,7 @@ const modelInfo = ref({
     settings: [],
     setting: {},
     isSupport: false,
+    config: {} as Record<string, any>,
 });
 const isImporting = ref(false);
 const logStatus = ref("");
@@ -69,6 +70,7 @@ const emptyModelInfo = () => {
     modelInfo.value.settings = [];
     modelInfo.value.setting = {};
     modelInfo.value.isSupport = false;
+    modelInfo.value.config = {};
     resolvePanel.value?.reset();
 };
 
@@ -87,6 +89,7 @@ const doSubmitLocalDir = async () => {
         localPath: modelInfo.value.path,
         settings: modelInfo.value.settings,
         setting: modelInfo.value.setting,
+        config: modelInfo.value.config,
     } as ServerRecord);
 };
 
@@ -162,6 +165,7 @@ const doSelectLocalDir = async () => {
         modelInfo.value.functions = json.functions || [];
         modelInfo.value.settings = json.settings || {};
         modelInfo.value.setting = json.setting || {};
+        modelInfo.value.config = json;
         modelInfo.value.isSupport = await $mapi.server.isSupport({
             localPath: serverPath,
             name: modelInfo.value.name,

src/components/common/ImagePreviewBox.vue

@@ -24,7 +24,7 @@ const processedUrl = computed(() => {
 });
 
 const currentWidth = computed(() => (isZoomed.value ? props.largeWidth || "100%" : props.width || "10rem"));
-const currentHeight = computed(() => (isZoomed.value ? props.largeHeight || "90vh" : props.height || "10rem"));
+const currentHeight = computed(() => (isZoomed.value ? props.largeHeight || "70vh" : props.height || "10rem"));
 
 const toggleZoom = () => {
     isZoomed.value = !isZoomed.value;

src/components/common/VideoPreviewBox.vue

@@ -23,7 +23,7 @@ const processedUrl = computed(() => {
 });
 
 const currentWidth = computed(() => (isZoomed.value ? props.largeWidth || "100%" : props.width || "20rem"));
-const currentHeight = computed(() => (isZoomed.value ? props.largeHeight || "90vh" : props.height || "12rem"));
+const currentHeight = computed(() => (isZoomed.value ? props.largeHeight || "70vh" : props.height || "12rem"));
 
 const toggleZoom = () => {
     isZoomed.value = !isZoomed.value;
@@ -34,7 +34,7 @@ const toggleZoom = () => {
     <div class="inline-block relative bg-gray-200 p-2 rounded-lg">
         <video :src="processedUrl" :style="{ width: currentWidth, height: currentHeight }"
                controls preload="none"
-               class="object-contain border rounded"/>
+               class="object-contain border rounded bg-black"/>
         <div @click="toggleZoom"
              class="cursor-pointer w-6 h-6 text-center leading-6 absolute top-4 left-4 bg-black bg-opacity-50 text-white rounded hover:bg-opacity-75">
             <icon-zoom-in v-if="!isZoomed"/>

src/lang/en-US.json

@@ -179,6 +179,7 @@
     "0d02bde4": "Upgrade to Pro to enjoy cloud models",
     "0d3fccdb": "Click to copy text",
     "0e6adf4b": "Live streaming knowledge base updated",
+    "0e88e8ae": "连续调用加速已开启",
     "0eed4342": "Task submitted successfully, waiting for video generation to complete",
     "0f921fa0": "Confirm deletion of {count} records?",
     "1058053f": "将长文本内容转换为音频文件",
@@ -393,6 +394,7 @@
     "37f71c6b": "Hardware Requirements",
     "380d81ad": "Please enter recognition text",
     "382747b5": "Confirm Cropping",
+    "388a7d95": "一键优化时间线",
     "38d6305f": "Confirm Submission",
     "38d76226": "Confirm Text",
     "3914e591": "Use Now",
@@ -536,6 +538,7 @@
     "6750687f": "Facial interference detected",
     "67a69ed1": "For example: GPT-3.5",
     "6863573b": "Insufficient user quota",
+    "68e00582": "重新校验文字",
     "6a5462b9": "Please select model to test",
     "6a6f7787": "No downloadable records",
     "6a7ee8a1": "Use CPU",

src/lang/source.json

@@ -22,6 +22,7 @@
     "shou": "0035dafb",
     "{extensions}": "5cfe7472",
     "{title}不能为空": "4707f570",
+    "一键优化时间线": "388a7d95",
     "一键复制不同角色声音": "3297ed40",
     "一键运行": "25b6e62a",
     "上传": "0009c256",
@@ -520,6 +521,7 @@
     "连接中": "02286f86",
     "连接网络设备": "37ce23fb",
     "连接设备": "42ed4ed0",
+    "连续调用加速已开启": "0e88e8ae",
     "退出": "0011c1fa",
     "适配": "0012018b",
     "选择": "0011d400",
@@ -541,6 +543,7 @@
     "重排确认": "43cbe71b",
     "重新加载": "43cf49a0",
     "重新录制": "43d09644",
+    "重新校验文字": "68e00582",
     "重新选择": "43d68cc3",
     "重试任务": "445dccae",
     "重试成功": "44601c37",

src/lang/zh-CN.json

@@ -179,6 +179,7 @@
     "0d02bde4": "升级Pro版，畅享云模型",
     "0d3fccdb": "点击文字复制",
     "0e6adf4b": "直播知识库已更新",
+    "0e88e8ae": "连续调用加速已开启",
     "0eed4342": "任务已经提交成功，等待视频生成完成",
     "0f921fa0": "确定删除 {count} 条记录?",
     "1058053f": "将长文本内容转换为音频文件",
@@ -390,6 +391,7 @@
     "37f71c6b": "硬件要求",
     "380d81ad": "请输入识别文本",
     "382747b5": "确定裁剪",
+    "388a7d95": "一键优化时间线",
     "38d6305f": "确认提交",
     "38d76226": "确认文字",
     "3914e591": "立即使用",
@@ -530,6 +532,7 @@
     "6750687f": "面部有干扰",
     "67a69ed1": "例如 GPT-3.5",
     "6863573b": "用户配额不足",
+    "68e00582": "重新校验文字",
     "6a5462b9": "请选择要检测的模型",
     "6a6f7787": "没有可以下载的记录",
     "6a7ee8a1": "使用CPU",

src/pages/Apps/SoundReplace/components/SoundReplaceItem.vue

@@ -123,7 +123,7 @@ const doCombineConfirm = async () => {
         <div class="mt-3 flex">
             <div class="w-24 flex-shrink-0">
                 <div class="inline-block text-center">
-                    <i class="iconfont icon-video-text"></i>
+                    <icon-ordered-list />
                     {{ $t("重排确认") }}
                 </div>
             </div>

src/pages/Apps/SoundReplace/task.ts

@@ -242,6 +242,7 @@ export const SoundReplace: TaskBiz = {
                 return "success";
             }
             jobResult.CombineConfirm.status = "success";
+            jobResult.step = "End";
             await TaskService.update(bizId, {
                 jobResult,
             });