修复组合任务在获取子任务信息的过程中，手动停止或删除，没有回调的问题

2020-12-09 21:22:01 +08:00
parent 35e66caab5
commit 9db8f1e9c0
16 changed files with 174 additions and 54 deletions
--- a/Aria/src/main/java/com/arialyy/aria/core/download/CheckDGEntityUtil.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/CheckDGEntityUtil.java
@@ -69,7 +69,8 @@ public class CheckDGEntityUtil implements ICheckEntityUtil {
      ALog.e(TAG, "文件夹路径不能为null");
      return false;
    }
-    if (!FileUtil.canWrite(dirPath)){
+    File file = new File(dirPath);
+    if (!FileUtil.canWrite(file.getParent()) && !FileUtil.canWrite(dirPath)) {
      ALog.e(TAG, String.format("路径【%s】不可写", dirPath));
      return false;
    }
@@ -77,7 +78,7 @@ public class CheckDGEntityUtil implements ICheckEntityUtil {
      ALog.e(TAG, String.format("文件夹路径【%s】错误", dirPath));
      return false;
    }
-    File file = new File(dirPath);
+
    if (file.isFile()) {
      ALog.e(TAG, String.format("路径【%s】是文件，请设置文件夹路径", dirPath));
      return false;
@@ -131,8 +132,9 @@ public class CheckDGEntityUtil implements ICheckEntityUtil {
   * @return false 任务不再执行，true 任务继续执行
   */
  private boolean checkGroupHash(boolean isIgnoreTaskOccupy, String groupHash) {
-    DownloadGroupEntity dge = DbEntity.findFirst(DownloadGroupEntity.class, "groupHash=?", groupHash);
-    if (dge != null && dge.getGroupHash().equals(mEntity.getGroupHash())){
+    DownloadGroupEntity dge =
+        DbEntity.findFirst(DownloadGroupEntity.class, "groupHash=?", groupHash);
+    if (dge != null && dge.getGroupHash().equals(mEntity.getGroupHash())) {
      mEntity.rowID = dge.rowID;
      return true;
    }
--- a/DEV_LOG.md
+++ b/DEV_LOG.md
@@ -4,6 +4,7 @@
    - 修复一个重新下载文件时，同名路径文件没有被被删除的问题
    - fix bug https://github.com/AriaLyy/Aria/issues/807
    - fix bug https://github.com/AriaLyy/Aria/issues/811
+    - 修复组合任务在获取子任务信息的过程中，手动停止或删除，没有回调的问题
  + v_3.8.15 (2020/11/9)
    - 修复不支持断点的连接下载失败问题，https://github.com/AriaLyy/Aria/issues/771
    - 修复iv不存在时，索引文件异常的问题，https://github.com/AriaLyy/Aria/issues/780
--- a/FtpComponent/src/main/java/com/arialyy/aria/ftp/AbsFtpInfoTask.java
+++ b/FtpComponent/src/main/java/com/arialyy/aria/ftp/AbsFtpInfoTask.java
@@ -27,6 +27,7 @@ import aria.apache.commons.net.ftp.FTPSClient;
 import com.arialyy.aria.core.AriaConfig;
 import com.arialyy.aria.core.FtpUrlEntity;
 import com.arialyy.aria.core.common.AbsEntity;
+import com.arialyy.aria.core.common.CompleteInfo;
 import com.arialyy.aria.core.common.FtpConnectionMode;
 import com.arialyy.aria.core.loader.IInfoTask;
 import com.arialyy.aria.core.loader.ILoaderVisitor;
@@ -55,7 +56,8 @@ public abstract class AbsFtpInfoTask<ENTITY extends AbsEntity, TASK_WRAPPER exte
  private int mConnectTimeOut;
  protected long mSize = 0;
  protected String charSet = "UTF-8";
-  protected Callback callback;
+  private Callback callback;
+  private boolean isStop = false, isCancel = false;

  public AbsFtpInfoTask(TASK_WRAPPER taskWrapper) {
    mTaskWrapper = taskWrapper;
@@ -81,6 +83,14 @@ public abstract class AbsFtpInfoTask<ENTITY extends AbsEntity, TASK_WRAPPER exte
  protected abstract void handelFileInfo(FTPClient client, FTPFile[] files,
      String convertedRemotePath) throws IOException;

+  @Override public void stop() {
+    isStop = true;
+  }
+
+  @Override public void cancel() {
+    isCancel = true;
+  }
+
  @Override public void setCallback(Callback callback) {
    this.callback = callback;
  }
@@ -101,10 +111,10 @@ public abstract class AbsFtpInfoTask<ENTITY extends AbsEntity, TASK_WRAPPER exte
      handelFileInfo(client, files, convertedRemotePath);
    } catch (IOException e) {
      e.printStackTrace();
-      failDownload(client, "FTP错误信息", e, true);
+      handleFail(client, "FTP错误信息", e, true);
    } catch (InterruptedException e) {
      e.printStackTrace();
-      failDownload(client, "FTP错误信息", e, true);
+      handleFail(client, "FTP错误信息", e, true);
    } finally {
      closeClient(client);
    }
@@ -146,7 +156,7 @@ public abstract class AbsFtpInfoTask<ENTITY extends AbsEntity, TASK_WRAPPER exte
    }

    if (client == null) {
-      failDownload(client, String.format("链接失败, url: %s", mTaskOption.getUrlEntity().url), null,
+      handleFail(client, String.format("链接失败, url: %s", mTaskOption.getUrlEntity().url), null,
          true);
      return null;
    }
@@ -168,14 +178,14 @@ public abstract class AbsFtpInfoTask<ENTITY extends AbsEntity, TASK_WRAPPER exte
    }

    if (!loginSuccess) {
-      failDownload(client, "登录失败", null, false);
+      handleFail(client, "登录失败", null, false);
      client.disconnect();
      return null;
    }

    int reply = client.getReplyCode();
    if (!FTPReply.isPositiveCompletion(reply)) {
-      failDownload(client, String.format("无法连接到ftp服务器，filePath: %s, url: %s", mEntity.getKey(),
+      handleFail(client, String.format("无法连接到ftp服务器，filePath: %s, url: %s", mEntity.getKey(),
          mTaskOption.getUrlEntity().url), null, true);
      client.disconnect();
      return null;
@@ -299,7 +309,7 @@ public abstract class AbsFtpInfoTask<ENTITY extends AbsEntity, TASK_WRAPPER exte
    for (FTPFile file : files) {
      if (file.isFile()) {
        size += file.getSize();
-        handleFile(path + file.getName(), file);
+        handleFile(client, path + file.getName(), file);
      } else {
        String remotePath = CommonUtil.convertFtpChar(charSet, path + file.getName());
        size += getFileSize(client.listFiles(remotePath), client, path + file.getName());
@@ -314,10 +324,13 @@ public abstract class AbsFtpInfoTask<ENTITY extends AbsEntity, TASK_WRAPPER exte
   * @param remotePath ftp服务器文件夹路径
   * @param ftpFile ftp服务器上对应的文件
   */
-  protected void handleFile(String remotePath, FTPFile ftpFile) {
+  protected void handleFile(FTPClient client, String remotePath, FTPFile ftpFile) {
  }

-  protected void failDownload(FTPClient client, String msg, Exception e, boolean needRetry) {
+  protected void handleFail(FTPClient client, String msg, Exception e, boolean needRetry) {
+    if (isStop || isCancel) {
+      return;
+    }
    if (callback != null) {
      if (client == null) {
        msg = "创建ftp客户端失败";
@@ -332,6 +345,10 @@ public abstract class AbsFtpInfoTask<ENTITY extends AbsEntity, TASK_WRAPPER exte
    }
  }

+  protected void onSucceed(CompleteInfo info){
+    callback.onSucceed(mEntity.getKey(), info);
+  }
+
  @Override public void accept(ILoaderVisitor visitor) {
    visitor.addComponent(this);
  }
--- a/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDFileInfoTask.java
+++ b/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDFileInfoTask.java
@@ -38,10 +38,10 @@ final class FtpDFileInfoTask extends AbsFtpInfoTask<DownloadEntity, DTaskWrapper
    super(taskEntity);
  }

-  @Override protected void handleFile(String remotePath, FTPFile ftpFile) {
-    super.handleFile(remotePath, ftpFile);
+  @Override protected void handleFile(FTPClient client, String remotePath, FTPFile ftpFile) {
+    super.handleFile(client, remotePath, ftpFile);
    if (!FileUtil.checkMemorySpace(mEntity.getFilePath(), ftpFile.getSize())) {
-      callback.onFail(mEntity, new AriaFTPException(
+      handleFail(client, "内存空间不足", new AriaFTPException(
              String.format("获取ftp文件信息失败，内存空间不足, filePath: %s", mEntity.getFilePath())),
          false);
    }
@@ -72,7 +72,7 @@ final class FtpDFileInfoTask extends AbsFtpInfoTask<DownloadEntity, DTaskWrapper
      }
      closeClient(client);

-      failDownload(client,
+      handleFail(client,
          String.format("文件不存在，url: %s, remotePath：%s", mTaskOption.getUrlEntity().url,
              getRemotePath()), null, false);
      return;
@@ -90,7 +90,7 @@ final class FtpDFileInfoTask extends AbsFtpInfoTask<DownloadEntity, DTaskWrapper
    int reply = client.getReplyCode();
    if (!FTPReply.isPositiveCompletion(reply)) {
      closeClient(client);
-      failDownload(client, "获取文件信息错误，url: " + mTaskOption.getUrlEntity().url, null, true);
+      handleFail(client, "获取文件信息错误，url: " + mTaskOption.getUrlEntity().url, null, true);
      return;
    }
    mTaskWrapper.setCode(reply);
@@ -112,6 +112,6 @@ final class FtpDFileInfoTask extends AbsFtpInfoTask<DownloadEntity, DTaskWrapper
      mTaskWrapper.setNewTask(true);
    }
    mEntity.setFileSize(mSize);
-    callback.onSucceed(mEntity.getUrl(), new CompleteInfo(code, mTaskWrapper));
+    onSucceed(new CompleteInfo(code, mTaskWrapper));
  }
 }
--- a/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDGInfoTask.java
+++ b/FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDGInfoTask.java
@@ -49,7 +49,7 @@ final class FtpDGInfoTask extends AbsFtpInfoTask<DownloadGroupEntity, DGTaskWrap

  @Override public void run() {
    if (mTaskWrapper.getEntity().getFileSize() > 1 && checkSubOption()) {
-      callback.onSucceed(mEntity.getKey(), new CompleteInfo(200, mTaskWrapper));
+      onSucceed(new CompleteInfo(200, mTaskWrapper));
    } else {
      super.run();
    }
@@ -80,7 +80,7 @@ final class FtpDGInfoTask extends AbsFtpInfoTask<DownloadGroupEntity, DGTaskWrap
      }
      closeClient(client);

-      failDownload(client,
+      handleFail(client,
          String.format("文件不存在，url: %s, remotePath：%s", mTaskOption.getUrlEntity().url,
              getRemotePath()), null, false);
      return;
@@ -98,7 +98,7 @@ final class FtpDGInfoTask extends AbsFtpInfoTask<DownloadGroupEntity, DGTaskWrap
    int reply = client.getReplyCode();
    if (!FTPReply.isPositiveCompletion(reply)) {
      closeClient(client);
-      failDownload(client, "获取文件信息错误，url: " + mTaskOption.getUrlEntity().url, null, true);
+      handleFail(client, "获取文件信息错误，url: " + mTaskOption.getUrlEntity().url, null, true);
      return;
    }
    mTaskWrapper.setCode(reply);
@@ -127,8 +127,8 @@ final class FtpDGInfoTask extends AbsFtpInfoTask<DownloadGroupEntity, DGTaskWrap
    return mTaskOption.getUrlEntity().remotePath;
  }

-  @Override protected void handleFile(String remotePath, FTPFile ftpFile) {
-    super.handleFile(remotePath, ftpFile);
+  @Override protected void handleFile(FTPClient client, String remotePath, FTPFile ftpFile) {
+    super.handleFile(client, remotePath, ftpFile);
    addEntity(remotePath, ftpFile);
  }

@@ -138,7 +138,7 @@ final class FtpDGInfoTask extends AbsFtpInfoTask<DownloadGroupEntity, DGTaskWrap
    for (DTaskWrapper wrapper : mTaskWrapper.getSubTaskWrapper()) {
      cloneInfo(wrapper);
    }
-    callback.onSucceed(mEntity.getKey(), new CompleteInfo(code, mTaskWrapper));
+    onSucceed(new CompleteInfo(code, mTaskWrapper));
  }

  private void cloneInfo(DTaskWrapper subWrapper) {
@@ -234,8 +234,8 @@ final class FtpDGInfoTask extends AbsFtpInfoTask<DownloadGroupEntity, DGTaskWrap
  }

  @Override
-  protected void failDownload(FTPClient client, String msg, Exception e, boolean needRetry) {
-    super.failDownload(client, msg, e, needRetry);
+  protected void handleFail(FTPClient client, String msg, Exception e, boolean needRetry) {
+    super.handleFail(client, msg, e, needRetry);
    DeleteDGRecord.getInstance().deleteRecord(mTaskWrapper.getEntity(), true, true);
  }
 }
--- a/FtpComponent/src/main/java/com/arialyy/aria/ftp/upload/FtpUFileInfoTask.java
+++ b/FtpComponent/src/main/java/com/arialyy/aria/ftp/upload/FtpUFileInfoTask.java
@@ -60,7 +60,7 @@ final class FtpUFileInfoTask extends AbsFtpInfoTask<UploadEntity, UTaskWrapper>
      return;
    }

-    handleFile(getRemotePath(), files.length == 0 ? null : files[0]);
+    handleFile(client, getRemotePath(), files.length == 0 ? null : files[0]);
    int reply = client.getReplyCode();
    if (!FTPReply.isPositiveCompletion(reply)) {
      //服务器上没有该文件路径，表示该任务为新的上传任务
@@ -133,8 +133,8 @@ final class FtpUFileInfoTask extends AbsFtpInfoTask<UploadEntity, UTaskWrapper>
   * @param remotePath ftp服务器文件夹路径
   * @param ftpFile ftp服务器上对应的文件
   */
-  @Override protected void handleFile(String remotePath, FTPFile ftpFile) {
-    super.handleFile(remotePath, ftpFile);
+  @Override protected void handleFile(FTPClient client,String remotePath, FTPFile ftpFile) {
+    super.handleFile(client, remotePath, ftpFile);
    this.ftpFile = ftpFile;
    if (ftpFile != null && ftpFile.getSize() == mEntity.getFileSize()) {
      isComplete = true;
@@ -145,6 +145,6 @@ final class FtpUFileInfoTask extends AbsFtpInfoTask<UploadEntity, UTaskWrapper>
    super.onPreComplete(code);
    CompleteInfo info = new CompleteInfo(isComplete ? CODE_COMPLETE : code, mTaskWrapper);
    info.obj = ftpFile;
-    callback.onSucceed(mEntity.getKey(), info);
+    onSucceed(info);
  }
 }
--- a/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDFileInfoTask.java
+++ b/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDFileInfoTask.java
@@ -64,6 +64,7 @@ final class HttpDFileInfoTask implements IInfoTask, Runnable {
  private int mConnectTimeOut;
  private Callback callback;
  private HttpTaskOption taskOption;
+  private boolean isStop = false, isCancel = false;

  HttpDFileInfoTask(DTaskWrapper taskWrapper) {
    this.mTaskWrapper = taskWrapper;
@@ -81,7 +82,7 @@ final class HttpDFileInfoTask implements IInfoTask, Runnable {
      conn = ConnectionHelp.handleConnection(url, taskOption);
      ConnectionHelp.setConnectParam(taskOption, conn);
      conn.setRequestProperty("Range", "bytes=" + 0 + "-");
-      if (AriaConfig.getInstance().getDConfig().isUseHeadRequest()){
+      if (AriaConfig.getInstance().getDConfig().isUseHeadRequest()) {
        ALog.d(TAG, "head请求");
        conn.setRequestMethod("HEAD");
      }
@@ -111,6 +112,14 @@ final class HttpDFileInfoTask implements IInfoTask, Runnable {
    this.callback = callback;
  }

+  @Override public void stop() {
+    isStop = true;
+  }
+
+  @Override public void cancel() {
+    isCancel = true;
+  }
+
  private void handleConnect(HttpURLConnection conn) throws IOException {
    if (taskOption.getRequestEnum() == RequestEnum.POST) {
      Map<String, String> params = taskOption.getParams();
@@ -232,7 +241,7 @@ final class HttpDFileInfoTask implements IInfoTask, Runnable {
        || code == HttpURLConnection.HTTP_CREATED // 201 跳转
        || code == 307) {
      handleUrlReTurn(conn, conn.getHeaderField("Location"));
-    }else if (code == 416){ // 处理0k长度的文件的情况
+    } else if (code == 416) { // 处理0k长度的文件的情况
      ALog.w(TAG, "文件长度为0，不支持断点");
      mTaskWrapper.setSupportBP(false);
      mTaskWrapper.setNewTask(true);
@@ -245,12 +254,13 @@ final class HttpDFileInfoTask implements IInfoTask, Runnable {
          String.format("任务下载失败，errorCode：%s, errorMsg: %s, url: %s", code,
              conn.getResponseMessage(), mEntity.getUrl())), !CheckUtil.httpIsBadRequest(code));
    }
+    if (isStop || isCancel) {
+      return;
+    }
    if (end) {
      taskOption.setChunked(isChunked);
-      if (callback != null) {
-        CompleteInfo info = new CompleteInfo(code, mTaskWrapper);
-        callback.onSucceed(mEntity.getUrl(), info);
-      }
+      CompleteInfo info = new CompleteInfo(code, mTaskWrapper);
+      callback.onSucceed(mEntity.getUrl(), info);
      mEntity.update();
    }
  }
@@ -343,7 +353,7 @@ final class HttpDFileInfoTask implements IInfoTask, Runnable {
    ConnectionHelp.setConnectParam(taskOption, conn);
    conn.setRequestProperty("Cookie", cookies);
    conn.setRequestProperty("Range", "bytes=" + 0 + "-");
-    if (AriaConfig.getInstance().getDConfig().isUseHeadRequest()){
+    if (AriaConfig.getInstance().getDConfig().isUseHeadRequest()) {
      conn.setRequestMethod("HEAD");
    }
    conn.setConnectTimeout(mConnectTimeOut);
@@ -367,6 +377,9 @@ final class HttpDFileInfoTask implements IInfoTask, Runnable {
  }

  private void failDownload(AriaHTTPException e, boolean needRetry) {
+    if (isStop || isCancel) {
+      return;
+    }
    if (callback != null) {
      callback.onFail(mEntity, e, needRetry);
    }
--- a/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDGInfoTask.java
+++ b/HttpComponent/src/main/java/com/arialyy/aria/http/download/HttpDGInfoTask.java
@@ -45,6 +45,7 @@ public final class HttpDGInfoTask implements IInfoTask {
  private AtomicInteger count = new AtomicInteger();
  private AtomicInteger failCount = new AtomicInteger();
  private DownloadGroupListener listener;
+  private boolean isStop = false, isCancel = false;

  /**
   * 子任务回调
@@ -71,6 +72,24 @@ public final class HttpDGInfoTask implements IInfoTask {
    this.listener = listener;
  }

+  /**
+   * 停止
+   */
+  @Override
+  public void stop() {
+    isStop = true;
+    if (mPool != null) {
+      mPool.shutdown();
+    }
+  }
+
+  @Override public void cancel() {
+    isCancel = true;
+    if (mPool != null) {
+      mPool.shutdown();
+    }
+  }
+
  @Override public void run() {
    // 如果是isUnknownSize()标志，并且获取大小没有完成，则直接回调onStop
    if (mPool != null && !getLenComplete) {
@@ -131,6 +150,11 @@ public final class HttpDGInfoTask implements IInfoTask {
   * 检查组合任务大小是否获取完成，获取完成后取消阻塞，并设置组合任务大小
   */
  private void checkGetSizeComplete(int count, int failCount) {
+    if (isStop || isCancel){
+      ALog.w(TAG, "任务已停止或已取消，isStop = " + isStop + ", isCancel = " + isCancel);
+      notifyLock();
+      return;
+    }
    if (failCount == wrapper.getSubTaskWrapper().size()) {
      callback.onFail(wrapper.getEntity(), new AriaHTTPException("获取子任务长度失败"), false);
      notifyLock();
--- a/M3U8Component/src/main/java/com/arialyy/aria/m3u8/M3U8InfoTask.java
+++ b/M3U8Component/src/main/java/com/arialyy/aria/m3u8/M3U8InfoTask.java
@@ -115,6 +115,14 @@ final public class M3U8InfoTask implements IInfoTask {
    mCallback = callback;
  }

+  @Override public void stop() {
+    this.isStop = true;
+  }
+
+  @Override public void cancel() {
+    this.isStop = true;
+  }
+
  private void handleConnect(String tsListUrl, HttpURLConnection conn) throws IOException {
    int code = conn.getResponseCode();
    if (code == HttpURLConnection.HTTP_OK) {
@@ -205,8 +213,7 @@ final public class M3U8InfoTask implements IInfoTask {
      }
      CompleteInfo info = new CompleteInfo();
      info.obj = extInf;
-
-      mCallback.onSucceed(mEntity.getKey(), info);
+      onSucceed(info);
      if (fos != null) {
        fos.close();
      }
@@ -223,6 +230,13 @@ final public class M3U8InfoTask implements IInfoTask {
    }
  }

+  private void onSucceed(CompleteInfo info) {
+    if (isStop) {
+      return;
+    }
+    mCallback.onSucceed(mEntity.getKey(), info);
+  }
+
  /**
   * 添加切片信息到索引文件中
   * 直播下载的索引只记录头部信息，不记录EXTINF中的信息，该信息在onGetPeer的方法中添加。
@@ -362,6 +376,9 @@ final public class M3U8InfoTask implements IInfoTask {
  }

  private void failDownload(String errorInfo, boolean needRetry) {
+    if (isStop) {
+      return;
+    }
    mCallback.onFail(mEntity, new AriaM3U8Exception(errorInfo), needRetry);
  }

--- a/PublicComponent/src/main/java/com/arialyy/aria/core/group/AbsGroupLoader.java
+++ b/PublicComponent/src/main/java/com/arialyy/aria/core/group/AbsGroupLoader.java
@@ -217,14 +217,20 @@ public abstract class AbsGroupLoader implements ILoaderVisitor, ILoader {

  @Override public void cancel() {
    isCancel = true;
+    mInfoTask.cancel();
    closeTimer();
    mSubQueue.removeAllTask();
    mListener.onCancel();
  }

  @Override public void stop() {
+    mInfoTask.stop();
    isStop = true;
-    mSubQueue.stopAllTask();
+    if (mSubQueue.getExecSize() == 0) {
+      mListener.onStop(mGTWrapper.getEntity().getCurrentProgress());
+    } else {
+      mSubQueue.stopAllTask();
+    }
    closeTimer();
  }

--- a/PublicComponent/src/main/java/com/arialyy/aria/core/group/SimpleSubQueue.java
+++ b/PublicComponent/src/main/java/com/arialyy/aria/core/group/SimpleSubQueue.java
@@ -43,7 +43,7 @@ final class SimpleSubQueue implements ISubQueue<AbsSubDLoadUtil> {
  /**
   * 最大执行任务数
   */
-  private int mExecSize;
+  private int mMaxExecSize;

  /**
   * 是否停止任务任务
@@ -51,7 +51,7 @@ final class SimpleSubQueue implements ISubQueue<AbsSubDLoadUtil> {
  private boolean isStopAll = false;

  private SimpleSubQueue() {
-    mExecSize = Configuration.getInstance().dGroupCfg.getSubMaxTaskNum();
+    mMaxExecSize = Configuration.getInstance().dGroupCfg.getSubMaxTaskNum();
  }

  static SimpleSubQueue newInstance() {
@@ -73,6 +73,10 @@ final class SimpleSubQueue implements ISubQueue<AbsSubDLoadUtil> {
    return mCache.size();
  }

+  public int getExecSize(){
+    return mExec.size();
+  }
+
  boolean isStopAll() {
    return isStopAll;
  }
@@ -82,7 +86,7 @@ final class SimpleSubQueue implements ISubQueue<AbsSubDLoadUtil> {
  }

  @Override public void startTask(AbsSubDLoadUtil fileer) {
-    if (mExec.size() < mExecSize) {
+    if (mExec.size() < mMaxExecSize) {
      mCache.remove(fileer.getKey());
      mExec.put(fileer.getKey(), fileer);
      ALog.d(TAG,
@@ -102,6 +106,7 @@ final class SimpleSubQueue implements ISubQueue<AbsSubDLoadUtil> {
  @Override public void stopAllTask() {
    isStopAll = true;
    ALog.d(TAG, "停止组合任务");
+    mCache.clear();
    Set<String> keys = mExec.keySet();
    for (String key : keys) {
      AbsSubDLoadUtil loader = mExec.get(key);
@@ -117,12 +122,12 @@ final class SimpleSubQueue implements ISubQueue<AbsSubDLoadUtil> {
      ALog.e(TAG, String.format("修改组合任务子任务队列数失败，num: %s", num));
      return;
    }
-    if (num == mExecSize) {
-      ALog.i(TAG, String.format("忽略此次修改，oldSize: %s, num: %s", mExecSize, num));
+    if (num == mMaxExecSize) {
+      ALog.i(TAG, String.format("忽略此次修改，oldSize: %s, num: %s", mMaxExecSize, num));
      return;
    }
-    int oldSize = mExecSize;
-    mExecSize = num;
+    int oldSize = mMaxExecSize;
+    mMaxExecSize = num;
    int diff = Math.abs(oldSize - num);

    if (oldSize < num) { // 处理队列变小的情况，该情况下将停止队尾任务，并将这些任务添加到缓存队列中
--- a/PublicComponent/src/main/java/com/arialyy/aria/core/loader/AbsNormalLoader.java
+++ b/PublicComponent/src/main/java/com/arialyy/aria/core/loader/AbsNormalLoader.java
@@ -229,6 +229,7 @@ public abstract class AbsNormalLoader<T extends AbsTaskWrapper> implements ILoad
      ALog.d(TAG, String.format("任务【%s】正在删除，删除任务失败", mTaskWrapper.getKey()));
      return;
    }
+    mInfoTask.cancel();
    closeTimer();
    isCancel = true;
    onCancel();
@@ -262,6 +263,7 @@ public abstract class AbsNormalLoader<T extends AbsTaskWrapper> implements ILoad
    if (isStop) {
      return;
    }
+    mInfoTask.stop();
    closeTimer();
    isStop = true;
    onStop();
--- a/PublicComponent/src/main/java/com/arialyy/aria/core/loader/IInfoTask.java
+++ b/PublicComponent/src/main/java/com/arialyy/aria/core/loader/IInfoTask.java
@@ -34,6 +34,16 @@ public interface IInfoTask extends ILoaderComponent {
   */
  void setCallback(Callback callback);

+  /**
+   * 任务停止
+   */
+  void stop();
+
+  /**
+   * 任务取消
+   */
+  void cancel();
+
  interface Callback {
    /**
     * 处理完成
--- a/SFtpComponent/src/main/java/com/arialyy/aria/sftp/AbsSFtpInfoTask.java
+++ b/SFtpComponent/src/main/java/com/arialyy/aria/sftp/AbsSFtpInfoTask.java
@@ -16,6 +16,7 @@
 package com.arialyy.aria.sftp;

 import com.arialyy.aria.core.FtpUrlEntity;
+import com.arialyy.aria.core.common.CompleteInfo;
 import com.arialyy.aria.core.loader.IInfoTask;
 import com.arialyy.aria.core.loader.ILoaderVisitor;
 import com.arialyy.aria.core.wrapper.AbsTaskWrapper;
@@ -32,9 +33,10 @@ import java.io.UnsupportedEncodingException;
 */
 public abstract class AbsSFtpInfoTask<WP extends AbsTaskWrapper> implements IInfoTask {
  protected String TAG = CommonUtil.getClassName(this);
-  protected Callback callback;
+  private Callback callback;
  private WP wrapper;
  private SFtpTaskOption option;
+  private boolean isStop = false, isCancel = false;

  public AbsSFtpInfoTask(WP wp) {
    this.wrapper = wp;
@@ -44,6 +46,28 @@ public abstract class AbsSFtpInfoTask<WP extends AbsTaskWrapper> implements IInf
  protected abstract void getFileInfo(Session session)
      throws JSchException, UnsupportedEncodingException, SftpException;

+  @Override public void stop() {
+    isStop = true;
+  }
+
+  @Override public void cancel() {
+    isCancel = true;
+  }
+
+  protected void handleFail(AriaException e, boolean needRetry) {
+    if (isStop || isCancel){
+      return;
+    }
+    callback.onFail(getWrapper().getEntity(), e, needRetry);
+  }
+
+  protected void onSucceed(CompleteInfo info){
+    if (isStop || isCancel){
+      return;
+    }
+    callback.onSucceed(getWrapper().getKey(), info);
+  }
+
  @Override public void run() {
    try {
      FtpUrlEntity entity = option.getUrlEntity();
--- a/SFtpComponent/src/main/java/com/arialyy/aria/sftp/download/SFtpDInfoTask.java
+++ b/SFtpComponent/src/main/java/com/arialyy/aria/sftp/download/SFtpDInfoTask.java
@@ -39,7 +39,7 @@ final class SFtpDInfoTask extends AbsSFtpInfoTask<DTaskWrapper> {
  }

  @Override protected void getFileInfo(Session session) throws JSchException,
-      UnsupportedEncodingException, SftpException {
+      UnsupportedEncodingException {
    SFtpTaskOption option = (SFtpTaskOption) getWrapper().getTaskOption();
    ChannelSftp channel = (ChannelSftp) session.openChannel("sftp");
    channel.connect(1000);
@@ -60,10 +60,9 @@ final class SFtpDInfoTask extends AbsSFtpInfoTask<DTaskWrapper> {
      getWrapper().getEntity().setFileSize(attr.getSize());
      CompleteInfo info = new CompleteInfo();
      info.code = 200;
-      callback.onSucceed(getWrapper().getKey(), info);
+      onSucceed(info);
    } else {
-      callback.onFail(getWrapper().getEntity(),
-          new AriaSFTPException(String.format("文件不存在，remotePath：%s", remotePath)), false);
+      handleFail(new AriaSFTPException(String.format("文件不存在，remotePath：%s", remotePath)), false);
    }
    channel.disconnect();
  }
--- a/SFtpComponent/src/main/java/com/arialyy/aria/sftp/upload/SFtpUInfoTask.java
+++ b/SFtpComponent/src/main/java/com/arialyy/aria/sftp/upload/SFtpUInfoTask.java
@@ -64,6 +64,6 @@ final class SFtpUInfoTask extends AbsSFtpInfoTask<UTaskWrapper> {
    info.code = isComplete ? ISCOMPLETE : 200;
    info.obj = attr;
    channel.disconnect();
-    callback.onSucceed(getWrapper().getKey(), info);
+    onSucceed(info);
  }
 }