Merge branch 'develop' into 'feature/meeting_document_types'

# Conflicts:
#   electron/main/script.js
#   main.js
This commit is contained in:
Hughes, Mike
2025-12-16 15:40:27 +01:00
8 changed files with 151 additions and 136 deletions
+8 -4
View File
@@ -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);
}
}