Merge branch 'develop' into 'feature/meeting_document_types'

# Conflicts:
#   electron/main/script.js
#   main.js

electron/main/index.html

@@ -147,12 +147,7 @@
     </div>
 
     <div class="step" id="step6" style="display:none;">
-      <button class="download-btn" id="downloadButton" onclick="" disabled>Download</button>
-
-      <div class="progressbar" id="progressbar">
-        <div class="progress_fill"></div>
-        <span class="progress_text">0%</span>
-      </div>
+      <button class="download-btn" id="downloadButton" onclick="fileDownload()">Download</button>
     </div>
   </div>
 

electron/main/preload.js

@@ -25,6 +25,11 @@ try {
     contextBridge.exposeInMainWorld("submitSpeaker", {
         submitSpeaker: (speaker_names) => {ipcRenderer.send("speaker_submit", speaker_names)}
     })
+
+    contextBridge.exposeInMainWorld("download", {
+        file_download: () => {ipcRenderer.send("file_download")}
+    })
+
     
     ipcRenderer.on("error", (event, err) => {alert(err)})
 } catch (error) {

electron/main/renderer.js

@@ -33,7 +33,6 @@ uploadContainer.addEventListener("drop", (e) => {
 
 window.addEventListener('load', async (e) => { 
   try {
-      console.log("test");
       loadLanguageOptions(); 
       const value = await window.onStartup.getModuleNames();
       loadAiOptions(value.ai_modules);
@@ -117,7 +116,7 @@ docFormat.addEventListener("change", (e) =>{
   } catch (error) {
     
   }
-})
+});
 docFormatSummary1.addEventListener("change", (e) =>{
   try {
     if(docFormatSummary1.checked){
@@ -129,7 +128,7 @@ docFormatSummary1.addEventListener("change", (e) =>{
   } catch (error) {
     
   }
-})
+});
 docFormatSummary2.addEventListener("change", (e) =>{
   try {
     if(docFormatSummary2.checked){
@@ -141,7 +140,7 @@ docFormatSummary2.addEventListener("change", (e) =>{
   } catch (error) {
     
   }
-})
+});
 docFormatSummary3.addEventListener("change", (e) =>{
   try {
     if(docFormatSummary3.checked){
@@ -153,7 +152,7 @@ docFormatSummary3.addEventListener("change", (e) =>{
   } catch (error) {
     
   }
-})
+});
 docFormatCustom.addEventListener("change", (e) =>{
   try {
     if(docFormatCustom.checked){
@@ -165,7 +164,7 @@ docFormatCustom.addEventListener("change", (e) =>{
   } catch (error) {
     
   }
-})
+});
 
 //Speaker change listener
 cur_speaker.addEventListener("change", (e) =>{
@@ -174,16 +173,12 @@ cur_speaker.addEventListener("change", (e) =>{
   } catch (error) {
     
   }
-})
+});
 
-window.electron.speakerAudios((event, arg) => {
-  try {
+window.audios.speakerAudios((event, arg) => {
     setSpeakerAudiosValue(arg);
     loadSpeakerOptions(arg);
-  } catch (error) {
-    
-  }
-})
+});
 
 window.electron.progress((event, arg) => {
     if(arg.curstep == 1){
@@ -207,7 +202,7 @@ function setCircleOne(){
   } catch (error) {
   }
 
-}
+};
 function setCircleZwo(){
   try {
     if(document.getElementById("box2").style.backgroundColor == "green"){
@@ -219,7 +214,7 @@ function setCircleZwo(){
     
   }
   
-}
+};
 function setCircleThree(){
   try {
     if(document.getElementById("box3").style.backgroundColor == "green"){
@@ -231,7 +226,7 @@ function setCircleThree(){
     
   }
   
-}
+};
 function setCircleFour(){
   try {
     if(document.getElementById("box4").style.backgroundColor == "green"){
@@ -242,7 +237,7 @@ function setCircleFour(){
   } catch (error) {
     
   } 
-}
+};
 
 
 

electron/main/script.js

@@ -25,7 +25,6 @@ function checkBoxes() {
       var pathTest = window.electronAPI.getFilePath(videoUpload.files[0]);
       var pathToLower = pathTest.toLowerCase();
       if(testEndings.some(e => pathToLower.endsWith(e))){
-        document.getElementById("progressbar").style.visibility = "visible";
         //assembly of the json for the main
 
         /*
@@ -57,8 +56,7 @@ function checkBoxes() {
         const sendingPackage = {
           "video": {
             "module":"extraction-video-to-audio",
-            "inputVideoPath": pathTest,
-            "outputType": outputType.value
+            "inputVideoPath": pathTest
           },
           "transcription": {
             "module": transcriptionType.value
@@ -114,7 +112,6 @@ function changeLanguage(language) {
 function handleFiles(files) {
   try {
     if (files.length > 0) {
-      document.getElementById("progressbar").style.visibility = "visible";
       const file = files[0];
       if (file.type.startsWith('video/')) {
         const filePath = window.explorer.onFileDrop(files[0])
@@ -339,3 +336,10 @@ function sendSpeakerPackages(){
   }
 }
 
+function fileDownload() {
+  try {
+    window.download.file_download();
+  } catch (error) {
+    console.error("Download failed:", error);
+  }
+}