rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only:LuaScriptPanel logging

This commit is contained in:
rusefi 2024-02-27 21:43:42 -05:00
parent db2dce6d7a
commit 057eb2e123
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java
View File

@ -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<String> firmwareVersion = new AtomicReference<>("N/A");
static long classBuildTimeMillis() {

15
java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java
View File

@ -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();
}
});