From 1ca3ff900dac1f1d7b4a1a837704dac63875eb34 Mon Sep 17 00:00:00 2001
From: laoyuyu <511455842@qq.com>
Date: Mon, 9 Jul 2018 21:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E5=9D=97=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=96=87=E4=BB=B6=E6=9C=89=E6=97=B6=E5=81=8F=E5=A4=A7?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/arialyy/aria/core/common/AbsFileer.java |  4 ++--
 .../aria/core/download/DownloadGroupTarget.java |  8 ++++++--
 .../com/arialyy/aria/core/inf/AbsTarget.java    | 17 +++++++++++++++--
 DEV_LOG.md                                      |  2 ++
 README.md                                       | 13 ++++---------
 build.gradle                                    |  2 +-
 6 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/Aria/src/main/java/com/arialyy/aria/core/common/AbsFileer.java b/Aria/src/main/java/com/arialyy/aria/core/common/AbsFileer.java
index f20c6a69..23250a4b 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/common/AbsFileer.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/common/AbsFileer.java
@@ -392,10 +392,10 @@ public abstract class AbsFileer<ENTITY extends AbsNormalEntity, TASK_ENTITY exte
             mCompleteThreadNum++;
           } else {
             tr.isComplete = false;
-            if (realLocation < tr.startLocation) {
+            if (realLocation != tr.startLocation) {
               ALog.i(TAG, String.format("修正分块【%s】的进度记录为：%s", temp.getPath(), realLocation));
               tr.startLocation = realLocation;
-            } else if (realLocation > tr.endLocation) {
+            }else if (realLocation > tr.endLocation) {
               ALog.i(TAG, String.format("分块【%s】错误，将重新开始该分块", temp.getPath()));
               temp.delete();
               tr.startLocation = i * blockLen;
diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/DownloadGroupTarget.java b/Aria/src/main/java/com/arialyy/aria/core/download/DownloadGroupTarget.java
index 8cbb23dc..a9f0ded1 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/download/DownloadGroupTarget.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/DownloadGroupTarget.java
@@ -18,11 +18,11 @@ package com.arialyy.aria.core.download;
 import android.support.annotation.CheckResult;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
-import android.util.Log;
 import com.arialyy.aria.core.common.RequestEnum;
 import com.arialyy.aria.core.delegate.HttpHeaderDelegate;
 import com.arialyy.aria.core.inf.IHttpHeaderTarget;
 import com.arialyy.aria.core.manager.TEManager;
+import com.arialyy.aria.orm.DbEntity;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.aria.util.CommonUtil;
 import java.io.File;
@@ -67,7 +67,6 @@ public class DownloadGroupTarget extends BaseGroupTarget<DownloadGroupTarget> im
   private void init() {
     mGroupName = CommonUtil.getMd5Code(mUrls);
     mTaskEntity = TEManager.getInstance().getGTEntity(DownloadGroupTaskEntity.class, mUrls);
-    //ALog.d(TAG, "gHash=" + mEntity.getSubEntities().get(0).hashCode() + "; subHash="+mEntity.getT)
     mEntity = mTaskEntity.getEntity();
     if (mEntity != null) {
       mDirPathTemp = mEntity.getDirPath();
@@ -239,6 +238,11 @@ public class DownloadGroupTarget extends BaseGroupTarget<DownloadGroupTarget> im
       if (oldFile.exists()) {
         oldFile.renameTo(new File(newPath));
       }
+      if (DbEntity.checkDataExist(DownloadEntity.class, "downloadPath=?", newPath)) {
+        ALog.w(TAG, String.format("更新文件名失败，路径【%s】已存在", newPath));
+        return;
+      }
+
       CommonUtil.modifyTaskRecord(oldFile.getPath(), newPath);
       entity.setDownloadPath(newPath);
       taskEntity.setKey(newPath);
diff --git a/Aria/src/main/java/com/arialyy/aria/core/inf/AbsTarget.java b/Aria/src/main/java/com/arialyy/aria/core/inf/AbsTarget.java
index e9c75be5..4be6c97f 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/inf/AbsTarget.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/inf/AbsTarget.java
@@ -21,10 +21,13 @@ import com.arialyy.aria.core.AriaManager;
 import com.arialyy.aria.core.command.ICmd;
 import com.arialyy.aria.core.command.normal.CancelCmd;
 import com.arialyy.aria.core.command.normal.NormalCmdFactory;
+import com.arialyy.aria.core.common.TaskRecord;
+import com.arialyy.aria.core.download.DownloadGroupEntity;
 import com.arialyy.aria.core.download.DownloadGroupTaskEntity;
 import com.arialyy.aria.core.download.DownloadTaskEntity;
 import com.arialyy.aria.core.manager.TEManager;
 import com.arialyy.aria.core.upload.UploadTaskEntity;
+import com.arialyy.aria.orm.DbEntity;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.aria.util.CommonUtil;
 import java.util.ArrayList;
@@ -35,7 +38,7 @@ import java.util.List;
  */
 public abstract class AbsTarget<TARGET extends AbsTarget, ENTITY extends AbsEntity, TASK_ENTITY extends AbsTaskEntity>
     implements ITarget<TARGET> {
-  protected String TAG ;
+  protected String TAG;
   protected ENTITY mEntity;
   protected TASK_ENTITY mTaskEntity;
   protected String mTargetName;
@@ -64,7 +67,17 @@ public abstract class AbsTarget<TARGET extends AbsTarget, ENTITY extends AbsEnti
       ALog.d("AbsTarget", "任务正在下载，即将删除任务");
       cancel();
     } else {
-      mEntity.deleteData();
+      if (mEntity instanceof AbsNormalEntity) {
+        TaskRecord record =
+            DbEntity.findFirst(TaskRecord.class, "TaskRecord.filePath=?", mTaskEntity.getKey());
+        if (record != null) {
+          CommonUtil.delTaskRecord(record, mTaskEntity.isRemoveFile(), (AbsNormalEntity) mEntity);
+        } else {
+          mEntity.deleteData();
+        }
+      } else if (mEntity instanceof DownloadGroupEntity) {
+        CommonUtil.delGroupTaskRecord(mTaskEntity.isRemoveFile(), ((DownloadGroupEntity) mEntity));
+      }
       TEManager.getInstance().removeTEntity(mEntity.getKey());
     }
   }
diff --git a/DEV_LOG.md b/DEV_LOG.md
index ee873164..2f1c8d47 100644
--- a/DEV_LOG.md
+++ b/DEV_LOG.md
@@ -1,4 +1,6 @@
 ## 开发日志
+  + v_3.4.7
+    - 修复分块任务异常操作导致的问题
   + v_3.4.6
     - 修复android 4.4.4 版本多dex下无法进行回调的问题
     - 新增`updateUrl(newUrl)`用于修改任务的url，[see](https://aria.laoyuyu.me/aria_doc/api/task_handle.html#%E6%9B%B4%E6%96%B0%E4%BB%BB%E5%8A%A1url)
diff --git a/README.md b/README.md
index b87c92cf..9a9668aa 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,8 @@ Aria有以下特点：
 [![Download](https://api.bintray.com/packages/arialyy/maven/AriaApi/images/download.svg)](https://bintray.com/arialyy/maven/AriaApi/_latestVersion)
 [![Download](https://api.bintray.com/packages/arialyy/maven/AriaCompiler/images/download.svg)](https://bintray.com/arialyy/maven/AriaCompiler/_latestVersion)
 ```java
-compile 'com.arialyy.aria:aria-core:3.4.6'
-annotationProcessor 'com.arialyy.aria:aria-compiler:3.4.6'
+compile 'com.arialyy.aria:aria-core:3.4.7'
+annotationProcessor 'com.arialyy.aria:aria-compiler:3.4.7'
 ```
 如果出现android support，请将 `compile 'com.arialyy.aria:aria-core:<last-version>'`替换为
 ```
@@ -100,13 +100,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
 ### 版本日志
-  + v_3.4.6
-    - 修复android 4.4.4 版本多dex下无法进行回调的问题
-    - 新增`updateUrl(newUrl)`用于修改任务的url，[see](https://aria.laoyuyu.me/aria_doc/api/task_handle.html#%E6%9B%B4%E6%96%B0%E4%BB%BB%E5%8A%A1url)
-    - 优化分块下载
-    - 修复了字符串中有特殊字符导致的路径冲突问题；修复ftp分块下载失败问题
-    - 修复连接中有`+`导致的地址呗使用问题。
-    - 修复表重复创建导致的崩溃问题 https://github.com/AriaLyy/Aria/issues/264
+  + v_3.4.7
+    - 修复分块任务异常操作导致的问题
 
 [更多版本记录](https://github.com/AriaLyy/Aria/blob/master/DEV_LOG.md)
 
diff --git a/build.gradle b/build.gradle
index 3a3d1e21..2c1ceeb5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ task clean(type: Delete) {
 ext {
   userOrg = 'arialyy'
   groupId = 'com.arialyy.aria'
-  publishVersion = '3.4.6'
+  publishVersion = '3.4.7'
 //  publishVersion = '1.0.3'  //FTP插件
   repoName='maven'
   desc = 'android 下载框架'