CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-07-02 21:11:03 +12:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes

Browse source
This commit is contained in:
crschnick 2023-02-21 09:58:39 +00:00
parent 0a23e950d9
commit 84a129191d
6 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
View file

@ -127,7 +127,6 @@ public class AppPrefs {
// External editor // External editor
// =============== // ===============
final ObjectProperty<ExternalEditorType> externalEditor = final ObjectProperty<ExternalEditorType> externalEditor =
typed(new SimpleObjectProperty<>(), ExternalEditorType.class); typed(new SimpleObjectProperty<>(), ExternalEditorType.class);
private final SingleSelectionField<ExternalEditorType> externalEditorControl = Field.ofSingleSelectionType( private final SingleSelectionField<ExternalEditorType> externalEditorControl = Field.ofSingleSelectionType(

4
app/src/main/java/io/xpipe/app/prefs/ExternalEditorType.java
View file

@ -82,8 +82,8 @@ public interface ExternalEditorType extends PrefsChoiceValue {
@Override @Override
public void launch(Path file) throws Exception { public void launch(Path file) throws Exception {
var customCommand = AppPrefs.get().customEditorCommand().getValue(); var customCommand = AppPrefs.get().customEditorCommand().getValue();
if (customCommand == null || customCommand.trim().isEmpty()) { if (customCommand == null || customCommand.isBlank()) {
return; throw new IllegalStateException("No custom editor command specified");
} }
var format = customCommand.contains("$file") ? customCommand : customCommand + " $file"; var format = customCommand.contains("$file") ? customCommand : customCommand + " $file";

3
app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java
View file

@ -153,8 +153,7 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
public void launch(String name, String command) throws Exception { public void launch(String name, String command) throws Exception {
var custom = AppPrefs.get().customTerminalCommand().getValue(); var custom = AppPrefs.get().customTerminalCommand().getValue();
if (custom == null || custom.isBlank()) { if (custom == null || custom.isBlank()) {
ErrorEvent.fromMessage("No custom terminal command specified").reportable(false).handle(); throw new IllegalStateException("No custom terminal command specified");
return;
} }
var format = custom.contains("$cmd") ? custom : custom + " $cmd"; var format = custom.contains("$cmd") ? custom : custom + " $cmd";

4
app/src/main/java/io/xpipe/app/update/AppUpdater.java
View file

@ -218,7 +218,8 @@ public class AppUpdater {
var performedUpdate = new PerformedUpdate( var performedUpdate = new PerformedUpdate(
downloadedUpdate.getValue().getVersion(), downloadedUpdate.getValue().getVersion(),
downloadedUpdate.getValue().getBody()); downloadedUpdate.getValue().getBody(),
downloadedUpdate.getValue().getVersion());
AppCache.update("performedUpdate", performedUpdate); AppCache.update("performedUpdate", performedUpdate);
} }
}); });
@ -290,6 +291,7 @@ public class AppUpdater {
public static class PerformedUpdate { public static class PerformedUpdate {
String name; String name;
String rawDescription; String rawDescription;
String newVersion;
} }
@Value @Value

8
app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java
View file

@ -2,7 +2,9 @@ package io.xpipe.app.update;
import io.xpipe.app.comp.base.MarkdownComp; import io.xpipe.app.comp.base.MarkdownComp;
import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppI18n;
import io.xpipe.app.core.AppProperties;
import io.xpipe.app.core.AppWindowHelper; import io.xpipe.app.core.AppWindowHelper;
import io.xpipe.app.issue.ErrorEvent;
import javafx.scene.control.Alert; import javafx.scene.control.Alert;
import javafx.scene.control.ButtonBar; import javafx.scene.control.ButtonBar;
import javafx.scene.control.ButtonType; import javafx.scene.control.ButtonType;
@ -12,6 +14,12 @@ public class UpdateChangelogAlert {
public static void showIfNeeded() { public static void showIfNeeded() {
var update = AppUpdater.get().getPerformedUpdate(); var update = AppUpdater.get().getPerformedUpdate();
if (update != null && !update.getNewVersion().equals(AppProperties.get().getVersion())) {
ErrorEvent.fromMessage("Update did not succeed").handle();
return;
}
if (update == null || update.getRawDescription() == null) { if (update == null || update.getRawDescription() == null) {
return; return;
} }

4
app/src/main/java/io/xpipe/app/util/TerminalHelper.java
View file

@ -10,6 +10,10 @@ public class TerminalHelper {
} }
var type = AppPrefs.get().terminalType().getValue(); var type = AppPrefs.get().terminalType().getValue();
if (type == null) {
throw new IllegalStateException("No terminal has been configured to be used");
}
type.launch(title, command); type.launch(title, command);
} }
} }