lee/xpipe
1
0 Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-10-07 15:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling at various places

Browse Source
This commit is contained in:
crschnick committed 2026-06-04 03:17:28 +00:00
1 parent 1bd9b28ace
commit 9ad55aa27e
7 files changed
+44 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/io/xpipe/app/browser/file/BrowserFileListCompEntry.java
+1 -1
View File
@@ -216,7 +216,7 @@ public class BrowserFileListCompEntry {
return null;
}
})
.filter(path -> path != null)
.filter(path -> path != null && !path.toString().isEmpty())
.toList();
var target = item != null && item.getRawFileEntry().resolved().getKind() == FileKind.DIRECTORY
? item.getRawFileEntry().resolved()
app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java
+2 -2
View File
@@ -95,14 +95,14 @@ public class BrowserTransferComp extends SimpleRegionBuilder {
struc.setOnMouseClicked(e -> {
if (e.getButton() == MouseButton.PRIMARY) {
var open = !e.isShiftDown();
ThreadHelper.runFailableAsync(() -> {
ThreadHelper.runAsync(() -> {
model.transferToDownloads(open);
});
e.consume();
}
});
struc.setOnAction(e -> {
ThreadHelper.runFailableAsync(() -> {
ThreadHelper.runAsync(() -> {
model.transferToDownloads(true);
});
e.consume();
app/src/main/java/io/xpipe/app/browser/file/BrowserTransferModel.java
+28 -24
View File
@@ -194,7 +194,7 @@ public class BrowserTransferModel {
}
}
public void transferToDownloads(boolean open) throws Exception {
public void transferToDownloads(boolean open) {
List<Item> toMove;
synchronized (items) {
toMove = items.stream()
@@ -206,32 +206,36 @@ public class BrowserTransferModel {
items.removeAll(toMove);
}
var files = toMove.stream().map(item -> item.getLocalFile()).toList();
var downloads = getDownloadsTargetDirectory();
Files.createDirectories(downloads);
Path firstToOpen = null;
for (Path file : files) {
if (!Files.exists(file)) {
continue;
}
try {
var files = toMove.stream().map(item -> item.getLocalFile()).toList();
var downloads = getDownloadsTargetDirectory();
Files.createDirectories(downloads);
Path firstToOpen = null;
for (Path file : files) {
if (!Files.exists(file)) {
continue;
}
var target = downloads.resolve(file.getFileName());
// Prevent DirectoryNotEmptyException
if (Files.exists(target) && Files.isDirectory(target)) {
FileUtils.deleteDirectory(target.toFile());
}
if (Files.isDirectory(file)) {
FileUtils.moveDirectory(file.toFile(), target.toFile());
} else {
Files.move(file, target, StandardCopyOption.REPLACE_EXISTING);
}
var target = downloads.resolve(file.getFileName());
// Prevent DirectoryNotEmptyException
if (Files.exists(target) && Files.isDirectory(target)) {
FileUtils.deleteDirectory(target.toFile());
}
if (Files.isDirectory(file)) {
FileUtils.moveDirectory(file.toFile(), target.toFile());
} else {
Files.move(file, target, StandardCopyOption.REPLACE_EXISTING);
}
if (firstToOpen == null) {
firstToOpen = target;
if (firstToOpen == null) {
firstToOpen = target;
}
}
}
if (open && firstToOpen != null) {
DesktopHelper.browseFileInDirectory(firstToOpen);
if (open && firstToOpen != null) {
DesktopHelper.browseFileInDirectory(firstToOpen);
}
} catch (IOException e) {
ErrorEventFactory.fromThrowable(e).expected().handle();
}
}
app/src/main/java/io/xpipe/app/core/window/AppWindowStyle.java
+1 -1
View File
@@ -23,7 +23,7 @@ import java.util.List;
public class AppWindowStyle {
public static void setSceneFill(Scene scene) {
if (OsType.ofLocal() != OsType.LINUX) {
if (OsType.ofLocal() != OsType.LINUX || AppPrefs.get() == null) {
scene.setFill(Color.TRANSPARENT);
return;
}
app/src/main/java/io/xpipe/app/platform/PlatformState.java
+3 -3
View File
@@ -123,11 +123,11 @@ public enum PlatformState {
// Catch more than just the headless exception in case the graphics environment initialization completely
// fails
} catch (HeadlessException h) {
var msg = getErrorMessage(h.getMessage());
} catch (HeadlessException | AWTError e) {
var msg = getErrorMessage(e.getMessage());
PlatformState.setCurrent(PlatformState.EXITED);
expectedError = true;
lastError = new UnsupportedOperationException(msg, h);
lastError = new UnsupportedOperationException(msg, e);
return;
} catch (Throwable t) {
PlatformState.setCurrent(PlatformState.EXITED);
app/src/main/java/io/xpipe/app/util/FileBridge.java
+4 -4
View File
@@ -56,7 +56,7 @@ public class FileBridge {
}
});
} catch (IOException e) {
ErrorEventFactory.fromThrowable(e).handle();
ErrorEventFactory.fromThrowable(e).expected().handle();
}
}
@@ -168,7 +168,7 @@ public class FileBridge {
input.onFinish();
}
} catch (Exception ex) {
ErrorEventFactory.fromThrowable(ex).handle();
ErrorEventFactory.fromThrowable(ex).expected().handle();
return;
}
ext.get().registerChange();
@@ -188,7 +188,7 @@ public class FileBridge {
input.onFinish();
}
} catch (Exception ex) {
ErrorEventFactory.fromThrowable(ex).handle();
ErrorEventFactory.fromThrowable(ex).expected().handle();
return;
}
@@ -208,7 +208,7 @@ public class FileBridge {
.build();
action.executeSync();
} catch (Exception ex) {
ErrorEventFactory.fromThrowable(ex).handle();
ErrorEventFactory.fromThrowable(ex).expected().handle();
}
}
});
app/src/main/java/io/xpipe/app/util/RemoteDesktopWindow.java
+5
View File
@@ -1,6 +1,7 @@
package io.xpipe.app.util;
import io.xpipe.app.core.*;
import io.xpipe.app.core.mode.AppOperationMode;
import io.xpipe.app.core.window.AppMainWindow;
import io.xpipe.app.core.window.AppModifiedStage;
import io.xpipe.app.core.window.AppWindowStyle;
@@ -307,6 +308,10 @@ public class RemoteDesktopWindow {
}
private void updateState() {
if (AppOperationMode.isInShutdown()) {
return;
}
model.clearDead();
DerivedObservableList.wrap(processes, true).setContent(model.getEntries());
selected.set(model.getSelected());