Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 11:39:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Downloader bug fixes

Browse source
This commit is contained in:
Gravita 2021-06-18 10:07:00 +07:00
parent d01c27177c
commit 661fb94594
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
LauncherCore/src/main/java/pro/gravit/launcher/AsyncDownloader.java
View file

@ -43,6 +43,7 @@ public AsyncDownloader() {
} }
public void downloadFile(URL url, Path target, long size) throws IOException { public void downloadFile(URL url, Path target, long size) throws IOException {
if (isClosed) throw new IOException("Download interrupted");
URLConnection connection = url.openConnection(); URLConnection connection = url.openConnection();
if (isCertificatePinning) { if (isCertificatePinning) {
HttpsURLConnection connection1 = (HttpsURLConnection) connection; HttpsURLConnection connection1 = (HttpsURLConnection) connection;

2
LauncherCore/src/main/java/pro/gravit/utils/Downloader.java
View file

@ -1,6 +1,7 @@
package pro.gravit.utils; package pro.gravit.utils;
import pro.gravit.launcher.AsyncDownloader; import pro.gravit.launcher.AsyncDownloader;
import pro.gravit.utils.helper.LogHelper;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List; import java.util.List;
@ -37,6 +38,7 @@ public boolean isCanceled() {
public static Downloader downloadList(List<AsyncDownloader.SizedFile> files, String baseURL, Path targetDir, DownloadCallback callback, ExecutorService executor, int threads) throws Exception { public static Downloader downloadList(List<AsyncDownloader.SizedFile> files, String baseURL, Path targetDir, DownloadCallback callback, ExecutorService executor, int threads) throws Exception {
final boolean closeExecutor; final boolean closeExecutor;
LogHelper.info("Download with legacy mode");
if (executor == null) { if (executor == null) {
executor = Executors.newWorkStealingPool(4); executor = Executors.newWorkStealingPool(4);
closeExecutor = true; closeExecutor = true;

15
LauncherCore/src/main/java11/pro/gravit/utils/Downloader.java
View file

@ -2,6 +2,8 @@
import pro.gravit.launcher.AsyncDownloader; import pro.gravit.launcher.AsyncDownloader;
import pro.gravit.launcher.LauncherInject; import pro.gravit.launcher.LauncherInject;
import pro.gravit.utils.helper.IOHelper;
import pro.gravit.utils.helper.LogHelper;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@ -10,6 +12,7 @@
import java.net.http.HttpResponse; import java.net.http.HttpResponse;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -60,6 +63,7 @@ public CompletableFuture<Void> getFuture() {
public static Downloader downloadList(List<AsyncDownloader.SizedFile> files, String baseURL, Path targetDir, DownloadCallback callback, ExecutorService executor, int threads) throws Exception { public static Downloader downloadList(List<AsyncDownloader.SizedFile> files, String baseURL, Path targetDir, DownloadCallback callback, ExecutorService executor, int threads) throws Exception {
boolean closeExecutor = false; boolean closeExecutor = false;
LogHelper.info("Download with Java 11+ HttpClient");
if (executor == null) { if (executor == null) {
executor = Executors.newWorkStealingPool(Math.min(3, threads)); executor = Executors.newWorkStealingPool(Math.min(3, threads));
closeExecutor = true; closeExecutor = true;
@ -118,8 +122,12 @@ public CompletableFuture<Void> downloadFiles(List<AsyncDownloader.SizedFile> fil
} }
try { try {
DownloadTask task = sendAsync(file, baseUri, targetDir, callback); DownloadTask task = sendAsync(file, baseUri, targetDir, callback);
task.completableFuture.thenAccept(consumerObject.next); task.completableFuture.thenAccept(consumerObject.next).exceptionally(ec -> {
future.completeExceptionally(ec);
return null;
});
} catch (Exception exception) { } catch (Exception exception) {
LogHelper.error(exception);
future.completeExceptionally(exception); future.completeExceptionally(exception);
} }
}; };
@ -149,6 +157,7 @@ public void cancel() {
} }
protected DownloadTask sendAsync(AsyncDownloader.SizedFile file, URI baseUri, Path targetDir, DownloadCallback callback) throws Exception { protected DownloadTask sendAsync(AsyncDownloader.SizedFile file, URI baseUri, Path targetDir, DownloadCallback callback) throws Exception {
IOHelper.createParentDirs(targetDir.resolve(file.filePath));
ProgressTrackingBodyHandler<Path> bodyHandler = makeBodyHandler(targetDir.resolve(file.filePath), callback); ProgressTrackingBodyHandler<Path> bodyHandler = makeBodyHandler(targetDir.resolve(file.filePath), callback);
CompletableFuture<HttpResponse<Path>> future = client.sendAsync(makeHttpRequest(baseUri, file.urlPath), bodyHandler); CompletableFuture<HttpResponse<Path>> future = client.sendAsync(makeHttpRequest(baseUri, file.urlPath), bodyHandler);
var ref = new Object() { var ref = new Object() {
@ -177,7 +186,7 @@ protected HttpRequest makeHttpRequest(URI baseUri, String filePath) throws URISy
} }
protected ProgressTrackingBodyHandler<Path> makeBodyHandler(Path file, DownloadCallback callback) { protected ProgressTrackingBodyHandler<Path> makeBodyHandler(Path file, DownloadCallback callback) {
return new ProgressTrackingBodyHandler<>(HttpResponse.BodyHandlers.ofFile(file), callback); return new ProgressTrackingBodyHandler<>(HttpResponse.BodyHandlers.ofFile(file, StandardOpenOption.CREATE, StandardOpenOption.WRITE), callback);
} }
public static class ProgressTrackingBodyHandler<T> implements HttpResponse.BodyHandler<T> { public static class ProgressTrackingBodyHandler<T> implements HttpResponse.BodyHandler<T> {
@ -223,12 +232,12 @@ public void onSubscribe(Flow.Subscription subscription) {
@Override @Override
public void onNext(List<ByteBuffer> byteBuffers) { public void onNext(List<ByteBuffer> byteBuffers) {
delegate.onNext(byteBuffers);
long diff = 0; long diff = 0;
for (ByteBuffer buffer : byteBuffers) { for (ByteBuffer buffer : byteBuffers) {
diff += buffer.remaining(); diff += buffer.remaining();
} }
if (callback != null) callback.apply(diff); if (callback != null) callback.apply(diff);
delegate.onNext(byteBuffers);
} }
@Override @Override

2
modules

@ -1 +1 @@
Subproject commit 8b616fff0946652ebba6d6dd432b73b8075421a5 Subproject commit 4678535d0bc74016d43c23017c5530a81c62e56d