Skip to content

Commit 85b3367

Browse files
clydegaleJohannes Merz
authored andcommitted
added ${Name} as variable for save path (CLI only)
1 parent d385dc3 commit 85b3367

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

src/main/java/airsquared/blobsaver/app/Background.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,8 @@ public static void saveAllBackgroundBlobs() {
280280
}
281281

282282
public static void saveBlobs(Prefs.SavedDevice savedDevice) {
283-
TSS.Builder builder = new TSS.Builder().setDevice(savedDevice.getIdentifier())
283+
TSS.Builder builder = new TSS.Builder().setName(savedDevice.getName())
284+
.setDevice(savedDevice.getIdentifier())
284285
.setEcid(savedDevice.getEcid()).setSavePath(savedDevice.getSavePath())
285286
.setIncludeBetas(savedDevice.doesIncludeBetas());
286287
savedDevice.getBoardConfig().ifPresent(builder::setBoardConfig);

src/main/java/airsquared/blobsaver/app/CLI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static class BackgroundControls {
9393

9494
@Option(names = "--save-path", paramLabel = "<path>",
9595
description = "Directory to save blobs in. Can use the following variables: " +
96-
"$${DeviceIdentifier}, $${BoardConfig}, $${APNonce}, $${Generator}, $${DeviceModel}, $${ECID}, $${FullVersionString}, $${BuildID}, and $${MajorVersion}.")
96+
"$${DeviceIdentifier}, $${BoardConfig}, $${APNonce}, $${Generator}, $${DeviceModel}, $${ECID}, $${FullVersionString}, $${BuildID}, $${MajorVersion} and $${Name} (if using a saved device).")
9797
File savePath;
9898

9999
@ArgGroup

src/main/java/airsquared/blobsaver/app/TSS.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public class TSS extends Task<String> {
5151
private static final Pattern ipswURLPattern = Pattern.compile("(https?://|file:/).*\\.(ipsw|plist)");
5252
private static final Pattern versionPattern = Pattern.compile("[0-9]+\\.[0-9]+\\.?[0-9]*(?<!\\.)");
5353

54+
private final String name;
5455
private final String deviceIdentifier;
5556
private final String ecid;
5657
private final String savePath;
@@ -68,7 +69,8 @@ public class TSS extends Task<String> {
6869
/**
6970
* Private constructor; use {@link TSS.Builder} instead
7071
*/
71-
private TSS(String deviceIdentifier, String ecid, String savePath, String boardConfig, boolean includeBetas, String manualVersion, String manualIpswURL, String apnonce, String generator, boolean saveToTSSSaver, boolean saveToSHSHHost) {
72+
private TSS(String name, String deviceIdentifier, String ecid, String savePath, String boardConfig, boolean includeBetas, String manualVersion, String manualIpswURL, String apnonce, String generator, boolean saveToTSSSaver, boolean saveToSHSHHost) {
73+
this.name = name;
7274
this.deviceIdentifier = deviceIdentifier;
7375
this.ecid = ecid;
7476
this.boardConfig = boardConfig;
@@ -189,7 +191,8 @@ private String parsePath(String input) {
189191
if (!input.contains("${")) return input;
190192
String template = input;
191193

192-
var variables = Map.of("${DeviceIdentifier}", deviceIdentifier,
194+
var variables = Map.of("${Name}", Utils.defIfNull(name, "UnknownName"),
195+
"${DeviceIdentifier}", deviceIdentifier,
193196
"${BoardConfig}", getBoardConfig(),
194197
"${APNonce}", Utils.defIfNull(apnonce, "UnknownAPNonce"),
195198
"${Generator}", Utils.defIfNull(generator, "UnknownGenerator"),
@@ -382,9 +385,13 @@ && containsIgnoreCase(tsscheckerLog, "checking tss status failed")) {
382385

383386
@SuppressWarnings("UnusedReturnValue")
384387
public static class Builder {
385-
private String device, ecid, savePath, boardConfig, manualVersion, manualIpswURL, apnonce, generator;
388+
private String name, device, ecid, savePath, boardConfig, manualVersion, manualIpswURL, apnonce, generator;
386389
private boolean includeBetas, saveToTSSSaver, saveToSHSHHost;
387390

391+
public Builder setName(String name) {
392+
this.name = name;
393+
return this;
394+
}
388395
public Builder setDevice(String device) {
389396
this.device = device;
390397
return this;
@@ -443,7 +450,8 @@ public Builder saveToSHSHHost(boolean saveToSHSHHost) {
443450
}
444451

445452
public TSS build() {
446-
return new TSS(Objects.requireNonNull(device, "Device"),
453+
return new TSS(name,
454+
Objects.requireNonNull(device, "Device"),
447455
Objects.requireNonNull(ecid, "ECID"),
448456
Objects.requireNonNull(savePath, "Save Path"),
449457
boardConfig, includeBetas, manualVersion, manualIpswURL, apnonce, generator, saveToTSSSaver, saveToSHSHHost);

0 commit comments

Comments
 (0)