From 915df3023c0985a168394b465f0224b7a6c10800 Mon Sep 17 00:00:00 2001 From: dingjinfeng Date: Fri, 4 Aug 2023 18:13:58 +0800 Subject: [PATCH 1/3] fix single thread download fail --- .../com/arialyy/aria/core/loader/NormalThreadStateManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/loader/NormalThreadStateManager.java b/PublicComponent/src/main/java/com/arialyy/aria/core/loader/NormalThreadStateManager.java index 4a8a6bbd..0a475daf 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/loader/NormalThreadStateManager.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/loader/NormalThreadStateManager.java @@ -105,7 +105,7 @@ public class NormalThreadStateManager implements IThreadStateManager { // mergerSFtp(); // mListener.onComplete(); //} else - if (mTaskRecord.isBlock || mTaskRecord.threadNum == 1) { + if (mTaskRecord.isBlock) { if (mergeFile()) { mListener.onComplete(); } else { From 4bc9c7cb17decfdabcd5061afe75eb75eed1dd01 Mon Sep 17 00:00:00 2001 From: dingjinfeng Date: Tue, 15 Aug 2023 20:30:05 +0800 Subject: [PATCH 2/3] fix file size error --- .../com/arialyy/aria/http/download/HttpDThreadTaskAdapter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDThreadTaskAdapter.java b/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDThreadTaskAdapter.java index 676c38c3..37fa2fb9 100644 --- a/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDThreadTaskAdapter.java +++ b/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDThreadTaskAdapter.java @@ -165,6 +165,7 @@ final class HttpDThreadTaskAdapter extends BaseHttpThreadTaskAdapter { fos.write(buffer, 0, len); progress(len); } + fos.flush(); handleComplete(); } catch (IOException e) { fail(new AriaHTTPException( @@ -218,6 +219,7 @@ final class HttpDThreadTaskAdapter extends BaseHttpThreadTaskAdapter { progress(len); } } + fos.flush(); handleComplete(); } catch (IOException e) { fail(new AriaHTTPException(String.format("文件下载失败,savePath: %s, url: %s", getEntity().getFilePath(), @@ -257,6 +259,7 @@ final class HttpDThreadTaskAdapter extends BaseHttpThreadTaskAdapter { file.write(buffer, 0, len); progress(len); } + file.flush(); } /** From c39bc7cdd96c4a23328b74c7cce6eac5f35168c3 Mon Sep 17 00:00:00 2001 From: dingjinfeng Date: Tue, 15 Aug 2023 20:34:06 +0800 Subject: [PATCH 3/3] recovery code --- .../com/arialyy/aria/core/loader/NormalThreadStateManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PublicComponent/src/main/java/com/arialyy/aria/core/loader/NormalThreadStateManager.java b/PublicComponent/src/main/java/com/arialyy/aria/core/loader/NormalThreadStateManager.java index 0a475daf..4a8a6bbd 100644 --- a/PublicComponent/src/main/java/com/arialyy/aria/core/loader/NormalThreadStateManager.java +++ b/PublicComponent/src/main/java/com/arialyy/aria/core/loader/NormalThreadStateManager.java @@ -105,7 +105,7 @@ public class NormalThreadStateManager implements IThreadStateManager { // mergerSFtp(); // mListener.onComplete(); //} else - if (mTaskRecord.isBlock) { + if (mTaskRecord.isBlock || mTaskRecord.threadNum == 1) { if (mergeFile()) { mListener.onComplete(); } else {