From 057eb2e12379705aff8fd350a56df7059077e724 Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 27 Feb 2024 21:43:42 -0500 Subject: [PATCH] only:LuaScriptPanel logging --- .../main/java/com/rusefi/core/rusEFIVersion.java | 2 +- .../java/com/rusefi/ui/lua/LuaScriptPanel.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java b/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java index c099405eef..a4fa0e632d 100644 --- a/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java +++ b/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java @@ -6,7 +6,7 @@ import java.net.URL; import java.util.concurrent.atomic.AtomicReference; public interface rusEFIVersion { - int CONSOLE_VERSION = 20240223; + int CONSOLE_VERSION = 20240227; AtomicReference firmwareVersion = new AtomicReference<>("N/A"); static long classBuildTimeMillis() { diff --git a/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java index 3226f555dd..9776e33f27 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java @@ -1,5 +1,6 @@ package com.rusefi.ui.lua; +import com.devexperts.logging.Logging; import com.opensr5.ConfigurationImage; import com.rusefi.ConnectionTab; import com.rusefi.binaryprotocol.BinaryProtocol; @@ -25,9 +26,12 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import static com.devexperts.logging.Logging.getLogging; import static com.rusefi.ui.util.UiUtils.trueLayout; public class LuaScriptPanel { + private static final Logging log = getLogging(LuaScriptPanel.class); + private static final String SCRIPT_FOLDER_CONFIG_KEY = "SCRIPT_FOLDER"; private final UIContext context; private final Node config; @@ -158,13 +162,20 @@ public class LuaScriptPanel { System.out.println("Reading " + fullFileName); try { - String discContent = Files.readString(new File(fullFileName).toPath()); + File file = new File(fullFileName); + log.info("Reloading " + file.getAbsolutePath()); + String discContent = Files.readString(file.toPath()); String newLua = LuaIncludeSyntax.reloadScript(discContent, name -> { String includeFullName = getWorkingFolder() + File.separator + name; + File includeFile = new File(includeFullName); + log.info("Reading " + includeFile.getAbsolutePath()); try { - return Files.readString(new File(includeFullName).toPath()); + String string = Files.readString(includeFile.toPath()); + log.info("Got " + string.length() + " bytes"); + return string; } catch (IOException e) { + log.error("ERROR ", e); return "ERROR reading " + name + ": " + e.getMessage(); } });