From a23f3f995217e980adf668af2ce09e32aad112b9 Mon Sep 17 00:00:00 2001
From: AriaLyy <511455842@qq.com>
Date: Tue, 14 Nov 2017 22:11:14 +0800
Subject: [PATCH] fix bug https://github.com/AriaLyy/Aria/issues/160

---
 .../java/com/arialyy/aria/core/download/BaseDListener.java    | 4 +++-
 .../arialyy/aria/core/download/downloader/AbsGroupUtil.java   | 3 ++-
 .../main/java/com/arialyy/aria/core/upload/BaseUListener.java | 3 ++-
 DEV_LOG.md                                                    | 3 +++
 aria/src/main/java/com/arialyy/aria/core/Configuration.java   | 3 ++-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/BaseDListener.java b/Aria/src/main/java/com/arialyy/aria/core/download/BaseDListener.java
index 0388da25..52b18018 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/download/BaseDListener.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/BaseDListener.java
@@ -128,7 +128,9 @@ class BaseDListener<ENTITY extends AbsEntity, TASK_ENTITY extends AbsTaskEntity<
     } else {
       mEntity.setSpeed(speed < 0 ? 0 : speed);
     }
-    mEntity.setPercent((int) (mEntity.getCurrentProgress() * 100 / mEntity.getFileSize()));
+
+    mEntity.setPercent((int) (mEntity.getFileSize() <= 0 ? 0
+        : mEntity.getCurrentProgress() * 100 / mEntity.getFileSize()));
   }
 
   /**
diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/downloader/AbsGroupUtil.java b/Aria/src/main/java/com/arialyy/aria/core/download/downloader/AbsGroupUtil.java
index 97bacaf5..1bced6bf 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/download/downloader/AbsGroupUtil.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/downloader/AbsGroupUtil.java
@@ -566,7 +566,8 @@ public abstract class AbsGroupUtil implements IUtil {
     private void handleSpeed(long speed) {
       subEntity.setSpeed(speed);
       subEntity.setConvertSpeed(speed <= 0 ? "" : CommonUtil.formatFileSize(speed) + "/s");
-      subEntity.setPercent((int) (subEntity.getCurrentProgress() * 100 / subEntity.getFileSize()));
+      subEntity.setPercent((int) (subEntity.getFileSize() <= 0 ? 0
+          : subEntity.getCurrentProgress() * 100 / subEntity.getFileSize()));
     }
 
     private void saveData(int state, long location) {
diff --git a/Aria/src/main/java/com/arialyy/aria/core/upload/BaseUListener.java b/Aria/src/main/java/com/arialyy/aria/core/upload/BaseUListener.java
index bcc3c2cd..ca7180db 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/upload/BaseUListener.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/upload/BaseUListener.java
@@ -116,7 +116,8 @@ class BaseUListener<ENTITY extends AbsEntity, TASK_ENTITY extends AbsTaskEntity<
     } else {
       mEntity.setSpeed(speed < 0 ? 0 : speed);
     }
-    mEntity.setPercent((int) (mEntity.getCurrentProgress() * 100 / mEntity.getFileSize()));
+    mEntity.setPercent((int) (mEntity.getFileSize() <= 0 ? 0
+        : mEntity.getCurrentProgress() * 100 / mEntity.getFileSize()));
   }
 
   /**
diff --git a/DEV_LOG.md b/DEV_LOG.md
index c4e96dfb..48d2342f 100644
--- a/DEV_LOG.md
+++ b/DEV_LOG.md
@@ -1,4 +1,7 @@
 ## 开发日志
+  + v_3.3.7
+    - 修复一个线程重启的问题 https://github.com/AriaLyy/Aria/issues/160
+    - 修复配置文件异常问题、格式化速度为0问题 https://github.com/AriaLyy/Aria/issues/161
   + v_3.3.6
     - 增加日志输出级别控制
     - 修复公网FTP地址不能下载的问题  https://github.com/AriaLyy/Aria/issues/146
diff --git a/aria/src/main/java/com/arialyy/aria/core/Configuration.java b/aria/src/main/java/com/arialyy/aria/core/Configuration.java
index 3aeca30e..0b927cf7 100644
--- a/aria/src/main/java/com/arialyy/aria/core/Configuration.java
+++ b/aria/src/main/java/com/arialyy/aria/core/Configuration.java
@@ -152,7 +152,8 @@ class Configuration {
               : UPLOAD_CONFIG_FILE));
       if (file.exists()) {
         Properties properties = CommonUtil.loadConfig(file);
-        List<Field> fields = CommonUtil.getAllFields(getClass());
+        List<Field> fields =
+            CommonUtil.getAllFields(isDownload ? DownloadConfig.class : UploadConfig.class);
         try {
           for (Field field : fields) {
             int m = field.getModifiers();