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

support white-labels in autoupdate

This commit is contained in:
kifir 2024-07-03 15:38:19 +03:00 committed by rusefillc
parent d1d8644c7c
commit fdb752b4fe
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java
View File

@ -119,7 +119,7 @@ public class Autoupdate {
private static void downloadAndUnzipAutoupdate(BundleUtil.BundleInfo info, UpdateMode mode, String baseUrl) { private static void downloadAndUnzipAutoupdate(BundleUtil.BundleInfo info, UpdateMode mode, String baseUrl) {
try { try {
String suffix = FindFileHelper.isObfuscated() ? "_obfuscated_public" : ""; String suffix = FindFileHelper.isObfuscated() ? "_obfuscated_public" : "";
String zipFileName = "rusefi_bundle_" + info.getTarget() + suffix + "_autoupdate" + ".zip"; String zipFileName = ConnectionAndMeta.getWhiteLabel() + "_bundle_" + info.getTarget() + suffix + "_autoupdate" + ".zip";
ConnectionAndMeta connectionAndMeta = new ConnectionAndMeta(zipFileName).invoke(baseUrl); ConnectionAndMeta connectionAndMeta = new ConnectionAndMeta(zipFileName).invoke(baseUrl);
System.out.println("Remote file " + zipFileName); System.out.println("Remote file " + zipFileName);
System.out.println("Server has " + connectionAndMeta.getCompleteFileSize() + " from " + new Date(connectionAndMeta.getLastModified())); System.out.println("Server has " + connectionAndMeta.getCompleteFileSize() + " from " + new Date(connectionAndMeta.getLastModified()));

7
java_console/shared_io/src/main/java/com/rusefi/core/net/ConnectionAndMeta.java
View File

@ -9,10 +9,12 @@ import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.Properties; import java.util.Properties;
public class ConnectionAndMeta { public class ConnectionAndMeta {
public static final String BASE_URL_RELEASE = "https://github.com/rusefi/rusefi/releases/latest/download/"; public static final String BASE_URL_RELEASE = "https://github.com/rusefi/rusefi/releases/latest/download/";
private static final String DEFAULT_WHITE_LABEL = "rusefi";
public static final String AUTOUPDATE = "/autoupdate/"; public static final String AUTOUPDATE = "/autoupdate/";
private static final int BUFFER_SIZE = 32 * 1024; private static final int BUFFER_SIZE = 32 * 1024;
@ -33,6 +35,11 @@ public class ConnectionAndMeta {
return result; return result;
} }
public static String getWhiteLabel() {
return Optional.ofNullable(getProperties().getProperty("white_label")).map(String::trim)
.orElse(DEFAULT_WHITE_LABEL);
}
public static String getSignatureWhiteLabel() { public static String getSignatureWhiteLabel() {
String signatureWhiteLabel = getProperties().getProperty("signature_white_label"); String signatureWhiteLabel = getProperties().getProperty("signature_white_label");
signatureWhiteLabel = signatureWhiteLabel == null ? null : signatureWhiteLabel.trim(); signatureWhiteLabel = signatureWhiteLabel == null ? null : signatureWhiteLabel.trim();