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

only:refactoring: extract part of functionality into `CalibrationsInfo` class #7357

This commit is contained in:
kifir23917 2025-02-03 16:41:15 +03:00 committed by rusefillc
parent 7f8379138a
commit aa85b21f12
2 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
java_console/ui/src/main/java/com/rusefi/maintenance/CalibrationsBackuper.java
View File

@ -24,17 +24,7 @@ public class CalibrationsBackuper {
private static final String PREVIOUS_CALIBRATIONS_BINARY = "prev_calibrations.zip"; private static final String PREVIOUS_CALIBRATIONS_BINARY = "prev_calibrations.zip";
private static final String PREVIOUS_CALIBRATIONS_XML = "prev_calibrations.msq"; private static final String PREVIOUS_CALIBRATIONS_XML = "prev_calibrations.msq";
private static class CalibrationsMeta { static Optional<CalibrationsInfo> readCalibrationsInfo(
private final String iniFilePath;
private final ConfigurationImageMetaVersion0_0 meta;
CalibrationsMeta(final String iniFilePath, final ConfigurationImageMetaVersion0_0 meta) {
this.iniFilePath = iniFilePath;
this.meta = meta;
}
}
private static Optional<CalibrationsMeta> readMeta(
final BinaryProtocol binaryProtocol, final BinaryProtocol binaryProtocol,
final UpdateOperationCallbacks callbacks final UpdateOperationCallbacks callbacks
) { ) {
@ -44,10 +34,10 @@ public class CalibrationsBackuper {
final IniFileModel iniFile = iniFileProvider.provide(signature); final IniFileModel iniFile = iniFileProvider.provide(signature);
final int pageSize = iniFile.getMetaInfo().getTotalSize(); final int pageSize = iniFile.getMetaInfo().getTotalSize();
callbacks.logLine(String.format("Page size is %d", pageSize)); callbacks.logLine(String.format("Page size is %d", pageSize));
return Optional.of(new CalibrationsMeta( final ConfigurationImageMetaVersion0_0 meta = new ConfigurationImageMetaVersion0_0(pageSize, signature);
iniFile.getIniFilePath(), callbacks.logLine("Reading current calibrations...");
new ConfigurationImageMetaVersion0_0(pageSize, signature) final ConfigurationImageWithMeta image = binaryProtocol.readFullImageFromController(meta);
)); return Optional.of(new CalibrationsInfo(iniFile, image));
} catch (final IOException e) { } catch (final IOException e) {
log.error("Failed to read meta:", e); log.error("Failed to read meta:", e);
callbacks.logLine("Failed to read meta"); callbacks.logLine("Failed to read meta");
@ -64,14 +54,10 @@ public class CalibrationsBackuper {
callbacks, callbacks,
(binaryProtocol) -> { (binaryProtocol) -> {
try { try {
final Optional<CalibrationsMeta> meta = readMeta(binaryProtocol, callbacks); final Optional<CalibrationsInfo> calibrationsInfo = readCalibrationsInfo(binaryProtocol, callbacks);
if (meta.isPresent()) { if (calibrationsInfo.isPresent()) {
final CalibrationsMeta receivedMeta = meta.get(); final CalibrationsInfo receivedCalibrations = calibrationsInfo.get();
callbacks.logLine("Reading current calibrations..."); final Path iniFilePath = Paths.get(receivedCalibrations.getIniFile().getIniFilePath());
final ConfigurationImageWithMeta image = binaryProtocol.readFullImageFromController(
receivedMeta.meta
);
final Path iniFilePath = Paths.get(receivedMeta.iniFilePath);
callbacks.logLine(String.format("Backing up current file %s...", iniFilePath)); callbacks.logLine(String.format("Backing up current file %s...", iniFilePath));
Files.copy( Files.copy(
iniFilePath, iniFilePath,
@ -81,7 +67,7 @@ public class CalibrationsBackuper {
callbacks.logLine(String.format("%s file is backed up", iniFilePath.getFileName())); callbacks.logLine(String.format("%s file is backed up", iniFilePath.getFileName()));
callbacks.logLine("Save current calibrations to files..."); callbacks.logLine("Save current calibrations to files...");
binaryProtocol.saveConfigurationImageToFiles( binaryProtocol.saveConfigurationImageToFiles(
image, receivedCalibrations.getImage(),
PREVIOUS_CALIBRATIONS_BINARY, PREVIOUS_CALIBRATIONS_BINARY,
PREVIOUS_CALIBRATIONS_XML PREVIOUS_CALIBRATIONS_XML
); );

22
java_console/ui/src/main/java/com/rusefi/maintenance/CalibrationsInfo.java Normal file
View File

@ -0,0 +1,22 @@
package com.rusefi.maintenance;
import com.opensr5.ConfigurationImageWithMeta;
import com.opensr5.ini.IniFileModel;
public class CalibrationsInfo {
private final IniFileModel iniFile;
private final ConfigurationImageWithMeta image;
public CalibrationsInfo(final IniFileModel iniFile, final ConfigurationImageWithMeta image) {
this.iniFile = iniFile;
this.image = image;
}
public IniFileModel getIniFile() {
return iniFile;
}
public ConfigurationImageWithMeta getImage() {
return image;
}
}