Merge pull request #230 from entrylabs/develop

version up : 2.1.30

Author: Tnks2U

build/entryx64.nsi

@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "2.1.29"
+!define PRODUCT_VERSION "2.1.30"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

build/entryx86.nsi

@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "2.1.29"
+!define PRODUCT_VERSION "2.1.30"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

package.json

@@ -2,7 +2,7 @@
     "private": true,
     "productName": "Entry",
     "name": "entry",
-    "version": "2.1.29",
+    "version": "2.1.30",
     "description": "Entry for offline",
     "main": "src/main_build/main.bundle.js",
     "scripts": {
@@ -39,8 +39,8 @@
         "async-csv": "^2.1.3",
         "axios": "^0.19.2",
         "cross-spawn": "^7.0.3",
-        "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.68",
-        "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.29",
+        "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.69",
+        "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.30",
         "entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20231026",
         "@entrylabs/legacy-video": "^1.0.0",
         "excel4node": "^1.7.0",

src/main/fileUtils.ts

@@ -8,6 +8,7 @@ import createLogger from './utils/functions/createLogger';
 import ffmpeg from 'fluent-ffmpeg';
 import ffmpegInstaller from '@ffmpeg-installer/ffmpeg';
 import ffprobeInstaller from '@ffprobe-installer/ffprobe';
+import Constants from './constants';
 import get from 'lodash/get';
 
 type tarCreateOption = FileOptions & CreateOptions;
@@ -306,6 +307,23 @@ export default class {
             });
         });
 
+    static getExistSoundFilePath(sound: { filename: string; ext?: string }) {
+        const basePath = Constants.resourceSoundPath(sound.filename);
+        const defaultPath = `${basePath}${sound.filename}${sound.ext || '.mp3'}`;
+        const alternativePath = `${basePath}sound/${sound.filename}${sound.ext || '.mp3'}`;
+
+        try {
+            if (fs.existsSync(defaultPath)) {
+                return defaultPath;
+            } else {
+                return alternativePath;
+            }
+        } catch (error) {
+            console.warn('Sound file not found:', basePath, error);
+            return alternativePath;
+        }
+    }
+
     static getDuration = (soundInfo: any) => {
         const duration = get(soundInfo, ['format', 'duration'], 0);
         return Number(duration).toFixed(1);

src/main/ipcMainHelper.ts

@@ -7,6 +7,7 @@ import CommonUtils from './commonUtils';
 import checkUpdateRequest from './utils/network/checkUpdate';
 import createLogger from './utils/functions/createLogger';
 import isValidAsarFile from './utils/functions/isValidAsarFile';
+import fileUtils from './fileUtils';
 require('@electron/remote/main').initialize();
 
 const logger = createLogger('main/ipcMainHelper.ts');
@@ -46,6 +47,7 @@ new (class {
         ipcMain.handle('getOpenSourceText', () => ''); // 별다른 표기 필요없음
         ipcMain.handle('isValidAsarFile', this.checkIsValidAsarFile.bind(this));
         ipcMain.handle('saveSoundBuffer', this.saveSoundBuffer.bind(this));
+        ipcMain.handle('getExistSoundFilePath', this.getExistSoundFilePath.bind(this));
     }
 
     async saveProject(event: IpcMainInvokeEvent, project: ObjectLike, targetPath: string) {
@@ -253,6 +255,10 @@ new (class {
         return MainUtils.saveSoundBuffer(buffer, prevFileUrl);
     }
 
+    async getExistSoundFilePath(event: IpcMainInvokeEvent, sound: any) {
+        return fileUtils.getExistSoundFilePath(sound);
+    }
+
     openUrl(event: IpcMainInvokeEvent, url: string) {
         logger.info(`openUrl called : ${url}`);
         shell.openExternal(url);

src/main/mainUtils.ts

@@ -736,10 +736,17 @@ export default class MainUtils {
         return Promise.all(
             sounds.map(async (sound) => {
                 const fileName = sound.filename + (sound.ext || '.mp3');
-                const soundResourcePath = path.join(
+                let soundResourcePath = path.join(
                     Constants.resourceSoundPath(sound.filename),
                     fileName
                 );
+                if (!fs.existsSync(soundResourcePath)) {
+                    soundResourcePath = path.join(
+                        Constants.resourceSoundPath(sound.filename),
+                        'sound/',
+                        fileName
+                    );
+                }
                 const newObject = await MainUtils.importSoundToTemp(soundResourcePath);
 
                 sound.filename = newObject.filename;

src/renderer/helper/entry/entryModalHelper.ts

@@ -311,23 +311,23 @@ class EntryModalHelper {
      */
     static async showSoundPopup() {
         await this._switchPopup('sound', {
-            fetch: (data: any) => {
-                DatabaseManager.findAll(data).then((result) => {
+            fetch: async (data: any) => {
+                await DatabaseManager.findAll(data).then(async (result) => {
                     EntryModalHelper.popup.setData({
                         data: { data: result },
                     });
-                    EntryUtils.loadSound(result as any[]);
+                    await EntryUtils.loadSound(result as any[]);
                 });
             },
-            search: (data: any) => {
+            search: async (data: any) => {
                 if (data.searchQuery === '') {
                     return;
                 }
-                DatabaseManager.search(data, 'sound').then((result) => {
+                await DatabaseManager.search(data, 'sound').then(async (result) => {
                     EntryModalHelper.popup.setData({
                         data: { data: result },
                     });
-                    EntryUtils.loadSound(result as any[]);
+                    await EntryUtils.loadSound(result as any[]);
                 });
             },
             submit: async (data: any) => {
@@ -369,7 +369,7 @@ class EntryModalHelper {
                     const results = await IpcRendererHelper.importSounds(uploadFilePaths);
                     createjs.Sound.stop();
 
-                    EntryUtils.loadSound(results);
+                    await EntryUtils.loadSound(results);
                     EntryModalHelper.popup.setData({
                         data: {
                             data: [], // 없으면 에러남. entry-tool 의 수정필요

src/renderer/helper/entry/entryUtils.ts

@@ -87,11 +87,9 @@ export default class {
      * 사운드 오브젝트 (from resources/db) 를 Entry.soundQueue 에 로드한다.
      * @param {Array<Object>} sounds
      */
-    static loadSound(sounds: any[] = []) {
-        sounds.forEach((sound) => {
-            const path =
-                sound.path ||
-                `${Constants.resourceSoundPath(sound.filename)}${sound.filename}${sound.ext}`;
+    static async loadSound(sounds: any[] = []) {
+        await sounds.forEach(async (sound) => {
+            const path = await IpcRendererHelper.getExistSoundFilePath(sound);
             Entry.soundQueue.loadFile({
                 id: sound._id,
                 src: path,

src/renderer/helper/ipcRendererHelper.ts

@@ -153,4 +153,8 @@ export default class {
     static saveSoundBuffer(buffer: ArrayBuffer, prevFileUrl: string) {
         return ipcInvoke('saveSoundBuffer', buffer, prevFileUrl);
     }
+
+    static getExistSoundFilePath(sound: { filename: string; ext?: string }) {
+        return ipcInvoke('getExistSoundFilePath', sound);
+    }
 }