From d7b4b746c647f983b9d73c9b2bde9c864f0a7d44 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Fri, 22 May 2020 01:41:01 -0400
Subject: [PATCH] flexible DFU file name

---
 .../inifile/src/com/opensr5/ini/IniFileModel.java   | 13 +++++++++----
 .../ui/src/com/rusefi/maintenance/DfuFlasher.java   | 13 ++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/java_console/inifile/src/com/opensr5/ini/IniFileModel.java b/java_console/inifile/src/com/opensr5/ini/IniFileModel.java
index c354cac6a6..7e412b03b1 100644
--- a/java_console/inifile/src/com/opensr5/ini/IniFileModel.java
+++ b/java_console/inifile/src/com/opensr5/ini/IniFileModel.java
@@ -62,13 +62,18 @@ public class IniFileModel {
         return this;
     }
 
-    private String findMetaInfoFile(String iniFilePath) {
-        File dir = new File(iniFilePath);
+    private static String findMetaInfoFile(String iniFilePath) {
+        return findFile(iniFilePath, RUSEFI_INI_PREFIX, RUSEFI_INI_SUFFIX);
+    }
+
+    @Nullable
+    public static String findFile(String fileDirectory, String prefix, String suffix) {
+        File dir = new File(fileDirectory);
         if (!dir.isDirectory())
             return null;
         for (String file : dir.list()) {
-            if (file.startsWith(RUSEFI_INI_PREFIX) && file.endsWith(RUSEFI_INI_SUFFIX))
-                return iniFilePath + File.separator + file;
+            if (file.startsWith(prefix) && file.endsWith(suffix))
+                return fileDirectory + File.separator + file;
         }
         return null;
     }
diff --git a/java_console/ui/src/com/rusefi/maintenance/DfuFlasher.java b/java_console/ui/src/com/rusefi/maintenance/DfuFlasher.java
index bdba87db5b..5ea3a7db8b 100644
--- a/java_console/ui/src/com/rusefi/maintenance/DfuFlasher.java
+++ b/java_console/ui/src/com/rusefi/maintenance/DfuFlasher.java
@@ -1,5 +1,6 @@
 package com.rusefi.maintenance;
 
+import com.opensr5.ini.IniFileModel;
 import com.rusefi.FileLog;
 import com.rusefi.Launcher;
 import com.rusefi.Timeouts;
@@ -7,7 +8,6 @@ import com.rusefi.autodetect.PortDetector;
 import com.rusefi.binaryprotocol.BinaryProtocol;
 import com.rusefi.config.generated.Fields;
 import com.rusefi.io.IoStream;
-import com.rusefi.io.serial.BaudRateHolder;
 import com.rusefi.io.serial.SerialIoStreamJSerialComm;
 import com.rusefi.ui.StatusWindow;
 import com.rusefi.ui.util.URLLabel;
@@ -24,9 +24,6 @@ import java.io.IOException;
  */
 public class DfuFlasher {
     public static final String DFU_BINARY = Launcher.TOOLS_PATH + File.separator + "DfuSe/DfuSeCommand.exe";
-    // TODO: integration with DFU command line tool
-    static final String DFU_COMMAND = DFU_BINARY + " -c -d --v --fn " + Launcher.INPUT_FILES_PATH + File.separator +
-            "rusefi.dfu";
     private static final String DFU_SETUP_EXE = "https://github.com/rusefi/rusefi_external_utils/raw/master/DFU_mode/DfuSe_Demo_V3.0.6_Setup.exe";
 
     private final JButton button = new JButton("Auto Program via DFU");
@@ -75,7 +72,7 @@ public class DfuFlasher {
         }
         StringBuffer stdout = new StringBuffer();
         String errorResponse = ExecHelper.executeCommand(FirmwareFlasher.BINARY_LOCATION,
-                FirmwareFlasher.BINARY_LOCATION + File.separator + DFU_COMMAND,
+                FirmwareFlasher.BINARY_LOCATION + File.separator + getDfuCommand(),
                 DFU_BINARY, wnd, stdout);
         if (stdout.toString().contains("Verify successful")) {
             wnd.appendMsg("SUCCESS!");
@@ -95,6 +92,12 @@ public class DfuFlasher {
         wnd.appendMsg("Please power cycle device to exit DFU mode");
     }
 
+    private static String getDfuCommand() {
+        String fileName = IniFileModel.findFile(Launcher.INPUT_FILES_PATH, "rusefi", ".dfu");
+
+        return DFU_BINARY + " -c -d --v --fn " + fileName;
+    }
+
     /**
      * connect via serial + initiate software DFU jump + program
      */