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

better error handling? 

only:hellen-honda-k
This commit is contained in:
Andrey 2024-09-30 01:30:21 -04:00
parent 9e517b8d29
commit 25d71abbf9
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java_console/inifile/src/main/java/com/opensr5/ini/IniFileModelImpl.java
View File

@ -103,7 +103,10 @@ public class IniFileModelImpl implements IniFileModel {
} }
private static String findMetaInfoFile(String iniFilePath) { private static String findMetaInfoFile(String iniFilePath) {
return FindFileHelper.findFile(iniFilePath, RUSEFI_INI_PREFIX, RUSEFI_INI_SUFFIX); String iniFileName = FindFileHelper.findFile(iniFilePath, RUSEFI_INI_PREFIX, RUSEFI_INI_SUFFIX);
if (iniFileName == null)
throw new IllegalStateException("Not found " + RUSEFI_INI_PREFIX + "*" + RUSEFI_INI_SUFFIX + " in " + iniFilePath);
return iniFileName;
} }
private void finishDialog() { private void finishDialog() {

9
java_console/shared_io/src/main/java/com/rusefi/core/FindFileHelper.java
View File

@ -1,11 +1,13 @@
package com.rusefi.core; package com.rusefi.core;
import com.devexperts.logging.Logging;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.io.File; import java.io.File;
import java.util.Objects; import java.util.Objects;
public class FindFileHelper { public class FindFileHelper {
private static final Logging log = Logging.getLogging(FindFileHelper.class);
public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", ".."); public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", "..");
/** /**
* Same .bin used by primary DFU and a bit unneeded ST-LINK options * Same .bin used by primary DFU and a bit unneeded ST-LINK options
@ -15,9 +17,10 @@ public class FindFileHelper {
@Nullable @Nullable
public static String findFile(String fileDirectory, String prefix, String suffix) { public static String findFile(String fileDirectory, String prefix, String suffix) {
File dir = new File(fileDirectory); File dir = new File(fileDirectory);
if (!dir.isDirectory()) if (!dir.isDirectory()) {
return null; throw new IllegalStateException("Not a directory: " + fileDirectory);
System.out.println("Searching for " + prefix + "*" + suffix + " in " + dir.getAbsolutePath()); }
log.info("Searching for " + prefix + "*" + suffix + " in " + dir.getAbsolutePath());
for (String file : Objects.requireNonNull(dir.list())) { for (String file : Objects.requireNonNull(dir.list())) {
if (file.contains(" ")) if (file.contains(" "))
continue; // spaces not acceptable continue; // spaces not acceptable

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

@ -10,7 +10,7 @@ public interface rusEFIVersion {
* *** BE CAREFUL WE HAVE SEPARATE AUTOUPDATE_VERSION also managed manually *** * *** BE CAREFUL WE HAVE SEPARATE AUTOUPDATE_VERSION also managed manually ***
* @see com.rusefi.autoupdate.Autoupdate#AUTOUPDATE_VERSION * @see com.rusefi.autoupdate.Autoupdate#AUTOUPDATE_VERSION
*/ */
int CONSOLE_VERSION = 20240929; int CONSOLE_VERSION = 20240930;
AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A"); AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
static long classBuildTimeMillis() { static long classBuildTimeMillis() {