From 18bf706c60d2e9a6019aa0579f73d75df528347e Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Mon, 6 Nov 2023 13:57:17 +0530
Subject: [PATCH 01/10] default audio extension changed as per selection

---
 .../projects/Export/ExportProjectPopUp.js     | 190 ++++++++++--------
 .../layouts/projects/Export/ExportUtils.js    |  14 +-
 2 files changed, 114 insertions(+), 90 deletions(-)

diff --git a/renderer/src/layouts/projects/Export/ExportProjectPopUp.js b/renderer/src/layouts/projects/Export/ExportProjectPopUp.js
index e1e072a7c..d2c34aa34 100644
--- a/renderer/src/layouts/projects/Export/ExportProjectPopUp.js
+++ b/renderer/src/layouts/projects/Export/ExportProjectPopUp.js
@@ -12,6 +12,7 @@ import updateObsSB from '@/core/burrito/updateObsSB';
 import { SnackBar } from '@/components/SnackBar';
 // import useSystemNotification from '@/components/hooks/useSystemNotification';
 import { LoadingSpinner } from '@/components/LoadingSpinner';
+import CustomMultiComboBox from '@/components/Resources/ResourceUtils/CustomMultiComboBox';
 import CloseIcon from '@/illustrations/close-button-black.svg';
 import { validate } from '../../../util/validate';
 import * as logger from '../../../logger';
@@ -21,6 +22,8 @@ import { ProgressCircle } from '../../../components/ProgressCircle';
 import { exportDefaultAudio, exportFullAudio } from './ExportUtils';
 import packageInfo from '../../../../../package.json';
 
+const audioExportFormats = { wav: { ext: 'wav', mimeType: 'audio/wav' }, mp3: { ext: 'mp3', mimeType: 'audio/mp3' } };
+
 export default function ExportProjectPopUp(props) {
   const {
     open,
@@ -43,6 +46,8 @@ export default function ExportProjectPopUp(props) {
   const [totalExports, setTotalExports] = React.useState(0);
   const [exportStart, setExportstart] = React.useState(false);
 
+  const [selectedAudioExt, setSelectedAudioExt] = React.useState(audioExportFormats.wav);
+
   // const { pushNotification } = useSystemNotification();
 
   function resetExportProgress() {
@@ -62,6 +67,7 @@ export default function ExportProjectPopUp(props) {
       setValid(false);
       setMetadata({});
       setCheckText(false);
+      setSelectedAudioExt(audioExportFormats.wav);
     }
   }
 
@@ -87,60 +93,60 @@ export default function ExportProjectPopUp(props) {
   const updateCommon = (fs, path, folder, project) => {
     const fse = window.require('fs-extra');
     logger.debug('ExportProjectPopUp.js', 'Updated Scripture burrito');
-          let data = fs.readFileSync(path.join(folder, 'metadata.json'), 'utf-8');
-          const sb = JSON.parse(data);
-          if (!sb.copyright?.shortStatements && sb.copyright?.licenses) {
-            delete sb.copyright.publicDomain;
-            data = JSON.stringify(sb);
-          }
-          const success = validate('metadata', path.join(folder, 'metadata.json'), data, sb.meta.version);
-          if (success) {
-            logger.debug('ExportProjectPopUp.js', 'Burrito validated successfully');
-            fse.copy(folder, path.join(folderPath, project.name))
-              .then(() => {
-                deleteGitAfterCopy(fs, path.join(folderPath, project.name), path)
-                .then(() => {
-                  resetExportProgress(); // reset export states
-                  logger.debug('ExportProjectPopUp.js', 'Exported Successfully');
-                  setNotify('success');
-                  setSnackText(t('dynamic-msg-export-success'));
-                  setOpenSnackBar(true);
-                  closePopUp(false);
-                });
-              })
-              .catch((err) => {
-                resetExportProgress(); // reset export states
-                logger.error('ExportProjectPopUp.js', `Failed to export ${err}`);
-                setNotify('failure');
-                setSnackText(t('dynamic-msg-export-fail'));
-                setOpenSnackBar(true);
-                closePopUp(false);
-              });
-          }
+    let data = fs.readFileSync(path.join(folder, 'metadata.json'), 'utf-8');
+    const sb = JSON.parse(data);
+    if (!sb.copyright?.shortStatements && sb.copyright?.licenses) {
+      delete sb.copyright.publicDomain;
+      data = JSON.stringify(sb);
+    }
+    const success = validate('metadata', path.join(folder, 'metadata.json'), data, sb.meta.version);
+    if (success) {
+      logger.debug('ExportProjectPopUp.js', 'Burrito validated successfully');
+      fse.copy(folder, path.join(folderPath, project.name))
+        .then(() => {
+          deleteGitAfterCopy(fs, path.join(folderPath, project.name), path)
+            .then(() => {
+              resetExportProgress(); // reset export states
+              logger.debug('ExportProjectPopUp.js', 'Exported Successfully');
+              setNotify('success');
+              setSnackText(t('dynamic-msg-export-success'));
+              setOpenSnackBar(true);
+              closePopUp(false);
+            });
+        })
+        .catch((err) => {
+          resetExportProgress(); // reset export states
+          logger.error('ExportProjectPopUp.js', `Failed to export ${err}`);
+          setNotify('failure');
+          setSnackText(t('dynamic-msg-export-fail'));
+          setOpenSnackBar(true);
+          closePopUp(false);
+        });
+    }
   };
 
   const updateBurritoVersion = (username, fs, path, folder) => {
     setTotalExported(1); // 1 step of 2 finished
     if (project?.type === 'Text Translation') {
-    updateTranslationSB(username, project, openModal)
+      updateTranslationSB(username, project, openModal)
         .then(() => {
           updateCommon(fs, path, folder, project);
         });
-      } else if (project?.type === 'OBS') {
-        updateObsSB(username, project, openModal)
+    } else if (project?.type === 'OBS') {
+      updateObsSB(username, project, openModal)
         .then(() => {
           updateCommon(fs, path, folder, project);
         });
-      }
+    }
     setOpenModal(false);
   };
 
   const ExportActions = {
     setNotify, setSnackText, setOpenSnackBar, setTotalExported, setTotalExports, setExportstart, resetExportProgress, setCheckText,
-   };
-     const ExportStates = {
+  };
+  const ExportStates = {
     checkText, audioExport, folderPath, project, exportStart,
-   };
+  };
 
   const exportBible = async () => {
     const fs = window.require('fs');
@@ -160,18 +166,18 @@ export default function ExportProjectPopUp(props) {
         setExportstart(true); // export start for all type of export
         if (project?.type === 'Audio') {
           if (audioExport === 'default' || audioExport === 'chapter') {
-            exportDefaultAudio(metadata, folder, path, fs, ExportActions, ExportStates, closePopUp, t);
+            exportDefaultAudio(metadata, folder, path, fs, ExportActions, ExportStates, closePopUp, t, selectedAudioExt);
           } else {
             setTotalExports(3);// 3 step process
-            exportFullAudio(metadata, folder, path, fs, ExportActions, ExportStates, closePopUp, t);
+            exportFullAudio(metadata, folder, path, fs, ExportActions, ExportStates, closePopUp, t, selectedAudioExt);
           }
         } else if (burrito?.meta?.version !== metadata?.meta?.version) {
-            setTotalExports(2); // total 2 steps process
-            setOpenModal(true);
+          setTotalExports(2); // total 2 steps process
+          setOpenModal(true);
         } else {
-            setTotalExports(2); // total 2 steps process
-            updateBurritoVersion(username, fs, path, folder);
-          }
+          setTotalExports(2); // total 2 steps process
+          updateBurritoVersion(username, fs, path, folder);
+        }
       });
     } else {
       logger.warn('ExportProjectPopUp.js', 'Invalid Path');
@@ -181,6 +187,7 @@ export default function ExportProjectPopUp(props) {
       setOpenSnackBar(true);
     }
   };
