diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml index 91f9558..eebfe8e 100644 --- a/.idea/deviceManager.xml +++ b/.idea/deviceManager.xml @@ -5,7 +5,7 @@ diff --git a/config.properties b/config.properties index d5a804e..02d4505 100644 --- a/config.properties +++ b/config.properties @@ -1,11 +1,12 @@ #Configuration file -#Fri Oct 24 10:57:19 WIB 2025 +#Mon Oct 27 15:51:50 WIB 2025 database.host=localhost database.name=aas database.password=admin database.port=3306 database.user=admin -remark.FLD=Gate Change [4] +default.voice.type=VOICE_1 +remark.FLD=Arrival [9] remark.GBD=Second Call [2] remark.GFC=Last Call [3] remark.GOP=First Call [1] diff --git a/html/webpage/assets/css/bss-overrides.css b/html/webpage/assets/css/bss-overrides.css index e4c6b12..f977d16 100644 --- a/html/webpage/assets/css/bss-overrides.css +++ b/html/webpage/assets/css/bss-overrides.css @@ -46,6 +46,10 @@ margin-top: 0!important; } +.mt-3 { + margin-top: 1rem!important; +} + .me-2 { margin-right: .5rem!important; } diff --git a/html/webpage/assets/css/styles.css b/html/webpage/assets/css/styles.css index 0f45c33..3fc979b 100644 --- a/html/webpage/assets/css/styles.css +++ b/html/webpage/assets/css/styles.css @@ -128,6 +128,66 @@ body { width: 25%; } +.class30 { + width: 30%; +} + +.class35 { + width: 35%; +} + +.class40 { + width: 40%; +} + +.class45 { + width: 45%; +} + +.class50 { + width: 50%; +} + +.class55 { + width: 55%; +} + +.class60 { + width: 60%; +} + +.class65 { + width: 65%; +} + +.class70 { + width: 70%; +} + +.class75 { + width: 75%; +} + +.class80 { + width: 80%; +} + +.class85 { + width: 85%; +} + +.class90 { + width: 90%; +} + +.class95 { + width: 95%; +} + +.class100 { + width: 100%; +} + .card-login { background-color: white; box-shadow: rgba(0, 0, 0, 0.15) 0px 15px 25px, rgba(0, 0, 0, 0.05) 0px 5px 10px; @@ -302,8 +362,8 @@ table { border: 2px dashed #ccc; border-radius: 20px; width: 400px; - height: 200px; - display: flex; + height: 310px; + /*display: flex;*/ justify-content: center; align-items: center; font-family: sans-serif; @@ -318,3 +378,58 @@ table { color: #0d6efd; } +#table_user_management { + table-layout: fixed; + width: 100%; +} + +#table_user_management th, #table_user_management td { + text-overflow: ellipsis; + white-space: normal !important; + word-wrap: break-word; + overflow-wrap: anywhere; +} + +.pad-result { + padding-left: 1rem; + padding-right: 1rem; + border-radius: 8px; +} + +.pad-icon-menu { + margin-top: -0.3rem; +} + +.div-file-list { + height: 20vh; + overflow-y: auto; + overflow-x: hidden; + padding: 10px; + /*border: dashed;*/ +} + +.pad-select { + margin-top: 0.3rem; +} + +.div-label-drop { + display: flex; + text-align: center; + justify-content: center; + padding-top: 2rem; + /*padding-bottom: 1.5rem;*/ +} + +.pad-drop { + padding-top: 1rem; +} + +.div-search { + padding: 0.5rem; +} + +.hr-dashed { + border: none; + border-bottom: 1px dashed #000000; +} + diff --git a/html/webpage/assets/js/filemanagement.js b/html/webpage/assets/js/filemanagement.js new file mode 100644 index 0000000..3deab66 --- /dev/null +++ b/html/webpage/assets/js/filemanagement.js @@ -0,0 +1,293 @@ + +/** + * Load setting language dropdown + */ +function load_setting_language() { + $("#setting_language").empty().off('change'); + + getLanguages(() => { + window.languages.forEach((lang) => { + let $option = $("").attr("value", lang).text(lang); + $("#setting_language").append($option); + }); + $("#setting_language").on('change', function () { + change_droparea_enable(); + }); + }); +} + +/** + * Load setting category dropdown + */ +function load_setting_category() { + $("#setting_category").empty().off('change'); + getCategories(() => { + window.categories.forEach((cat) => { + let $option = $("").attr("value", cat).text(cat); + $("#setting_category").append($option); + }); + $("#setting_category").on('change', function () { + change_droparea_enable(); + }); + }); +} + +/** + * Load setting voice dropdown + */ +function load_setting_voice() { + $("#setting_voice").empty().off('change'); + getVoiceTypes(() => { + window.voiceTypes.forEach((voice) => { + let $option = $("").attr("value", voice).text(voice); + $("#setting_voice").append($option); + }); + $("#setting_voice").on('change', function () { + change_droparea_enable(); + }); + }); +} + +/** + * Get soundbank files from server based on category, language, and voice + * @param {String} category + * @param {String} language + * @param {String} voice + */ +function getSoundBankFiles(category, language, voice) { + let URL = `FileManager/ListSoundbank/${language}/${voice}/${category}`; + fetchAPI(URL, "GET", {}, null, (okdata) => { + $("#file-list").empty(); + if (Array.isArray(okdata) && okdata.length > 0) { + okdata.forEach((file) => { + // get only the file name from the full path + let fileName = file.split(/[/\\]/).pop(); + let $li = $("
  • ").text(fileName); + $("#file-list").append($li); + }); + } + }, (errdata) => { + alert("Error getting soundbank files : " + errdata.message); + }); +} + +/** + * Enable or disable drop area based on selections + */ +function change_droparea_enable() { + let selected_category = $("#setting_category").val(); + let selected_language = $("#setting_language").val(); + let selected_voice = $("#setting_voice").val(); + $("#file-list").empty(); + $("#searchfilelist").val(""); + $("#searchfilelist").off('input').on('input', function () { + let searchTerm = $(this).val().toLowerCase(); + $("#file-list li").each(function () { + let fileName = $(this).text().toLowerCase(); + if (fileName.includes(searchTerm)) { + $(this).show(); + } else { + $(this).hide(); + } + }); + }); + console.log(`Selected Category: ${selected_category}, Language: ${selected_language}, Voice: ${selected_voice}`); + if (selected_category && selected_language && selected_voice) { + $("#drop-area").removeClass("disabled"); + getSoundBankFiles(selected_category, selected_language, selected_voice); + } else { + $("#drop-area").addClass("disabled"); + + } +} + + +/** + * Get Soundbank path from server + */ +function get_soundbank_path() { + $("#setting_path").val(""); + fetchAPI("Settings/SoundbankDirectory", "GET", {}, null, (okdata) => { + if (okdata.message && okdata.message.trim().length > 0) { + let path = okdata.message.trim(); + //console.log("Soundbank path retrieved: " + path); + $("#setting_path").val(path); + } + }, (errdata) => { + alert("Error getting soundbank path : " + errdata.message); + }); +} + +function download(path, filename) { + let downloadurl = `/api/FileManager/${path}`; + let reqdata = { filename: filename }; + fetch(downloadurl, { + method: 'POST', + headers: {}, + body: JSON.stringify(reqdata) + }) + .then(response => { + if (!response.ok) { + throw new Error("Network response was not ok"); + } + return response.blob(); + }) + .then(blob => { + const url = window.URL.createObjectURL(blob); + const a = document.createElement('a'); + a.href = url; + a.download = filename; + document.body.appendChild(a); + a.click(); + a.remove(); + window.URL.revokeObjectURL(url); + }) + .catch(errdata => { + alert("Error downloading paging result file: " + errdata.message); + }); +} + +function get_pagingresult_files() { + const url = `FileManager/PagingResultList`; + $("#tbody_resultpaging").empty(); + fetchAPI(url, "GET", {}, null, (okdata) => { + if (Array.isArray(okdata) && okdata.length > 0) { + console.log("Paging result files: ", JSON.stringify(okdata)); + okdata.forEach((file) => { + let filename = file.split(/[/\\]/).pop(); + let $tr = $(""); + let $tdtitle = $("").text(filename); + // add button inside td to download the file + let $btndownload = $("").text("Download").addClass("btn btn-primary"); + $btndownload.on('click', function () { + download("DownloadPagingResultFile", filename); + }); + + let $tdbutton = $("").append($btndownload).addClass("text-center"); + $tr.append($tdtitle); + $tr.append($tdbutton); + $("#tbody_resultpaging").append($tr); + }); + } + }, (errdata) => { + alert("Error getting paging result files : " + errdata.message); + }); +} + +function get_soundbankresult_files() { + const url = `FileManager/SoundbankResultList`; + $("#tbody_resultsoundbank").empty(); + fetchAPI(url, "GET", {}, null, (okdata) => { + if (Array.isArray(okdata) && okdata.length > 0) { + console.log("Soundbank result files: ", JSON.stringify(okdata)); + okdata.forEach((file) => { + let filename = file.split(/[/\\]/).pop(); + let $tr = $(""); + let $tdtitle = $("").text(filename); + // add button inside td to download the file + let $btndownload = $("").text("Download").addClass("btn btn-primary"); + let $tdbutton = $("").append($btndownload).addClass("text-center"); + $btndownload.on('click', function () { + download("DownloadSoundbankResultFile", filename); + }); + $tr.append($tdtitle); + $tr.append($tdbutton); + $("#tbody_resultsoundbank").append($tr); + }); + } + }, (errdata) => { + alert("Error getting soundbank result files : " + errdata.message); + }); +} + + + +$(document).ready(function () { + console.log("filemanagement.js xx loaded"); + load_setting_category(); + load_setting_language(); + load_setting_voice(); + get_soundbank_path(); + setTimeout(() => { + change_droparea_enable(); + }, 1000); + get_pagingresult_files(); + get_soundbankresult_files(); + $("#save_directory").off('click').on('click', function () { + let new_path = $("#setting_path").val(); + if (new_path && new_path.trim().length > 0) { + fetchAPI("Settings/SoundbankDirectory", "POST", {}, { directory: new_path }, (okdata) => { + alert("Soundbank directory path saved successfully."); + }, (errdata) => { + alert("Error saving soundbank directory path : " + errdata.message); + }); + } else { + alert("Please enter a valid soundbank directory path."); + } + }); + $("#drop-area").on('dragover', function (e) { + e.preventDefault(); + e.stopPropagation(); + $(this).addClass('dragover'); + }).on('dragleave', function (e) { + e.preventDefault(); + e.stopPropagation(); + $(this).removeClass('dragover'); + }).on('drop', function (e) { + e.preventDefault(); + e.stopPropagation(); + $(this).removeClass('dragover'); + if ($(this).hasClass('disabled')) { + alert("Please select Category, Language, and Voice Type before uploading files."); + return; + } + let lang = $("#setting_language").val().trim(); + let category = $("#setting_category").val().trim(); + let voice = $("#setting_voice").val().trim(); + let files = e.originalEvent.dataTransfer.files; + if (lang && lang.length > 0) { + if (category && category.length > 0) { + if (voice && voice.length > 0) { + if (files.length > 0) { + // check if each file have type audio/wav , size more than 0, and name ends with .wav + let allValid = true; + for (let i = 0; i < files.length; i++) { + let file = files[i]; + if (file.type !== 'audio/wav' && !file.name.toLowerCase().endsWith('.wav')) { + allValid = false; + } + if (file.size <= 0) { + allValid = false; + } + } + if (allValid) { + if (confirm(`Are you sure want to upload ${files.length} file(s) to the soundbank directory for Category: ${$("#setting_category").val()}, Language: ${$("#setting_language").val()}, Voice Type: ${$("#setting_voice").val()}?`)) { + let url = `api/Settings/UploadSoundbank/${lang}/${voice}/${category}`; + const formdata = new FormData(); + for (let i = 0; i < files.length; i++) { + formdata.append('files', files[i]); + } + try { + fetch(url, { + method: 'POST', + body: formdata + }) + .then(response => response.json()) + .then(okdata => { + console.log("Upload result: ", JSON.stringify(okdata)); + }) + .catch(errdata => { + alert("Error uploading files to soundbank directory : " + errdata.message); + }); + } catch (err) { + alert("Error preparing file upload: " + err.message); + } + } + } else alert("Please upload only valid WAV audio files. Type must be audio/wav and size must be more than 0 bytes."); + } else alert("No files detected for upload."); + } else alert("Please select Voice Type before uploading files."); + } else alert("Please select Category before uploading files."); + } else alert("Please select Language before uploading files."); + + }); +}); \ No newline at end of file diff --git a/html/webpage/assets/js/script.js b/html/webpage/assets/js/script.js index aa0b862..90e42a7 100644 --- a/html/webpage/assets/js/script.js +++ b/html/webpage/assets/js/script.js @@ -444,8 +444,15 @@ $(document).ready(function () { let json = JSON.parse(data); if (Array.isArray(json) && json.length > 0) { json.forEach((net) => { - if (result.length > 0) result += "\n" + if (net){ + if (net.displayName && net.displayName.length>0){ + if (net.ipV4addr && Array.isArray(net.ipV4addr) && net.ipV4addr.length>0){ + if (result.length > 0) result += "\n" result += `${net.displayName} (${net.ipV4addr.join(";")}) TX:${(net.txSpeed / 1024).toFixed(1)} KB/s RX:${(net.rxSpeed / 1024).toFixed(1)} KB/s` + } + } + } + }) } else result = "N/A"; $('#networkstatus').text(result) @@ -585,6 +592,15 @@ $(document).ready(function () { } }); }) + $('#filemanagement').click(() => { + sidemenu.hide(); + $('#content').load('filemanagement.html', function (response, status, xhr) { + if (status === "success") { + console.log("File Management content loaded successfully"); + // pindah ke filemanagement.js + } + }); + }); $('#logoutlink').click(() => { //window.location.href = "login.html" fetch("/logout", {method: 'GET'}) diff --git a/html/webpage/assets/js/setting.js b/html/webpage/assets/js/setting.js index 1dd1577..afa3aa3 100644 --- a/html/webpage/assets/js/setting.js +++ b/html/webpage/assets/js/setting.js @@ -1,82 +1,7 @@ -/** - * Load setting language dropdown - */ -function load_setting_language() { - $("#setting_language").empty().off('change'); - getLanguages(() => { - window.languages.forEach((lang) => { - let $option = $("").attr("value", lang).text(lang); - $("#setting_language").append($option); - }); - $("#setting_language").on('change', function () { - change_droparea_enable(); - }); - }); -} -/** - * Load setting category dropdown - */ -function load_setting_category() { - $("#setting_category").empty().off('change'); - getCategories(() => { - window.categories.forEach((cat) => { - let $option = $("").attr("value", cat).text(cat); - $("#setting_category").append($option); - }); - $("#setting_category").on('change', function () { - change_droparea_enable(); - }); - }); -} -/** - * Load setting voice dropdown - */ -function load_setting_voice() { - $("#setting_voice").empty().off('change'); - getVoiceTypes(() => { - window.voiceTypes.forEach((voice) => { - let $option = $("").attr("value", voice).text(voice); - $("#setting_voice").append($option); - }); - $("#setting_voice").on('change', function () { - change_droparea_enable(); - }); - }); -} - -/** - * Get Soundbank path from server - */ -function get_soundbank_path() { - $("#setting_path").val(""); - fetchAPI("Settings/SoundbankDirectory", "GET", {}, null, (okdata) => { - if (okdata.message && okdata.message.trim().length > 0) { - let path = okdata.message.trim(); - //console.log("Soundbank path retrieved: " + path); - $("#setting_path").val(path); - } - }, (errdata) => { - alert("Error getting soundbank path : " + errdata.message); - }); -} - -/** - * Enable or disable drop area based on selections - */ -function change_droparea_enable() { - let selected_category = $("#setting_category").val(); - let selected_language = $("#setting_language").val(); - let selected_voice = $("#setting_voice").val(); - if (selected_category && selected_language && selected_voice) { - $("#drop-area").removeClass("disabled"); - } else { - $("#drop-area").addClass("disabled"); - } -} /** * Load message bank data into selection dropdowns @@ -90,9 +15,7 @@ function load_messagebank(cbOK = null) { // get messagebank data from server, which contains [FLIGHT_NUMBER] let messageData = [...new Set(window.messagebankdata.filter(mb => mb.message_Detail.includes('[FLIGHT_NUMBER]')).map(mb => `${mb.description} [${mb.aNN_ID}]`))]; - //console.log("Message bank data with [FLIGHT_NUMBER]: ", messageData); messageData.forEach((item) => { - //console.log("Adding option: " + item); $("#input_GOP").append($("").attr("value", item).text(item)); $("#input_GBD").append($("").attr("value", item).text(item)); $("#input_GFC").append($("").attr("value", item).text(item)); @@ -105,51 +28,41 @@ function load_messagebank(cbOK = null) { function load_remark_selection() { fetchAPI("Settings/FISCode", "GET", {}, null, (okdata) => { - //console.log("FIS codes retrieved: ", JSON.stringify(okdata)); $("#input_GOP").val(okdata.gop) $("#input_GBD").val(okdata.gbd); $("#input_GFC").val(okdata.gfc); $("#input_FLD").val(okdata.fld); + $("#input_defaultvoice").val(okdata.defaultvoice); }, (errdata) => { alert("Error getting FIS codes : " + errdata.message); }); } +function load_default_voice(){ + $("#input_defaultvoice").empty(); + window.voiceTypes.forEach((voice) => { + $("#input_defaultvoice").append($("").attr("value", voice).text(voice)); + }); +} + $(document).ready(function () { console.log("setting.js loaded"); - - - $("#save_directory").off('click').on('click', function () { - let new_path = $("#setting_path").val(); - if (new_path && new_path.trim().length > 0) { - fetchAPI("Settings/SoundbankDirectory", "POST", {}, { directory: new_path }, (okdata) => { - alert("Soundbank directory path saved successfully."); - }, (errdata) => { - alert("Error saving soundbank directory path : " + errdata.message); - }); - } else { - alert("Please enter a valid soundbank directory path."); - } - }); - - - get_soundbank_path(); - load_setting_category(); - load_setting_language(); - load_setting_voice(); + load_default_voice(); load_messagebank(() => load_remark_selection()); $("#fiscodesave").off('click').on('click', function () { let gop = $("#input_GOP").val(); let gbd = $("#input_GBD").val(); let gfc = $("#input_GFC").val(); let fld = $("#input_FLD").val(); - if (gop && gbd && gfc && fld) { + let voice = $("#input_defaultvoice").val(); + if (gop && gbd && gfc && fld && voice) { let data = { GOP: gop, GBD: gbd, GFC: gfc, - FLD: fld + FLD: fld, + defaultvoice: voice }; fetchAPI("Settings/FISCode", "POST", {}, data, (okdata) => { alert("FIS codes saved successfully."); @@ -157,75 +70,11 @@ $(document).ready(function () { alert("Error saving FIS codes : " + errdata.message); }); } else { - alert("Please select all FIS codes (GOP, GBD, GFC, FLD) before saving."); + alert("Please select all FIS codes (GOP, GBD, GFC, FLD) and Default Voice before saving."); } }); - $("#drop-area").on('dragover', function (e) { - e.preventDefault(); - e.stopPropagation(); - $(this).addClass('dragover'); - }).on('dragleave', function (e) { - e.preventDefault(); - e.stopPropagation(); - $(this).removeClass('dragover'); - }).on('drop', function (e) { - e.preventDefault(); - e.stopPropagation(); - $(this).removeClass('dragover'); - if ($(this).hasClass('disabled')) { - alert("Please select Category, Language, and Voice Type before uploading files."); - return; - } - let lang = $("#setting_language").val().trim(); - let category = $("#setting_category").val().trim(); - let voice = $("#setting_voice").val().trim(); - let files = e.originalEvent.dataTransfer.files; - if (lang && lang.length > 0) { - if (category && category.length > 0) { - if (voice && voice.length > 0) { - if (files.length > 0) { - // check if each file have type audio/wav , size more than 0, and name ends with .wav - let allValid = true; - for (let i = 0; i < files.length; i++) { - let file = files[i]; - if (file.type !== 'audio/wav' && !file.name.toLowerCase().endsWith('.wav')) { - allValid = false; - } - if (file.size <= 0) { - allValid = false; - } - } - if (allValid) { - if (confirm(`Are you sure want to upload ${files.length} file(s) to the soundbank directory for Category: ${$("#setting_category").val()}, Language: ${$("#setting_language").val()}, Voice Type: ${$("#setting_voice").val()}?`)) { - let url = `api/Settings/UploadSoundbank/${lang}/${voice}/${category}`; - const formdata = new FormData(); - for (let i = 0; i < files.length; i++) { - formdata.append('files', files[i]); - } - try{ - fetch(url, { - method: 'POST', - body: formdata - }) - .then(response => response.json()) - .then(okdata => { - console.log("Upload result: ", JSON.stringify(okdata)); - }) - .catch(errdata => { - alert("Error uploading files to soundbank directory : " + errdata.message); - }); - } catch(err){ - alert("Error preparing file upload: " + err.message); - } - } - } else alert("Please upload only valid WAV audio files. Type must be audio/wav and size must be more than 0 bytes."); - } else alert("No files detected for upload."); - } else alert("Please select Voice Type before uploading files."); - } else alert("Please select Category before uploading files."); - } else alert("Please select Language before uploading files."); - - }); + }); \ No newline at end of file diff --git a/html/webpage/broadcastzones.html b/html/webpage/broadcastzones.html index ef34350..57f3239 100644 --- a/html/webpage/broadcastzones.html +++ b/html/webpage/broadcastzones.html @@ -4,7 +4,7 @@ - AAS_NewGen_17OKT25 + AAS_NewGen_27OKT25 diff --git a/html/webpage/filemanagement.html b/html/webpage/filemanagement.html new file mode 100644 index 0000000..8c1f2f0 --- /dev/null +++ b/html/webpage/filemanagement.html @@ -0,0 +1,127 @@ + + + + + + + AAS_NewGen_27OKT25 + + + + + + + +
    +
    +

    File Management

    +
    +
    +
    +
    +
    +
    +

    Upload Soundbank

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Search

    +
    +
    +
    +
    +
    +

    List Files : 

    +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +

      Soundbank Result

      +
      +
      + + + + + + + + + + + + + +
      File NameAction
      Result Soundbank 001
      +
      +
      +
      +

      Paging Result

      +
      +
      + + + + + + + + + + + + + +
      File NameAction
      Result Paging 001
      +
      +
      + + + + + + \ No newline at end of file diff --git a/html/webpage/home.html b/html/webpage/home.html index d9d349e..4c63b1e 100644 --- a/html/webpage/home.html +++ b/html/webpage/home.html @@ -34,7 +34,7 @@
    •  Overview
      • -
    • +
    •  Sound Bank
    • @@ -45,7 +45,7 @@  Language Link
      • -
    • +
    • @@ -56,17 +56,25 @@  Broadcast Zones
      • -
    • +
    •    Log
      • -
    • +
    •  User Management
      • -
    • +
    • + + + + + + +  File Management
      • +
    • diff --git a/html/webpage/language.html b/html/webpage/language.html index eb19006..6d667c7 100644 --- a/html/webpage/language.html +++ b/html/webpage/language.html @@ -4,7 +4,7 @@ - AAS_NewGen_17OKT25 + AAS_NewGen_27OKT25 diff --git a/html/webpage/log.html b/html/webpage/log.html index b292290..9577b03 100644 --- a/html/webpage/log.html +++ b/html/webpage/log.html @@ -4,7 +4,7 @@ - AAS_NewGen_17OKT25 + AAS_NewGen_27OKT25 @@ -36,7 +36,7 @@
      - +
      diff --git a/html/webpage/messagebank.html b/html/webpage/messagebank.html index 3936e97..012fa7c 100644 --- a/html/webpage/messagebank.html +++ b/html/webpage/messagebank.html @@ -4,7 +4,7 @@ - AAS_NewGen_17OKT25 + AAS_NewGen_27OKT25 diff --git a/html/webpage/overview.html b/html/webpage/overview.html index 54e1e43..fce2fda 100644 --- a/html/webpage/overview.html +++ b/html/webpage/overview.html @@ -4,7 +4,7 @@ - AAS_NewGen_17OKT25 + AAS_NewGen_27OKT25 diff --git a/html/webpage/setting.html b/html/webpage/setting.html index 1a79094..40403fc 100644 --- a/html/webpage/setting.html +++ b/html/webpage/setting.html @@ -4,7 +4,7 @@ - AAS_NewGen_17OKT25 + AAS_NewGen_27OKT25 @@ -19,60 +19,39 @@
      -
      -
      -

      Upload Soundbank

      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      +
      -
      +
      -

      FIS CODE

      +

      FIS CODE

      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      diff --git a/html/webpage/soundbank.html b/html/webpage/soundbank.html index 4bc18ba..c6de92b 100644 --- a/html/webpage/soundbank.html +++ b/html/webpage/soundbank.html @@ -4,7 +4,7 @@ - AAS_NewGen_17OKT25 + AAS_NewGen_27OKT25 diff --git a/html/webpage/streamerstatus.html b/html/webpage/streamerstatus.html index 89ff588..dd22749 100644 --- a/html/webpage/streamerstatus.html +++ b/html/webpage/streamerstatus.html @@ -4,7 +4,7 @@ - AAS_NewGen_17OKT25 + AAS_NewGen_27OKT25 diff --git a/html/webpage/timer.html b/html/webpage/timer.html index f713229..e6eec9d 100644 --- a/html/webpage/timer.html +++ b/html/webpage/timer.html @@ -4,7 +4,7 @@ - AAS_NewGen_17OKT25 + AAS_NewGen_27OKT25 @@ -88,7 +88,7 @@
      -
      -
      +
      @@ -126,7 +126,7 @@

      Message

      -
      +
      @@ -160,7 +160,7 @@

      Broadcast Zones

      -
      diff --git a/html/webpage/usermanagement.html b/html/webpage/usermanagement.html index 1a26400..8c0ae44 100644 --- a/html/webpage/usermanagement.html +++ b/html/webpage/usermanagement.html @@ -4,7 +4,7 @@ - AAS_NewGen_17OKT25 + AAS_NewGen_27OKT25 @@ -39,7 +39,7 @@
      -
      No
      +
      @@ -92,6 +92,12 @@
      +
      +
      +

      City Tags

      +
      +
      +

      Airline Tags

      @@ -99,18 +105,7 @@
      -
      -
      -
      -
      -
      -
      -

      City Tags

      -
      -
      -
      -
      -
      +
      @@ -121,7 +116,7 @@
      -
      +
      @@ -132,7 +127,7 @@
      -
      +
      diff --git a/src/Main.kt b/src/Main.kt index b5431a3..6362a8c 100644 --- a/src/Main.kt +++ b/src/Main.kt @@ -33,13 +33,10 @@ lateinit var audioPlayer: AudioPlayer val StreamerOutputs: MutableMap = HashMap() lateinit var udpreceiver: UDPReceiver lateinit var tcpreceiver: TCPReceiver -const val version = "0.0.11 (24/10/2025)" +const val version = "0.0.12 (27/10/2025)" // AAS 64 channels const val max_channel = 64 -// dipakai untuk pilih voice type, bisa diganti via web nanti -var selected_voice = VoiceType.VOICE_1.name - // dipakai untuk ambil messagebank berdasarkan id val urutan_bahasa = listOf( Language.INDONESIA.name, @@ -168,8 +165,6 @@ fun main() { Logger.error { "Failed to start TCP Receiver on port 5002" } } - - val androidserver = TCP_Android_Command_Server() androidserver.StartTcpServer(5003){ Logger.info { it } diff --git a/src/MainExtension01.kt b/src/MainExtension01.kt index 931424d..c6b1146 100644 --- a/src/MainExtension01.kt +++ b/src/MainExtension01.kt @@ -16,6 +16,7 @@ import codes.configKeys import content.Category import content.Language import content.ScheduleDay +import content.VoiceType import database.BroadcastZones import database.Messagebank import database.QueueTable @@ -137,8 +138,11 @@ class MainExtension01 { */ fun Get_MessageBank_by_id(id: Int, languages: List = urutan_bahasa): ArrayList { val mb_list = ArrayList() + var selected_voice = config.Get(configKeys.DEFAULT_VOICE_TYPE.key) + if (selected_voice.isEmpty()) selected_voice = VoiceType.VOICE_1.name languages.forEach { lang -> - db.messageDB.List.find { mb -> mb.ANN_ID == id.toUInt() && mb.Language.equals(lang, true) && mb.Voice_Type.equals(selected_voice, true) } + db.messageDB.List + .find { mb -> mb.ANN_ID == id.toUInt() && mb.Language.equals(lang, true) && mb.Voice_Type.equals(selected_voice, true) } ?.let { mb_list.add(it) } @@ -656,8 +660,6 @@ class MainExtension01 { contentCache.addAudioFile(filenya, afi) } } - - } val targetfile = SoundbankResult_directory.resolve( Make_WAV_FileName( @@ -752,7 +754,7 @@ class MainExtension01 { val zz = qa.BroadcastZones.split(";") if (AllBroadcastZonesValid(zz)){ val ips = BroadcastZones_to_SoundChannel_IP(zz) - val ann_id = Get_ANN_ID(qa.Message) + val ann_id = Get_ANN_ID(qa.SB_TAGS) if (ann_id>0){ if (AllStreamerOutputIdle(ips)){ val mblist = Get_MessageBank_by_id(ann_id, qa.Language.split(";")) diff --git a/src/barix/BarixConnection.kt b/src/barix/BarixConnection.kt index 3a7c20e..ad940b8 100644 --- a/src/barix/BarixConnection.kt +++ b/src/barix/BarixConnection.kt @@ -118,15 +118,15 @@ class BarixConnection(val index: UInt, var channel: String, val ipaddress: Strin udp.send(DatagramPacket(chunk, chunk.size, inet)) delay(2) } catch (e: Exception) { - cbFail.accept("SendData to $ipaddress:$port failed, message: ${e.message}") + cbFail.accept("SendData to $ipaddress failed, message: ${e.message}") return@launch } } - cbOK.accept("SendData to $channel ($ipaddress:$port) succeeded, ${data.size} bytes sent") + cbOK.accept("SendData to $channel ($ipaddress) succeeded, ${data.size} bytes sent") } } - } else cbFail.accept("SendData to $ipaddress:$port failed, data is empty") + } else cbFail.accept("SendData to $ipaddress failed, data is empty") } diff --git a/src/codes/Somecodes.kt b/src/codes/Somecodes.kt index 695b3d2..1d68c16 100644 --- a/src/codes/Somecodes.kt +++ b/src/codes/Somecodes.kt @@ -1,6 +1,5 @@ package codes -import codes.Somecodes.Companion.Soundbank_directory import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import content.Category @@ -23,6 +22,7 @@ import java.nio.file.Files import java.nio.file.Path import java.time.LocalDateTime import java.time.format.DateTimeFormatter +import java.util.function.BiConsumer import java.util.function.Consumer import kotlin.io.path.name @@ -77,6 +77,110 @@ class Somecodes { ) } + /** + * Delete old PagingResult files older than specified days. + * If PagingResult directory does not exist, callback with -1,-1. + * @param daysOlder Number of days to determine old files, default to 7 days. + * @param cb Callback function of Success count and Failed count. + */ + fun Delete_Old_PagingResult_Files(daysOlder: Int, cb: BiConsumer){ + var deleted = 0 + var failed = 0 + if (Files.isDirectory(PagingResult_directory)){ + val cutoffTime = System.currentTimeMillis() - daysOlder.toLong() * 24 * 60 * 60 * 1000 + Files.list(PagingResult_directory).forEach { + try{ + val fileTime = Files.getLastModifiedTime(it).toMillis() + if (fileTime < cutoffTime){ + Files.delete(it) + Logger.info{ "Deleted old PagingResult file ${it.toAbsolutePath()}" } + deleted++ + } + } catch (e: Exception){ + Logger.error { "Failed to delete file ${it.toAbsolutePath()}: ${e.message}" } + failed++ + } + } + cb.accept(deleted, failed) + } else cb.accept(-1,-1) + } + + /** + * Clear all files in PagingResult directory. + * If PagingResult directory does not exist, callback with -1,-1. + * @param cb Callback function of Success count and Failed count. + */ + fun Clear_PagingResult_Directory(cb : BiConsumer){ + var deleted = 0 + var failed = 0 + if (Files.isDirectory(PagingResult_directory)){ + Files.list(PagingResult_directory).forEach { + try{ + Files.delete(it) + Logger.info{ "Deleted file ${it.toAbsolutePath()}" } + deleted++ + } catch (e: Exception){ + Logger.error { "Failed to delete file ${it.toAbsolutePath()}: ${e.message}" } + failed++ + } + } + cb.accept(deleted, failed) + } else cb.accept(-1,-1) + + } + + /** + * Clear all files in SoundbankResult directory. + * If SoundbankResult directory does not exist, callback with -1,-1. + * @param cb Callback function of Success count and Failed count. + */ + fun Clear_SoundbankResult_Directory(cb : BiConsumer){ + var deleted = 0 + var failed = 0 + if (Files.isDirectory(SoundbankResult_directory)){ + Files.list(SoundbankResult_directory).forEach { + try{ + Files.delete(it) + Logger.info{ "Deleted file ${it.toAbsolutePath()}" } + deleted++ + } catch (e: Exception){ + Logger.error { "Failed to delete file ${it.toAbsolutePath()}: ${e.message}" } + failed++ + } + } + cb.accept(deleted, failed) + } else cb.accept(-1,-1) + + } + + /** + * Delete old SoundbankResult files older than specified days. + * If SoundbankResult directory does not exist, callback with -1,-1. + * @param daysOlder Number of days to determine old files, default to 7 days. + * @param cb Callback function of Success count and Failed count. + */ + fun Delete_Old_SoundbankResult_Files(daysOlder: Int=7, cb: BiConsumer){ + var deleted = 0 + var failed = 0 + if (Files.isDirectory(SoundbankResult_directory)){ + val cutoffTime = System.currentTimeMillis() - daysOlder.toLong() * 24 * 60 * 60 * 1000 + Files.list(SoundbankResult_directory).forEach { + try{ + val fileTime = Files.getLastModifiedTime(it).toMillis() + if (fileTime < cutoffTime){ + Files.delete(it) + Logger.info{ "Deleted old SoundbankResult file ${it.toAbsolutePath()}" } + deleted++ + } + } catch (e: Exception){ + Logger.error { "Failed to delete file ${it.toAbsolutePath()}: ${e.message}" } + failed++ + } + } + cb.accept(deleted, failed) + } else cb.accept(-1,-1) + } + fun ExtractFilesFromClassPath(resourcePath: String, outputDir: Path) { try { val resource = Somecodes::class.java.getResource(resourcePath) @@ -357,11 +461,26 @@ class Somecodes { */ fun ValidFile(value : String) : Boolean { if (value.isNotBlank()){ - return Files.exists(Path.of(value)) + return ValidFile(Path.of(value)) } return false } + fun ValidFile(value : Path) : Boolean { + return Files.exists(value) && Files.isRegularFile(value) + } + + fun ValidDirectory(value : String) : Boolean { + if (value.isNotBlank()){ + return ValidDirectory(Path.of(value)) + } + return false + } + + fun ValidDirectory(value : Path) : Boolean { + return Files.exists(value) && Files.isDirectory(value) + } + /** * Check if a string is a valid date in the format "dd/MM/yyyy". * @param value The string to check. diff --git a/src/codes/configFile.kt b/src/codes/configFile.kt index 6aa7a5a..a293024 100644 --- a/src/codes/configFile.kt +++ b/src/codes/configFile.kt @@ -1,5 +1,6 @@ package codes +import content.VoiceType import org.tinylog.Logger import java.nio.file.Files import java.nio.file.Paths @@ -66,6 +67,7 @@ class configFile { config[configKeys.WEBAPP_VIEWER_USERNAME.key] = "viewer" config[configKeys.WEBAPP_VIEWER_PASSWORD.key] = "password" config[configKeys.WEBAPP_PORT.key] = "3030" + config[configKeys.DEFAULT_VOICE_TYPE.key] = VoiceType.VOICE_1.name Save() } } \ No newline at end of file diff --git a/src/codes/configKeys.kt b/src/codes/configKeys.kt index 2ce3e5c..b331591 100644 --- a/src/codes/configKeys.kt +++ b/src/codes/configKeys.kt @@ -11,6 +11,7 @@ enum class configKeys(val key: String) { REMARK_GBD("remark.GBD"), REMARK_GFC("remark.GFC"), REMARK_FLD("remark.FLD"), + DEFAULT_VOICE_TYPE("default.voice.type"), WEBAPP_ADMIN_USERNAME("webapp.admin.username"), WEBAPP_ADMIN_PASSWORD("webapp.admin.password"), WEBAPP_VIEWER_USERNAME("webapp.viewer.username"), diff --git a/src/web/WebApp.kt b/src/web/WebApp.kt index 48b17ce..4c7c28c 100644 --- a/src/web/WebApp.kt +++ b/src/web/WebApp.kt @@ -44,8 +44,8 @@ import java.nio.file.Files import java.time.LocalDateTime import codes.configKeys import org.tinylog.Logger - -//import com.sun.security.auth.login.ConfigFile +import java.io.File +import java.nio.file.Path @Suppress("unused") @@ -64,7 +64,7 @@ class WebApp(val listenPort: Int, val userlist: List>, val } fun Start() { - + Logger.info { "Starting Web Application on port $listenPort" } app = Javalin.create { config -> config.useVirtualThreads = true config.staticFiles.add("/webpage") @@ -191,8 +191,6 @@ class WebApp(val listenPort: Int, val userlist: List>, val } } - - } } path("soundbank.html") { @@ -213,6 +211,27 @@ class WebApp(val listenPort: Int, val userlist: List>, val path("timer.html") { before { CheckUsers(it) } } + path("filemanagement.html") { + before { CheckUsers(it) } + } + path("broadcastzones.html") { + before { CheckUsers(it) } + } + path("overview.html") { + before { CheckUsers(it) } + } + path("setting.html"){ + before { CheckUsers(it) } + } + path("streamerstatus.html"){ + before { CheckUsers(it) } + } + path("timer.html"){ + before { CheckUsers(it) } + } + path("usermanagement.html"){ + before { CheckUsers(it) } + } path("api") { path("VoiceType") { get { @@ -315,7 +334,7 @@ class WebApp(val listenPort: Int, val userlist: List>, val VoiceType.valueOf(addvalue.VoiceType), Category.valueOf(addvalue.Category) ).resolve(addvalue.Path) - if (Files.isRegularFile(absolutepath)) { + if (ValidFile(absolutepath)) { addvalue.Path = absolutepath.toAbsolutePath().toString() if (db.soundDB.Add(addvalue)) { db.soundDB.Resort() @@ -348,7 +367,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val // delete by index val index = it.pathParam("index").toUIntOrNull() if (index == null) { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) } else { if (db.soundDB.DeleteByIndex(index.toInt())) { db.soundDB.Resort() @@ -414,7 +434,7 @@ class WebApp(val listenPort: Int, val userlist: List>, val newsb.VoiceType, newsb.Category ).resolve(newsb.Path) - if (Files.isRegularFile(newpath)) { + if (ValidFile(newpath)) { if (newpath.toAbsolutePath().toString() != sb.Path) { sb.Path = newpath.toAbsolutePath().toString() varchanged = true @@ -550,7 +570,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val // delete by index val index = it.pathParam("index").toUIntOrNull() if (index == null) { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) } else { if (db.messageDB.DeleteByIndex(index.toInt())) { db.messageDB.Resort() @@ -566,7 +587,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val // update messagebank by index val index = it.pathParam("index").toUIntOrNull() if (index == null) { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) } else { val mb = db.messageDB.List.find { xx -> xx.index == index } if (mb == null) { @@ -677,7 +699,14 @@ class WebApp(val listenPort: Int, val userlist: List>, val val tag = json.get("tag").asText("") val languages = json.get("language").asText("").split(";") if (ValidString(tag)) { - if (languages.all { xx -> Language.entries.any { yy -> yy.name.equals(xx, true) } }) { + if (languages.all { xx -> + Language.entries.any { yy -> + yy.name.equals( + xx, + true + ) + } + }) { if (!db.languageDB.List.any { ll -> ll.TAG.equals(tag, true) }) { val newvalue = LanguageLink(0u, tag, languages.joinToString(";")) if (db.languageDB.Add(newvalue)) { @@ -714,7 +743,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val // delete by index val index = it.pathParam("index").toUIntOrNull() if (index == null) { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) } else { if (db.languageDB.DeleteByIndex(index.toInt())) { db.languageDB.Resort() @@ -730,7 +760,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val // update by index val index = it.pathParam("index").toUIntOrNull() if (index == null) { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) } else { val ll = db.languageDB.List.find { xx -> xx.index == index } if (ll == null) { @@ -865,7 +896,11 @@ class WebApp(val listenPort: Int, val userlist: List>, val ) ) } else it.status(500) - .result(objectmapper.writeValueAsString(resultMessage("Failed to add schedule to database"))) + .result( + objectmapper.writeValueAsString( + resultMessage("Failed to add schedule to database") + ) + ) } else it.status(400) .result(objectmapper.writeValueAsString(resultMessage("Invalid Language"))) } else it.status(400) @@ -887,7 +922,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val // delete by index val index = it.pathParam("index").toUIntOrNull() if (index == null) { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) } else { if (db.scheduleDB.DeleteByIndex(index.toInt())) { db.scheduleDB.Resort() @@ -902,9 +938,9 @@ class WebApp(val listenPort: Int, val userlist: List>, val patch("UpdateByIndex/{index}") { // update by index val index = it.pathParam("index").toUIntOrNull() - if (index!=null){ + if (index != null) { val sb = db.scheduleDB.List.find { xx -> xx.index == index } - if (sb!=null){ + if (sb != null) { val json = objectmapper.readTree(it.body()) val _description = json.get("Description").asText("") val _time = json.get("Time").asText("") @@ -914,18 +950,33 @@ class WebApp(val listenPort: Int, val userlist: List>, val val _enable = json.get("Enable").asBoolean() val _broadcast_zones = json.get("BroadcastZones").asText("") val _language = json.get("Language").asText("") - val newsb = ScheduleBank(index, _description, _day, _time, _soundpath, _repeat, _enable, _broadcast_zones, _language) - if (newsb.isNotEmpty()){ - if (!sb.isEqual(newsb)){ - if (db.scheduleDB.UpdateByIndex(index.toInt(), newsb)){ + val newsb = ScheduleBank( + index, + _description, + _day, + _time, + _soundpath, + _repeat, + _enable, + _broadcast_zones, + _language + ) + if (newsb.isNotEmpty()) { + if (!sb.isEqual(newsb)) { + if (db.scheduleDB.UpdateByIndex(index.toInt(), newsb)) { db.scheduleDB.Resort() it.result(objectmapper.writeValueAsString(resultMessage("OK"))) - } else it.status(500).result(objectmapper.writeValueAsString(resultMessage("Failed to update schedule with index $index"))) - } else it.status(400).result(objectmapper.writeValueAsString(resultMessage("Nothing has changed for schedule with index $index"))) - } else it.status(400).result(objectmapper.writeValueAsString(resultMessage("Some fields are empty"))) + } else it.status(500) + .result(objectmapper.writeValueAsString(resultMessage("Failed to update schedule with index $index"))) + } else it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Nothing has changed for schedule with index $index"))) + } else it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Some fields are empty"))) - } else it.status(400).result(objectmapper.writeValueAsString(resultMessage("Schedule with index $index not found"))) - } else it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) + } else it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Schedule with index $index not found"))) + } else it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) } get("ExportXLSX") { val xlsxdata = db.scheduleDB.Export_XLSX() @@ -967,7 +1018,11 @@ class WebApp(val listenPort: Int, val userlist: List>, val get("GetMessageAndBroadcastZones") { val result = object { val messages = db.messageDB.List - .filter { mb -> !mb.Message_Detail.contains("[") && !mb.Message_Detail.contains("]") } + .filter { mb -> + !mb.Message_Detail.contains("[") && !mb.Message_Detail.contains( + "]" + ) + } .map { mb -> "${mb.Description} [${mb.ANN_ID}]" } val broadcastzones = db.broadcastDB.List } @@ -1072,7 +1127,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val // delete by index val index = it.pathParam("index").toUIntOrNull() if (index == null) { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) } else { if (db.userDB.DeleteByIndex(index.toInt())) { db.userDB.Resort() @@ -1120,7 +1176,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val val atags = _airline_tags.split(";").map { it.trim() } .filter { it.isNotEmpty() }.distinct() val ctags = - _city_tags.split(";").map { it.trim() }.filter { it.isNotEmpty() } + _city_tags.split(";").map { it.trim() } + .filter { it.isNotEmpty() } .distinct() val msgids = _messagebank_ann_id.split(";").map { it.trim() } .filter { it.isNotEmpty() }.distinct() @@ -1160,13 +1217,19 @@ class WebApp(val listenPort: Int, val userlist: List>, val ) } else ctx.status(500).result( - objectmapper.writeValueAsString(resultMessage("Failed to update user with index $index")) + objectmapper.writeValueAsString( + resultMessage("Failed to update user with index $index") + ) ) } else ctx.status(400).result( objectmapper.writeValueAsString(resultMessage("Nothing has changed for user with index $index")) ) } else ctx.status(400) - .result(objectmapper.writeValueAsString(resultMessage("Some broadcast zone is not found in Broadcast Zone list"))) + .result( + objectmapper.writeValueAsString( + resultMessage("Some broadcast zone is not found in Broadcast Zone list") + ) + ) } else ctx.status(400) .result(objectmapper.writeValueAsString(resultMessage("Some ANN_ID not found in Messagebank"))) } else ctx.status(400) @@ -1307,7 +1370,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val if (ValidString(_soundchannel)) { if (ValidString(_box)) { if (ValidString(_relay)) { - val newbp = BroadcastZones(0u, _description, _soundchannel, _box, _relay) + val newbp = + BroadcastZones(0u, _description, _soundchannel, _box, _relay) if (db.broadcastDB.Add(newbp)) { db.broadcastDB.Resort() it.result(objectmapper.writeValueAsString(resultMessage("OK"))) @@ -1326,7 +1390,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val // delete by index val index = it.pathParam("index").toUIntOrNull() if (index == null) { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) } else { if (db.broadcastDB.DeleteByIndex(index.toInt())) { db.broadcastDB.Resort() @@ -1342,7 +1407,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val // update by index val index = it.pathParam("index").toUIntOrNull() if (index == null) { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) } else { val bz = db.broadcastDB.List.find { xx -> xx.index == index } if (bz == null) { @@ -1448,7 +1514,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val val index = it.pathParam("index").toUIntOrNull() if (index == null) { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) } else { val sc = db.soundchannelDB.List.find { xx -> xx.index == index } if (sc == null) { @@ -1471,8 +1538,9 @@ class WebApp(val listenPort: Int, val userlist: List>, val } else { // cek apakah ada soundchannel lain yang pakai ip dan channel yang sama - val othersc = db.soundchannelDB.List.filter { sc -> sc.ip == _ip } - .filter { sc -> sc.index != index } + val othersc = + db.soundchannelDB.List.filter { sc -> sc.ip == _ip } + .filter { sc -> sc.index != index } if (othersc.isNotEmpty()) { it.status(400) .result(objectmapper.writeValueAsString(resultMessage("This IP address is already used by another sound channel"))) @@ -1481,10 +1549,20 @@ class WebApp(val listenPort: Int, val userlist: List>, val val newsc = SoundChannel(0u, _channel, _ip) if (db.soundchannelDB.UpdateByIndex(index.toInt(), newsc)) { db.soundchannelDB.Resort() - it.result(objectmapper.writeValueAsString(resultMessage("OK"))) + it.result( + objectmapper.writeValueAsString( + resultMessage( + "OK" + ) + ) + ) } else { it.status(500) - .result(objectmapper.writeValueAsString(resultMessage("Failed to update sound channel with index $index"))) + .result( + objectmapper.writeValueAsString( + resultMessage("Failed to update sound channel with index $index") + ) + ) } } @@ -1563,7 +1641,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val // delete by index val index = it.pathParam("index").toUIntOrNull() if (index == null) { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) } else { if (db.queuepagingDB.DeleteByIndex(index.toInt())) { db.queuepagingDB.Resort() @@ -1577,7 +1656,6 @@ class WebApp(val listenPort: Int, val userlist: List>, val } } - path("QueueTable") { get("List") { it.result(MariaDB.ArrayListtoString(db.queuetableDB.List)) @@ -1596,7 +1674,8 @@ class WebApp(val listenPort: Int, val userlist: List>, val // delete by index val index = it.pathParam("index").toUIntOrNull() if (index == null) { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Invalid index"))) } else { if (db.queuetableDB.DeleteByIndex(index.toInt())) { db.queuetableDB.Resort() @@ -1610,8 +1689,190 @@ class WebApp(val listenPort: Int, val userlist: List>, val } } } - path("Settings") { + path("FileManager") { + get("PagingResultList") { + it.result(objectmapper.writeValueAsString(ListAudioFiles(Somecodes.PagingResult_directory))) + } + delete("DeleteOldPagingResultFiles/{days}") { + // kalau tidak ada, default 7 hari + val days = it.pathParam("days").toIntOrNull() ?: 7 + Somecodes.Delete_Old_PagingResult_Files(days) { success, failed -> + it.result(objectmapper.writeValueAsString(resultMessage("Old paging result files deleted. Deleted: $success, Failed: $failed"))) + } + } + delete("ClearPagingResultFiles") { + Somecodes.Clear_PagingResult_Directory { success, failed -> + it.result(objectmapper.writeValueAsString(resultMessage("Paging result files cleared. Deleted: $success, Failed: $failed"))) + } + } + post("DownloadPagingResultFile") { + val json: JsonNode = objectmapper.readTree(it.body()) + val filename = json.get("filename").asText("") + if (filename.isNotEmpty()) { + val p: Path = Somecodes.PagingResult_directory.resolve(filename) + if (ValidFile(p)) { + it.header("Content-Disposition", "attachment; filename=\"$filename\"") + it.outputStream().use { out -> + Files.newInputStream(p).use { inp -> + inp.copyTo(out) + } + } + } else it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("File not found"))) + } else it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Filename is empty"))) + } + get("SoundbankResultList") { + it.result(objectmapper.writeValueAsString(ListAudioFiles(Somecodes.SoundbankResult_directory))) + } + delete("DeleteOldSoundbankResultFiles/{days}") { + // kalau tidak ada, default 7 hari + val days = it.pathParam("days").toIntOrNull() ?: 7 + Somecodes.Delete_Old_SoundbankResult_Files(days) { success, failed -> + it.result(objectmapper.writeValueAsString(resultMessage("Old soundbank result files deleted. Deleted: $success, Failed: $failed"))) + } + } + delete("ClearSoundbankResultFiles") { + Somecodes.Clear_PagingResult_Directory { success, failed -> + it.result(objectmapper.writeValueAsString(resultMessage("Soundbank result files cleared. Deleted: $success, Failed: $failed"))) + } + } + post("DownloadSoundbankResultFile") { + val json: JsonNode = objectmapper.readTree(it.body()) + val filename = json.get("filename").asText("") + if (filename.isNotEmpty()) { + val p: Path = Somecodes.SoundbankResult_directory.resolve(filename) + if (ValidFile(p)) { + it.header("Content-Disposition", "attachment; filename=\"$filename\"") + it.outputStream().use { out -> + Files.newInputStream(p).use { inp -> + inp.copyTo(out) + } + } + } else it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("File not found"))) + } else it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Filename is empty"))) + } + get("ListSoundbank/{language}/{voice}/{category}"){ + val language = it.pathParam("language") + val voice = it.pathParam("voice") + val category = it.pathParam("category") + //println("ListSoundbank called with language=$language, voice=$voice, category=$category") + if (ValidString(language) && Language.entries.any { lang -> lang.name == language }) { + if (ValidString(voice) && VoiceType.entries.any { vtype -> vtype.name == voice }) { + if (ValidString(category) && Category.entries.any { cat -> cat.name == category }) { + val targetdir = Somecodes.SoundbankDirectory( + Language.valueOf(language), + VoiceType.valueOf(voice), + Category.valueOf(category) + ) + val result = ListAudioFiles(targetdir).map{ mm -> + // just the filename, without path + mm.substring(mm.lastIndexOf(File.separator)+1) + } + //println("ListSoundbank result: $result") + it.result(objectmapper.writeValueAsString(result)) + } else { + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Category parameter is invalid"))) + } + } else { + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("VoiceType parameter is invalid"))) + } + } else { + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Language parameter is invalid"))) + } + } + // tested ok + post("UploadSoundbank/{language}/{voice}/{category}") { + val language = it.pathParam("language") + val voice = it.pathParam("voice") + val category = it.pathParam("category") + val uploaded = it.uploadedFiles() + if (ValidString(language) && Language.entries.any { lang -> lang.name == language }) { + if (ValidString(voice) && VoiceType.entries.any { vtype -> vtype.name == voice }) { + if (ValidString(category) && Category.entries.any { cat -> cat.name == category }) { + if (uploaded.isNotEmpty()) { + val targetdir = Somecodes.SoundbankDirectory( + Language.valueOf(language), + VoiceType.valueOf(voice), + Category.valueOf(category) + ) + if (!Files.isDirectory(targetdir)) Files.createDirectories(targetdir) + val successfiles = mutableListOf() + val failedfiles = mutableListOf() + val alreadyexists = mutableListOf() + uploaded.forEach { ff -> + val targetfile = targetdir.resolve(ff.filename()) + if (Files.exists(targetfile)) { + alreadyexists.add(ff.filename()) + } else { + try { + Files.newOutputStream(targetfile).use { out -> + ff.content().use { inp -> + inp.copyTo(out) + } + } + Logger.info { "Uploaded soundbank file to ${targetfile.toAbsolutePath()}" } + successfiles.add(ff.filename()) + } catch (e: Exception) { + Logger.error { + "Failed to upload soundbank file to ${targetfile.toAbsolutePath()}: ${e.message}" + } + failedfiles.add(ff.filename()) + } + } + + + } + if (successfiles.size == uploaded.size) { + it.result( + objectmapper.writeValueAsString( + resultMessage( + "All files uploaded successfully: ${ + successfiles.joinToString( + ", " + ) + }" + ) + ) + ) + } else { + it.result( + objectmapper.writeValueAsString( + resultMessage( + "Some files uploaded successfully: ${ + successfiles.joinToString( + ", " + ) + }, failed: ${failedfiles.joinToString(", ")}, already exists: ${alreadyexists.joinToString(", ")}" + ) + ) + ) + } + } else { + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("No file uploaded"))) + } + } else { + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Category parameter is invalid"))) + } + } else { + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("VoiceType parameter is invalid"))) + } + } else { + it.status(400) + .result(objectmapper.writeValueAsString(resultMessage("Language parameter is invalid"))) + } + } + } + path("Settings") { get("SoundbankDirectory") { val dir = _config.Get(configKeys.SOUNDBANK_DIRECTORY.key) it.result(objectmapper.writeValueAsString(resultMessage(dir))) @@ -1629,165 +1890,71 @@ class WebApp(val listenPort: Int, val userlist: List>, val .result(objectmapper.writeValueAsString(resultMessage("Invalid directory value"))) } } - - - get("SoundbankResultList") { - it.result(objectmapper.writeValueAsString(ListAudioFiles(Somecodes.SoundbankResult_directory))) - } - - get("SoundbankResultFile/{filename}") { - - //TODO recheck bener/gak cara downloadnya - val filename = it.pathParam("filename") - - val filepath = Somecodes.SoundbankResult_directory.resolve(filename) - if (ValidFile(filename) && Files.isRegularFile(filepath)) { - it.header( - "Content-Disposition", - "attachment; filename=\"$filename\"" - ) - it.outputStream().use { out -> - Files.newInputStream(filepath).use { inp -> - inp.copyTo(out) - } - } - } else { - it.status(404).result(objectmapper.writeValueAsString(resultMessage("File not found"))) - } - } - - get("PagingResultList") { - it.result(objectmapper.writeValueAsString(ListAudioFiles(Somecodes.PagingResult_directory))) - } - - get("PagingResultFile/{filename}") { - val filename = it.pathParam("filename") - val filepath = Somecodes.PagingResult_directory.resolve(filename) - if (ValidFile(filename) && Files.isRegularFile(filepath)) { - it.header("Content-Disposition", "attachment; filename=\"$filename\"") - it.outputStream().use { out -> - Files.newInputStream(filepath).use { inp -> - inp.copyTo(out) - } - } - } else { - it.status(404).result(objectmapper.writeValueAsString(resultMessage("File not found"))) - } - } - get("FISCode") { - //TODO get FIS code + val value = object { //get from config file val GOP = _config.Get(configKeys.REMARK_GOP.key) val GBD = _config.Get(configKeys.REMARK_GBD.key) val GFC = _config.Get(configKeys.REMARK_GFC.key) val FLD = _config.Get(configKeys.REMARK_FLD.key) + val defaultvoice = _config.Get(configKeys.DEFAULT_VOICE_TYPE.key) } - + //println("Serving FIS Code request: GOP=${value.GOP}, GBD=${value.GBD}, GFC=${value.GFC}, FLD=${value.FLD}, DefaultVoice=${value.defaultvoice}") it.result(objectmapper.writeValueAsString(value)) } post("FISCode") { - //TODO set FIS code val json: JsonNode = objectmapper.readTree(it.body()) val _gop = json.get("GOP").asText("") val _gbd = json.get("GBD").asText("") val _gfc = json.get("GFC").asText("") val _fld = json.get("FLD").asText("") + val defaultvoice = json.get("defaultvoice").asText("") + //println("Received FIS Code update: GOP=$_gop, GBD=$_gbd, GFC=$_gfc, FLD=$_fld, DefaultVoice=$defaultvoice") if (ValidString(_gop) && ValidString(_gbd) && ValidString(_gfc) && ValidString(_fld)) { // save to config file _config.Set(configKeys.REMARK_GOP.key, _gop) _config.Set(configKeys.REMARK_GBD.key, _gbd) _config.Set(configKeys.REMARK_GFC.key, _gfc) _config.Set(configKeys.REMARK_FLD.key, _fld) + _config.Set(configKeys.DEFAULT_VOICE_TYPE.key, defaultvoice) _config.Save() Logger.info { "Changed FIS Codes" } - db.Add_Log("AAS", "Save FIS Codes Message: GOP=$_gop, GBD=$_gbd, GFC=$_gfc, FLD=$_fld") + db.Add_Log( + "AAS", + "Save FIS Codes Message: GOP=$_gop, GBD=$_gbd, GFC=$_gfc, FLD=$_fld" + ) it.result(objectmapper.writeValueAsString(resultMessage("OK"))) } else { it.status(400) .result(objectmapper.writeValueAsString(resultMessage("Invalid FIS code value"))) } } - post("UploadSoundbank/{language}/{voice}/{category}") { - val language = it.pathParam("language") - val voice = it.pathParam("voice") - val category = it.pathParam("category") - - val uploaded = it.uploadedFiles() - if (ValidString(language) && Language.entries.any{ lang -> lang.name == language}) { - if (ValidString(voice) && VoiceType.entries.any{ vtype -> vtype.name == voice}) { - if (ValidString(category) && Category.entries.any{ cat -> cat.name == category}) { - if (uploaded.isNotEmpty()) { - val targetdir = Somecodes.SoundbankDirectory( - Language.valueOf(language), - VoiceType.valueOf(voice), - Category.valueOf(category) - ) - if (!Files.isDirectory(targetdir)) Files.createDirectories(targetdir) - val successfiles = mutableListOf() - val failedfiles = mutableListOf() - uploaded.forEach { ff -> - val targetfile = targetdir.resolve(ff.filename()) - try { - Files.newOutputStream(targetfile).use { out -> - ff.content().use { inp -> - inp.copyTo(out) - } - } - Logger.info { "Uploaded soundbank file to ${targetfile.toAbsolutePath()}" } - successfiles.add(ff.filename()) - } catch (e: Exception) { - Logger.error { - "Failed to upload soundbank file to ${targetfile.toAbsolutePath()}: ${e.message}" - } - failedfiles.add(ff.filename()) - } - - } - if (successfiles.size==uploaded.size){ - it.result(objectmapper.writeValueAsString(resultMessage("All files uploaded successfully: ${successfiles.joinToString(", ")}"))) - } else { - it.result(objectmapper.writeValueAsString(resultMessage("Some files uploaded successfully: ${successfiles.joinToString(", ")}, failed: ${failedfiles.joinToString(", ")}"))) - } - } else { - it.status(400) - .result(objectmapper.writeValueAsString(resultMessage("No file uploaded"))) - } - } else { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Category parameter is invalid"))) - } - } else { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("VoiceType parameter is invalid"))) - } - } else { - it.status(400).result(objectmapper.writeValueAsString(resultMessage("Language parameter is invalid"))) - } - } } + } } - }.start(listenPort) + }.start(listenPort) +} + + +fun CheckUsers(ctx: Context) { + //val user = ctx.sessionAttribute("user") + val user = ctx.cookie("aas-user") + if (user == null) { + ctx.redirect("login.html") } - - - fun CheckUsers(ctx: Context) { - //val user = ctx.sessionAttribute("user") - val user = ctx.cookie("aas-user") - if (user == null) { - ctx.redirect("login.html") - } - val foundUser = userlist.find { it.first == user } - if (foundUser == null) { - ctx.redirect("login.html") - } + val foundUser = userlist.find { it.first == user } + if (foundUser == null) { + ctx.redirect("login.html") } +} - fun Stop() { - app?.stop() +fun Stop() { + app?.stop() - } +} } \ No newline at end of file
      No