Skip to content

Commit f474bc6

Browse files
committed
Fix issue #39
1 parent e51b507 commit f474bc6

File tree

2 files changed

+7
-27
lines changed

2 files changed

+7
-27
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,10 @@ private static void saveBackgroundBlobs(int preset) {
250250
String tsscheckerLog;
251251
try {
252252
if (!"none".equals(boardConfig) && !"".equals(boardConfig)) { // needs board config
253-
tsscheckerLog = executeProgram(tsschecker.getPath(), "-d", identifier, "-s", "-e", ecid,
253+
tsscheckerLog = executeProgram(tsschecker.getPath(), "--nocache", "-d", identifier, "-s", "-e", ecid,
254254
"--save-path", path, "-i", version, "--boardconfig", boardConfig);
255255
} else {
256-
tsscheckerLog = executeProgram(tsschecker.getPath(), "-d", identifier, "-s", "-e", ecid,
256+
tsscheckerLog = executeProgram(tsschecker.getPath(), "--nocache", "-d", identifier, "-s", "-e", ecid,
257257
"--save-path", path, "-i", version);
258258
}
259259
} catch (IOException e) {

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

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@
3737
import org.json.JSONArray;
3838

3939
import java.awt.Desktop;
40-
import java.io.BufferedReader;
4140
import java.io.File;
4241
import java.io.FileNotFoundException;
4342
import java.io.IOException;
4443
import java.io.InputStream;
45-
import java.io.InputStreamReader;
4644
import java.net.URL;
4745
import java.util.ArrayList;
4846
import java.util.Arrays;
@@ -253,7 +251,7 @@ private void run(String device) {
253251
File locationToSaveBlobs = new File(pathField.getText());
254252
//noinspection ResultOfMethodCallIgnored
255253
locationToSaveBlobs.mkdirs();
256-
ArrayList<String> args = new ArrayList<>(Arrays.asList(tsschecker.getPath(), "-d", device, "-s", "-e", ecidField.getText(), "--save-path", pathField.getText()));
254+
ArrayList<String> args = new ArrayList<>(Arrays.asList(tsschecker.getPath(), "--nocache", "-d", device, "-s", "-e", ecidField.getText(), "--save-path", pathField.getText()));
257255
if (getBoardConfig) {
258256
Collections.addAll(args, "--boardconfig", boardConfigField.getText());
259257
}
@@ -297,36 +295,17 @@ private void run(String device) {
297295
} else {
298296
Collections.addAll(args, "-i", versionField.getText());
299297
}
300-
Process proc;
298+
String tsscheckerLog;
301299
try {
302300
log("Running: " + args.toString());
303-
proc = new ProcessBuilder(args).start();
301+
tsscheckerLog = executeProgram(args.toArray(new String[0]));
304302
} catch (IOException e) {
305303
newReportableError("There was an error starting tsschecker.", e.toString());
306304
e.printStackTrace();
307305
deleteTempFiles(tsschecker, buildManifestPlist);
308306
return;
309307
}
310-
String tsscheckerLog;
311-
try (BufferedReader reader = new BufferedReader(new InputStreamReader(proc.getInputStream()))) {
312-
StringBuilder logBuilder = new StringBuilder();
313-
String line;
314-
while ((line = reader.readLine()) != null) {
315-
log(line + "\n");
316-
logBuilder.append(line).append("\n");
317-
}
318-
tsscheckerLog = logBuilder.toString();
319-
} catch (IOException e) {
320-
newReportableError("There was an error getting the tsschecker result", e.toString());
321-
e.printStackTrace();
322-
deleteTempFiles(tsschecker, buildManifestPlist);
323-
return;
324-
}
325-
try {
326-
proc.waitFor();
327-
} catch (InterruptedException e) {
328-
newReportableError("The tsschecker process was interrupted.", e.toString());
329-
}
308+
330309
if (tsscheckerLog.contains("Saved shsh blobs")) {
331310
Alert alert = new Alert(Alert.AlertType.INFORMATION, "Successfully saved blobs in\n" + pathField.getText(), ButtonType.OK);
332311
alert.setHeaderText("Success!");
@@ -1267,6 +1246,7 @@ public void goButtonHandler() {
12671246
private static boolean isTextFieldValid(CheckBox checkBox, TextField textField) {
12681247
return isTextFieldValid(checkBox.isSelected(), textField);
12691248
}
1249+
12701250
private static boolean isTextFieldValid(boolean isTextFieldRequired, TextField textField) {
12711251
if (isTextFieldRequired && "".equals(textField.getText())) {
12721252
textField.setEffect(errorBorder);

0 commit comments

Comments
 (0)