From 0426c51ddc0886d99b6f9db66d40a3638221f707 Mon Sep 17 00:00:00 2001 From: an-lee Date: Wed, 10 Jan 2024 15:44:09 +0800 Subject: [PATCH] update yarnrc to fix electron-forge package issue --- .yarnrc.yml | 1 + enjoy/src/main/ffmpeg.ts | 7 ++++++- enjoy/src/main/whisper.ts | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index f03163f4..f3ee3c4f 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,3 +1,4 @@ nodeLinker: node-modules +nmHoistingLimits: workspaces yarnPath: .yarn/releases/yarn-4.0.2.cjs diff --git a/enjoy/src/main/ffmpeg.ts b/enjoy/src/main/ffmpeg.ts index 48069931..9837e3eb 100644 --- a/enjoy/src/main/ffmpeg.ts +++ b/enjoy/src/main/ffmpeg.ts @@ -7,7 +7,7 @@ import fs from "fs-extra"; import AdmZip from "adm-zip"; import downloader from "@main/downloader"; -const logger = log.scope("FFMPEG"); +const logger = log.scope("ffmepg"); export default class FfmpegWrapper { public ffmpeg: Ffmpeg.FfmpegCommand; @@ -31,6 +31,10 @@ export default class FfmpegWrapper { .on("start", (commandLine) => { logger.info("Spawned FFmpeg with command: " + commandLine); }) + .on("error", (err) => { + logger.error(err); + reject(err); + }) .ffprobe((err, metadata) => { if (err) { logger.error(err); @@ -121,6 +125,7 @@ export default class FfmpegWrapper { resolve(output); }) .on("error", (err: Error) => { + logger.error(err); reject(err); }) .save(output); diff --git a/enjoy/src/main/whisper.ts b/enjoy/src/main/whisper.ts index 84413669..b6dd820b 100644 --- a/enjoy/src/main/whisper.ts +++ b/enjoy/src/main/whisper.ts @@ -9,7 +9,7 @@ import { exec } from "child_process"; import fs from "fs-extra"; import log from "electron-log/main"; -const logger = log.scope("WHISPER"); +const logger = log.scope("whisper"); const MAGIC_TOKENS = ["Mrs.", "Ms.", "Mr.", "Dr.", "Prof.", "St."]; const END_OF_WORD_REGEX = /[^\.!,\?][\.!\?]/g; class Whipser {