+
   return (
     <>
       <Transition
@@ -210,7 +217,7 @@ export default function ExportProjectPopUp(props) {
                     {t('label-export-project')}
                     :
                     {
-                    `${project?.name}`
+                      `${project?.name}`
                     }
                   </div>
                   <button
@@ -254,46 +261,61 @@ export default function ExportProjectPopUp(props) {
                     <div>
                       <h4 className="text-red-500">{valid === true ? 'Enter valid location' : ''}</h4>
                     </div>
-                    { project?.type === 'Audio'
-                    && (
-                    <div>
-                      <div className=" mb-3">
-                        <input
-                          type="radio"
-                          className="form-radio h-4 w-4 text-primary"
-                          value="Default"
-                          checked={audioExport === 'default'}
-                          onChange={() => setAudioExport('default')}
-                        />
-                        <span className=" ml-4 text-xs font-bold" title="Verse-wise export with only the default take of each verse kept as a Scripture Burrito">Verse-wise Default</span>
-                        <div className="flex flex-row justify-end mr-3">
-                          <input id="visible_1" className="visible" type="checkbox" checked={checkText} onClick={() => setCheckText(!checkText)} />
-                          <span className="ml-2 text-xs font-bold" title="You can have the text content along with the Audio">With Text (if available)</span>
+
+                    {project?.type === 'Audio'
+                      && (
+                        <div className="w-full flex mt-10 items-center justify-center">
+                          <div className="basis-1/2 flex flex-col gap-5">
+                            <div className="">
+                              <input
+                                type="radio"
+                                className="form-radio h-4 w-4 text-primary"
+                                value="Default"
+                                checked={audioExport === 'default'}
+                                onChange={() => setAudioExport('default')}
+                              />
+                              <span className=" ml-4 text-xs font-bold" title="Verse-wise export with only the default take of each verse kept as a Scripture Burrito">Verse-wise Default</span>
+                            </div>
+                            <div className="">
+                              <input
+                                type="radio"
+                                className="form-radio h-4 w-4 text-primary"
+                                value="Chapter"
+                                checked={audioExport === 'chapter'}
+                                onChange={() => setAudioExport('chapter')}
+                              />
+                              <span className=" ml-4 text-xs font-bold" title="Chapter Level export with only the default take of each verse">Chapter-wise</span>
+                            </div>
+                            <div className="">
+                              <input
+                                type="radio"
+                                className="form-radio h-4 w-4 text-primary"
+                                value="full"
+                                checked={audioExport === 'full'}
+                                onChange={() => setAudioExport('full')}
+                              />
+                              <span className=" ml-4 text-xs font-bold" title="All takes of every verse saved as a ZIP archive within Scripture Burrito">Full project</span>
+                            </div>
+                          </div>
+                          <div className="basic-1/2 flex flex-col gap-5">
+                            <div className="flex flex-row">
+                              <input id="visible_1" className="visible" type="checkbox" checked={checkText} onClick={() => setCheckText(!checkText)} />
+                              <span className="ml-2 text-xs font-bold" title="You can have the text content along with the Audio">With Text (if available)</span>
+                            </div>
+                            <div className="max-w-[150px]">
+                              <CustomMultiComboBox
+                                selectedList={[selectedAudioExt]}
+                                setSelectedList={setSelectedAudioExt}
+                                customData={Object.values(audioExportFormats)}
+                                filterParams="ext"
+                                placeholder="Select Output type"
+                                dropArrow
+                              />
+                            </div>
+                          </div>
                         </div>
-                      </div>
-                      <div className="mb-3">
-                        <input
-                          type="radio"
-                          className="form-radio h-4 w-4 text-primary"
-                          value="Chapter"
-                          checked={audioExport === 'chapter'}
-                          onChange={() => setAudioExport('chapter')}
-                        />
-                        <span className=" ml-4 text-xs font-bold" title="Chapter Level export with only the default take of each verse">Chapter-wise</span>
-                      </div>
-                      <hr className="border-2" />
-                      <div className="mt-3">
-                        <input
-                          type="radio"
-                          className="form-radio h-4 w-4 text-primary"
-                          value="full"
-                          checked={audioExport === 'full'}
-                          onChange={() => setAudioExport('full')}
-                        />
-                        <span className=" ml-4 text-xs font-bold" title="All takes of every verse saved as a ZIP archive within Scripture Burrito">Full project</span>
-                      </div>
-                    </div>
-                    )}
+                      )}
+
                     <div className="absolute bottom-0 right-0 left-0 bg-white">
                       <div className="flex gap-6 mx-5 justify-end">
                         <button
diff --git a/renderer/src/layouts/projects/Export/ExportUtils.js b/renderer/src/layouts/projects/Export/ExportUtils.js
index e95a612d7..fd5d836d7 100644
--- a/renderer/src/layouts/projects/Export/ExportUtils.js
+++ b/renderer/src/layouts/projects/Export/ExportUtils.js
@@ -31,9 +31,10 @@ export async function walk(dir, path, fs) {
   }
 
 // util Function for default export Audio
-const writeAndUpdateBurritoDefaultExport = async (audio, path, mp3ExportPath, fs, fse, book, verse, burrito, folderPath, project) => {
+const writeAndUpdateBurritoDefaultExport = async (audio, path, mp3ExportPath, fs, fse, book, verse, burrito, folderPath, project, selectedAudioExt) => {
 await fse.copy(audio, path.join(folderPath, project.name, mp3ExportPath))
     .then(async () => {
+      console.log('export aduio : ', mp3ExportPath, path.join(folderPath, project.name, mp3ExportPath));
     logger.debug('ExportProjectUtils.js', 'Creating the ingredients.');
     const content = fs.readFileSync(path.join(folderPath, project.name, mp3ExportPath), 'utf8');
     const stats = fs.statSync(path.join(folderPath, project.name, mp3ExportPath));
@@ -41,7 +42,7 @@ await fse.copy(audio, path.join(folderPath, project.name, mp3ExportPath))
         checksum: {
         md5: md5(content),
         },
-        mimeType: 'audio/mp3',
+        mimeType: selectedAudioExt.mimeType,
         size: stats.size,
         scope: {},
     };
@@ -50,7 +51,7 @@ await fse.copy(audio, path.join(folderPath, project.name, mp3ExportPath))
 };
 
 // export audio project FUll Zip
-export const exportFullAudio = async (metadata, folder, path, fs, ExportActions, ExportStates, closePopUp, t) => {
+export const exportFullAudio = async (metadata, folder, path, fs, ExportActions, ExportStates, closePopUp, t, selectedAudioExt) => {
     logger.debug('ExportProjectUtils.js', 'In export Full zip for audio');
     ExportActions.setTotalExported((curr) => curr + 1);
     const AdmZip = window.require('adm-zip');
@@ -168,7 +169,7 @@ const exportChapterAudio = async (defaultAudio, burrito, fs, path, folder, folde
     }
   };
 
-export const exportDefaultAudio = async (metadata, folder, path, fs, ExportActions, ExportStates, closePopUp, t) => {
+export const exportDefaultAudio = async (metadata, folder, path, fs, ExportActions, ExportStates, closePopUp, t, selectedAudioExt) => {
     logger.debug('ExportProjectUtils.js', 'in Export Audio Common Function ');
     const fse = window.require('fs-extra');
     const burrito = metadata;
@@ -185,9 +186,10 @@ export const exportDefaultAudio = async (metadata, folder, path, fs, ExportActio
         const url = audio.split(/[\/\\]/).slice(-1)[0];
         const mp3 = url.replace(/_\d_default/, '');
         const verse = mp3.replace('.mp3', '');
-        const mp3ExportPath = path.join('ingredients', book, chapter, mp3);
+        // const mp3ExportPath = path.join('ingredients', book, chapter, mp3);
+        const mp3ExportPath = path.join('ingredients', book, chapter, `${verse}.${selectedAudioExt.ext}`);
         // eslint-disable-next-line
-        await writeAndUpdateBurritoDefaultExport(audio, path, mp3ExportPath, fs, fse, book, verse, burrito, ExportStates.folderPath, ExportStates.project);
+        await writeAndUpdateBurritoDefaultExport(audio, path, mp3ExportPath, fs, fse, book, verse, burrito, ExportStates.folderPath, ExportStates.project, selectedAudioExt);
         ExportActions.setTotalExported((prev) => prev + 1);
       }
     } else if (ExportStates.audioExport === 'chapter') {

From 9d31e2a4a4faa1587be9d09446a98c7c7922c0a9 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Thu, 9 Nov 2023 09:42:52 +0530
Subject: [PATCH 02/10] not finished . not able to convert . sample codes

---
 package.json                                  | 413 +++++++++---------
 .../EditorPage/AudioEditor/MainPlayer.js      | 103 ++++-
 .../layouts/projects/Export/ExportUtils.js    |  51 ++-
 .../src/layouts/projects/Export/WavToMp3.js   |  60 +++
 yarn.lock                                     |  22 +
 5 files changed, 435 insertions(+), 214 deletions(-)
 create mode 100644 renderer/src/layouts/projects/Export/WavToMp3.js

diff --git a/package.json b/package.json
index f934f3c5f..4069aec2a 100644
--- a/package.json
+++ b/package.json
@@ -1,207 +1,210 @@
 {
-  "name": "scribe",
-  "productName": "scribe-scripture-editor",
-  "description": "A friendly assistant for Bible Translators.",
-  "author": "Bible Technology <autographa.support@bridgeconn.com>",
-  "version": "0.5.3",
-  "license": "MIT",
-  "private": true,
-  "main": "main/index.js",
-  "homepage": "./",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/bible-technology/scribe-scripture-editor"
-  },
-  "scripts": {
-    "clean": "rimraf dist renderer/.next renderer/out",
-    "start": "electron .",
-    "dev": "next dev",
-    "prod": "yarn build && next start",
-    "test": "jest",
-    "e2e": "npx playwright test",
-    "report": "npx playwright test --reporter=html && npx playwright show-report",
-    "lint": "eslint ./renderer/src",
-    "lint:fix": "eslint ./renderer/src --fix",
-    "maxmemory-allocation": "NODE_OPTIONS=--max_old_space_size=4096",
-    "eslint:github-action": "node ./node_modules/eslint/bin/eslint . --ignore-path .gitignore --max-warnings 0",
-    "build": "next build renderer && next export renderer",
-    "pack-app": "yarn build && electron-builder --dir",
-    "dist": "yarn build && electron-builder -p never",
-    "deploy": "yarn build && electron-builder -p always"
-  },
-  "eslintIgnore": [
-    "*.test.js"
-  ],
-  "build": {
-    "asar": true,
-    "extraResources": "renderer/public",
-    "extraMetadata": {
-      "main": "main/index.js"
-    },
-    "files": [
-      "main",
-      "renderer/out",
-      "public",
-      "renderer/public/**/*",
-      "build/**/*",
-      "postcss.config.js",
-      "renderer/jsconfig.json",
-      "styles/**/*"
-    ],
-    "linux": {
-      "target": [
-        "deb"
-      ],
-      "icon": "styles/scribe.icns"
-    },
-    "mac": {
-      "category": "public.app-category.Utilities",
-      "target": "dmg",
-      "icon": "styles/scribe.icns",
-      "type": "distribution"
-    },
-    "win": {
-      "target": "nsis",
-      "icon": "styles/scribe-logo.png",
-      "publish": [
-        "github"
-      ]
-    },
-    "nsis": {
-      "allowToChangeInstallationDirectory": true,
-      "oneClick": false
-    },
-    "publish": [
-      {
-        "provider": "github",
-        "owner": "vipinpaul",
-        "repo": "scribe-scripture-editor"
-      }
-    ]
-  },
-  "devDependencies": {
-    "@babel/eslint-parser": "^7.5.4",
-    "@babel/preset-env": "^7.18.2",
-    "@babel/preset-react": "^7.17.12",
-    "@netlify/plugin-nextjs": "^4.8.0",
-    "@playwright/test": "^1.36.2",
-    "@svgr/webpack": "^5.5.0",
-    "@testing-library/dom": "^8.13.0",
-    "@testing-library/jest-dom": "^5.16.4",
-    "@testing-library/react": "^12.1.2",
-    "@testing-library/user-event": "14.2.0",
-    "ajv": "^6.12.2",
-    "autoprefixer": "^10.4.13",
-    "babel-jest": "^28.1.1",
-    "babel-plugin-istanbul": "^6.1.1",
-    "buffer-loader": "^0.1.0",
-    "canvas": "^2.9.1",
-    "electron": "21.0.1",
-    "electron-builder": "^23.6.0",
-    "eslint": "^8.17.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-next": "^13.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.30.0",
-    "eslint-plugin-react-hooks": "^4.5.0",
-    "eslint-plugin-simple-import-sort": "^7.0.0",
-    "jest": "^26.6.3",
-    "jest-dom": "^4.0.0",
-    "null-loader": "^4.0.1",
-    "postcss": "^8.4.21",
-    "prettier": "^2.8.3",
-    "tailwindcss": "^3.2.4"
-  },
-  "dependencies": {
-    "@electron/remote": "^2.0.8",
-    "@emotion/react": "^11.10.5",
-    "@emotion/styled": "^11.10.5",
-    "@headlessui/react": "^1.7.8",
-    "@heroicons/react": "^2.0.14",
-    "@material-ui/core": "^4.12.4",
-    "@material-ui/icons": "^4.11.3",
-    "@material-ui/lab": "4.0.0-alpha.57",
-    "@mui/icons-material": "^5.10.9",
-    "@mui/lab": "^5.0.0-alpha.104",
-    "@mui/material": "^5.10.12",
-    "@ory/kratos-client": "^0.10.1",
-    "@radix-ui/react-dialog": "^1.0.3",
-    "@radix-ui/react-dropdown-menu": "^2.0.4",
-    "@supabase/supabase-js": "^2.26.0",
-    "@tailwindcss/forms": "^0.5.2",
-    "@tailwindcss/typography": "^0.5.9",
-    "@xelah/type-perf-html": "^1.0.1",
-    "adm-zip": "^0.5.9",
-    "audiobuffer-to-wav": "^1.0.0",
-    "bible-reference-rcl": "1.1.0",
-    "clsx": "1.1.1",
-    "crypto-js": "^4.1.1",
-    "dotenv": "^16.3.1",
-    "electron-is-dev": "^2.0.0",
-    "electron-log": "4.4.7",
-    "electron-next": "^3.1.5",
-    "electron-updater": "^5.0.1",
-    "epitelete": "0.2.20-beta.1",
-    "epitelete-html": "0.2.20-beta.2",
-    "eslint-import-resolver-alias": "^1.1.2",
-    "font-detect-rhl": "1.0.5-1",
-    "font-list": "^1.4.5",
-    "fs-extra": "^10.1.0",
-    "get-system-fonts": "^2.0.2",
-    "gitea-react-toolkit": "2.1.2",
-    "i18next": "^21.8.9",
-    "is-electron": "^2.2.1",
-    "isomorphic-git": "^1.24.0",
-    "js-yaml": "^4.1.0",
-    "localforage": "1.10.0",
-    "lodash.isequal": "^4.5.0",
-    "markdown-translatable": "1.3.0",
-    "md5": "^2.3.0",
-    "moment": "^2.29.3",
-    "next": "^13.4.10",
-    "next-images": "^1.8.4",
-    "next-on-netlify": "^3.0.1",
-    "next-optimized-images": "^2.6.2",
-    "nprogress": "^0.2.0",
-    "phosphor-react": "^1.4.1",
-    "postcss-import": "^15.1.0",
-    "postcss-nested": "^6.0.0",
-    "prop-types": "15.8.1",
-    "proskomma-react-hooks": "2.4.0",
-    "raw-loader": "^4.0.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-i18next": "^11.17.1",
-    "react-media-recorder": "^1.6.6",
-    "react-scripts": "5.0.1",
-    "styled-components": "^5.3.6",
-    "tc-ui-toolkit": "5.3.3",
-    "translation-helps-rcl": "3.3.7",
-    "use-deep-compare": "^1.1.0",
-    "usfm-editor": "0.8.7",
-    "usfm-grammar": "^2.3.0",
-    "uuid": "^8.3.2",
-    "wavesurfer.js": "^6.6.2",
-    "webpack-node-externals": "^3.0.0",
-    "winston": "^3.7.2",
-    "word-aligner": "1.0.0",
-    "ws": "^8.8.0",
-    "yarn": "^1.22.19"
-  },
-  "optionalDependencies": {
-    "bufferutil": "^4.0.6",
-    "react-icons": "4.10.1",
-    "scripture-resources-rcl": "5.1.0",
-    "utf-8-validate": "^5.0.9"
-  },
-  "overrides": {
-    "react": "$react",
-    "react-dom": "$react-dom",
-    "@material-ui/lab": "$@material-ui/lab",
-    "gitea-react-toolkit": "$gitea-react-toolkit",
-    "word-aligner": "$word-aligner",
-    "@mui/lab": "$@mui/lab"
-  }
+	"name": "scribe",
+	"productName": "scribe-scripture-editor",
+	"description": "A friendly assistant for Bible Translators.",
+	"author": "Bible Technology <autographa.support@bridgeconn.com>",
+	"version": "0.5.3",
+	"license": "MIT",
+	"private": true,
+	"main": "main/index.js",
+	"homepage": "./",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/bible-technology/scribe-scripture-editor"
+	},
+	"scripts": {
+		"clean": "rimraf dist renderer/.next renderer/out",
+		"start": "electron .",
+		"dev": "next dev",
+		"prod": "yarn build && next start",
+		"test": "jest",
+		"e2e": "npx playwright test",
+		"report": "npx playwright test --reporter=html && npx playwright show-report",
+		"lint": "eslint ./renderer/src",
+		"lint:fix": "eslint ./renderer/src --fix",
+		"maxmemory-allocation": "NODE_OPTIONS=--max_old_space_size=4096",
+		"eslint:github-action": "node ./node_modules/eslint/bin/eslint . --ignore-path .gitignore --max-warnings 0",
+		"build": "next build renderer && next export renderer",
+		"pack-app": "yarn build && electron-builder --dir",
+		"dist": "yarn build && electron-builder -p never",
+		"deploy": "yarn build && electron-builder -p always"
+	},
+	"eslintIgnore": [
+		"*.test.js"
+	],
+	"build": {
+		"asar": true,
+		"extraResources": "renderer/public",
+		"extraMetadata": {
+			"main": "main/index.js"
+		},
+		"files": [
+			"main",
+			"renderer/out",
+			"public",
+			"renderer/public/**/*",
+			"build/**/*",
+			"postcss.config.js",
+			"renderer/jsconfig.json",
+			"styles/**/*"
+		],
+		"linux": {
+			"target": [
+				"deb"
+			],
+			"icon": "styles/scribe.icns"
+		},
+		"mac": {
+			"category": "public.app-category.Utilities",
+			"target": "dmg",
+			"icon": "styles/scribe.icns",
+			"type": "distribution"
+		},
+		"win": {
+			"target": "nsis",
+			"icon": "styles/scribe-logo.png",
+			"publish": [
+				"github"
+			]
+		},
+		"nsis": {
+			"allowToChangeInstallationDirectory": true,
+			"oneClick": false
+		},
+		"publish": [
+			{
+				"provider": "github",
+				"owner": "vipinpaul",
+				"repo": "scribe-scripture-editor"
+			}
+		]
+	},
+	"devDependencies": {
+		"@babel/eslint-parser": "^7.5.4",
+		"@babel/preset-env": "^7.18.2",
+		"@babel/preset-react": "^7.17.12",
+		"@netlify/plugin-nextjs": "^4.8.0",
+		"@playwright/test": "^1.36.2",
+		"@svgr/webpack": "^5.5.0",
+		"@testing-library/dom": "^8.13.0",
+		"@testing-library/jest-dom": "^5.16.4",
+		"@testing-library/react": "^12.1.2",
+		"@testing-library/user-event": "14.2.0",
+		"ajv": "^6.12.2",
+		"autoprefixer": "^10.4.13",
+		"babel-jest": "^28.1.1",
+		"babel-plugin-istanbul": "^6.1.1",
+		"buffer-loader": "^0.1.0",
+		"canvas": "^2.9.1",
+		"electron": "21.0.1",
+		"electron-builder": "^23.6.0",
+		"eslint": "^8.17.0",
+		"eslint-config-airbnb": "^19.0.4",
+		"eslint-config-next": "^13.0.0",
+		"eslint-plugin-import": "^2.26.0",
+		"eslint-plugin-jsx-a11y": "^6.5.1",
+		"eslint-plugin-prettier": "^4.0.0",
+		"eslint-plugin-react": "^7.30.0",
+		"eslint-plugin-react-hooks": "^4.5.0",
+		"eslint-plugin-simple-import-sort": "^7.0.0",
+		"jest": "^26.6.3",
+		"jest-dom": "^4.0.0",
+		"null-loader": "^4.0.1",
+		"postcss": "^8.4.21",
+		"prettier": "^2.8.3",
+		"tailwindcss": "^3.2.4"
+	},
+	"dependencies": {
+		"@electron/remote": "^2.0.8",
+		"@emotion/react": "^11.10.5",
+		"@emotion/styled": "^11.10.5",
+		"@headlessui/react": "^1.7.8",
+		"@heroicons/react": "^2.0.14",
+		"@material-ui/core": "^4.12.4",
+		"@material-ui/icons": "^4.11.3",
+		"@material-ui/lab": "4.0.0-alpha.57",
+		"@mui/icons-material": "^5.10.9",
+		"@mui/lab": "^5.0.0-alpha.104",
+		"@mui/material": "^5.10.12",
+		"@ory/kratos-client": "^0.10.1",
+		"@radix-ui/react-dialog": "^1.0.3",
+		"@radix-ui/react-dropdown-menu": "^2.0.4",
+		"@supabase/supabase-js": "^2.26.0",
+		"@tailwindcss/forms": "^0.5.2",
+		"@tailwindcss/typography": "^0.5.9",
+		"@xelah/type-perf-html": "^1.0.1",
+		"adm-zip": "^0.5.9",
+		"audiobuffer-to-wav": "^1.0.0",
+		"bible-reference-rcl": "1.1.0",
+		"clsx": "1.1.1",
+		"crypto-js": "^4.1.1",
+		"dotenv": "^16.3.1",
+		"electron-is-dev": "^2.0.0",
+		"electron-log": "4.4.7",
+		"electron-next": "^3.1.5",
+		"electron-updater": "^5.0.1",
+		"epitelete": "0.2.20-beta.1",
+		"epitelete-html": "0.2.20-beta.2",
+		"eslint-import-resolver-alias": "^1.1.2",
+		"font-detect-rhl": "1.0.5-1",
+		"font-list": "^1.4.5",
+		"fs-extra": "^10.1.0",
+		"get-system-fonts": "^2.0.2",
+		"gitea-react-toolkit": "2.1.2",
+		"i18next": "^21.8.9",
+		"is-electron": "^2.2.1",
+		"isomorphic-git": "^1.24.0",
+		"js-yaml": "^4.1.0",
+		"lamejs": "1.2.0",
+		"localforage": "1.10.0",
+		"lodash.isequal": "^4.5.0",
+		"markdown-translatable": "1.3.0",
+		"md5": "^2.3.0",
+		"moment": "^2.29.3",
+		"next": "^13.4.10",
+		"next-images": "^1.8.4",
+		"next-on-netlify": "^3.0.1",
+		"next-optimized-images": "^2.6.2",
+		"nprogress": "^0.2.0",
+		"opus-recorder": "^8.0.5",
+		"phosphor-react": "^1.4.1",
+		"postcss-import": "^15.1.0",
+		"postcss-nested": "^6.0.0",
+		"prop-types": "15.8.1",
+		"proskomma-react-hooks": "2.4.0",
+		"raw-loader": "^4.0.2",
+		"react": "^18.2.0",
+		"react-dom": "^18.2.0",
+		"react-i18next": "^11.17.1",
+		"react-media-recorder": "^1.6.6",
+		"react-scripts": "5.0.1",
+		"recordmp3js": "^0.5.0",
+		"styled-components": "^5.3.6",
+		"tc-ui-toolkit": "5.3.3",
+		"translation-helps-rcl": "3.3.7",
+		"use-deep-compare": "^1.1.0",
+		"usfm-editor": "0.8.7",
+		"usfm-grammar": "^2.3.0",
+		"uuid": "^8.3.2",
+		"wavesurfer.js": "^6.6.2",
+		"webpack-node-externals": "^3.0.0",
+		"winston": "^3.7.2",
+		"word-aligner": "1.0.0",
+		"ws": "^8.8.0",
+		"yarn": "^1.22.19"
+	},
+	"optionalDependencies": {
+		"bufferutil": "^4.0.6",
+		"react-icons": "4.10.1",
+		"scripture-resources-rcl": "5.1.0",
+		"utf-8-validate": "^5.0.9"
+	},
+	"overrides": {
+		"react": "$react",
+		"react-dom": "$react-dom",
+		"@material-ui/lab": "$@material-ui/lab",
+		"gitea-react-toolkit": "$gitea-react-toolkit",
+		"word-aligner": "$word-aligner",
+		"@mui/lab": "$@mui/lab"
+	}
 }
diff --git a/renderer/src/components/EditorPage/AudioEditor/MainPlayer.js b/renderer/src/components/EditorPage/AudioEditor/MainPlayer.js
index 7a88d2fe3..a52e62e8c 100644
--- a/renderer/src/components/EditorPage/AudioEditor/MainPlayer.js
+++ b/renderer/src/components/EditorPage/AudioEditor/MainPlayer.js
@@ -6,6 +6,8 @@ import {
 } from 'react';
 import { useReactMediaRecorder } from 'react-media-recorder';
 import ConfirmationModal from '@/layouts/editor/ConfirmationModal';
+import { Mp3Encoder } from 'lamejs';
+// import { recordmp3js } from 'recordmp3js';
 import { getDetails } from '../ObsEditor/utils/getDetails';
 
 const MainPlayer = () => {
@@ -121,6 +123,96 @@ const MainPlayer = () => {
     loadChapter();
     }
   };
+
+  // -------------------------------------------- test save mp3 ----------------------------------------------------
+
+  // const convertToMP3 = async (audioBlob) => new Promise((resolve) => {
+  //     const reader = new FileReader();
+  //     reader.onload = async (event) => {
+  //       const arrayBuffer = event.target.result;
+  //       const audioData = new Int16Array(arrayBuffer);
+  //       const sampleRate = 48000; // Adjusted sample rate to 48,000 Hz
+  //       const channels = 1; // Mono audio, change to 2 for stereo
+  //       const lame = new Mp3Encoder(channels, sampleRate, 128);
+
+  //       const bufferSize = 2304; // Adjusted buffer size to ensure it's a multiple of 2
+  //       const mp3Data = [];
+
+  //       for (let i = 0; i < audioData.length; i += bufferSize) {
+  //         const buffer = audioData.subarray(i, i + bufferSize);
+  //         const mp3Frame = lame.encodeBuffer(buffer);
+  //         if (mp3Frame.length > 0) {
+  //           mp3Data.push(new Int8Array(mp3Frame));
+  //         }
+  //       }
+
+  //       const mp3Blob = new Blob(mp3Data, { type: 'audio/mpeg' });
+  //       resolve(mp3Blob);
+  //     };
+
+  //     reader.readAsArrayBuffer(audioBlob);
+  //   });
+
+  const convertToMP3 = async (audioBlob) => new Promise((resolve) => {
+    const audioContext = new window.AudioContext();
+    const reader = new FileReader();
+      reader.onload = async (event) => {
+        const arrayBuffer = event.target.result;
+        const audioBuffer = await audioContext.decodeAudioData(arrayBuffer);
+
+        const mediaStream = audioContext.createMediaStreamDestination();
+        const mediaRecorder = new MediaRecorder(mediaStream.stream);
+
+        const audioChunks = [];
+        mediaRecorder.ondataavailable = (event) => {
+            if (event.data.size > 0) {
+                audioChunks.push(event.data);
+            }
+        };
+
+        mediaRecorder.onstop = () => {
+          const mp3Blob = new Blob(audioChunks, { type: 'audio/mp3' });
+          resolve(mp3Blob);
+        };
+
+        mediaRecorder.start();
+        const source = audioContext.createBufferSource();
+        source.buffer = audioBuffer;
+        source.connect(mediaStream);
+        source.start();
+
+        setTimeout(() => {
+          mediaRecorder.stop();
+          audioContext.close();
+      }, audioBuffer.duration * 1000);
+      };
+
+      reader.readAsArrayBuffer(audioBlob);
+  });
+
+    // -------------------------------------------------------------------
+    const saveAudioAsMP3 = async (audioBlob, projectsDir) => {
+      if (audioBlob) {
+        const fs = window.require('fs');
+        const path = require('path');
+        const mp3Blob = await convertToMP3(audioBlob);
+        const fileReader = new FileReader();
+        // eslint-disable-next-line func-names
+        const filePath = path.join(projectsDir, 'audio', 'ingredients', bookId.toUpperCase(), chapter, `${chapter}_${verse}_converted.mp3`);
+        fileReader.onload = function () {
+          // eslint-disable-next-line react/no-this-in-sfc
+          fs.writeFile(filePath, Buffer.from(new Uint8Array(this.result)), (err) => {
+            if (!err) {
+              console.log('converted mp3 saved', { bookId, chapter, verse });
+            }
+          });
+        };
+        fileReader.readAsArrayBuffer(mp3Blob);
+      }
+    };
+
+  // ----------------------------------------------------------------------------------------------------------------
+
   const saveAudio = (blob) => {
     getDetails()
     .then(({
@@ -135,13 +227,13 @@ const MainPlayer = () => {
       let filePath;
       if (name.length > 0) {
         // While Re-recording replacing the file with same name
-        if (fs.existsSync(path.join(projectsDir, 'audio', 'ingredients', bookId.toUpperCase(), chapter, `${chapter}_${verse}_${result}_default.mp3`))) {
-          filePath = path.join(projectsDir, 'audio', 'ingredients', bookId.toUpperCase(), chapter, `${chapter}_${verse}_${result}_default.mp3`);
+        if (fs.existsSync(path.join(projectsDir, 'audio', 'ingredients', bookId.toUpperCase(), chapter, `${chapter}_${verse}_${result}_default.wav`))) {
+          filePath = path.join(projectsDir, 'audio', 'ingredients', bookId.toUpperCase(), chapter, `${chapter}_${verse}_${result}_default.wav`);
         } else {
-          filePath = path.join(projectsDir, 'audio', 'ingredients', bookId.toUpperCase(), chapter, `${chapter}_${verse}_${result}.mp3`);
+          filePath = path.join(projectsDir, 'audio', 'ingredients', bookId.toUpperCase(), chapter, `${chapter}_${verse}_${result}.wav`);
         }
       } else {
-        filePath = path.join(projectsDir, 'audio', 'ingredients', bookId.toUpperCase(), chapter, `${chapter}_${verse}_${result}_default.mp3`);
+        filePath = path.join(projectsDir, 'audio', 'ingredients', bookId.toUpperCase(), chapter, `${chapter}_${verse}_${result}_default.wav`);
       }
 
       fs.mkdirSync(path.dirname(filePath), { recursive: true });
@@ -156,6 +248,9 @@ const MainPlayer = () => {
         });
       };
       fileReader.readAsArrayBuffer(blob);
+
+      // save as mp3
+      saveAudioAsMP3(blob, projectsDir);
     });
   };
   const playRecordingFeedback = useCallback(
diff --git a/renderer/src/layouts/projects/Export/ExportUtils.js b/renderer/src/layouts/projects/Export/ExportUtils.js
index fd5d836d7..32079d490 100644
--- a/renderer/src/layouts/projects/Export/ExportUtils.js
+++ b/renderer/src/layouts/projects/Export/ExportUtils.js
@@ -1,5 +1,6 @@
 /* eslint-disable no-useless-escape */
 import { mergeAudio } from '@/components/AudioRecorder/core/audioUtils';
+import { convertToMP3 } from './WavToMp3';
 import * as logger from '../../../logger';
 
 const md5 = require('md5');
@@ -30,8 +31,8 @@ export async function walk(dir, path, fs) {
     return files.reduce((all, folderContents) => all.concat(folderContents), []);
   }
 
-// util Function for default export Audio
-const writeAndUpdateBurritoDefaultExport = async (audio, path, mp3ExportPath, fs, fse, book, verse, burrito, folderPath, project, selectedAudioExt) => {
+// util Function for default export Audio wav
+const writeAndUpdateBurritoDefaultExportWav = async (audio, path, mp3ExportPath, fs, fse, book, verse, burrito, folderPath, project, selectedAudioExt) => {
 await fse.copy(audio, path.join(folderPath, project.name, mp3ExportPath))
     .then(async () => {
       console.log('export aduio : ', mp3ExportPath, path.join(folderPath, project.name, mp3ExportPath));
@@ -50,6 +51,39 @@ await fse.copy(audio, path.join(folderPath, project.name, mp3ExportPath))
     }).catch((err) => logger.error('ExportProjectUtils.js', `${err}`));
 };
 
+async function convertWavToMp3(inputFilePath, path, outputFilePath) {
+  try {
+    const context = new window.AudioContext();
+    const mp3Blob = await convertToMP3(context, path.join('file://', inputFilePath), path.join('file://', outputFilePath));
+
+    console.log('generated mp3 blob : ', { mp3Blob });
+    return mp3Blob;
+  } catch (error) {
+    console.error('Error during conversion:', error);
+  }
+}
+
+// utils fucnton for default export Audio mp3
+const writeAndUpdateBurritoDefaultExportMp3 = async (audio, path, mp3ExportPath, fs, fse, book, verse, burrito, folderPath, project, selectedAudioExt) => {
+  // update new file path mostly in target
+  const outputFilePath = path.join(folderPath, project.name, mp3ExportPath);
+  const mp3Blob = await convertWavToMp3(audio, path, outputFilePath);
+  await writeRecfile(mp3Blob, outputFilePath, fs)
+      .then(async (convertedBlob) => {
+      logger.debug('ExportProjectPopUp.js', 'Generated mp3 audio written to folder');
+      const stats = fs.statSync(outputFilePath);
+      burrito.ingredients[mp3ExportPath] = {
+        checksum: {
+          md5: md5(convertedBlob),
+        },
+        mimeType: selectedAudioExt.mimeType,
+        size: stats.size,
+        scope: {},
+      };
+    });
+  burrito.ingredients[mp3ExportPath].scope[book] = [verse.replace('_', ':')];
+};
+
 // export audio project FUll Zip
 export const exportFullAudio = async (metadata, folder, path, fs, ExportActions, ExportStates, closePopUp, t, selectedAudioExt) => {
     logger.debug('ExportProjectUtils.js', 'In export Full zip for audio');
@@ -185,11 +219,18 @@ export const exportDefaultAudio = async (metadata, folder, path, fs, ExportActio
         const chapter = audio.split(/[\/\\]/).slice(-2)[0];
         const url = audio.split(/[\/\\]/).slice(-1)[0];
         const mp3 = url.replace(/_\d_default/, '');
-        const verse = mp3.replace('.mp3', '');
+        const verse = mp3.replace('.mp3', ''); // change this when backend change default to wav
         // const mp3ExportPath = path.join('ingredients', book, chapter, mp3);
         const mp3ExportPath = path.join('ingredients', book, chapter, `${verse}.${selectedAudioExt.ext}`);
-        // eslint-disable-next-line
-        await writeAndUpdateBurritoDefaultExport(audio, path, mp3ExportPath, fs, fse, book, verse, burrito, ExportStates.folderPath, ExportStates.project, selectedAudioExt);
+        const exportFolderPath = path.join(ExportStates.folderPath, ExportStates.project.name, 'ingredients', book, chapter);
+        if (selectedAudioExt.ext === 'wav') {
+          // eslint-disable-next-line
+          await writeAndUpdateBurritoDefaultExportWav(audio, path, mp3ExportPath, fs, fse, book, verse, burrito, ExportStates.folderPath, ExportStates.project, selectedAudioExt);
+        } else if (selectedAudioExt.ext === 'mp3') {
+          fs.mkdirSync(exportFolderPath, { recursive: true });
+          // eslint-disable-next-line
+          await writeAndUpdateBurritoDefaultExportMp3(audio, path, mp3ExportPath, fs, fse, book, verse, burrito, ExportStates.folderPath, ExportStates.project, selectedAudioExt);
+        }
         ExportActions.setTotalExported((prev) => prev + 1);
       }
     } else if (ExportStates.audioExport === 'chapter') {
diff --git a/renderer/src/layouts/projects/Export/WavToMp3.js b/renderer/src/layouts/projects/Export/WavToMp3.js
new file mode 100644
index 000000000..66ed2a957
--- /dev/null
+++ b/renderer/src/layouts/projects/Export/WavToMp3.js
@@ -0,0 +1,60 @@
+async function readAudioFileAndDecode(filepath, audioContext) {
+  // const response = await fetch(path.join('file://', url));
+  const response = await fetch(filepath);
+  const buffer = await response.arrayBuffer();
+  // const decodedData = await audioContext.decodeAudioData(buffer);
+  return buffer;
+}
+
+const convertToMP3 = async (audioContext, inputPath, outpath) => {
+
+};
+
+// lame js testing
+// const convertToMP3 = async (audioContext, filePath) => {
+//   try {
+//   // read file
+//   const audioBuffer = await readAudioFileAndDecode(filePath, audioContext);
+//   const encoder = new Mp3Encoder(1, 44100, 128); // Mono, 44.1 kHz, 128 kbps
+
+//   const wavView = new DataView(audioBuffer);
+
+//   const mp3Buffer = [];
+//   const sampleBlockSize = 1152;
+//   const samplesMono = new Int16Array(sampleBlockSize);
+
+//   console.log(encoder, wavView, audioBuffer, mp3Buffer);
+
+//   // Loop through the WAV data and encode it into MP3
+// for (let i = 44; i < audioBuffer.byteLength; i += 2) {
+//   if (i + 1 < audioBuffer.byteLength) {
+//     const sample = wavView.getInt16(i, true); // Little-endian
+//     samplesMono[(i - 44) / 2] = sample;
+//     if ((i - 44) % (sampleBlockSize * 2) === 0) {
+//       const mp3Data = encoder.encodeBuffer(samplesMono);
+//       if (mp3Data.length > 0) {
+//         mp3Buffer.push(new Int8Array(mp3Data));
+//       }
+//     }
+//   } else {
+//     break; // Break the loop if the offset is out of bounds
+//   }
+// }
+
+//   const mp3Data = encoder.flush();
+//   if (mp3Data.length > 0) {
+//     mp3Buffer.push(new Int8Array(mp3Data));
+//   }
+
+// 	const mp3Concatenated = new Int8Array(mp3Buffer.reduce((acc, chunk) => acc.concat(chunk), []));
+
+//   const mp3Blob = new Blob(mp3Concatenated, { type: 'audio/mp3' });
+//   return mp3Blob;
+
+//   // --------------------------------------------------------
+//   } catch (err) {
+//     console.log('audio convert error : ', err);
+//   }
+// };
+
+export { convertToMP3 };
diff --git a/yarn.lock b/yarn.lock
index 8a64f5a80..7bf534467 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13006,6 +13006,13 @@ kuler@^2.0.0:
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
   integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==
 
+lamejs@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/lamejs/-/lamejs-1.2.0.tgz#0259f83db4666141a7b671b8caa6369d95177d08"
+  integrity sha512-xEYvsB2sZ9jIccqfUQpQEBdB6UYQDG/ta2xQkH7oEpENb0JHFJii965WVF8ErUMdZzoe7EdIruz1WpICdhZ9Pw==
+  dependencies:
+    use-strict "1.0.1"
+
 language-subtag-registry@~0.3.2:
   version "0.3.22"
   resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d"
@@ -14908,6 +14915,11 @@ optionator@^0.9.3:
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
 
+opus-recorder@^8.0.5:
+  version "8.0.5"
+  resolved "https://registry.yarnpkg.com/opus-recorder/-/opus-recorder-8.0.5.tgz#06d3e32e15da57ebc3f57e41b93033475fcb4e3e"
+  integrity sha512-tBRXc9Btds7i3bVfA7d5rekAlyOcfsivt5vSIXHxRV1Oa+s6iXFW8omZ0Lm3ABWotVcEyKt96iIIUcgbV07YOw==
+
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
@@ -16979,6 +16991,11 @@ recorder-audio-worklet@^5.1.26:
     tslib "^2.5.0"
     worker-factory "^6.0.76"
 
+recordmp3js@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/recordmp3js/-/recordmp3js-0.5.0.tgz#9902d87472800b42464703f5635a8deebb6a1af5"
+  integrity sha512-0MyJJiq6yUrPupBoZxyLk2B1EFfuzkma70ZQAQmdMdza6XoiUqhQuy5H4/f5ti/Z/2ZagnzNRsLfXu2p493o7g==
+
 recursive-readdir@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.3.tgz#e726f328c0d69153bcabd5c322d3195252379372"
@@ -19623,6 +19640,11 @@ use-sidecar@^1.1.2:
     detect-node-es "^1.1.0"
     tslib "^2.0.0"
 
+use-strict@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/use-strict/-/use-strict-1.0.1.tgz#0bb80d94f49a4a05192b84a8c7d34e95f1a7e3a0"
+  integrity sha512-IeiWvvEXfW5ltKVMkxq6FvNf2LojMKvB2OCeja6+ct24S1XOmQw2dGr2JyndwACWAGJva9B7yPHwAmeA9QCqAQ==
+
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"

From d8583730d54d258f60fb0c1ccc3ac8bab47642e8 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Mon, 4 Dec 2023 15:51:42 +0530
Subject: [PATCH 03/10] prototype worked for export audio single and combined -
 wav , mo3

---
 package.json                                  |   2 +
 .../AudioRecorder/core/audioUtils.js          | 158 +++++++++++++++++-
 .../EditorPage/AudioEditor/AudioEditor.js     |   4 +-
 .../EditorPage/AudioEditor/MainPlayer.js      | 117 ++-----------
 .../layouts/projects/Export/ExportUtils.js    |  54 ++++--
 .../projects/Export/ffmpegAudioCore.js        |  25 +++
 yarn.lock                                     |  17 ++
 7 files changed, 245 insertions(+), 132 deletions(-)
 create mode 100644 renderer/src/layouts/projects/Export/ffmpegAudioCore.js

diff --git a/package.json b/package.json
index 4069aec2a..29cc349ac 100644
--- a/package.json
+++ b/package.json
@@ -118,6 +118,8 @@
 		"@electron/remote": "^2.0.8",
 		"@emotion/react": "^11.10.5",
 		"@emotion/styled": "^11.10.5",
+		"@ffmpeg/ffmpeg": "^0.12.7",
+		"@ffmpeg/util": "^0.12.1",
 		"@headlessui/react": "^1.7.8",
 		"@heroicons/react": "^2.0.14",
 		"@material-ui/core": "^4.12.4",
diff --git a/renderer/src/components/AudioRecorder/core/audioUtils.js b/renderer/src/components/AudioRecorder/core/audioUtils.js
index 7e82974ef..294ac1aca 100644
--- a/renderer/src/components/AudioRecorder/core/audioUtils.js
+++ b/renderer/src/components/AudioRecorder/core/audioUtils.js
@@ -1,4 +1,5 @@
 /* eslint-disable no-await-in-loop */
+import { fetchFile } from '@ffmpeg/util';
 import * as logger from '../../../logger';
 
 const toWav = require('audiobuffer-to-wav');
@@ -16,6 +17,7 @@ function sec_to_min_sec_milli_convertor(time) {
 }
 
 async function generateTimeStampData(buffers, book, chapter) {
+    console.log({ buffers, book, chapter });
     logger.debug('audioUtils.js', 'In TimeStamp Generation');
     return new Promise((resolve) => {
         let fileString = 'verse_number\tstart_timestamp\tduration\n';
@@ -24,10 +26,15 @@ async function generateTimeStampData(buffers, book, chapter) {
         const file = `${book}_${chapter.toString().padStart(3, 0)}.${fileType}`;
         let start = 0;
         buffers.forEach((buffer, index) => {
+            console.log({ buffer, index });
             const currentVerse = `Verse_${(index + 1).toString().padStart(2, 0)}`;
+            console.log({ currentVerse });
             const startTimeString = sec_to_min_sec_milli_convertor(start)[3];
+            console.log({ startTimeString }, buffer.duration);
             const durationString = sec_to_min_sec_milli_convertor(buffer.duration)[3];
+            console.log({ durationString });
             fileString += `${currentVerse + seperator + startTimeString + seperator + durationString}\n`;
+            console.log({ fileString }, buffer.duration);
             start += buffer.duration;
         });
         resolve([file, fileString]);
@@ -80,27 +87,162 @@ function sortingLogic(a, b) {
     return a.split('_')[1] - b.split('_')[1];
 }
 
-export async function mergeAudio(audioArr, dirPath, path, book, chapter) {
+export async function mergeAudio(audioArr, dirPath, path, book, chapter, extension, ffmpeg) {
     logger.debug('audioUtils.js', 'In Merge Audio fucntion');
     // const audio = new ConcatAudio(window);
-    return new Promise((resolve) => {
+    return new Promise(async (resolve, reject) => {
         audioArr.sort(sortingLogic);
         for (let i = 0; i < audioArr.length; i++) {
             audioArr[i] = path.join(dirPath, audioArr[i]);
         }
         logger.debug('audioUtils.js', 'start merging audios');
 
-        fetchAndCombineAudio(audioArr, path)
-        .then(async (mergedData) => {
-            logger.debug('audioUtils.js', `Audio merge success . Started Generate Timestamp : ${book} : ${chapter}`);
-            generateTimeStampData(mergedData.buffers, book, chapter)
+        console.log({ audioArr });
+
+        // --------------------------------------------------------------------------------------------
+
+        // const inputFiles = [];
+        // const inputFilesNames = [];
+
+        // for (let i = 0; i < audioArr.length; i++) {
+        //     // const response = await fetch(path.join('file://', audioArr[i]));
+        //     // const arrayBuffer = await response.arrayBuffer();
+        //     // audioBuffers.push(arrayBuffer);
+
+        //     // await fetchFile(path.join('file://', audioArr[i]));
+        //     // const file = new File([arrayBuffer], `input_${i}.wav`);
+        //     inputFilesNames.push(`input_${i}.wav`);
+        //     // inputFiles.push(file);
+        // }
+
+        // console.log('finished write file');
+        // await ffmpeg.exec(['-i', `concat:${inputFiles.map((_, index) => `input_${index}.wav`).join('|')}`, 'output.mp3']);
+        // console.log('finished concat exec -------');
+
+        // // Get the result
+        // try {
+        //     const data = await ffmpeg.readFile('output.mp3');
+        //     console.log('data ==========> ', data);
+        // } catch (err) {
+        //     console.log('error reading  ==========> ', err);
+        // }
+
+        try {
+        // write with file and read method
+        // await ffmpeg.writeFile('concat_list.txt', inputFilesNames.join('/n'));
+        // const listData = await ffmpeg.readFile('concat_list.txt');
+
+        // await ffmpeg.exec(['-f', 'concat', '-safe', '0', '-i', await ffmpeg.readFile('concat_list.txt'), 'output.mp3']);
+
+        // geneate the sequence command string ['-i', 'input1.wav', '-i', 'input2.wav', .... , '-filter_complex',
+        // '[0:0][1:0][2:0][3:0]concat=n=4:v=0:a=1[out]']
+
+        //         ffmpeg -i input1.wav -i input2.wav -i input3.wav -i input4.wav \
+        // -filter_complex '[0:0][1:0][2:0][3:0]concat=n=4:v=0:a=1[out]' \
+        // -map '[out]' output.wav
+
+        console.log('starting merge ----------- ', { ffmpeg });
+
+        const inputCmdArr = [];
+        const commandArr = [];
+        const audioBuffersArr = [];
+        let filterStr = '';
+
+        const audioContext = new (window.AudioContext || window.webkitAudioContext)();
+
+        for (let i = 0; i < audioArr.length; i++) {
+            const audioFile = await fetchFile(path.join('file://', audioArr[i]));
+            const audioFileCopy = new Uint8Array(audioFile);
+            await ffmpeg.writeFile(`input_${i}.wav`, audioFile);
+            inputCmdArr.push('-i', `input_${i}.wav`);
+            filterStr += `[${i}:0]`;
+
+            const audioBuffer = await audioContext.decodeAudioData(audioFileCopy.buffer);
+            audioBuffersArr.push(audioBuffer);
+            console.log({ audioBuffer }, typeof audioBuffer);
+
+            // await ffmpeg.writeFile(`input_${i}.wav`, new Uint8Array(inputFiles[i].arrayBuffer()));
+        }
+
+        filterStr += `concat=n=${audioArr.length}:v=0:a=1[out]`;
+
+        commandArr.push(...inputCmdArr, '-filter_complex', filterStr, '-map', '[out]', `output.${extension}`);
+
+        console.log({ commandArr });
+
+        await ffmpeg.exec(commandArr);
+
+        // const data = await ffmpeg.readFile('output.mp3');
+        const fileData = await ffmpeg.readFile(`output.${extension}`);
+
+        console.log({ fileData });
+
+        // Create a Blob from the result
+        const blob = new Blob([fileData.buffer], { type: extension === 'mp3' ? 'audio/mp3' : 'audio/wav' });
+
+        console.log('genetated blob : ', { blob });
+
+        if (blob) {
+            generateTimeStampData(audioBuffersArr, book, chapter)
             .then((timeStampData) => {
                 logger.debug('audioUtils.js', `return Merged Audio for chapter : ${book} : ${chapter}`);
-                resolve([mergedData.blob, timeStampData]);
+                resolve([blob, timeStampData]);
+            }).catch((err) => {
+                throw new Error(`unable to generate audio : ${err}`);
             });
-        });
+        } else {
+            throw new Error('unable to generate audio');
+        }
+
+        // resolve(blob, []);
+        } catch (err) {
+            console.log('errrorrrr ========> ', err);
+            reject(err);
+        }
+
+        // Promise.all(
+        //     audioArr.map(async (url) => {
+        //       const response = await fetch(path.join('file://', url));
+        //       const arrayBuffer = await response.arrayBuffer();
+        //       return new File([arrayBuffer], 'audio.wav', { type: 'audio/wav' });
+        //     }),
+        //   ).then(async (files) => {
+        //     await files.forEach((file, index) => {
+        //         ffmpeg.FS('writeFile', `input_${index}.wav`, new Uint8Array(file.arrayBuffer()));
+        //     });
+
+        //     await ffmpeg.run('-i', `concat:${files.map((_, index) => `input_${index}.wav`).join('|')}`, 'output.mp3');
+
+        //     // Get the result
+        //     const data = ffmpeg.FS('readFile', 'output.mp3');
+
+        //     // Create a Blob from the result
+        //     const blob = new Blob([data.buffer], { type: 'audio/mp3' });
+
+        //     console.log('generated blob : ', { blob });
+        //     return blob;
+        // }).then((blob) => {
+        //       console.log('in resolve : ', blob);
+        //       resolve(blob, []);
+        //   }).catch((err) => {
+        //     console.log('error in conversion and merge : ', err);
+        //     reject(err);
+        //   });
+
+        // --------------------------------------------------------------------------------------------
+
+        // fetchAndCombineAudio(audioArr, path)
+        // .then(async (mergedData) => {
+        //     logger.debug('audioUtils.js', `Audio merge success . Started Generate Timestamp : ${book} : ${chapter}`);
+        //     generateTimeStampData(mergedData.buffers, book, chapter)
+        //     .then((timeStampData) => {
+        //         logger.debug('audioUtils.js', `return Merged Audio for chapter : ${book} : ${chapter}`);
+        //         resolve([mergedData.blob, timeStampData]);
+        //     });
+        // });
     });
 }
+//
 
 // old snippet for reference
 
diff --git a/renderer/src/components/EditorPage/AudioEditor/AudioEditor.js b/renderer/src/components/EditorPage/AudioEditor/AudioEditor.js
index 3a1a6c27f..625711750 100644
--- a/renderer/src/components/EditorPage/AudioEditor/AudioEditor.js
+++ b/renderer/src/components/EditorPage/AudioEditor/AudioEditor.js
@@ -158,9 +158,9 @@ const AudioEditor = ({ editor }) => {
                                             } else {
                                               // If found only one audio for the verse then making that audio as default one.
                                               // replace url with `${chapter}_${verseNum[1]}_1_default.mp3`
-                                              bookContent[key].contents[v].take1 = `${chapter}_${verseNum[1]}_1_default.mp3`;
+                                              bookContent[key].contents[v].take1 = `${chapter}_${verseNum[1]}_1_default.wav`;
                                               bookContent[key].contents[v].default = 'take1';
-                                              fs.renameSync(path.join(filePath, chapterNum, verse), path.join(filePath, chapterNum, `${chapter}_${verseNum[1]}_1_default.mp3`));
+                                              fs.renameSync(path.join(filePath, chapterNum, verse), path.join(filePath, chapterNum, `${chapter}_${verseNum[1]}_1_default.wav`));
                                             }
                                           }
                                         },
diff --git a/renderer/src/components/EditorPage/AudioEditor/MainPlayer.js b/renderer/src/components/EditorPage/AudioEditor/MainPlayer.js
index a52e62e8c..11aa9c471 100644
--- a/renderer/src/components/EditorPage/AudioEditor/MainPlayer.js
+++ b/renderer/src/components/EditorPage/AudioEditor/MainPlayer.js
@@ -6,8 +6,6 @@ import {
 } from 'react';
 import { useReactMediaRecorder } from 'react-media-recorder';
 import ConfirmationModal from '@/layouts/editor/ConfirmationModal';
-import { Mp3Encoder } from 'lamejs';
-// import { recordmp3js } from 'recordmp3js';
 import { getDetails } from '../ObsEditor/utils/getDetails';
 
 const MainPlayer = () => {
@@ -107,14 +105,14 @@ const MainPlayer = () => {
     const path = require('path');
     let i = 1;
     // Checking whether the take has any audio
-    if (fs.existsSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${value}.mp3`))) {
+    if (fs.existsSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${value}.wav`))) {
       while (i < 4) {
       // Looking for the existed default file so that we can easily rename both the files
-      if (fs.existsSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${i}_default.mp3`))) {
+      if (fs.existsSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${i}_default.wav`))) {
         // Checking whether the user is trying to default the same default file, else rename both.
         if (i !== value) {
-          fs.renameSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${i}_default.mp3`), path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${i}.mp3`));
-          fs.renameSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${value}.mp3`), path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${value}_default.mp3`));
+          fs.renameSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${i}_default.wav`), path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${i}.wav`));
+          fs.renameSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${value}.wav`), path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${value}_default.wav`));
         }
       }
       i += 1;
@@ -124,95 +122,6 @@ const MainPlayer = () => {
     }
   };
 
-  // -------------------------------------------- test save mp3 ----------------------------------------------------
-
-  // const convertToMP3 = async (audioBlob) => new Promise((resolve) => {
-  //     const reader = new FileReader();
-  //     reader.onload = async (event) => {
-  //       const arrayBuffer = event.target.result;
-  //       const audioData = new Int16Array(arrayBuffer);
-  //       const sampleRate = 48000; // Adjusted sample rate to 48,000 Hz
-  //       const channels = 1; // Mono audio, change to 2 for stereo
-  //       const lame = new Mp3Encoder(channels, sampleRate, 128);
-
-  //       const bufferSize = 2304; // Adjusted buffer size to ensure it's a multiple of 2
-  //       const mp3Data = [];
-
-  //       for (let i = 0; i < audioData.length; i += bufferSize) {
-  //         const buffer = audioData.subarray(i, i + bufferSize);
-  //         const mp3Frame = lame.encodeBuffer(buffer);
-  //         if (mp3Frame.length > 0) {
-  //           mp3Data.push(new Int8Array(mp3Frame));
-  //         }
-  //       }
-
-  //       const mp3Blob = new Blob(mp3Data, { type: 'audio/mpeg' });
-  //       resolve(mp3Blob);
-  //     };
-
-  //     reader.readAsArrayBuffer(audioBlob);
-  //   });
-
-  const convertToMP3 = async (audioBlob) => new Promise((resolve) => {
-    const audioContext = new window.AudioContext();
-    const reader = new FileReader();
-      reader.onload = async (event) => {
-        const arrayBuffer = event.target.result;
-        const audioBuffer = await audioContext.decodeAudioData(arrayBuffer);
-
-        const mediaStream = audioContext.createMediaStreamDestination();
-        const mediaRecorder = new MediaRecorder(mediaStream.stream);
-
-        const audioChunks = [];
-        mediaRecorder.ondataavailable = (event) => {
-            if (event.data.size > 0) {
-                audioChunks.push(event.data);
-            }
-        };
-
-        mediaRecorder.onstop = () => {
-          const mp3Blob = new Blob(audioChunks, { type: 'audio/mp3' });
-          resolve(mp3Blob);
-        };
-
-        mediaRecorder.start();
-        const source = audioContext.createBufferSource();
-        source.buffer = audioBuffer;
-        source.connect(mediaStream);
-        source.start();
-
-        setTimeout(() => {
-          mediaRecorder.stop();
-          audioContext.close();
-      }, audioBuffer.duration * 1000);
-      };
-
-      reader.readAsArrayBuffer(audioBlob);
-  });
-
-    // -------------------------------------------------------------------
-    const saveAudioAsMP3 = async (audioBlob, projectsDir) => {
-      if (audioBlob) {
-        const fs = window.require('fs');
-        const path = require('path');
-        const mp3Blob = await convertToMP3(audioBlob);
-        const fileReader = new FileReader();
-        // eslint-disable-next-line func-names
-        const filePath = path.join(projectsDir, 'audio', 'ingredients', bookId.toUpperCase(), chapter, `${chapter}_${verse}_converted.mp3`);
-        fileReader.onload = function () {
-          // eslint-disable-next-line react/no-this-in-sfc
-          fs.writeFile(filePath, Buffer.from(new Uint8Array(this.result)), (err) => {
-            if (!err) {
-              console.log('converted mp3 saved', { bookId, chapter, verse });
-            }
-          });
-        };
-        fileReader.readAsArrayBuffer(mp3Blob);
-      }
-    };
-
-  // ----------------------------------------------------------------------------------------------------------------
-
   const saveAudio = (blob) => {
     getDetails()
     .then(({
@@ -249,8 +158,8 @@ const MainPlayer = () => {
       };
       fileReader.readAsArrayBuffer(blob);
 
-      // save as mp3
-      saveAudioAsMP3(blob, projectsDir);
+      // // save as mp3
+      // saveAudioAsMP3(blob, projectsDir);
     });
   };
   const playRecordingFeedback = useCallback(
@@ -268,7 +177,7 @@ const MainPlayer = () => {
   } = useReactMediaRecorder({
       audio: true,
       onStop: playRecordingFeedback,
-      blobPropertyBag: { type: 'audio/mp3' },
+      blobPropertyBag: { type: 'audio/wav' },
   });
   const handleFunction = () => {
     // We have used trigger to identify whether the call is from DeleteAudio or Re-record
@@ -286,15 +195,15 @@ const MainPlayer = () => {
         },
       );
       // Checking whether the user is trying to delete the default file.
-      if (fs.existsSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${result}_default.mp3`))) {
+      if (fs.existsSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${result}_default.wav`))) {
         // Since user is deleting the default file, we need to change the default to some other takes if available
         let i = 1;
         while (i < 4) {
           if (i !== +result) {
-            if (fs.existsSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${i}.mp3`))) {
-              fs.renameSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${i}.mp3`), path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${i}_default.mp3`));
+            if (fs.existsSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${i}.wav`))) {
+              fs.renameSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${i}.wav`), path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${i}_default.wav`));
               delete audioCurrentChapter.bookContent[chapter - 1].contents[versePosition][take];
-              fs.unlinkSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${result}_default.mp3`));
+              fs.unlinkSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${result}_default.wav`));
               delete audioCurrentChapter.bookContent[chapter - 1].contents[versePosition][take];
               i = 5;
             }
@@ -303,13 +212,13 @@ const MainPlayer = () => {
         }
         // Deleting the default one
         if (i !== 6) {
-          fs.unlinkSync(path.join(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${result}_default.mp3`)));
+          fs.unlinkSync(path.join(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${result}_default.wav`)));
           delete audioCurrentChapter.bookContent[chapter - 1].contents[versePosition][take];
           delete audioCurrentChapter.bookContent[chapter - 1].contents[versePosition].default;
         }
       } else {
         delete audioCurrentChapter.bookContent[chapter - 1].contents[versePosition][take];
-        fs.unlinkSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${result}.mp3`));
+        fs.unlinkSync(path.join(audioCurrentChapter.filePath, audioCurrentChapter.chapterNum, `${chapter}_${verse}_${result}.wav`));
       }
       // Since we are not loading the entire component and updating the JSON data (audioContent), we need to update it manually.
       setAudioContent(audioCurrentChapter.bookContent[chapter - 1].contents);
diff --git a/renderer/src/layouts/projects/Export/ExportUtils.js b/renderer/src/layouts/projects/Export/ExportUtils.js
index 32079d490..338dd814a 100644
--- a/renderer/src/layouts/projects/Export/ExportUtils.js
+++ b/renderer/src/layouts/projects/Export/ExportUtils.js
@@ -2,6 +2,7 @@
 import { mergeAudio } from '@/components/AudioRecorder/core/audioUtils';
 import { convertToMP3 } from './WavToMp3';
 import * as logger from '../../../logger';
+import loadFFmpeg, { transcodeSingleWavToMp3 } from './ffmpegAudioCore';
 
 const md5 = require('md5');
 
@@ -51,25 +52,36 @@ await fse.copy(audio, path.join(folderPath, project.name, mp3ExportPath))
     }).catch((err) => logger.error('ExportProjectUtils.js', `${err}`));
 };
 
-async function convertWavToMp3(inputFilePath, path, outputFilePath) {
+async function convertWavToMp3(inputFilePath, path) {
   try {
-    const context = new window.AudioContext();
-    const mp3Blob = await convertToMP3(context, path.join('file://', inputFilePath), path.join('file://', outputFilePath));
-
-    console.log('generated mp3 blob : ', { mp3Blob });
-    return mp3Blob;
+    // const context = new window.AudioContext();
+    // const mp3Blob = await convertToMP3(context, path.join('file://', inputFilePath), path.join('file://', outputFilePath));
+    let ffmpeg;
+    if (!ffmpeg) {
+      ffmpeg = await loadFFmpeg();
+    }
+    console.log('load success : ', { ffmpeg });
+    if (ffmpeg) {
+      const mp3Blob = await transcodeSingleWavToMp3(path.join('file://', inputFilePath));
+      console.log('conversion success : ', { inputFilePath, mp3Blob });
+      console.log('-----------------------------------------------------------------------');
+      return mp3Blob;
+    }
+    throw new Error('Error. FFmpeg loading. Export failed');
   } catch (error) {
     console.error('Error during conversion:', error);
+    throw new Error(error?.message || error);
   }
 }
 
 // utils fucnton for default export Audio mp3
 const writeAndUpdateBurritoDefaultExportMp3 = async (audio, path, mp3ExportPath, fs, fse, book, verse, burrito, folderPath, project, selectedAudioExt) => {
   // update new file path mostly in target
-  const outputFilePath = path.join(folderPath, project.name, mp3ExportPath);
-  const mp3Blob = await convertWavToMp3(audio, path, outputFilePath);
-  await writeRecfile(mp3Blob, outputFilePath, fs)
-      .then(async (convertedBlob) => {
+  try {
+    const outputFilePath = path.join(folderPath, project.name, mp3ExportPath);
+    const mp3Blob = await convertWavToMp3(audio, path);
+    await writeRecfile(mp3Blob, outputFilePath, fs)
+    .then(async (convertedBlob) => {
       logger.debug('ExportProjectPopUp.js', 'Generated mp3 audio written to folder');
       const stats = fs.statSync(outputFilePath);
       burrito.ingredients[mp3ExportPath] = {
@@ -81,7 +93,10 @@ const writeAndUpdateBurritoDefaultExportMp3 = async (audio, path, mp3ExportPath,
         scope: {},
       };
     });
-  burrito.ingredients[mp3ExportPath].scope[book] = [verse.replace('_', ':')];
+    burrito.ingredients[mp3ExportPath].scope[book] = [verse.replace('_', ':')];
+  } catch (err) {
+    throw new Error(err?.message || err);
+  }
 };
 
 // export audio project FUll Zip
@@ -137,9 +152,12 @@ export const exportFullAudio = async (metadata, folder, path, fs, ExportActions,
 };
 
 // Function for Chapter Level Export DEFAULT - Verse Wise / MERGE CHAPTER LEVEL
-const exportChapterAudio = async (defaultAudio, burrito, fs, path, folder, folderPath, project, ExportActions) => {
+const exportChapterAudio = async (defaultAudio, burrito, fs, path, folder, folderPath, project, ExportActions, selectedAudioExt) => {
     logger.debug('ExportProjectUtils.js', 'In export Chapter level audio');
     const audioObj = {};
+    // load ffmpeg
+    const ffmpeg = await loadFFmpeg();
+
     // delete verse vice ingredients exist in burrito
     const audioExtensions = ['.mp3', '.wav'];
     // eslint-disable-next-line no-unused-vars
@@ -160,18 +178,18 @@ const exportChapterAudio = async (defaultAudio, burrito, fs, path, folder, folde
           audioObj[book][chapter] = new Array(url);
       }
     }
-    // loop the book and chapter to generate merged audio of chapter
+    // loop the book and chapter  to generate merged audio of chapter
     // eslint-disable-next-line no-restricted-syntax
     for (const bk in audioObj) {
       if (Object.prototype.hasOwnProperty.call(audioObj, bk)) {
         // eslint-disable-next-line no-restricted-syntax
         for (const ch in audioObj[bk]) {
           if (Object.prototype.hasOwnProperty.call(audioObj[bk], ch)) {
-            const extension = audioObj[bk][ch][0].split('.').pop();
-            const audioName = `${ch}.${extension}`;
+            // const extension = audioObj[bk][ch][0].split('.').pop();
+            const audioName = `${ch}.${selectedAudioExt.ext}`;
             const audioExportPath = path.join(folderPath, project.name, 'ingredients', bk);
             // eslint-disable-next-line no-await-in-loop
-            await mergeAudio(audioObj[bk][ch], path.join(folder, 'audio', 'ingredients', bk, ch), path, bk, ch)
+            await mergeAudio(audioObj[bk][ch], path.join(folder, 'audio', 'ingredients', bk, ch), path, bk, ch, selectedAudioExt.ext, ffmpeg)
             .then(async ([mergedAudioBlob, timeStampData]) => {
               logger.debug('ExportProjectPopUp.js', `generated merged audio for ${bk} : ${ch}`);
               // console.log('audio created ==== : ', `generated merged audio for => ${bk} : ${ch}`);
@@ -186,7 +204,7 @@ const exportChapterAudio = async (defaultAudio, burrito, fs, path, folder, folde
                 checksum: {
                   md5: md5(convertedBlob),
                 },
-                mimeType: 'audio/mp3',
+                mimeType: 'audio/mpeg',
                 size: stats.size,
                 scope: {},
               };
@@ -234,7 +252,7 @@ export const exportDefaultAudio = async (metadata, folder, path, fs, ExportActio
         ExportActions.setTotalExported((prev) => prev + 1);
       }
     } else if (ExportStates.audioExport === 'chapter') {
-      await exportChapterAudio(defaultAudio, burrito, fs, path, folder, ExportStates.folderPath, ExportStates.project, ExportActions);
+        await exportChapterAudio(defaultAudio, burrito, fs, path, folder, ExportStates.folderPath, ExportStates.project, ExportActions, selectedAudioExt);
     }
     // We need to execute these loop before going to next line so 'for' is used instead of 'forEach'
     // eslint-disable-next-line no-restricted-syntax
diff --git a/renderer/src/layouts/projects/Export/ffmpegAudioCore.js b/renderer/src/layouts/projects/Export/ffmpegAudioCore.js
new file mode 100644
index 000000000..d7b67d7f3
--- /dev/null
+++ b/renderer/src/layouts/projects/Export/ffmpegAudioCore.js
@@ -0,0 +1,25 @@
+// ffmpeg audio core related fucntionalities
+import { FFmpeg } from '@ffmpeg/ffmpeg';
+import { toBlobURL, fetchFile } from '@ffmpeg/util';
+
+let ffmpeg;
+
+export default async function loadFFmpeg() {
+  ffmpeg = new FFmpeg();
+  const baseURL = 'https://unpkg.com/@ffmpeg/core@0.12.2/dist/umd';
+  await ffmpeg.load({
+    coreURL: await toBlobURL(`${baseURL}/ffmpeg-core.js`, 'text/javascript'),
+    wasmURL: await toBlobURL(`${baseURL}/ffmpeg-core.wasm`, 'application/wasm'),
+  });
+  return ffmpeg;
+}
+
+export const transcodeSingleWavToMp3 = async (inputFilePath) => {
+  await ffmpeg.writeFile('input.wav', await fetchFile(inputFilePath));
+  // await ffmpeg.exec(['-i', 'input.wav', '-b:a', '96', '-ar', '44100', '-c:a', 'copy', 'output.mp3']);
+  await ffmpeg.exec(['-i', 'input.wav', 'output.mp3']);
+  const fileData = await ffmpeg.readFile('output.mp3');
+  const data = new Uint8Array(fileData);
+  const mp3Blob = new Blob([data.buffer], { type: 'audio/mpeg' });
+  return mp3Blob;
+};
diff --git a/yarn.lock b/yarn.lock
index 7bf534467..edecdb23f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1588,6 +1588,23 @@
   resolved "https://registry.yarnpkg.com/@fastify/accept-negotiator/-/accept-negotiator-1.1.0.tgz#c1c66b3b771c09742a54dd5bc87c582f6b0630ff"
   integrity sha512-OIHZrb2ImZ7XG85HXOONLcJWGosv7sIvM2ifAPQVhg9Lv7qdmMBNVaai4QTdyuaqbKM5eO6sLSQOYI7wEQeCJQ==
 
+"@ffmpeg/ffmpeg@^0.12.7":
+  version "0.12.7"
+  resolved "https://registry.yarnpkg.com/@ffmpeg/ffmpeg/-/ffmpeg-0.12.7.tgz#fbe8b28cae2183ff74456d77fdc2803e54048df0"
+  integrity sha512-Uw9h1tNU4/Q4YRrgBKvnKiH5gpL+nl8h4HRfvSK0K93MqVOan6Qs3Lj82l9i1qj6xQLPramXw0Wl6g65W4pfnA==
+  dependencies:
+    "@ffmpeg/types" "^0.12.2"
+
+"@ffmpeg/types@^0.12.2":
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/@ffmpeg/types/-/types-0.12.2.tgz#bc7eef321ae50225c247091f1f23fd3087c6aa1d"
+  integrity sha512-NJtxwPoLb60/z1Klv0ueshguWQ/7mNm106qdHkB4HL49LXszjhjCCiL+ldHJGQ9ai2Igx0s4F24ghigy//ERdA==
+
+"@ffmpeg/util@^0.12.1":
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/@ffmpeg/util/-/util-0.12.1.tgz#98afa20d7b4c0821eebdb205ddcfa5d07b0a4f53"
+  integrity sha512-10jjfAKWaDyb8+nAkijcsi9wgz/y26LOc1NKJradNMyCIl6usQcBbhkjX5qhALrSBcOy6TOeksunTYa+a03qNQ==
+
 "@findr/perf@^1.0.3-beta.17":
   version "1.0.3-beta.17"
   resolved "https://registry.yarnpkg.com/@findr/perf/-/perf-1.0.3-beta.17.tgz#e0837afd6cf81028c782c0708a534f0fef5df7b1"

From 1e902ccf13599e5d02739d7dc49ff0b6b2e4a8a6 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Mon, 4 Dec 2023 16:35:30 +0530
Subject: [PATCH 04/10] code cleanup and error handling for all export , fixed
 ui hang issue on failure

---
 .../AudioRecorder/core/audioUtils.js          | 330 +++++-------------
 .../layouts/projects/Export/ExportUtils.js    | 216 +++++++-----
 .../src/layouts/projects/Export/WavToMp3.js   |  60 ----
 3 files changed, 204 insertions(+), 402 deletions(-)
 delete mode 100644 renderer/src/layouts/projects/Export/WavToMp3.js

diff --git a/renderer/src/components/AudioRecorder/core/audioUtils.js b/renderer/src/components/AudioRecorder/core/audioUtils.js
index 294ac1aca..4d0d7031b 100644
--- a/renderer/src/components/AudioRecorder/core/audioUtils.js
+++ b/renderer/src/components/AudioRecorder/core/audioUtils.js
@@ -2,84 +2,46 @@
 import { fetchFile } from '@ffmpeg/util';
 import * as logger from '../../../logger';
 
-const toWav = require('audiobuffer-to-wav');
-
 function sec_to_min_sec_milli_convertor(time) {
-    logger.debug('audioUtils.js', 'In  time conversion function');
-    let milliseconds = time.toString().split('.')[1];
-    if (milliseconds === undefined) {
-        milliseconds = '0';
+    try {
+        logger.debug('audioUtils.js', 'In  time conversion function');
+        let milliseconds = time.toString().split('.')[1];
+        if (milliseconds === undefined) {
+            milliseconds = '0';
+        }
+        const minutes = Math.floor(time / 60);
+        const seconds = (time - minutes * 60).toString().split('.')[0].padStart(2, 0);
+        const formatedStringTime = `${minutes.toString().padStart(2, 0)}:${seconds}:${milliseconds.padStart(2, 0)}`;
+        logger.debug('audioUtils.js', 'In  time conversion function done');
+        return [minutes, seconds, milliseconds, formatedStringTime];
+    } catch (err) {
+        throw new Error(`audio generation failed : ${err}`);
     }
-    const minutes = Math.floor(time / 60);
-    const seconds = (time - minutes * 60).toString().split('.')[0].padStart(2, 0);
-    const formatedStringTime = `${minutes.toString().padStart(2, 0)}:${seconds}:${milliseconds.padStart(2, 0)}`;
-    return [minutes, seconds, milliseconds, formatedStringTime];
 }
 
 async function generateTimeStampData(buffers, book, chapter) {
-    console.log({ buffers, book, chapter });
-    logger.debug('audioUtils.js', 'In TimeStamp Generation');
-    return new Promise((resolve) => {
-        let fileString = 'verse_number\tstart_timestamp\tduration\n';
-        const seperator = '\t';
-        const fileType = 'tsv';
-        const file = `${book}_${chapter.toString().padStart(3, 0)}.${fileType}`;
-        let start = 0;
-        buffers.forEach((buffer, index) => {
-            console.log({ buffer, index });
-            const currentVerse = `Verse_${(index + 1).toString().padStart(2, 0)}`;
-            console.log({ currentVerse });
-            const startTimeString = sec_to_min_sec_milli_convertor(start)[3];
-            console.log({ startTimeString }, buffer.duration);
-            const durationString = sec_to_min_sec_milli_convertor(buffer.duration)[3];
-            console.log({ durationString });
-            fileString += `${currentVerse + seperator + startTimeString + seperator + durationString}\n`;
-            console.log({ fileString }, buffer.duration);
-            start += buffer.duration;
+    try {
+        logger.debug('audioUtils.js', 'In TimeStamp Generation');
+        return new Promise((resolve) => {
+            let fileString = 'verse_number\tstart_timestamp\tduration\n';
+            const seperator = '\t';
+            const fileType = 'tsv';
+            const file = `${book}_${chapter.toString().padStart(3, 0)}.${fileType}`;
+            let start = 0;
+            buffers.forEach((buffer, index) => {
+                const currentVerse = `Verse_${(index + 1).toString().padStart(2, 0)}`;
+                const startTimeString = sec_to_min_sec_milli_convertor(start)[3];
+                const durationString = sec_to_min_sec_milli_convertor(buffer.duration)[3];
+                fileString += `${currentVerse + seperator + startTimeString + seperator + durationString}\n`;
+                start += buffer.duration;
+            });
+            resolve([file, fileString]);
+        }).catch((err) => {
+            throw new Error(`audio generation failed : ${err}`);
         });
-        resolve([file, fileString]);
-    });
-}
-
-async function fetchAndCombineAudio(audioArr, path) {
-    logger.debug('audioUtils.js', 'In Fetch and merge audio function');
-    // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve) => {
-        const context = new window.AudioContext();
-
-        // store the decoded buff
-        const sources = [];
-
-        // eslint-disable-next-line no-restricted-syntax, guard-for-in
-        for (const url of audioArr) {
-            try {
-            const response = await fetch(path.join('file://', url));
-            const buffer = await response.arrayBuffer();
-            const decodedData = await context.decodeAudioData(buffer);
-            sources.push(decodedData);
-            } catch (err) {
-                logger.error('audioUtils.js', `Error reading audio - ${url} : ${err}`);
-            }
-        }
-
-        logger.debug('audioUtils.js', 'In fetchAndCombineAudio : Fetch audio success  ');
-
-        const totalLength = sources.reduce((total, source) => total + source.length, 0);
-        const output = context.createBuffer(1, totalLength, context.sampleRate);
-
-        let offset = 0;
-
-        // eslint-disable-next-line no-restricted-syntax
-        for (const source of sources) {
-            output.copyToChannel(source.getChannelData(0), 0, offset);
-            offset += source.length;
-        }
-        const wavData = toWav(output);
-        logger.debug('audioUtils.js', 'In fetchAndCombineAudio : generate wav success');
-        const blob = new Blob([new DataView(wavData)], { type: 'audio/wav' });
-        logger.debug('audioUtils.js', 'In fetchAndCombineAudio : Generate Final merged Audio success ');
-        resolve({ blob, buffers: sources });
-    });
+    } catch (err) {
+        throw new Error('audio generation failed : err');
+    }
 }
 
 function sortingLogic(a, b) {
@@ -88,189 +50,63 @@ function sortingLogic(a, b) {
 }
 
 export async function mergeAudio(audioArr, dirPath, path, book, chapter, extension, ffmpeg) {
-    logger.debug('audioUtils.js', 'In Merge Audio fucntion');
-    // const audio = new ConcatAudio(window);
-    return new Promise(async (resolve, reject) => {
-        audioArr.sort(sortingLogic);
-        for (let i = 0; i < audioArr.length; i++) {
-            audioArr[i] = path.join(dirPath, audioArr[i]);
-        }
-        logger.debug('audioUtils.js', 'start merging audios');
-
-        console.log({ audioArr });
-
-        // --------------------------------------------------------------------------------------------
-
-        // const inputFiles = [];
-        // const inputFilesNames = [];
-
-        // for (let i = 0; i < audioArr.length; i++) {
-        //     // const response = await fetch(path.join('file://', audioArr[i]));
-        //     // const arrayBuffer = await response.arrayBuffer();
-        //     // audioBuffers.push(arrayBuffer);
-
-        //     // await fetchFile(path.join('file://', audioArr[i]));
-        //     // const file = new File([arrayBuffer], `input_${i}.wav`);
-        //     inputFilesNames.push(`input_${i}.wav`);
-        //     // inputFiles.push(file);
-        // }
-
-        // console.log('finished write file');
-        // await ffmpeg.exec(['-i', `concat:${inputFiles.map((_, index) => `input_${index}.wav`).join('|')}`, 'output.mp3']);
-        // console.log('finished concat exec -------');
-
-        // // Get the result
-        // try {
-        //     const data = await ffmpeg.readFile('output.mp3');
-        //     console.log('data ==========> ', data);
-        // } catch (err) {
-        //     console.log('error reading  ==========> ', err);
-        // }
-
-        try {
-        // write with file and read method
-        // await ffmpeg.writeFile('concat_list.txt', inputFilesNames.join('/n'));
-        // const listData = await ffmpeg.readFile('concat_list.txt');
-
-        // await ffmpeg.exec(['-f', 'concat', '-safe', '0', '-i', await ffmpeg.readFile('concat_list.txt'), 'output.mp3']);
-
-        // geneate the sequence command string ['-i', 'input1.wav', '-i', 'input2.wav', .... , '-filter_complex',
-        // '[0:0][1:0][2:0][3:0]concat=n=4:v=0:a=1[out]']
-
-        //         ffmpeg -i input1.wav -i input2.wav -i input3.wav -i input4.wav \
-        // -filter_complex '[0:0][1:0][2:0][3:0]concat=n=4:v=0:a=1[out]' \
-        // -map '[out]' output.wav
-
-        console.log('starting merge ----------- ', { ffmpeg });
-
-        const inputCmdArr = [];
-        const commandArr = [];
-        const audioBuffersArr = [];
-        let filterStr = '';
-
-        const audioContext = new (window.AudioContext || window.webkitAudioContext)();
-
-        for (let i = 0; i < audioArr.length; i++) {
-            const audioFile = await fetchFile(path.join('file://', audioArr[i]));
-            const audioFileCopy = new Uint8Array(audioFile);
-            await ffmpeg.writeFile(`input_${i}.wav`, audioFile);
-            inputCmdArr.push('-i', `input_${i}.wav`);
-            filterStr += `[${i}:0]`;
-
-            const audioBuffer = await audioContext.decodeAudioData(audioFileCopy.buffer);
-            audioBuffersArr.push(audioBuffer);
-            console.log({ audioBuffer }, typeof audioBuffer);
-
-            // await ffmpeg.writeFile(`input_${i}.wav`, new Uint8Array(inputFiles[i].arrayBuffer()));
-        }
-
-        filterStr += `concat=n=${audioArr.length}:v=0:a=1[out]`;
-
-        commandArr.push(...inputCmdArr, '-filter_complex', filterStr, '-map', '[out]', `output.${extension}`);
-
-        console.log({ commandArr });
-
-        await ffmpeg.exec(commandArr);
-
-        // const data = await ffmpeg.readFile('output.mp3');
-        const fileData = await ffmpeg.readFile(`output.${extension}`);
-
-        console.log({ fileData });
-
-        // Create a Blob from the result
-        const blob = new Blob([fileData.buffer], { type: extension === 'mp3' ? 'audio/mp3' : 'audio/wav' });
+    try {
+        logger.debug('audioUtils.js', 'In Merge Audio fucntion');
+        // eslint-disable-next-line no-async-promise-executor
+        return new Promise(async (resolve) => {
+            audioArr.sort(sortingLogic);
+            for (let i = 0; i < audioArr.length; i++) {
+                audioArr[i] = path.join(dirPath, audioArr[i]);
+            }
+            logger.debug('audioUtils.js', 'mergeAudio : start merging audios');
 
-        console.log('genetated blob : ', { blob });
+            const inputCmdArr = [];
+            const commandArr = [];
+            const audioBuffersArr = [];
+            let filterStr = '';
 
-        if (blob) {
-            generateTimeStampData(audioBuffersArr, book, chapter)
-            .then((timeStampData) => {
-                logger.debug('audioUtils.js', `return Merged Audio for chapter : ${book} : ${chapter}`);
-                resolve([blob, timeStampData]);
-            }).catch((err) => {
-                throw new Error(`unable to generate audio : ${err}`);
-            });
-        } else {
-            throw new Error('unable to generate audio');
-        }
+            const audioContext = new (window.AudioContext || window.webkitAudioContext)();
 
-        // resolve(blob, []);
-        } catch (err) {
-            console.log('errrorrrr ========> ', err);
-            reject(err);
-        }
+            for (let i = 0; i < audioArr.length; i++) {
+                const audioFile = await fetchFile(path.join('file://', audioArr[i]));
+                const audioFileCopy = new Uint8Array(audioFile);
+                await ffmpeg.writeFile(`input_${i}.wav`, audioFile);
+                inputCmdArr.push('-i', `input_${i}.wav`);
+                filterStr += `[${i}:0]`;
 
-        // Promise.all(
-        //     audioArr.map(async (url) => {
-        //       const response = await fetch(path.join('file://', url));
-        //       const arrayBuffer = await response.arrayBuffer();
-        //       return new File([arrayBuffer], 'audio.wav', { type: 'audio/wav' });
-        //     }),
-        //   ).then(async (files) => {
-        //     await files.forEach((file, index) => {
-        //         ffmpeg.FS('writeFile', `input_${index}.wav`, new Uint8Array(file.arrayBuffer()));
-        //     });
+                const audioBuffer = await audioContext.decodeAudioData(audioFileCopy.buffer);
+                audioBuffersArr.push(audioBuffer);
+            }
+            filterStr += `concat=n=${audioArr.length}:v=0:a=1[out]`;
+            commandArr.push(...inputCmdArr, '-filter_complex', filterStr, '-map', '[out]', `output.${extension}`);
 
-        //     await ffmpeg.run('-i', `concat:${files.map((_, index) => `input_${index}.wav`).join('|')}`, 'output.mp3');
+            logger.debug('audioUtils.js', 'mergeAudio : audio internal write done and buffers created');
 
-        //     // Get the result
-        //     const data = ffmpeg.FS('readFile', 'output.mp3');
+            // exeute merge process
+            await ffmpeg.exec(commandArr);
 
-        //     // Create a Blob from the result
-        //     const blob = new Blob([data.buffer], { type: 'audio/mp3' });
+            // generate unit8 buffer out
+            const fileData = await ffmpeg.readFile(`output.${extension}`);
 
-        //     console.log('generated blob : ', { blob });
-        //     return blob;
-        // }).then((blob) => {
-        //       console.log('in resolve : ', blob);
-        //       resolve(blob, []);
-        //   }).catch((err) => {
-        //     console.log('error in conversion and merge : ', err);
-        //     reject(err);
-        //   });
+            logger.debug('audioUtils.js', 'mergeAudio : audio merged buffer created');
 
-        // --------------------------------------------------------------------------------------------
+            // Create a Blob from the result
+            const blob = new Blob([fileData.buffer], { type: extension === 'mp3' ? 'audio/mpeg' : 'audio/wav' });
+            logger.debug('audioUtils.js', 'mergeAudio : audio merged blob created');
 
-        // fetchAndCombineAudio(audioArr, path)
-        // .then(async (mergedData) => {
-        //     logger.debug('audioUtils.js', `Audio merge success . Started Generate Timestamp : ${book} : ${chapter}`);
-        //     generateTimeStampData(mergedData.buffers, book, chapter)
-        //     .then((timeStampData) => {
-        //         logger.debug('audioUtils.js', `return Merged Audio for chapter : ${book} : ${chapter}`);
-        //         resolve([mergedData.blob, timeStampData]);
-        //     });
-        // });
-    });
+            if (blob) {
+                generateTimeStampData(audioBuffersArr, book, chapter)
+                .then((timeStampData) => {
+                    logger.debug('audioUtils.js', `mergeAudio : return timestamp for Merged Audio for chapter : ${book} : ${chapter}`);
+                    resolve([blob, timeStampData]);
+                }).catch((err) => {
+                    throw new Error(`unable to generate audio : ${err}`);
+                });
+            } else {
+                throw new Error('unable to generate audio');
+            }
+        });
+    } catch (err) {
+        throw new Error(`audio generation failed : ${err}`);
+    }
 }
-//
-
-// old snippet for reference
-
-// export async function mergeAudio(audioArr, dirPath, path, book, chapter) {
-//     logger.debug('audioUtils.js', 'In Merge Audio fucntion');
-//     const audio = new ConcatAudio(window);
-//     return new Promise((resolve) => {
-//         let merged;
-//         let output;
-//         audioArr.sort();
-//         for (let i = 0; i < audioArr.length; i++) {
-//             audioArr[i] = path.join(dirPath, audioArr[i]);
-//         }
-//         logger.debug('audioUtils.js', 'start merging audios');
-//         audio.fetchAudio(...audioArr)
-//         .then(async (buffers) => {
-//             // generate timestamp data string
-//             await generateTimeStampData(buffers, book, chapter)
-//             .then((timeStampData) => {
-//                 // merging all buffers
-//                 merged = audio.concatAudio(buffers);
-//                 return [merged, timeStampData];
-//             })
-//             .then(async ([merged, timeStampData]) => {
-//                 output = audio.export(merged, 'audio/mp3');
-//                 logger.debug('audioUtils.js', `return Merged Audio for chapter : ${book} : ${chapter}`);
-//                 resolve([output.blob, timeStampData]);
-//             });
-//         });
-//     });
-// }
diff --git a/renderer/src/layouts/projects/Export/ExportUtils.js b/renderer/src/layouts/projects/Export/ExportUtils.js
index 338dd814a..52f62133e 100644
--- a/renderer/src/layouts/projects/Export/ExportUtils.js
+++ b/renderer/src/layouts/projects/Export/ExportUtils.js
@@ -1,12 +1,12 @@
 /* eslint-disable no-useless-escape */
 import { mergeAudio } from '@/components/AudioRecorder/core/audioUtils';
-import { convertToMP3 } from './WavToMp3';
 import * as logger from '../../../logger';
 import loadFFmpeg, { transcodeSingleWavToMp3 } from './ffmpegAudioCore';
 
 const md5 = require('md5');
 
 export async function writeRecfile(file, filePath, fs) {
+  try {
     logger.debug('ExportProjectUtils.js', `in Chapter level file write : ${filePath}`);
     return new Promise((resolve) => {
     const fileReader = new FileReader();
@@ -17,11 +17,15 @@ export async function writeRecfile(file, filePath, fs) {
     };
     fileReader.readAsArrayBuffer(file);
     });
+  } catch (err) {
+    throw new Error(err);
+  }
 }
 
 // fucntion to walkthough the directory and identify audios
 export async function walk(dir, path, fs) {
-    logger.debug('ExportProjectUtils.js', `in wlak thorugh dir : ${dir} : ${path}`);
+  try {
+    logger.debug('ExportUtils.js', `in wlak thorugh dir : ${dir} : ${path}`);
     let files = await fs.readdirSync(dir);
     files = await Promise.all(files.map(async (file) => {
         const filePath = path.join(dir, file);
@@ -30,46 +34,47 @@ export async function walk(dir, path, fs) {
         if (stats.isFile()) { return filePath; }
     }));
     return files.reduce((all, folderContents) => all.concat(folderContents), []);
+  } catch (err) {
+    throw new Error(err);
   }
+}
 
 // util Function for default export Audio wav
 const writeAndUpdateBurritoDefaultExportWav = async (audio, path, mp3ExportPath, fs, fse, book, verse, burrito, folderPath, project, selectedAudioExt) => {
-await fse.copy(audio, path.join(folderPath, project.name, mp3ExportPath))
+  await fse.copy(audio, path.join(folderPath, project.name, mp3ExportPath))
     .then(async () => {
-      console.log('export aduio : ', mp3ExportPath, path.join(folderPath, project.name, mp3ExportPath));
-    logger.debug('ExportProjectUtils.js', 'Creating the ingredients.');
-    const content = fs.readFileSync(path.join(folderPath, project.name, mp3ExportPath), 'utf8');
-    const stats = fs.statSync(path.join(folderPath, project.name, mp3ExportPath));
-    burrito.ingredients[mp3ExportPath] = {
-        checksum: {
-        md5: md5(content),
-        },
-        mimeType: selectedAudioExt.mimeType,
-        size: stats.size,
-        scope: {},
-    };
-    burrito.ingredients[mp3ExportPath].scope[book] = [verse.replace('_', ':')];
-    }).catch((err) => logger.error('ExportProjectUtils.js', `${err}`));
+      logger.debug('ExportUtilss.js', 'Creating the ingredients.');
+      const content = fs.readFileSync(path.join(folderPath, project.name, mp3ExportPath), 'utf8');
+      const stats = fs.statSync(path.join(folderPath, project.name, mp3ExportPath));
+      burrito.ingredients[mp3ExportPath] = {
+          checksum: {
+          md5: md5(content),
+          },
+          mimeType: selectedAudioExt.mimeType,
+          size: stats.size,
+          scope: {},
+      };
+      burrito.ingredients[mp3ExportPath].scope[book] = [verse.replace('_', ':')];
+    }).catch((err) => {
+      logger.error('ExportUtilss.js', `${err}`);
+      throw new Error(err);
+  });
 };
 
 async function convertWavToMp3(inputFilePath, path) {
   try {
-    // const context = new window.AudioContext();
-    // const mp3Blob = await convertToMP3(context, path.join('file://', inputFilePath), path.join('file://', outputFilePath));
+    logger.debug('ExportUtils.js', 'convertWavToMp3 : in convert indivudual wav to mp3');
     let ffmpeg;
     if (!ffmpeg) {
       ffmpeg = await loadFFmpeg();
     }
-    console.log('load success : ', { ffmpeg });
     if (ffmpeg) {
       const mp3Blob = await transcodeSingleWavToMp3(path.join('file://', inputFilePath));
-      console.log('conversion success : ', { inputFilePath, mp3Blob });
-      console.log('-----------------------------------------------------------------------');
       return mp3Blob;
     }
-    throw new Error('Error. FFmpeg loading. Export failed');
+    throw new Error('Error load converter. Export failed');
   } catch (error) {
-    console.error('Error during conversion:', error);
+    logger.debug('ExportUtils.js', `convertWavToMp3 : error in convert indivudual wav to mp3 ${error}`);
     throw new Error(error?.message || error);
   }
 }
@@ -82,7 +87,7 @@ const writeAndUpdateBurritoDefaultExportMp3 = async (audio, path, mp3ExportPath,
     const mp3Blob = await convertWavToMp3(audio, path);
     await writeRecfile(mp3Blob, outputFilePath, fs)
     .then(async (convertedBlob) => {
-      logger.debug('ExportProjectPopUp.js', 'Generated mp3 audio written to folder');
+      logger.debug('ExportUtils.js', 'Generated wav audio written to folder');
       const stats = fs.statSync(outputFilePath);
       burrito.ingredients[mp3ExportPath] = {
         checksum: {
@@ -100,8 +105,9 @@ const writeAndUpdateBurritoDefaultExportMp3 = async (audio, path, mp3ExportPath,
 };
 
 // export audio project FUll Zip
-export const exportFullAudio = async (metadata, folder, path, fs, ExportActions, ExportStates, closePopUp, t, selectedAudioExt) => {
-    logger.debug('ExportProjectUtils.js', 'In export Full zip for audio');
+export const exportFullAudio = async (metadata, folder, path, fs, ExportActions, ExportStates, closePopUp, t) => {
+  try {
+    logger.debug('ExportUtils.js', 'In export Full zip for audio');
     ExportActions.setTotalExported((curr) => curr + 1);
     const AdmZip = window.require('adm-zip');
     const fse = window.require('fs-extra');
@@ -118,7 +124,7 @@ export const exportFullAudio = async (metadata, folder, path, fs, ExportActions,
       zip.addLocalFolder(path.join(folder, 'audio', 'ingredients', sourceDir), sourceDir);
     });
     zip.writeZip(path.join(dir, 'ag_internal_audio.zip'));
-    logger.debug('ExportProjectUtils.js', 'write zip completed');
+    logger.debug('ExportUtils.js', 'write zip completed');
     ExportActions.setTotalExported((curr) => curr + 1);
     const list = await walk(path.join(folder, 'audio', 'ingredients'), path, fs);
     const otherFiles = list.filter((name) => !name.includes('.mp3') && !name.includes('.wav'));
@@ -126,7 +132,7 @@ export const exportFullAudio = async (metadata, folder, path, fs, ExportActions,
       const filePath = file.split(/[\/\\]ingredients[\/\\]/)[1];
       await fse.copy(file, path.join(ExportStates.folderPath, ExportStates.project.name, 'ingredients', filePath));
     });
-    logger.debug('ExportProjectUtils.js', 'copied all files');
+    logger.debug('ExportUtils.js', 'copied all files');
     const renames = Object.keys(burrito.ingredients).filter((key) => key.includes('audio'));
     await renames?.forEach((rename) => {
       burrito.ingredients[rename.replace(/audio[\/\\]/, '')] = burrito.ingredients[rename];
@@ -143,86 +149,102 @@ export const exportFullAudio = async (metadata, folder, path, fs, ExportActions,
     };
     ExportActions.setTotalExported((curr) => curr + 1);
     await fs.writeFileSync(path.join(ExportStates.folderPath, ExportStates.project.name, 'metadata.json'), JSON.stringify(burrito));
-    logger.debug('ExportProjectPopUp.js', 'Exported Successfully');
+    logger.debug('ExportUtils.js', 'Exported Successfully');
     ExportActions.resetExportProgress();
     ExportActions.setNotify('success');
     ExportActions.setSnackText(t('dynamic-msg-export-success'));
     ExportActions.setOpenSnackBar(true);
     closePopUp(false);
+  } catch (err) {
+    logger.debug('ExportUtils.js', `Exported failed ${err}`);
+    ExportActions.resetExportProgress(); // finish export reset all states of export
+    ExportActions.setNotify('failure');
+    ExportActions.setSnackText(t('dynamic-msg-export-fail'));
+    ExportActions.setOpenSnackBar(true);
+  }
 };
 
 // Function for Chapter Level Export DEFAULT - Verse Wise / MERGE CHAPTER LEVEL
 const exportChapterAudio = async (defaultAudio, burrito, fs, path, folder, folderPath, project, ExportActions, selectedAudioExt) => {
-    logger.debug('ExportProjectUtils.js', 'In export Chapter level audio');
-    const audioObj = {};
-    // load ffmpeg
-    const ffmpeg = await loadFFmpeg();
+    try {
+      logger.debug('ExportUtils.js', 'In export Chapter level audio');
+      const audioObj = {};
+      // load ffmpeg
+      const ffmpeg = await loadFFmpeg();
 
-    // delete verse vice ingredients exist in burrito
-    const audioExtensions = ['.mp3', '.wav'];
-    // eslint-disable-next-line no-unused-vars
-    Object.entries(burrito.ingredients).forEach(([_k, _v]) => {
-      if (audioExtensions.some((ext) => _k.toLocaleLowerCase().includes(ext.toLocaleLowerCase()))) { delete burrito.ingredients[_k]; }
-    });
-    // eslint-disable-next-line
-    for (const audio of defaultAudio) {
-      const book = audio.split(/[\/\\]/).slice(-3)[0];
-      const chapter = audio.split(/[\/\\]/).slice(-2)[0];
-      const url = audio.split(/[\/\\]/).slice(-1)[0];
-      // eslint-disable-next-line no-await-in-loop
-      if (book in audioObj && chapter in audioObj[book]) {
-          audioObj[book][chapter].push(url);
-      } else if (!(book in audioObj)) {
-          audioObj[book] = { [chapter]: new Array(url) };
-      } else if (book in audioObj && !(chapter in audioObj[book])) {
-          audioObj[book][chapter] = new Array(url);
+      // delete verse vice ingredients exist in burrito
+      const audioExtensions = ['.mp3', '.wav'];
+      // eslint-disable-next-line no-unused-vars
+      Object.entries(burrito.ingredients).forEach(([_k, _v]) => {
+        if (audioExtensions.some((ext) => _k.toLocaleLowerCase().includes(ext.toLocaleLowerCase()))) { delete burrito.ingredients[_k]; }
+      });
+      // eslint-disable-next-line
+      for (const audio of defaultAudio) {
+        const book = audio.split(/[\/\\]/).slice(-3)[0];
+        const chapter = audio.split(/[\/\\]/).slice(-2)[0];
+        const url = audio.split(/[\/\\]/).slice(-1)[0];
+        // eslint-disable-next-line no-await-in-loop
+        if (book in audioObj && chapter in audioObj[book]) {
+            audioObj[book][chapter].push(url);
+        } else if (!(book in audioObj)) {
+            audioObj[book] = { [chapter]: new Array(url) };
+        } else if (book in audioObj && !(chapter in audioObj[book])) {
+            audioObj[book][chapter] = new Array(url);
+        }
       }
-    }
-    // loop the book and chapter  to generate merged audio of chapter
-    // eslint-disable-next-line no-restricted-syntax
-    for (const bk in audioObj) {
-      if (Object.prototype.hasOwnProperty.call(audioObj, bk)) {
+      // loop the book and chapter  to generate merged audio of chapter
+      if (ffmpeg) {
         // eslint-disable-next-line no-restricted-syntax
-        for (const ch in audioObj[bk]) {
-          if (Object.prototype.hasOwnProperty.call(audioObj[bk], ch)) {
-            // const extension = audioObj[bk][ch][0].split('.').pop();
-            const audioName = `${ch}.${selectedAudioExt.ext}`;
-            const audioExportPath = path.join(folderPath, project.name, 'ingredients', bk);
-            // eslint-disable-next-line no-await-in-loop
-            await mergeAudio(audioObj[bk][ch], path.join(folder, 'audio', 'ingredients', bk, ch), path, bk, ch, selectedAudioExt.ext, ffmpeg)
-            .then(async ([mergedAudioBlob, timeStampData]) => {
-              logger.debug('ExportProjectPopUp.js', `generated merged audio for ${bk} : ${ch}`);
-              // console.log('audio created ==== : ', `generated merged audio for => ${bk} : ${ch}`);
-              ExportActions.setTotalExported((curr) => curr + audioObj[bk][ch].length);
-              // Write Merge Audio
-              fs.mkdirSync(audioExportPath, { recursive: true });
-              await writeRecfile(mergedAudioBlob, path.join(audioExportPath, audioName), fs)
-              .then(async (convertedBlob) => {
-              logger.debug('ExportProjectPopUp.js', 'Generated audio written to folder');
-              const stats = fs.statSync(path.join(audioExportPath, audioName));
-              burrito.ingredients[path.join('ingredients', bk, audioName)] = {
-                checksum: {
-                  md5: md5(convertedBlob),
-                },
-                mimeType: 'audio/mpeg',
-                size: stats.size,
-                scope: {},
-              };
-              burrito.ingredients[path.join('ingredients', bk, audioName)].scope[bk] = [ch.toString()];
-              logger.debug('ExportProjectPopUp.js', 'Burrito updated for generated Audio');
-              // Write TimeStamp
-              fs.mkdirSync(path.join(folderPath, project.name, 'time stamps'), { recursive: true });
-              await fs.writeFileSync(path.join(folderPath, project.name, 'time stamps', timeStampData[0]), timeStampData[1], 'utf-8');
-            });
-            });
+        for (const bk in audioObj) {
+          if (Object.prototype.hasOwnProperty.call(audioObj, bk)) {
+            // eslint-disable-next-line no-restricted-syntax
+            for (const ch in audioObj[bk]) {
+              if (Object.prototype.hasOwnProperty.call(audioObj[bk], ch)) {
+                // const extension = audioObj[bk][ch][0].split('.').pop();
+                const audioName = `${ch}.${selectedAudioExt.ext}`;
+                const audioExportPath = path.join(folderPath, project.name, 'ingredients', bk);
+                // eslint-disable-next-line no-await-in-loop
+                await mergeAudio(audioObj[bk][ch], path.join(folder, 'audio', 'ingredients', bk, ch), path, bk, ch, selectedAudioExt.ext, ffmpeg)
+                .then(async ([mergedAudioBlob, timeStampData]) => {
+                  logger.debug('ExportUtils.js', `generated merged audio for ${bk} : ${ch}`);
+                  // console.log('audio created ==== : ', `generated merged audio for => ${bk} : ${ch}`);
+                  ExportActions.setTotalExported((curr) => curr + audioObj[bk][ch].length);
+                  // Write Merge Audio
+                  fs.mkdirSync(audioExportPath, { recursive: true });
+                  await writeRecfile(mergedAudioBlob, path.join(audioExportPath, audioName), fs)
+                  .then(async (convertedBlob) => {
+                  logger.debug('ExportUtils.js', 'Generated audio written to folder');
+                  const stats = fs.statSync(path.join(audioExportPath, audioName));
+                  burrito.ingredients[path.join('ingredients', bk, audioName)] = {
+                    checksum: {
+                      md5: md5(convertedBlob),
+                    },
+                    mimeType: selectedAudioExt.ext === 'mp3' ? 'audio/mpeg' : 'audio/wav',
+                    size: stats.size,
+                    scope: {},
+                  };
+                  burrito.ingredients[path.join('ingredients', bk, audioName)].scope[bk] = [ch.toString()];
+                  logger.debug('ExportUtils.js', 'Burrito updated for generated Audio');
+                  // Write TimeStamp
+                  fs.mkdirSync(path.join(folderPath, project.name, 'time stamps'), { recursive: true });
+                  await fs.writeFileSync(path.join(folderPath, project.name, 'time stamps', timeStampData[0]), timeStampData[1], 'utf-8');
+                });
+                });
+              }
+            }
           }
         }
+      } else {
+        throw new Error('failed to convert. Converted not loaded');
       }
+    } catch (err) {
+      throw new Error(`audio generation failed : ${err}`);
     }
   };
 
 export const exportDefaultAudio = async (metadata, folder, path, fs, ExportActions, ExportStates, closePopUp, t, selectedAudioExt) => {
-    logger.debug('ExportProjectUtils.js', 'in Export Audio Common Function ');
+  try {
+    logger.debug('ExportUtils.js', 'in Export Audio Common Function ');
     const fse = window.require('fs-extra');
     const burrito = metadata;
     const list = await walk(path.join(folder, 'audio', 'ingredients'), path, fs);
@@ -276,14 +298,18 @@ export const exportDefaultAudio = async (metadata, folder, path, fs, ExportActio
       await fse.copySync(path.join(folder, 'text-1'), path.join(ExportStates.folderPath, ExportStates.project.name, 'text-1'));
       await fs.rmSync(path.join(ExportStates.folderPath, ExportStates.project.name, 'ingredients'), { recursive: true, force: true });
     }
-    // if (audioExport === 'chapter') {
-    //   pushNotification('Export Project', `${t('dynamic-msg-export-success')} ${project.name} project`);
-    // }
-    logger.debug('ExportProjectPopUp.js', 'Exported Successfully');
+    logger.debug('ExportUtils.js', 'Exported Successfully');
     ExportActions.resetExportProgress(); // finish export reset all states of export
     ExportActions.setNotify('success');
     ExportActions.setSnackText(t('dynamic-msg-export-success'));
     ExportActions.setOpenSnackBar(true);
     closePopUp(false);
     ExportActions.setCheckText(false);
-  };
+  } catch (err) {
+    logger.debug('ExportUtils.js', `Exported failed ${err}`);
+    ExportActions.resetExportProgress(); // finish export reset all states of export
+    ExportActions.setNotify('failure');
+    ExportActions.setSnackText(t('dynamic-msg-export-fail'));
+    ExportActions.setOpenSnackBar(true);
+  }
+};
diff --git a/renderer/src/layouts/projects/Export/WavToMp3.js b/renderer/src/layouts/projects/Export/WavToMp3.js
deleted file mode 100644
index 66ed2a957..000000000
--- a/renderer/src/layouts/projects/Export/WavToMp3.js
+++ /dev/null
@@ -1,60 +0,0 @@
-async function readAudioFileAndDecode(filepath, audioContext) {
-  // const response = await fetch(path.join('file://', url));
-  const response = await fetch(filepath);
-  const buffer = await response.arrayBuffer();
-  // const decodedData = await audioContext.decodeAudioData(buffer);
-  return buffer;
-}
-
-const convertToMP3 = async (audioContext, inputPath, outpath) => {
-
-};
-
-// lame js testing
-// const convertToMP3 = async (audioContext, filePath) => {
-//   try {
-//   // read file
-//   const audioBuffer = await readAudioFileAndDecode(filePath, audioContext);
-//   const encoder = new Mp3Encoder(1, 44100, 128); // Mono, 44.1 kHz, 128 kbps
-
-//   const wavView = new DataView(audioBuffer);
-
-//   const mp3Buffer = [];
-//   const sampleBlockSize = 1152;
-//   const samplesMono = new Int16Array(sampleBlockSize);
-
-//   console.log(encoder, wavView, audioBuffer, mp3Buffer);
-
-//   // Loop through the WAV data and encode it into MP3
-// for (let i = 44; i < audioBuffer.byteLength; i += 2) {
-//   if (i + 1 < audioBuffer.byteLength) {
-//     const sample = wavView.getInt16(i, true); // Little-endian
-//     samplesMono[(i - 44) / 2] = sample;
-//     if ((i - 44) % (sampleBlockSize * 2) === 0) {
-//       const mp3Data = encoder.encodeBuffer(samplesMono);
-//       if (mp3Data.length > 0) {
-//         mp3Buffer.push(new Int8Array(mp3Data));
-//       }
-//     }
-//   } else {
-//     break; // Break the loop if the offset is out of bounds
-//   }
-// }
-
-//   const mp3Data = encoder.flush();
-//   if (mp3Data.length > 0) {
-//     mp3Buffer.push(new Int8Array(mp3Data));
-//   }
-
-// 	const mp3Concatenated = new Int8Array(mp3Buffer.reduce((acc, chunk) => acc.concat(chunk), []));
-
-//   const mp3Blob = new Blob(mp3Concatenated, { type: 'audio/mp3' });
-//   return mp3Blob;
-
-//   // --------------------------------------------------------
-//   } catch (err) {
-//     console.log('audio convert error : ', err);
-//   }
-// };
-
-export { convertToMP3 };

From b3de99a1ef079ea4e76afc8df64aed01d5ca00c9 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Mon, 4 Dec 2023 16:45:37 +0530
Subject: [PATCH 05/10] removed export extension selection for full audio
 export

---
 .../projects/Export/ExportProjectPopUp.js     | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/renderer/src/layouts/projects/Export/ExportProjectPopUp.js b/renderer/src/layouts/projects/Export/ExportProjectPopUp.js
index d2c34aa34..66f5ea41a 100644
--- a/renderer/src/layouts/projects/Export/ExportProjectPopUp.js
+++ b/renderer/src/layouts/projects/Export/ExportProjectPopUp.js
@@ -302,16 +302,18 @@ export default function ExportProjectPopUp(props) {
                               <input id="visible_1" className="visible" type="checkbox" checked={checkText} onClick={() => setCheckText(!checkText)} />
                               <span className="ml-2 text-xs font-bold" title="You can have the text content along with the Audio">With Text (if available)</span>
                             </div>
-                            <div className="max-w-[150px]">
-                              <CustomMultiComboBox
-                                selectedList={[selectedAudioExt]}
-                                setSelectedList={setSelectedAudioExt}
-                                customData={Object.values(audioExportFormats)}
-                                filterParams="ext"
-                                placeholder="Select Output type"
-                                dropArrow
-                              />
-                            </div>
+                            {audioExport !== 'full' && (
+                              <div className="max-w-[150px]">
+                                <CustomMultiComboBox
+                                  selectedList={[selectedAudioExt]}
+                                  setSelectedList={setSelectedAudioExt}
+                                  customData={Object.values(audioExportFormats)}
+                                  filterParams="ext"
+                                  placeholder="Select Output type"
+                                  dropArrow
+                                />
+                              </div>
+                            )}
                           </div>
                         </div>
                       )}

From 9c884ac06c2946240f52431727302f10a910a600 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Wed, 6 Dec 2023 14:22:30 +0530
Subject: [PATCH 06/10] added metadata, fixed naming , added 1 sec silence at
 begining and adjusted the timestamp

---
 .../AudioRecorder/core/audioUtils.js          | 164 +++++++++++-------
 .../layouts/projects/Export/ExportUtils.js    |   6 +-
 2 files changed, 105 insertions(+), 65 deletions(-)

diff --git a/renderer/src/components/AudioRecorder/core/audioUtils.js b/renderer/src/components/AudioRecorder/core/audioUtils.js
index 4d0d7031b..b33234637 100644
--- a/renderer/src/components/AudioRecorder/core/audioUtils.js
+++ b/renderer/src/components/AudioRecorder/core/audioUtils.js
@@ -1,6 +1,8 @@
 /* eslint-disable no-await-in-loop */
 import { fetchFile } from '@ffmpeg/util';
+import * as localforage from 'localforage';
 import * as logger from '../../../logger';
+import packageInfo from '../../../../../package.json';
 
 function sec_to_min_sec_milli_convertor(time) {
     try {
@@ -27,13 +29,22 @@ async function generateTimeStampData(buffers, book, chapter) {
             const seperator = '\t';
             const fileType = 'tsv';
             const file = `${book}_${chapter.toString().padStart(3, 0)}.${fileType}`;
-            let start = 0;
+            let start = 0; // because of 1 sec silence in merged verses
             buffers.forEach((buffer, index) => {
                 const currentVerse = `Verse_${(index + 1).toString().padStart(2, 0)}`;
                 const startTimeString = sec_to_min_sec_milli_convertor(start)[3];
-                const durationString = sec_to_min_sec_milli_convertor(buffer.duration)[3];
+                let durationString;
+                let offset = 0;
+                if (index === 0 || (index === buffers.length - 1)) {
+                    // adding this because of 1 sec silence in the start || 1 sec silence in the end add it to last verse
+                    durationString = sec_to_min_sec_milli_convertor(buffer.duration + 1)[3];
+                    offset = 1;
+                } else {
+                    offset = 0;
+                    durationString = sec_to_min_sec_milli_convertor(buffer.duration)[3];
+                }
                 fileString += `${currentVerse + seperator + startTimeString + seperator + durationString}\n`;
-                start += buffer.duration;
+                start += buffer.duration + offset;
             });
             resolve([file, fileString]);
         }).catch((err) => {
@@ -49,64 +60,93 @@ function sortingLogic(a, b) {
     return a.split('_')[1] - b.split('_')[1];
 }
 
-export async function mergeAudio(audioArr, dirPath, path, book, chapter, extension, ffmpeg) {
-    try {
-        logger.debug('audioUtils.js', 'In Merge Audio fucntion');
-        // eslint-disable-next-line no-async-promise-executor
-        return new Promise(async (resolve) => {
-            audioArr.sort(sortingLogic);
-            for (let i = 0; i < audioArr.length; i++) {
-                audioArr[i] = path.join(dirPath, audioArr[i]);
-            }
-            logger.debug('audioUtils.js', 'mergeAudio : start merging audios');
-
-            const inputCmdArr = [];
-            const commandArr = [];
-            const audioBuffersArr = [];
-            let filterStr = '';
-
-            const audioContext = new (window.AudioContext || window.webkitAudioContext)();
-
-            for (let i = 0; i < audioArr.length; i++) {
-                const audioFile = await fetchFile(path.join('file://', audioArr[i]));
-                const audioFileCopy = new Uint8Array(audioFile);
-                await ffmpeg.writeFile(`input_${i}.wav`, audioFile);
-                inputCmdArr.push('-i', `input_${i}.wav`);
-                filterStr += `[${i}:0]`;
-
-                const audioBuffer = await audioContext.decodeAudioData(audioFileCopy.buffer);
-                audioBuffersArr.push(audioBuffer);
-            }
-            filterStr += `concat=n=${audioArr.length}:v=0:a=1[out]`;
-            commandArr.push(...inputCmdArr, '-filter_complex', filterStr, '-map', '[out]', `output.${extension}`);
-
-            logger.debug('audioUtils.js', 'mergeAudio : audio internal write done and buffers created');
-
-            // exeute merge process
-            await ffmpeg.exec(commandArr);
-
-            // generate unit8 buffer out
-            const fileData = await ffmpeg.readFile(`output.${extension}`);
-
-            logger.debug('audioUtils.js', 'mergeAudio : audio merged buffer created');
-
-            // Create a Blob from the result
-            const blob = new Blob([fileData.buffer], { type: extension === 'mp3' ? 'audio/mpeg' : 'audio/wav' });
-            logger.debug('audioUtils.js', 'mergeAudio : audio merged blob created');
-
-            if (blob) {
-                generateTimeStampData(audioBuffersArr, book, chapter)
-                .then((timeStampData) => {
-                    logger.debug('audioUtils.js', `mergeAudio : return timestamp for Merged Audio for chapter : ${book} : ${chapter}`);
-                    resolve([blob, timeStampData]);
-                }).catch((err) => {
-                    throw new Error(`unable to generate audio : ${err}`);
-                });
-            } else {
-                throw new Error('unable to generate audio');
-            }
+export async function mergeAudio(audioArr, dirPath, path, book, chapter, extension, ffmpeg, project) {
+  try {
+    logger.debug('audioUtils.js', 'In Merge Audio fucntion');
+    // eslint-disable-next-line no-async-promise-executor
+    return new Promise(async (resolve, reject) => {
+      try {
+        audioArr.sort(sortingLogic);
+        for (let i = 0; i < audioArr.length; i++) {
+            audioArr[i] = path.join(dirPath, audioArr[i]);
+        }
+        logger.debug('audioUtils.js', 'mergeAudio : start merging audios');
+
+        const inputCmdArr = [];
+        const commandArr = [];
+        const audioBuffersArr = [];
+        let filterStr = '';
+        let currentUser;
+        await localforage.getItem('userProfile').then((value) => {
+            currentUser = value?.username;
         });
-    } catch (err) {
-        throw new Error(`audio generation failed : ${err}`);
-    }
+        // only support specific data fields // title, artist, album, year, comment
+        const audioMetaDataArr = [
+            '-metadata', `title=${book}_${chapter}`,
+            '-metadata', `artist=${currentUser || packageInfo.name}`,
+            '-metadata', `album=${project.name}`,
+            '-metadata', `comment=${packageInfo.name}_${packageInfo.version}`,
+            '-metadata', `date=${new Date().getFullYear().toString()}`,
+        ];
+
+        const audioContext = new (window.AudioContext || window.webkitAudioContext)();
+
+        for (let i = 0; i < audioArr.length; i++) {
+          const audioFile = await fetchFile(path.join('file://', audioArr[i]));
+          const audioFileCopy = new Uint8Array(audioFile);
+          await ffmpeg.writeFile(`input_${i}.wav`, audioFile);
+          inputCmdArr.push('-i', `input_${i}.wav`);
+          filterStr += `[${i}:0]`;
+
+          const audioBuffer = await audioContext.decodeAudioData(audioFileCopy.buffer);
+          audioBuffersArr.push(audioBuffer);
+        }
+        filterStr += `concat=n=${audioArr.length + 1 }:v=0:a=1[out]`;
+
+        commandArr.push(
+          ...inputCmdArr,
+          '-filter_complex',
+          `aevalsrc=0:d=1[silence1];[silence1]${filterStr}`,
+          '-map',
+          '[out]',
+          ...audioMetaDataArr,
+          '-ar',
+          '48000',
+          `output.${extension}`,
+        );
+
+        console.log({ filterStr, commandArr });
+
+        logger.debug('audioUtils.js', 'mergeAudio : audio internal write done and buffers created');
+
+        // exeute merge process
+        await ffmpeg.exec(commandArr);
+
+        // generate unit8 buffer out
+        const fileData = await ffmpeg.readFile(`output.${extension}`);
+
+        logger.debug('audioUtils.js', 'mergeAudio : audio merged buffer created');
+
+        // Create a Blob from the result
+        const blob = new Blob([fileData.buffer], { type: extension === 'mp3' ? 'audio/mpeg' : 'audio/wav' });
+        logger.debug('audioUtils.js', 'mergeAudio : audio merged blob created');
+
+        if (blob) {
+          generateTimeStampData(audioBuffersArr, book, chapter)
+          .then((timeStampData) => {
+              logger.debug('audioUtils.js', `mergeAudio : return timestamp for Merged Audio for chapter : ${book} : ${chapter}`);
+              resolve([blob, timeStampData]);
+          }).catch((err) => {
+              throw new Error(`unable to generate audio : ${err}`);
+          });
+        } else {
+            throw new Error('unable to generate audio');
+        }
+      } catch (err) {
+          reject(new Error(`audio generation failed : ${err}`));
+      }
+    });
+  } catch (err) {
+      throw new Error(`audio generation failed : ${err}`);
+  }
 }
diff --git a/renderer/src/layouts/projects/Export/ExportUtils.js b/renderer/src/layouts/projects/Export/ExportUtils.js
index 52f62133e..4c903d00f 100644
--- a/renderer/src/layouts/projects/Export/ExportUtils.js
+++ b/renderer/src/layouts/projects/Export/ExportUtils.js
@@ -204,7 +204,7 @@ const exportChapterAudio = async (defaultAudio, burrito, fs, path, folder, folde
                 const audioName = `${ch}.${selectedAudioExt.ext}`;
                 const audioExportPath = path.join(folderPath, project.name, 'ingredients', bk);
                 // eslint-disable-next-line no-await-in-loop
-                await mergeAudio(audioObj[bk][ch], path.join(folder, 'audio', 'ingredients', bk, ch), path, bk, ch, selectedAudioExt.ext, ffmpeg)
+                await mergeAudio(audioObj[bk][ch], path.join(folder, 'audio', 'ingredients', bk, ch), path, bk, ch, selectedAudioExt.ext, ffmpeg, project)
                 .then(async ([mergedAudioBlob, timeStampData]) => {
                   logger.debug('ExportUtils.js', `generated merged audio for ${bk} : ${ch}`);
                   // console.log('audio created ==== : ', `generated merged audio for => ${bk} : ${ch}`);
@@ -258,8 +258,8 @@ export const exportDefaultAudio = async (metadata, folder, path, fs, ExportActio
         const book = audio.split(/[\/\\]/).slice(-3)[0];
         const chapter = audio.split(/[\/\\]/).slice(-2)[0];
         const url = audio.split(/[\/\\]/).slice(-1)[0];
-        const mp3 = url.replace(/_\d_default/, '');
-        const verse = mp3.replace('.mp3', ''); // change this when backend change default to wav
+        const wavAudio = url.replace(/_\d_default/, '');
+        const verse = wavAudio.replace('.wav', ''); // change this when backend change default to wav
         // const mp3ExportPath = path.join('ingredients', book, chapter, mp3);
         const mp3ExportPath = path.join('ingredients', book, chapter, `${verse}.${selectedAudioExt.ext}`);
         const exportFolderPath = path.join(ExportStates.folderPath, ExportStates.project.name, 'ingredients', book, chapter);

From a3be7f2b5e9644135dedc50790131b10dfdcc66b Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Wed, 6 Dec 2023 14:39:28 +0530
Subject: [PATCH 07/10] added metadata for verse level audios

---
 .../layouts/projects/Export/ExportUtils.js    | 20 ++++++++++++++++---
 .../projects/Export/ffmpegAudioCore.js        | 14 +++++++++++--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/renderer/src/layouts/projects/Export/ExportUtils.js b/renderer/src/layouts/projects/Export/ExportUtils.js
index 4c903d00f..02e560cb6 100644
--- a/renderer/src/layouts/projects/Export/ExportUtils.js
+++ b/renderer/src/layouts/projects/Export/ExportUtils.js
@@ -1,7 +1,9 @@
 /* eslint-disable no-useless-escape */
 import { mergeAudio } from '@/components/AudioRecorder/core/audioUtils';
+import * as localforage from 'localforage';
 import * as logger from '../../../logger';
 import loadFFmpeg, { transcodeSingleWavToMp3 } from './ffmpegAudioCore';
+import packageInfo from '../../../../../package.json';
 
 const md5 = require('md5');
 
@@ -61,7 +63,7 @@ const writeAndUpdateBurritoDefaultExportWav = async (audio, path, mp3ExportPath,
   });
 };
 
-async function convertWavToMp3(inputFilePath, path) {
+async function convertWavToMp3(inputFilePath, path, project, book, chapter, currentUser) {
   try {
     logger.debug('ExportUtils.js', 'convertWavToMp3 : in convert indivudual wav to mp3');
     let ffmpeg;
@@ -69,7 +71,14 @@ async function convertWavToMp3(inputFilePath, path) {
       ffmpeg = await loadFFmpeg();
     }
     if (ffmpeg) {
-      const mp3Blob = await transcodeSingleWavToMp3(path.join('file://', inputFilePath));
+      const mp3Blob = await transcodeSingleWavToMp3(
+        path.join('file://', inputFilePath),
+        project,
+        book,
+        chapter,
+        packageInfo,
+        currentUser,
+        );
       return mp3Blob;
     }
     throw new Error('Error load converter. Export failed');
@@ -84,7 +93,12 @@ const writeAndUpdateBurritoDefaultExportMp3 = async (audio, path, mp3ExportPath,
   // update new file path mostly in target
   try {
     const outputFilePath = path.join(folderPath, project.name, mp3ExportPath);
-    const mp3Blob = await convertWavToMp3(audio, path);
+    let currentUser;
+    await localforage.getItem('userProfile').then((value) => {
+        currentUser = value?.username;
+    });
+    const ch_verse = verse.split('_');
+    const mp3Blob = await convertWavToMp3(audio, path, project, book, ch_verse[0], currentUser);
     await writeRecfile(mp3Blob, outputFilePath, fs)
     .then(async (convertedBlob) => {
       logger.debug('ExportUtils.js', 'Generated wav audio written to folder');
diff --git a/renderer/src/layouts/projects/Export/ffmpegAudioCore.js b/renderer/src/layouts/projects/Export/ffmpegAudioCore.js
index d7b67d7f3..8a0e9681e 100644
--- a/renderer/src/layouts/projects/Export/ffmpegAudioCore.js
+++ b/renderer/src/layouts/projects/Export/ffmpegAudioCore.js
@@ -14,10 +14,20 @@ export default async function loadFFmpeg() {
   return ffmpeg;
 }
 
-export const transcodeSingleWavToMp3 = async (inputFilePath) => {
+export const transcodeSingleWavToMp3 = async (inputFilePath, project, book, chapter, packageInfo, currentUser) => {
   await ffmpeg.writeFile('input.wav', await fetchFile(inputFilePath));
   // await ffmpeg.exec(['-i', 'input.wav', '-b:a', '96', '-ar', '44100', '-c:a', 'copy', 'output.mp3']);
-  await ffmpeg.exec(['-i', 'input.wav', 'output.mp3']);
+  let audioMetaDataArr = [];
+  if (project?.name && book && chapter && packageInfo && currentUser) {
+    audioMetaDataArr = [
+      '-metadata', `title=${book}_${chapter}`,
+      '-metadata', `artist=${currentUser || packageInfo.name}`,
+      '-metadata', `album=${project.name}`,
+      '-metadata', `comment=${packageInfo.name}_${packageInfo.version}`,
+      '-metadata', `date=${new Date().getFullYear().toString()}`,
+  ];
+  }
+  await ffmpeg.exec(['-i', 'input.wav', ...audioMetaDataArr, 'output.mp3']);
   const fileData = await ffmpeg.readFile('output.mp3');
   const data = new Uint8Array(fileData);
   const mp3Blob = new Blob([data.buffer], { type: 'audio/mpeg' });

From 1fa7d824c88d9e17fb17ba9d04c1a1004d3ce84c Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Thu, 7 Dec 2023 10:25:17 +0530
Subject: [PATCH 08/10] updated package

---
 package.json |  2 ++
 yarn.lock    | 22 ----------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 5d562b6aa..09a4b542b 100644
--- a/package.json
+++ b/package.json
@@ -118,6 +118,8 @@
     "@electron/remote": "^2.0.8",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
+    "@ffmpeg/ffmpeg": "^0.12.7",
+    "@ffmpeg/util": "^0.12.1",
     "@headlessui/react": "^1.7.8",
     "@heroicons/react": "^2.0.14",
     "@material-ui/core": "^4.12.4",
diff --git a/yarn.lock b/yarn.lock
index 13bc8de7b..defd41842 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13024,13 +13024,6 @@ kuler@^2.0.0:
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
   integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==
 
-lamejs@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/lamejs/-/lamejs-1.2.0.tgz#0259f83db4666141a7b671b8caa6369d95177d08"
-  integrity sha512-xEYvsB2sZ9jIccqfUQpQEBdB6UYQDG/ta2xQkH7oEpENb0JHFJii965WVF8ErUMdZzoe7EdIruz1WpICdhZ9Pw==
-  dependencies:
-    use-strict "1.0.1"
-
 language-subtag-registry@~0.3.2:
   version "0.3.22"
   resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d"
@@ -14933,11 +14926,6 @@ optionator@^0.9.3:
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
 
-opus-recorder@^8.0.5:
-  version "8.0.5"
-  resolved "https://registry.yarnpkg.com/opus-recorder/-/opus-recorder-8.0.5.tgz#06d3e32e15da57ebc3f57e41b93033475fcb4e3e"
-  integrity sha512-tBRXc9Btds7i3bVfA7d5rekAlyOcfsivt5vSIXHxRV1Oa+s6iXFW8omZ0Lm3ABWotVcEyKt96iIIUcgbV07YOw==
-
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
@@ -16999,11 +16987,6 @@ recorder-audio-worklet@^5.1.26:
     tslib "^2.5.0"
     worker-factory "^6.0.76"
 
-recordmp3js@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/recordmp3js/-/recordmp3js-0.5.0.tgz#9902d87472800b42464703f5635a8deebb6a1af5"
-  integrity sha512-0MyJJiq6yUrPupBoZxyLk2B1EFfuzkma70ZQAQmdMdza6XoiUqhQuy5H4/f5ti/Z/2ZagnzNRsLfXu2p493o7g==
-
 recursive-readdir@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.3.tgz#e726f328c0d69153bcabd5c322d3195252379372"
@@ -19650,11 +19633,6 @@ use-sidecar@^1.1.2:
     detect-node-es "^1.1.0"
     tslib "^2.0.0"
 
-use-strict@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/use-strict/-/use-strict-1.0.1.tgz#0bb80d94f49a4a05192b84a8c7d34e95f1a7e3a0"
-  integrity sha512-IeiWvvEXfW5ltKVMkxq6FvNf2LojMKvB2OCeja6+ct24S1XOmQw2dGr2JyndwACWAGJva9B7yPHwAmeA9QCqAQ==
-
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"

From b08963744639fb46bafdf649d3e85bfa85bd1e06 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Fri, 8 Dec 2023 10:16:53 +0530
Subject: [PATCH 09/10] import changes , restrict chapter vise , only allow old
 mp3 with proper mimetype

---
 renderer/src/core/burrito/importBurrito.js    | 17 +++++
 .../projects/Export/ExportProjectPopUp.js     |  2 +-
 .../layouts/projects/ImportProjectPopUp.js    | 75 +++++++++++++------
 3 files changed, 71 insertions(+), 23 deletions(-)

diff --git a/renderer/src/core/burrito/importBurrito.js b/renderer/src/core/burrito/importBurrito.js
index 50d0d565c..431099e4e 100644
--- a/renderer/src/core/burrito/importBurrito.js
+++ b/renderer/src/core/burrito/importBurrito.js
@@ -96,6 +96,7 @@ export const viewBurrito = async (filePath, currentUser, resource) => {
       sb = JSON.stringify(metadata);
     }
     const success = await validate('metadata', path.join(filePath, 'metadata.json'), sb, metadata.meta.version);
+    console.log({ metadata });
     if (success || metadata.type?.flavorType?.flavor?.name === 'audioTranslation') {
       result.validate = true;
       logger.debug('importBurrito.js', 'Burrito file validated successfully');
@@ -103,6 +104,7 @@ export const viewBurrito = async (filePath, currentUser, resource) => {
       result.version = metadata.meta.version;
       result.burritoType = `${metadata.type?.flavorType?.name} / ${metadata.type?.flavorType?.flavor?.name}`;
       result.ingredients = Object.keys(metadata.ingredients).map((key) => key);
+      result.ingredientsArray = metadata.ingredients;
       result.primaryKey = metadata.identification.primary;
       result.publicDomain = metadata.copyright?.publicDomain;
       result.language = metadata.languages.map((lang) => lang.name.en);
@@ -331,6 +333,21 @@ const importBurrito = async (filePath, currentUser, updateBurritoVersion, concat
           }
           metadata.ingredients[key].checksum.md5 = checksum;
           metadata.ingredients[key].size = stats.size;
+          // specific to old .mp3 audio support
+          // change .mp3 to wav and mimetype to audio/wav (for old mp3 exports)
+          if (/\.mp3$/.test(key)) {
+            try {
+              fs.renameSync(path.join(audioDir, key), path.join(audioDir, key.replace('.mp3', '.wav')));
+              metadata.ingredients[key].mimeType = 'audio/wav';
+              const newKey = key.replace('.mp3', '.wav');
+              metadata.ingredients[newKey] = metadata.ingredients[key];
+              delete metadata.ingredients[key];
+            } catch (err) {
+              logger.debug('importBurrito.js', `import failed - mp3 to wav section : ${err}`);
+              fs.unlinkSync(path.join(projectDir, `${projectName}_${id}`));
+              throw new Error('import failed');
+            }
+          }
         });
       })
       .catch((err) => logger.error('importBurrito.js', `${err}`));
diff --git a/renderer/src/layouts/projects/Export/ExportProjectPopUp.js b/renderer/src/layouts/projects/Export/ExportProjectPopUp.js
index 66f5ea41a..edd8b1fd7 100644
--- a/renderer/src/layouts/projects/Export/ExportProjectPopUp.js
+++ b/renderer/src/layouts/projects/Export/ExportProjectPopUp.js
@@ -22,7 +22,7 @@ import { ProgressCircle } from '../../../components/ProgressCircle';
 import { exportDefaultAudio, exportFullAudio } from './ExportUtils';
 import packageInfo from '../../../../../package.json';
 
-const audioExportFormats = { wav: { ext: 'wav', mimeType: 'audio/wav' }, mp3: { ext: 'mp3', mimeType: 'audio/mp3' } };
+const audioExportFormats = { wav: { ext: 'wav', mimeType: 'audio/wav' }, mp3: { ext: 'mp3', mimeType: 'audio/mpeg' } };
 
 export default function ExportProjectPopUp(props) {
   const {
diff --git a/renderer/src/layouts/projects/ImportProjectPopUp.js b/renderer/src/layouts/projects/ImportProjectPopUp.js
index 55879aedb..26b082717 100644
--- a/renderer/src/layouts/projects/ImportProjectPopUp.js
+++ b/renderer/src/layouts/projects/ImportProjectPopUp.js
@@ -152,35 +152,66 @@ export default function ImportProjectPopUp(props) {
     logger.debug('importProjectPopUp.js', 'git merge process done');
   }
 
+  const checksForAudioImport = async (sbData) => {
+    console.log({sbData});
+    const ingredientsArr = sbData?.ingredientsArray || []
+    // check for the importing audio is chapter vise
+    if(Object.keys(ingredientsArr).length > 0){
+      Object.entries(ingredientsArr).forEach(([key ,value]) => {
+        console.log(key ,value)
+        if(/^ingredients\/.+\/\d+.mp3$/.test(key)) {
+            // matched ingedients/BookId/1.mp3
+            throw new Error("Chapter Level audio project is not supported")
+        }
+        // new mp3 have mime type as audio/mpeg old is audio/mp3
+        if(/\.mp3$/.test(key) && value?.mimeType === "audio/mpeg") {
+          // key - path end with mp3
+          throw new Error("unable to import mp3 projects")
+        }
+      })
+    }else{
+      throw new Error("Not found ingredients in metadata")
+    }
+  }
+
   const importProject = async () => {
-    logger.debug('ImportProjectPopUp.js', 'Inside importProject');
-    if (folderPath) {
-      setImportProgress((prev)=>({...prev, importStarted:true, completedSteps: prev.completedSteps + 1 }))
-      setValid(false);
-      if (sbData.duplicate === true) {
-        logger.warn('ImportProjectPopUp.js', 'Project already available');
-        // currently MERGE feature only Enabled for OBS projects
-        console.log({sbData});
-        if (sbData?.burritoType === 'gloss / textStories'){
-          setMerge(true)
+    try{
+      logger.debug('ImportProjectPopUp.js', 'Inside importProject');
+      if (folderPath) {
+        setImportProgress((prev)=>({...prev, importStarted:true, completedSteps: prev.completedSteps + 1 }))
+        setValid(false);
+        // if type is audio
+        if(sbData?.burritoType === 'scripture / audioTranslation'){
+          await checksForAudioImport(sbData)
+        }
+        if (sbData.duplicate === true) {
+          logger.warn('ImportProjectPopUp.js', 'Project already available');
+          // currently MERGE feature only Enabled for OBS projects
+          if (sbData?.burritoType === 'gloss / textStories'){
+            setMerge(true)
+          }
+          setModel({
+            openModel: true,
+            title: t('modal-title-replace-resource'),
+            confirmMessage: t('dynamic-msg-confirm-replace-resource'),
+            buttonName: t('btn-replace'),
+          });
+        } else {
+          logger.debug('ImportProjectPopUp.js', 'Its a new project');
+          checkBurritoVersion();
         }
-        setModel({
-          openModel: true,
-          title: t('modal-title-replace-resource'),
-          confirmMessage: t('dynamic-msg-confirm-replace-resource'),
-          buttonName: t('btn-replace'),
-        });
       } else {
-        logger.debug('ImportProjectPopUp.js', 'Its a new project');
-        checkBurritoVersion();
+        logger.error('ImportProjectPopUp.js', 'Invalid Path');
+        setValid(true);
+        throw new Error(t('dynamic-msg-invalid-path'))
       }
-    } else {
-      logger.error('ImportProjectPopUp.js', 'Invalid Path');
-      setValid(true);
+    } catch(err) {
       setNotify('failure');
-      setSnackText(t('dynamic-msg-invalid-path'));
+      setSnackText(err?.message || err);
       setOpenSnackBar(true);
+      setImportProgress((prev)=>({...prev, importStarted:false, completedSteps: 0, totalSteps: 4}))
     }
+    
   };
 
   React.useEffect(() => {

From 943aac3923503ab9445d9e2ece3910e2df734ac3 Mon Sep 17 00:00:00 2001
From: sijumoncy <72241997+sijumoncy@users.noreply.github.com>
Date: Tue, 12 Dec 2023 18:23:39 +0530
Subject: [PATCH 10/10] added 2 sec silence in the end of the audio

---
 .vscode/settings.json                         | 12 +++-----
 .../AudioRecorder/core/audioUtils.js          | 28 +++++++++++++++----
 renderer/src/core/burrito/importBurrito.js    |  1 -
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0ecec27ec..ad081d03a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,15 +2,11 @@
 	"[javascript]": {
 		"editor.formatOnSave": false
 	},
-	"editor.rulers": [
-		100
-	],
+	"editor.rulers": [100],
 	"editor.fontLigatures": true,
 	"prettier.tabWidth": 4,
 	"eslint.alwaysShowStatus": true,
-	"prettier.disableLanguages": [
-		"js"
-	],
+	"prettier.disableLanguages": ["js"],
 	"prettier.useTabs": true,
 	"editor.formatOnSave": true,
 	"editor.multiCursorModifier": "alt",
@@ -27,8 +23,8 @@
 	"eslint.codeAction.disableRuleComment": {},
 	"eslint.codeAction.showDocumentation": {},
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	},
 	"eslint.workingDirectories": [],
 	"editor.tabSize": 2
-}
\ No newline at end of file
+}
diff --git a/renderer/src/components/AudioRecorder/core/audioUtils.js b/renderer/src/components/AudioRecorder/core/audioUtils.js
index b33234637..a8b68af27 100644
--- a/renderer/src/components/AudioRecorder/core/audioUtils.js
+++ b/renderer/src/components/AudioRecorder/core/audioUtils.js
@@ -34,11 +34,12 @@ async function generateTimeStampData(buffers, book, chapter) {
                 const currentVerse = `Verse_${(index + 1).toString().padStart(2, 0)}`;
                 const startTimeString = sec_to_min_sec_milli_convertor(start)[3];
                 let durationString;
+                const silenceDuration = 2;
                 let offset = 0;
                 if (index === 0 || (index === buffers.length - 1)) {
-                    // adding this because of 1 sec silence in the start || 1 sec silence in the end add it to last verse
-                    durationString = sec_to_min_sec_milli_convertor(buffer.duration + 1)[3];
-                    offset = 1;
+                    // adding this because of 2 sec silence in the start || 2 sec silence in the end add it to last verse
+                    durationString = sec_to_min_sec_milli_convertor(buffer.duration + silenceDuration)[3];
+                    offset = silenceDuration;
                 } else {
                     offset = 0;
                     durationString = sec_to_min_sec_milli_convertor(buffer.duration)[3];
@@ -106,10 +107,9 @@ export async function mergeAudio(audioArr, dirPath, path, book, chapter, extensi
         commandArr.push(
           ...inputCmdArr,
           '-filter_complex',
-          `aevalsrc=0:d=1[silence1];[silence1]${filterStr}`,
+          `aevalsrc=0:d=2[silence1];[silence1]${filterStr}`,
           '-map',
           '[out]',
-          ...audioMetaDataArr,
           '-ar',
           '48000',
           `output.${extension}`,
@@ -122,8 +122,24 @@ export async function mergeAudio(audioArr, dirPath, path, book, chapter, extensi
         // exeute merge process
         await ffmpeg.exec(commandArr);
 
+        // add end 2 sec to the create audio
+        await ffmpeg.exec([
+            '-i',
+            `output.${extension}`,
+            '-filter_complex',
+            'aevalsrc=0:d=2[silenceEnd];[0:0][silenceEnd]concat=n=2:v=0:a=1[outEnd]',
+            '-map',
+            '[outEnd]',
+            ...audioMetaDataArr,
+            '-ar',
+            '48000',
+            `outputMerged.${extension}`,
+            ]);
+
+        // write the audio back and convert
+
         // generate unit8 buffer out
-        const fileData = await ffmpeg.readFile(`output.${extension}`);
+        const fileData = await ffmpeg.readFile(`outputMerged.${extension}`);
 
         logger.debug('audioUtils.js', 'mergeAudio : audio merged buffer created');
 
diff --git a/renderer/src/core/burrito/importBurrito.js b/renderer/src/core/burrito/importBurrito.js
index 431099e4e..ed194c9b4 100644
--- a/renderer/src/core/burrito/importBurrito.js
+++ b/renderer/src/core/burrito/importBurrito.js
@@ -96,7 +96,6 @@ export const viewBurrito = async (filePath, currentUser, resource) => {
       sb = JSON.stringify(metadata);
     }
     const success = await validate('metadata', path.join(filePath, 'metadata.json'), sb, metadata.meta.version);
-    console.log({ metadata });
     if (success || metadata.type?.flavorType?.flavor?.name === 'audioTranslation') {
       result.validate = true;
       logger.debug('importBurrito.js', 'Burrito file validated successfully');