Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from xpipe-io:master #42

Merged
merged 1 commit into from
Mar 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Improve transfer stop resiliency
  • Loading branch information
crschnick committed Feb 28, 2025
commit 6958a4979cc4dffaa2d8afd96a3d729941364e6f
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ private Comp<CompStructure<VBox>> createLeftSide() {
var rec = new Rectangle();
rec.widthProperty().bind(struc.get().widthProperty());
rec.heightProperty().bind(struc.get().heightProperty());
rec.setArcHeight(7);
rec.setArcWidth(7);
rec.setArcHeight(11);
rec.setArcWidth(11);
struc.get().getChildren().getFirst().setClip(rec);
})
.vgrow();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.xpipe.app.browser.file;

import io.xpipe.app.issue.ErrorEvent;
import io.xpipe.app.util.ThreadHelper;
import io.xpipe.core.store.*;

import javafx.beans.property.BooleanProperty;
Expand All @@ -11,7 +12,10 @@
import java.time.Instant;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Timer;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -413,23 +417,60 @@ private void transferFile(
// Initialize progress immediately prior to reading anything
updateProgress(new BrowserTransferProgress(sourceFile.getName(), transferred.get(), total.get(), start));

var bs = (int) Math.min(DEFAULT_BUFFER_SIZE, sourceFile.getSize());
byte[] buffer = new byte[bs];
int read;
while ((read = inputStream.read(buffer, 0, bs)) > 0) {
if (cancelled()) {
var killStreams = new AtomicBoolean(false);
var exception = new AtomicReference<Exception>();
var thread = ThreadHelper.createPlatformThread("transfer", true, () -> {
try {
var bs = (int) Math.min(DEFAULT_BUFFER_SIZE, sourceFile.getSize());
byte[] buffer = new byte[bs];
int read;
while ((read = inputStream.read(buffer, 0, bs)) > 0) {
if (cancelled()) {
killStreams.set(true);
break;
}

if (!checkTransferValidity()) {
killStreams.set(true);
break;
}

outputStream.write(buffer, 0, read);
transferred.addAndGet(read);
updateProgress(new BrowserTransferProgress(sourceFile.getName(), transferred.get(), total.get(), start));
}
} catch (Exception ex) {
exception.set(ex);
}
});

thread.start();
while (true) {
var alive = thread.isAlive();
var cancelled = cancelled();

if (cancelled) {
// Assume that the transfer has stalled if it doesn't finish until then
thread.join(1000);
killStreams();
break;
}

if (!checkTransferValidity()) {
if (alive) {
Thread.sleep(100);
continue;
}

if (killStreams.get()) {
killStreams();
break;
}

outputStream.write(buffer, 0, read);
transferred.addAndGet(read);
updateProgress(new BrowserTransferProgress(sourceFile.getName(), transferred.get(), total.get(), start));
var ex = exception.get();
if (ex != null) {
throw ex;
} else {
break;
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}

.bookmarks-container {
-fx-background-radius: 4 0 0 0;
-fx-background-radius: 4 2 2 4;
-fx-background-insets: 0 7 4 4, 1 8 5 5;
-fx-padding: 1 0 5 5;
-fx-background-color: -color-border-default, -color-bg-default;
Expand Down