rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring: code flow simplification

This commit is contained in:
rusefillc 2022-08-15 18:39:31 -04:00
parent e0172a170d
commit 73d4154b55
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
View File

@ -184,7 +184,8 @@ public class ConfigDefinition {
ParseState parseState = new ParseState(state.enumsReader); ParseState parseState = new ParseState(state.enumsReader);
// Add the variable for the config signature // Add the variable for the config signature
long crc32 = IoUtil2.signatureHash(state, parseState, tsInputFileFolder, state.inputFiles); long crc32 = IoUtil2.getCrc32(state.inputFiles);
IoUtil2.signatureHash(state, parseState, tsInputFileFolder, crc32);
ExtraUtil.handleFiringOrder(firingEnumFileName, state.variableRegistry, parseState); ExtraUtil.handleFiringOrder(firingEnumFileName, state.variableRegistry, parseState);

11
java_tools/configuration_definition/src/main/java/com/rusefi/IoUtil2.java
View File

@ -33,7 +33,7 @@ public class IoUtil2 {
} }
} }
static long getCrc32(String fileName) throws IOException { private static long getCrc32(String fileName) throws IOException {
File file = new File(fileName); File file = new File(fileName);
byte[] fileContent = Files.readAllBytes(file.toPath()); byte[] fileContent = Files.readAllBytes(file.toPath());
for (int i = 0; i < fileContent.length; i++) { for (int i = 0; i < fileContent.length; i++) {
@ -46,7 +46,8 @@ public class IoUtil2 {
return c.getValue(); return c.getValue();
} }
static long signatureHash(ReaderState state, ParseState parseState, String tsPath, List<String> inputFileNames) throws IOException {
static long getCrc32(List<String> inputFileNames) throws IOException {
// get CRC32 of given input files // get CRC32 of given input files
long crc32 = 0; long crc32 = 0;
for (String fileName : inputFileNames) { for (String fileName : inputFileNames) {
@ -55,6 +56,10 @@ public class IoUtil2 {
crc32 ^= c; crc32 ^= c;
} }
SystemOut.println("CRC32 from all input files = " + crc32); SystemOut.println("CRC32 from all input files = " + crc32);
return crc32;
}
static void signatureHash(ReaderState state, ParseState parseState, String tsPath, long crc32) {
// store the CRC32 as a built-in variable // store the CRC32 as a built-in variable
// nasty trick - do not insert signature into live data files // nasty trick - do not insert signature into live data files
@ -62,7 +67,5 @@ public class IoUtil2 {
state.variableRegistry.register(ConfigDefinition.SIGNATURE_HASH, "" + crc32); state.variableRegistry.register(ConfigDefinition.SIGNATURE_HASH, "" + crc32);
parseState.addDefinition(ConfigDefinition.SIGNATURE_HASH, Long.toString(crc32), Definition.OverwritePolicy.NotAllowed); parseState.addDefinition(ConfigDefinition.SIGNATURE_HASH, Long.toString(crc32), Definition.OverwritePolicy.NotAllowed);
} }
return crc32;
} }
} }