Skip to content

Commit

Permalink
Merge 8284651 into d9cbeca
Browse files Browse the repository at this point in the history
  • Loading branch information
@kylergib
kylergib authored Jun 7, 2024
2 parents d9cbeca + 8284651 commit a5a3046
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .idea/compiler.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/runConfigurations.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
53 changes: 30 additions & 23 deletions src/main/java/com/kylergib/wavelinktp/WaveLinkPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);

}
});
Expand Down Expand Up @@ -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;
Expand All @@ -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);

});

Expand Down Expand Up @@ -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";
Expand All @@ -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();
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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);
}
Expand Down Expand Up @@ -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");
}
}
29 changes: 23 additions & 6 deletions src/main/java/com/kylergib/wavelinktp/model/Status.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down Expand Up @@ -120,11 +122,16 @@ public static void getOutputConfig() {

public static void getInput() {
//TODO: possible to get icon data and import icon?
// List<String> 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);

Expand Down Expand Up @@ -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);

Expand All @@ -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;
Expand All @@ -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);
// }

}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/kylergib/wavelinktp/model/WaveLinkActions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a5a3046

Please sign in to comment.