diff --git a/src/Main.kt b/src/Main.kt
index 887871b..0b29c27 100644
--- a/src/Main.kt
+++ b/src/Main.kt
@@ -2,7 +2,7 @@ import audio.AudioFilePlayer
import audio.AudioUtility
import audio.OpusStreamReceiver
import com.fasterxml.jackson.core.type.TypeReference
-import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import somecodes.Codes.Companion.ValidString
import somecodes.configFile
import web.WsReply
@@ -11,15 +11,17 @@ import zello.ZelloClient
import zello.ZelloEvent
import javafx.util.Pair
import org.slf4j.LoggerFactory
-import somecodes.Codes.Companion.ValidFile
+import somecodes.Codes
import web.WsCommand
import java.util.function.BiFunction
+import kotlin.io.path.isRegularFile
+import kotlin.io.path.pathString
//TIP To
Run code, press
or
// click the
icon in the gutter.
fun main() {
val logger = LoggerFactory.getLogger("Main")
- val objectMapper = ObjectMapper()
+ val objectMapper = jacksonObjectMapper()
val cfg = configFile()
cfg.Load()
@@ -33,7 +35,7 @@ fun main() {
}
}
if (audioID!=0){
- val initsuccess = au.InitDevice(audioID)
+ val initsuccess = au.InitDevice(audioID,44100)
println("Audio Device $audioID initialized: $initsuccess")
}
@@ -45,8 +47,25 @@ fun main() {
when (source) {
"setting" -> when(cmd.command){
"getConfig" ->{
- logger.info("Get Config")
- WsReply(cmd.command,objectMapper.writeValueAsString(cfg) )
+ val data = mapOf(
+ "zelloUsername" to cfg.ZelloUsername,
+ "zelloPassword" to cfg.ZelloPassword,
+ "zelloChannel" to cfg.ZelloChannel,
+ "zelloServer" to cfg.ZelloServer,
+ "zelloWorkNetworkName" to cfg.ZelloWorkNetworkName,
+ "zelloEnterpriseServerDomain" to cfg.ZelloEnterpriseServerDomain,
+ "m1" to cfg.M1,
+ "m2" to cfg.M2,
+ "m3" to cfg.M3,
+ "m4" to cfg.M4,
+ "m5" to cfg.M5,
+ "m6" to cfg.M6,
+ "m7" to cfg.M7,
+ "m8" to cfg.M8,
+ "messageList" to Codes.getAudioFiles()
+ )
+
+ WsReply(cmd.command, objectMapper.writeValueAsString(data).trim())
}
"setZelloConfig" -> {
try{
@@ -57,7 +76,7 @@ fun main() {
cfg.ZelloServer = xx["ZelloServer"]
cfg.ZelloWorkNetworkName = xx["ZelloWorkNetworkName"]
cfg.ZelloEnterpriseServerDomain = xx["ZelloEnterpriseServerDomain"]
-
+ cfg.Save()
WsReply(cmd.command,"success")
} catch (e: Exception){
WsReply(cmd.command,"failed: ${e.message}")
@@ -76,6 +95,7 @@ fun main() {
cfg.M6 = xx["M6"]
cfg.M7 = xx["M7"]
cfg.M8 = xx["M8"]
+ cfg.Save()
WsReply(cmd.command,"success")
} catch (e: Exception){
WsReply(cmd.command,"failed: ${e.message}")
@@ -101,7 +121,7 @@ fun main() {
}
"getPlaybackStatus" ->{
if (afp!=null && true==afp?.isPlaying){
- WsReply(cmd.command, "Playing: ${afp?.filename}")
+ WsReply(cmd.command, "Playing: ${afp?.ShortFileName()}")
} else {
WsReply(cmd.command, "Idle")
}
@@ -120,17 +140,23 @@ fun main() {
null
}
}
- if (ValidFile(filename)){
- try{
- val player= AudioFilePlayer(audioID, filename)
- player.Play { _ -> afp = null}
- afp = player
- WsReply(cmd.command,"success")
+ if (filename!=null){
+ val completefilename = Codes.audioFilePath.resolve(filename)
+ if (completefilename.isRegularFile()){
+ try{
+
+ val player= AudioFilePlayer(audioID, completefilename.pathString)
+ player.Play { _ -> afp = null}
+ afp = player
+ WsReply(cmd.command,"success")
+
+ } catch (e: Exception){
+ WsReply(cmd.command, "failed: ${e.message}")
+ }
+ } else WsReply(cmd.command,"File Not Found : $filename")
+ } else WsReply(cmd.command,"Invalid message name: ${cmd.data}")
+
- } catch (e: Exception){
- WsReply(cmd.command, "failed: ${e.message}")
- }
- } else WsReply(cmd.command,"Invalid file : $filename")
diff --git a/src/audio/AudioFilePlayer.kt b/src/audio/AudioFilePlayer.kt
index b2781da..7de5654 100644
--- a/src/audio/AudioFilePlayer.kt
+++ b/src/audio/AudioFilePlayer.kt
@@ -5,16 +5,18 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import java.util.function.Consumer
+import kotlin.io.path.Path
/**
* Audio Player for playing audio files.
* Supported extensions : .wav, .mp3
*/
@Suppress("unused")
-class AudioFilePlayer(deviceID: Int, val filename: String?, device_samplingrate: Int = 48000) {
+class AudioFilePlayer(deviceID: Int, filename: String, device_samplingrate: Int = 48000) {
val bass: Bass = Bass.Instance
var filehandle = 0
var isPlaying = false
+ private val filepath = Path(filename)
init{
if (bass.BASS_SetDevice(deviceID)){
filehandle = bass.BASS_StreamCreateFile(false, filename, 0, 0, 0)
@@ -32,6 +34,10 @@ class AudioFilePlayer(deviceID: Int, val filename: String?, device_samplingrate:
}
}
+ fun ShortFileName() : String {
+ return filepath.fileName.toString()
+ }
+
fun Play(finished: Consumer
) : Boolean{
if (bass.BASS_ChannelPlay(filehandle, false)){
diff --git a/src/somecodes/Codes.kt b/src/somecodes/Codes.kt
index 598115f..d59929c 100644
--- a/src/somecodes/Codes.kt
+++ b/src/somecodes/Codes.kt
@@ -1,12 +1,30 @@
package somecodes
-import com.fasterxml.jackson.databind.ObjectMapper
import java.io.File
+import kotlin.io.path.Path
@Suppress("unused")
class Codes {
- private val objectMapper = ObjectMapper()
+
companion object{
+ val audioFilePath = Path(System.getProperty("user.dir"), "audiofile")
+ private val validAudioExtensions = setOf("wav", "mp3")
+ fun getAudioFiles() : Array {
+ val audioDir = audioFilePath.toFile()
+ if (!audioDir.exists()) {
+ audioDir.mkdirs() // Create directory if it doesn't exist
+ }
+ val ll = audioDir.listFiles()?.filter { it.isFile && validAudioExtensions.contains(it.extension) }?.map { it.name } ?: emptyList()
+ return ll.toTypedArray()
+ }
+
+ fun getaudioFileFullPath(filename: String) : String {
+ if (ValidString(filename)) {
+ val file = audioFilePath.resolve(filename)
+ return file.toAbsolutePath().toString()
+ }
+ return ""
+ }
fun ValidFile(s: String?) : Boolean {
if (s!=null){
diff --git a/src/somecodes/configFile.kt b/src/somecodes/configFile.kt
index 4323876..313d77a 100644
--- a/src/somecodes/configFile.kt
+++ b/src/somecodes/configFile.kt
@@ -1,5 +1,6 @@
package somecodes
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import java.nio.file.Path
import kotlin.io.path.Path
@@ -21,15 +22,14 @@ class configFile {
private val filepath : Path = Path(System.getProperty("user.dir"), "config.json")
+ @Suppress("UNCHECKED_CAST")
fun Load(){
if (filepath.toFile().exists()){
// file found, then load the configuration to configFile object
try{
val json = filepath.toFile().readText()
- val configMap = json.split(",").associate { it ->
- val (key, value) = it.split(":").map { it.trim().removeSurrounding("\"") }
- key to value
- }
+ val objectMapper = jacksonObjectMapper()
+ val configMap = objectMapper.readValue(json, Map::class.java) as Map
ZelloUsername = configMap["ZelloUsername"]
ZelloPassword = configMap["ZelloPassword"]
@@ -72,23 +72,25 @@ class configFile {
fun Save(){
try {
// Convert the configFile object to JSON and write it to the file
- val json = """{
- "ZelloUsername": "$ZelloUsername",
- "ZelloPassword": "$ZelloPassword",
- "ZelloChannel": "$ZelloChannel",
- "ZelloServer": "$ZelloServer",
- "ZelloWorkNetworkName": "$ZelloWorkNetworkName",
- "ZelloEnterpriseServerDomain": "$ZelloEnterpriseServerDomain",
- "M1": "$M1",
- "M2": "$M2",
- "M3": "$M3",
- "M4": "$M4",
- "M5": "$M5",
- "M6": "$M6",
- "M7": "$M7",
- "M8": "$M8"
- }"""
- filepath.toFile().writeText(json)
+ val js = mapOf(
+ "ZelloUsername" to ZelloUsername,
+ "ZelloPassword" to ZelloPassword,
+ "ZelloChannel" to ZelloChannel,
+ "ZelloServer" to ZelloServer,
+ "ZelloWorkNetworkName" to ZelloWorkNetworkName,
+ "ZelloEnterpriseServerDomain" to ZelloEnterpriseServerDomain,
+ "M1" to M1,
+ "M2" to M2,
+ "M3" to M3,
+ "M4" to M4,
+ "M5" to M5,
+ "M6" to M6,
+ "M7" to M7,
+ "M8" to M8
+ )
+
+ val mapper = jacksonObjectMapper()
+ mapper.writerWithDefaultPrettyPrinter().writeValue(filepath.toFile(), js)
} catch (e: Exception) {
println("Error saving configuration: ${e.message}")
}
diff --git a/src/web/webApp.java b/src/web/webApp.java
index 396ba6a..d099041 100644
--- a/src/web/webApp.java
+++ b/src/web/webApp.java
@@ -2,10 +2,16 @@ package web;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.javalin.Javalin;
+import io.javalin.http.HttpStatus;
import javafx.util.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import somecodes.Codes;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiFunction;
@@ -85,7 +91,7 @@ public class webApp {
String message = wsMessageContext.message();
try{
var command = objectMapper.readValue(message, WsCommand.class);
- logger.info("Received command from prerecordedbroadcast.html/ws : {}", command);
+ //logger.info("Received command from prerecordedbroadcast.html/ws : {}", command);
var reply = callback.apply("prerecordedbroadcast", command);
wsMessageContext.send(reply);
} catch (Exception e){
@@ -99,14 +105,33 @@ public class webApp {
ctx.redirect("/index.html");
}
});
+ post("/upload", ctx -> {
+ // Handle file upload
+ var file = ctx.uploadedFile("file");
+ if (file != null ) {
+ // Process the uploaded file
+ try(InputStream in = file.content()) {
+ var savetarget = Codes.Companion.getAudioFilePath().resolve(file.filename());
+ Files.copy(in, savetarget, StandardCopyOption.REPLACE_EXISTING);
+ logger.info("File uploaded: {}", file.filename());
+ ctx.status(HttpStatus.OK).result("File uploaded successfully: " + file.filename());
+ } catch (Exception e){
+ ctx.status(HttpStatus.INTERNAL_SERVER_ERROR).result("File upload failed: " + file.filename());
+ }
+
+ } else {
+ ctx.status(HttpStatus.BAD_REQUEST).result("No file uploaded");
+ }
+ });
ws("/ws", wshandler -> wshandler.onMessage(wsMessageContext -> {
// Handle incoming WebSocket messages
String message = wsMessageContext.message();
+ //logger.info("Received message from setting.html/ws: {}", message);
try{
var command = objectMapper.readValue(message, WsCommand.class);
- logger.info("Received command from setting.html/ws : {}", command);
+ //logger.info("Received command from setting.html/ws : {}", command);
var reply = callback.apply("setting", command);
- logger.info("Replying to setting.html/ws : {}", reply);
+ //logger.info("Replying to setting.html/ws : {}", reply);
wsMessageContext.send(reply);
} catch (Exception e){
logger.error("Error processing {} from setting.html/ws: {}", message, e.getMessage());