Only save blobs if not already saved in blobs directory (#513)

This setting can be changed from the Help menu

Author: airsquared

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

@@ -197,7 +197,7 @@ private void loadSavedDevice(Prefs.SavedDevice savedDevice) {
  deleteDeviceMenu.setText("Remove Saved Device");
  return;
  }
- deleteDeviceMenu.setText("Remove Saved Device \"" + savedDevice + "\"");
+ deleteDeviceMenu.setText("Remove \"" + savedDevice + "\"");
 
  ecidField.setText(savedDevice.getEcid());
  pathField.setText(savedDevice.getSavePath());
@@ -307,6 +307,10 @@ public void disableAnalyticsHandler(Event evt) {
  Prefs.setDisableAnalytics(((CheckMenuItem) evt.getSource()).isSelected());
  }
 
+ public void alwaysSaveNewBlobsHandler(Event evt) {
+ Prefs.setAlwaysSaveNewBlobs(((CheckMenuItem) evt.getSource()).isSelected());
+ }
+
  public void checkBlobs() {
  Utils.openURL("https://verify.shsh.host");
  Analytics.checkBlobs();
@@ -380,7 +384,7 @@ private void useMacOSMenuBar() {
  new SeparatorMenuItem(), tk.createBringAllToFrontItem());
  tk.autoAddWindowMenuItems(menuBar.getMenus().get(3));
 
- menuBar.getMenus().get(4).getItems().remove(10); // remove about
+ menuBar.getMenus().get(4).getItems().remove(11); // remove about
 
  tk.setApplicationMenu(applicationMenu);
  tk.setGlobalMenuBar(menuBar);

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

@@ -141,6 +141,14 @@ public static void setDarkMode(DarkMode darkMode) {
  appPrefs.put("Dark Mode", darkMode.name());
  }
 
+ public static boolean getAlwaysSaveNewBlobs() {
+ return appPrefs.getBoolean("Always save new blobs", false);
+ }
+
+ public static void setAlwaysSaveNewBlobs(boolean alwaysSaveNewBlobs) {
+ appPrefs.putBoolean("Always save new blobs", alwaysSaveNewBlobs);
+ }
+
  private static Stream<SavedDevice> savedDevices() {
  try {
  return Arrays.stream(savedDevicesPrefs.childrenNames()).map(SavedDevice::new);

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

@@ -37,6 +37,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.StringJoiner;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
@@ -46,6 +47,7 @@
 import static airsquared.blobsaver.app.Utils.getFirmwareList;
 import static airsquared.blobsaver.app.Utils.getSignedBetas;
 import static airsquared.blobsaver.app.Utils.getSignedFirmwares;
+import static airsquared.blobsaver.app.Utils.isNumeric;
 
 public class TSS extends Task<String> {
 
@@ -95,13 +97,14 @@ protected String call() throws TSSException {
  System.out.println("iosVersions = " + iosVersions);
  ArrayList<String> args = constructArgs();
 
- StringBuilder responseBuilder = new StringBuilder("Successfully saved blobs in\n").append(savePath);
- if (manualIpswURL == null) {
- responseBuilder.append(iosVersions.size() == 1 ? "\n\nFor version " : "\n\nFor versions ");
- }
-
- // can't use forEach() because exception won't be caught
+ var alreadySaved = new StringJoiner(", ");
+ var savedFor = new StringJoiner(", ");
  for (Utils.IOSVersion iosVersion : iosVersions) {
+ if (!Prefs.getAlwaysSaveNewBlobs() && checkAlreadySaved(iosVersion)) {
+ alreadySaved.add(iosVersion.versionString());
+ continue;
+ }
+
  try {
  saveFor(iosVersion, args);
  } catch (TSSException e) {
@@ -113,11 +116,22 @@ protected String call() throws TSSException {
  }
 
  if (iosVersion.versionString() != null) {
- responseBuilder.append(iosVersion.versionString());
- if (iosVersion != iosVersions.get(iosVersions.size() - 1))
- responseBuilder.append(", ");
+ savedFor.add(iosVersion.versionString());
  }
  }
+ StringBuilder responseBuilder = new StringBuilder();
+ if (manualIpswURL != null || savedFor.length() > 0) {
+ responseBuilder.append("Successfully saved blobs in\n").append(savePath);
+ if (savedFor.length() > 0) {
+ responseBuilder.append("\n\nFor version").append(iosVersions.size() == 1 ? " " : "s ").append(savedFor);
+ }
+ if (alreadySaved.length() > 0) {
+ responseBuilder.append("\n\n");
+ }
+ }
+ if (alreadySaved.length() > 0) {
+ responseBuilder.append("Already saved for ").append(alreadySaved);
+ }
 
  if (saveToTSSSaver || saveToSHSHHost) {
  responseBuilder.append("\n\n");
@@ -133,6 +147,27 @@ protected String call() throws TSSException {
  return responseBuilder.toString();
  }
 
+ private boolean checkAlreadySaved(Utils.IOSVersion ios) {
+ if (ios.versionString() == null) {
+ return false;
+ }
+ var versionStringOnly = ios.versionString().trim().replaceFirst(" .*", ""); // strip out 'beta' labels
+ // https://github.com/1Conan/tsschecker/blob/0bc6174c3c2f77a0de525b71e7d8ec0987f07aa1/tsschecker/tsschecker.c#L1262
+ String fileName = "%s_%s_%s_%s-%s_%s.shsh2"
+ .formatted(parseECID(), deviceIdentifier, getBoardConfig(), versionStringOnly, ios.buildid(), apnonce);
+
+ if (Files.exists(Path.of(savePath, fileName))) {
+ System.out.println("Already Saved: " + fileName);
+ return true;
+ }
+ return false;
+ }
+
+ private long parseECID() {
+ return isNumeric(ecid) ? Long.parseLong(ecid)
+ : Long.parseLong(ecid.startsWith("0x") ? ecid.substring(2) : ecid, 16);
+ }
+
 
  private void saveFor(Utils.IOSVersion iosVersion, ArrayList<String> args) throws TSSException {
  final int urlIndex = args.size() - 1;
@@ -203,7 +238,7 @@ private List<Utils.IOSVersion> getIOSVersions() throws TSSException {
  manualVersion.equals(iosVersion.versionString())).findFirst()
  .orElseThrow(() -> new TSSException("No versions found.", false)));
  } else if (manualIpswURL != null) {
- return Collections.singletonList(new Utils.IOSVersion(null, manualIpswURL, null));
+ return Collections.singletonList(new Utils.IOSVersion(null, null, manualIpswURL, null));
  } else if (includeBetas) {
  return Stream.concat(getSignedFirmwares(deviceIdentifier), getSignedBetas(deviceIdentifier)).toList();
  } else { // all signed firmwares
@@ -391,7 +426,7 @@ public void showErrorAlert() {
  private void saveBlobsTSSSaver(StringBuilder responseBuilder) {
  Map<Object, Object> deviceParameters = new HashMap<>();
 
- deviceParameters.put("ecid", String.valueOf(Long.parseLong(ecid.startsWith("0x") ? ecid.substring(2) : ecid, 16)));
+ deviceParameters.put("ecid", String.valueOf(parseECID()));
  deviceParameters.put("deviceIdentifier", deviceIdentifier);
  deviceParameters.put("boardConfig", getBoardConfig());
 

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

@@ -354,7 +354,7 @@ static Stream<IOSVersion> getBetaList(String deviceIdentifier) throws IOExceptio
  private static Stream<IOSVersion> createVersionStream(JsonArray array) {
  return StreamSupport.stream(array.spliterator(), false)
  .map(JsonElement::getAsJsonObject)
- .map(o -> new IOSVersion(o.get("version").getAsString(), o.get("url").getAsString(), o.get("signed").getAsBoolean()));
+ .map(o -> new IOSVersion(o.get("version").getAsString(), o.get("buildid").getAsString(), o.get("url").getAsString(), o.get("signed").getAsBoolean()));
  }
 
  static Stream<IOSVersion> getSignedFirmwares(String deviceIdentifier) throws IOException {
@@ -365,7 +365,7 @@ static Stream<IOSVersion> getSignedBetas(String deviceIdentifier) throws IOExcep
  return getBetaList(deviceIdentifier).filter(IOSVersion::signed);
  }
 
- record IOSVersion(String versionString, String ipswURL, Boolean signed) {
+ record IOSVersion(String versionString, String buildid, String ipswURL, Boolean signed) {
  public IOSVersion {
  Objects.requireNonNull(ipswURL, "ipsw url cannot be null");
  }

src/main/resources/airsquared/blobsaver/app/blobsaver.fxml

@@ -81,6 +81,12 @@
  <Prefs fx:factory="getDisableAnalytics"/>
  </selected>
  </CheckMenuItem>
+ <CheckMenuItem mnemonicParsing="false" text="Always Save New Blobs"
+ onAction="#alwaysSaveNewBlobsHandler">
+ <selected>
+ <Prefs fx:factory="getAlwaysSaveNewBlobs"/>
+ </selected>
+ </CheckMenuItem>
  <SeparatorMenuItem mnemonicParsing="false"/>
  <MenuItem mnemonicParsing="false" onAction="#showWiki" text="blobsaver Help/Wiki"/>
  <MenuItem mnemonicParsing="false" onAction="#newGithubIssue" text="Send Feedback (Github Issue)"/>
@@ -312,6 +318,9 @@
  <VBox.margin>
  <Insets bottom="15.0"/>
  </VBox.margin>
+ <contextMenu>
+ <ContextMenu items="$deleteDeviceMenu"/>
+ </contextMenu>
  </ListView>
  <!--suppress JavaFxUnresolvedFxIdReference -->
  <Button fx:id="saveDeviceButton" prefWidth="Infinity" maxWidth="Infinity" mnemonicParsing="false"