diff --git a/src/main/java/de/bwravencl/controllerbuddy/gui/Main.java b/src/main/java/de/bwravencl/controllerbuddy/gui/Main.java index 8c0e7737..7bfd4935 100644 --- a/src/main/java/de/bwravencl/controllerbuddy/gui/Main.java +++ b/src/main/java/de/bwravencl/controllerbuddy/gui/Main.java @@ -970,11 +970,17 @@ public void windowOpened(final WindowEvent e) { final var presentControllers = taskRunner.run(Main::getPresentControllers); if (presentControllers != null && !presentControllers.isEmpty()) { + log.log(Level.INFO, + "Present controllers:" + presentControllers.stream() + .map(controllerInfo -> assembleControllerLoggingMessage("\n\t", controllerInfo)) + .collect(Collectors.joining())); + final var lastControllerGuid = preferences.get(PREFERENCES_LAST_CONTROLLER, null); if (lastControllerGuid != null) { presentControllers.stream().filter(controller -> lastControllerGuid.equals(controller.guid)).findFirst() .ifPresentOrElse(controller -> { - log.log(Level.INFO, assembleControllerLoggingMessage("Found previously used", controller)); + log.log(Level.INFO, + assembleControllerLoggingMessage("Found previously used controller ", controller)); setSelectedController(controller); }, () -> { log.log(Level.INFO, "Previously used controller is not present"); @@ -997,7 +1003,8 @@ public void windowOpened(final WindowEvent e) { if (disconnected || GLFW.glfwJoystickIsGamepad(jid)) { if (disconnected && presentControllers != null && presentControllers.stream().anyMatch(controller -> controller.jid == jid)) { - log.log(Level.INFO, assembleControllerLoggingMessage("Disconnected", new ControllerInfo(jid))); + log.log(Level.INFO, + assembleControllerLoggingMessage("Disconnected controller ", new ControllerInfo(jid))); if (selectedController != null && selectedController.jid == jid) { if (!isMac) { @@ -1006,7 +1013,8 @@ public void windowOpened(final WindowEvent e) { input.deInit(true); } } else if (event == GLFW.GLFW_CONNECTED) { - log.log(Level.INFO, assembleControllerLoggingMessage("Connected", new ControllerInfo(jid))); + log.log(Level.INFO, + assembleControllerLoggingMessage("Connected controller ", new ControllerInfo(jid))); } EventQueue.invokeLater(() -> onControllersChanged(getPresentControllers(), false)); @@ -1051,7 +1059,7 @@ private static void addGlueToSettingsPanel(final JPanel settingsPanel) { public static String assembleControllerLoggingMessage(final String prefix, final ControllerInfo controller) { final var sb = new StringBuilder(); - sb.append(prefix).append(" controller "); + sb.append(prefix); final var appendGamepadName = controller.name != null; @@ -1163,6 +1171,8 @@ private static boolean isModalDialogShowing() { public static void main(final String[] args) { log.log(Level.INFO, "Launching " + Metadata.APPLICATION_NAME + " " + Metadata.VERSION); + log.log(Level.INFO, "Operating System: " + System.getProperty("os.name") + " " + + System.getProperty("os.version") + " " + System.getProperty("os.arch")); Thread.setDefaultUncaughtExceptionHandler((_, e) -> { log.log(Level.SEVERE, e.getMessage(), e); @@ -2379,7 +2389,7 @@ private void setSelectedController(final ControllerInfo controller) { selectedController = controller; if (controller != null) { - log.log(Level.INFO, assembleControllerLoggingMessage("Selected controller", controller)); + log.log(Level.INFO, assembleControllerLoggingMessage("Selected controller ", controller)); if (controller.guid != null) { preferences.put(PREFERENCES_LAST_CONTROLLER, controller.guid); diff --git a/src/main/java/de/bwravencl/controllerbuddy/input/Input.java b/src/main/java/de/bwravencl/controllerbuddy/input/Input.java index 755d64cf..b164dd59 100644 --- a/src/main/java/de/bwravencl/controllerbuddy/input/Input.java +++ b/src/main/java/de/bwravencl/controllerbuddy/input/Input.java @@ -355,8 +355,8 @@ public boolean poll() { if (state.buttons(hotSwappingButtonId) != 0) { hotSwappingButtonDownJids.add(controller.jid()); } else if (hotSwappingButtonDownJids.contains(controller.jid())) { - log.log(Level.INFO, - Main.assembleControllerLoggingMessage("Initiating hot swap to ", controller)); + log.log(Level.INFO, Main.assembleControllerLoggingMessage( + "Initiating hot swap to controller ", controller)); hotSwappingButtonId = HotSwappingButton.None.id; EventQueue.invokeLater(() -> { diff --git a/src/main/java/de/bwravencl/controllerbuddy/input/driver/EvdevDriver.java b/src/main/java/de/bwravencl/controllerbuddy/input/driver/EvdevDriver.java index adb47230..731807bc 100644 --- a/src/main/java/de/bwravencl/controllerbuddy/input/driver/EvdevDriver.java +++ b/src/main/java/de/bwravencl/controllerbuddy/input/driver/EvdevDriver.java @@ -64,7 +64,7 @@ private EvdevDriver(final Input input, final ControllerInfo controller, final Ev strongRumbleEffectId = createRumbleEffect((short) 90); lightRumbleEffectId = createRumbleEffect((short) 60); - log.log(Level.INFO, Main.assembleControllerLoggingMessage("Using evdev driver for controller", controller)); + log.log(Level.INFO, Main.assembleControllerLoggingMessage("Using evdev driver for controller ", controller)); } private static void closeFileDescriptor(final int fd) { diff --git a/src/main/java/de/bwravencl/controllerbuddy/input/driver/XInputDriver.java b/src/main/java/de/bwravencl/controllerbuddy/input/driver/XInputDriver.java index 41a93bc0..67904819 100644 --- a/src/main/java/de/bwravencl/controllerbuddy/input/driver/XInputDriver.java +++ b/src/main/java/de/bwravencl/controllerbuddy/input/driver/XInputDriver.java @@ -88,10 +88,9 @@ private XInputDriver(final Input input, final ControllerInfo controller) throws } log.log(Level.INFO, - Main.assembleControllerLoggingMessage( - "Using XInput " + XInputDevice.getLibraryVersion().name().substring("XINPUT_".length()) - .replace('_', '.') + " controller with ID " + xinputDevice.getPlayerNum() + " as", - controller)); + Main.assembleControllerLoggingMessage("Using XInput controller " + + XInputDevice.getLibraryVersion().name().substring("XINPUT_".length()).replace('_', '.') + + " controller with ID " + xinputDevice.getPlayerNum() + " as", controller)); } private static boolean isXInputController(final ControllerInfo controller) { diff --git a/src/main/java/de/bwravencl/controllerbuddy/input/driver/sony/SonyDriver.java b/src/main/java/de/bwravencl/controllerbuddy/input/driver/sony/SonyDriver.java index 83bf475b..51d6b4d1 100644 --- a/src/main/java/de/bwravencl/controllerbuddy/input/driver/sony/SonyDriver.java +++ b/src/main/java/de/bwravencl/controllerbuddy/input/driver/sony/SonyDriver.java @@ -142,9 +142,12 @@ public abstract class SonyDriver extends Driver implements IGamepadStateProvider final var reportId = reportData[0]; if (reportId != connection.inputReportId || (bluetooth ? reportLength < BLUETOOTH_REPORT_LENGTH : reportLength != USB_REPORT_LENGTH)) { - getLogger().log(Level.WARNING, - Main.assembleControllerLoggingMessage("Received unexpected HID input report with ID " - + reportId + " and length " + reportLength + " from", controller)); + getLogger() + .log(Level.WARNING, + Main.assembleControllerLoggingMessage( + "Received unexpected HID input report with ID " + reportId + + " and length " + reportLength + " from controller ", + controller)); continue; } @@ -168,7 +171,7 @@ public abstract class SonyDriver extends Driver implements IGamepadStateProvider if (receivedCrc32Value != calculatedCrc32Value) { getLogger().log(Level.WARNING, Main.assembleControllerLoggingMessage( - "Received faulty HID input report from", controller)); + "Received faulty HID input report from controller ", controller)); continue; } } @@ -362,15 +365,15 @@ static HidDevice getHidDevice(final List presentControllers, final var hidDevice = devices.get(deviceIndex); if (!hidDevice.open()) { - log.log(Level.WARNING, Main.assembleControllerLoggingMessage("Could not open HID device " - + humanReadableName + " with path " + hidDevice.getPath() + " to use as", selectedController)); + log.log(Level.WARNING, + Main.assembleControllerLoggingMessage("Could not open HID device " + humanReadableName + + " with path " + hidDevice.getPath() + " to use as controller ", selectedController)); return null; } - log.log(Level.INFO, - Main.assembleControllerLoggingMessage( - "Using " + humanReadableName + " controller with path " + hidDevice.getPath() + " as", - selectedController)); + log.log(Level.INFO, Main.assembleControllerLoggingMessage( + "Using " + humanReadableName + " controller with path " + hidDevice.getPath() + " as controller ", + selectedController)); hidServices = null; return hidDevice; @@ -444,7 +447,7 @@ public boolean getGamepadState(final GLFWGamepadState state) { if (System.currentTimeMillis() - lastInputReportTime > INPUT_REPORT_TIMEOUT) { getLogger().log(Level.WARNING, Main.assembleControllerLoggingMessage( - "No new input report for more than " + INPUT_REPORT_TIMEOUT + " ms from", controller)); + "No new input report for more than " + INPUT_REPORT_TIMEOUT + " ms from controller ", controller)); return false; } @@ -584,7 +587,7 @@ boolean sendHidReport() { if (!success) { getLogger().log(Level.WARNING, - Main.assembleControllerLoggingMessage("Error while sending HID packet to", controller)); + Main.assembleControllerLoggingMessage("Error while sending HID packet to controller ", controller)); } return success; diff --git a/src/main/java/de/bwravencl/controllerbuddy/runmode/RunMode.java b/src/main/java/de/bwravencl/controllerbuddy/runmode/RunMode.java index 2d64e0ba..1fa500da 100644 --- a/src/main/java/de/bwravencl/controllerbuddy/runmode/RunMode.java +++ b/src/main/java/de/bwravencl/controllerbuddy/runmode/RunMode.java @@ -49,7 +49,8 @@ final void controllerDisconnected() { Thread.startVirtualThread(() -> main.stopAll(true, !main.isAutoRestartOutput(), true)); - log.log(Level.WARNING, Main.assembleControllerLoggingMessage("Could not read from", input.getController())); + log.log(Level.WARNING, + Main.assembleControllerLoggingMessage("Could not read from controller ", input.getController())); if (!main.isSkipControllerDialogs()) { EventQueue.invokeLater(() -> GuiUtils.showMessageDialog(main, main.getFrame(), Main.strings.getString("COULD_NOT_READ_FROM_CONTROLLER_DIALOG_TEXT"),