diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 2aa09bf..cdf5731 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -21,7 +21,7 @@
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index b4920da..52332db 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,6 @@
-
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 1e8c697..0033bc5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ def mainClassPackage = 'com.kylergib.wavelinktp'
group mainClassPackage
def versionMajor = 2
def versionMinor = 0
-def versionPatch = 0
+def versionPatch = 1
version versionMajor + '.' + versionMinor + '.' + versionPatch
def versionCode = versionMajor * 1000 + versionMinor * 100 + versionPatch
diff --git a/src/main/java/com/kylergib/wavelinktp/WaveLinkPlugin.java b/src/main/java/com/kylergib/wavelinktp/WaveLinkPlugin.java
index 67e8a7f..46674fa 100644
--- a/src/main/java/com/kylergib/wavelinktp/WaveLinkPlugin.java
+++ b/src/main/java/com/kylergib/wavelinktp/WaveLinkPlugin.java
@@ -22,10 +22,12 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.logging.ConsoleHandler;
+import java.util.logging.FileHandler;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -421,7 +423,7 @@ private void actionSetInputMute(@Data(stateId = "inputList") String[] choices,
input.setStreamMixerMuted(newValueStream);
String streamMuteStateId = "com.kylergib.wavelinktp.WaveLinkPlugin.WaveLinkMuteStates.state." + input.getStreamMuteStateId().replace(" ","");
waveLinkPlugin.sendStateUpdate(streamMuteStateId, mutedValue);
- System.out.println(streamMuteStateId + " - " + mutedValue);
+// System.out.println(streamMuteStateId + " - " + mutedValue);
}
});
@@ -454,8 +456,8 @@ private void actionSetInputFilterActive(@Data(stateId = "inputList") String[] c
} else {
newValue = Boolean.valueOf(value[0]);
}
- System.out.println(String.format("%s", inputPlugin.getName(), inputPlugin.getIsActive()));
- System.out.println(String.format("%s", input.getName()));
+// System.out.println(String.format("%s", inputPlugin.getName(), inputPlugin.getIsActive()));
+// System.out.println(String.format("%s", input.getName()));
String stateId = input.getName().replace(" ","") + "Filter" + inputPlugin.getName();
String stateIdValue;
@@ -468,7 +470,7 @@ private void actionSetInputFilterActive(@Data(stateId = "inputList") String[] c
inputPlugin.setIsActive(newValue);
WaveLinkActions.setInputFilter(input.getIdentifier(),inputPlugin.getFilterID(),newValue);
waveLinkPlugin.sendStateUpdate("com.kylergib.wavelinktp.WaveLinkPlugin.WaveLinkFilterStates.state." + stateId,stateIdValue);
- System.out.println(stateId + " - " + stateIdValue);
+// System.out.println(stateId + " - " + stateIdValue);
});
@@ -590,7 +592,7 @@ public void updateInputs() throws InterruptedException {
}
public void updateInputValues() {
- System.out.println("STARTING input UPDATE");
+// System.out.println("STARTING input UPDATE");
Status.allInputs.forEach(input -> {
String localMutedValue = "unmuted";
@@ -613,11 +615,11 @@ public void updateInputValues() {
WaveLinkPlugin.setInputValue(input.getLocalMixerLevel(), "Local", input, true);
WaveLinkPlugin.setInputValue(input.getStreamMixerLevel(), "Stream", input, true);
});
- System.out.println("ending inputs UPDATE");
+// System.out.println("ending inputs UPDATE");
}
public void updateOutputs() {
- System.out.println("STARTING OUTPUTS UPDATE");
+// System.out.println("STARTING OUTPUTS UPDATE");
if (!firstRun) {
Status.allOutputs.clear();
Status.getOutputs();
@@ -645,7 +647,7 @@ public void updateOutputs() {
}
}
waveLinkPlugin.sendChoiceUpdate(WaveLinkPluginConstants.WaveLinkOutputs.States.OutputList.ID, allOutputsString);
- System.out.println("ending OUTPUTS UPDATE");
+// System.out.println("ending OUTPUTS UPDATE");
}
public void updateMics() {
@@ -1143,7 +1145,7 @@ public void onWaveLinkDisconnected() {
}
public void setLogLevel() {
-// debugSetting = 4;
+// debugSetting = 3;
LOGGER.log(Level.INFO, "Log level is: " + debugSetting);
ConsoleHandler consoleHandler = (ConsoleHandler) Arrays.stream(LOGGER.getHandlers()).findFirst().get();
Level newLevel;
@@ -1168,26 +1170,26 @@ public void setLogLevel() {
}
if (debugSetting > 3) {
try {
- System.out.println("1");
+// System.out.println("1");
File folder = new File(".");
if (folder.exists() && folder.isDirectory()) {
- System.out.println("2");
+// System.out.println("2");
File[] files = folder.listFiles();
int numLogs = 0;
if (files != null) {
- System.out.println("3");
+// System.out.println("3");
LocalDateTime oldestFileDate = null;
File oldestFile = null;
for (File file : files) {
- System.out.println("4");
+// System.out.println("4");
if (file.isFile()) {
- System.out.println("5");
+// System.out.println("5");
//
String filename = file.getName();
if (filename.length() > 4 && filename.substring(filename.length() - 4).equals(".log")) {
- System.out.println("6");
+// System.out.println("6");
LocalDateTime fileDate = LocalDateTime.parse(filename.substring(7,filename.length() - 4));
if (oldestFile == null) oldestFile = file;
if (oldestFileDate == null) oldestFileDate = fileDate;
@@ -1201,22 +1203,27 @@ else if (oldestFileDate.isAfter(fileDate)) {
}
}
if (oldestFile != null && numLogs > 4) {
- System.out.println("7");
+// System.out.println("7");
oldestFile.delete();
LOGGER.log(FINEST, String.format("Deleted log file: %s", oldestFile.getName()));
}
- System.out.println("8");
+// System.out.println("8");
}
}
// System.out.println("9");
-// LocalDateTime date = LocalDateTime.now();
+ LocalDateTime date = LocalDateTime.now();
// System.out.println("10");
-// FileHandler fileHandler = new FileHandler(String.format("logfile%s.txt", date));
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm-ss");
+ String logName = String.format("logfile-%s.log", date.format(formatter));
+ FileHandler fileHandler = new FileHandler(logName, true);
// System.out.println("11");
-// LOGGER.addHandler(fileHandler);
+ LOGGER.addHandler(fileHandler);
// System.out.println("12");
-// fileHandler.setFormatter(consoleHandler.getFormatter());
-// LOGGER.log(FINEST, "Starting to output to logfile.log");
+ fileHandler.setFormatter(consoleHandler.getFormatter());
+ LOGGER.log(FINEST, "Starting to output to " + logName);
+ LOGGER.log(FINEST, "Output: " + fileHandler.toString());
+
+
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -1399,6 +1406,6 @@ public static void setOutputValue(int value, String mixerName, boolean updateCon
} else {
WaveLinkPlugin.waveLinkPlugin.sendStateUpdate(WaveLinkPluginConstants.WaveLinkOutputs.States.StreamVolume.ID, value);
}
- System.out.println("finisdhed");
+// System.out.println("finisdhed");
}
}
diff --git a/src/main/java/com/kylergib/wavelinktp/model/Status.java b/src/main/java/com/kylergib/wavelinktp/model/Status.java
index 9a274f5..9c43fd0 100644
--- a/src/main/java/com/kylergib/wavelinktp/model/Status.java
+++ b/src/main/java/com/kylergib/wavelinktp/model/Status.java
@@ -13,6 +13,8 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Base64;
+import java.util.List;
+
/**
* Current status for things inside of wave link
*/
@@ -120,11 +122,16 @@ public static void getOutputConfig() {
public static void getInput() {
//TODO: possible to get icon data and import icon?
+// List allInputsStringList = new ArrayList<>();
+
+
if (!allInputs.isEmpty()) {
allInputs.clear();
}
int id = (int) inputConfigs.get("id");
JSONArray resultJson = (JSONArray) inputConfigs.get("result");
+ int numIndex = 0;
+ String[] allInputsStringList = new String[resultJson.length()];
for (int i = 0; i < resultJson.length(); i++) {
JSONObject tempJson = (JSONObject) resultJson.get(i);
@@ -205,6 +212,8 @@ public static void getInput() {
newInput.setLevelRightStateId(newInput.getName() + " Level Right");
newInput.setLocalVolumeStateId(newInput.getName() + " Local Volume");
newInput.setStreamVolumeStateId(newInput.getName() + " Stream Volume");
+ allInputsStringList[numIndex] = newInput.getName();
+ numIndex = numIndex + 1;
// setInputValue(streamMixerLevel, "Stream", newInput);
// setInputValue(localMixerLevel, "Local", newInput);
@@ -219,7 +228,8 @@ public static void getInput() {
if (!allInputs.isEmpty()) {
Boolean shouldAdd = true;
for (Input allInput : allInputs) {
-
+// allInputsStringList[numIndex] = allInput.getName();
+// numIndex = numIndex + 1;
if (allInput.getIdentifier().equals(newInput.getIdentifier())) {
shouldAdd = false;
break;
@@ -233,15 +243,22 @@ public static void getInput() {
}
}
else {
+
+// numIndex = numIndex + 1;
allInputs.add(newInput);
WaveLinkPlugin.waveLinkPlugin.sendDynamicStates(newInput);
}
}
- try {
- WaveLinkPlugin.waveLinkPlugin.updateInputs();
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
+// WaveLinkPlugin.waveLinkPlugin.sendChoiceUpdate(WaveLinkPluginConstants
+// .WaveLinkInputs.States.InputList.ID, allInputsString);
+ WaveLinkPlugin.waveLinkPlugin.sendChoiceUpdate(WaveLinkPluginConstants
+ .WaveLinkInputs.States.InputList.ID, allInputsStringList);
+ System.out.println("finished get input");
+// try {
+// WaveLinkPlugin.waveLinkPlugin.updateInputs();
+// } catch (InterruptedException e) {
+// throw new RuntimeException(e);
+// }
}
diff --git a/src/main/java/com/kylergib/wavelinktp/model/WaveLinkActions.java b/src/main/java/com/kylergib/wavelinktp/model/WaveLinkActions.java
index 02fcc6d..6e9c086 100644
--- a/src/main/java/com/kylergib/wavelinktp/model/WaveLinkActions.java
+++ b/src/main/java/com/kylergib/wavelinktp/model/WaveLinkActions.java
@@ -40,7 +40,7 @@ public static void setMicOutputEnhancement(String property, String micName, Stri
params.put("isAdjustVolume", false);
} else {
- System.out.println(4);
+// System.out.println(4);
params.put("isAdjustVolume", true);
if (option.equals("Decrease")) {
value = (Integer) value * -1;