loader 优化

FtpComponent/src/main/java/aria/apache/commons/net/ftp/FTPFile.java

@@ -55,7 +55,7 @@ public class FTPFile implements Serializable {
   /** A constant indicating file/directory write permission. ***/
   public static final int WRITE_PERMISSION = 1;
   /**
-   * A constant indicating file execute permission or directory listing
+   * A constant indicating file accept permission or directory listing
    * permission.
    ***/
   public static final int EXECUTE_PERMISSION = 2;

FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java

@@ -95,7 +95,7 @@ public class NetwareFTPEntryParser extends ConfigurableFTPFileEntryParserImpl {
    * Netware file permissions are in the following format:  RWCEAFMS, and are explained as follows:
    * <ul>
    * <li><b>S</b> - Supervisor; All rights.
-   * <li><b>R</b> - Read; Right to open and read or execute.
+   * <li><b>R</b> - Read; Right to open and read or accept.
    * <li><b>W</b> - Write; Right to open and modify.
    * <li><b>C</b> - Create; Right to create; when assigned to a file, allows a deleted file to be
    * recovered.

FtpComponent/src/main/java/aria/apache/commons/net/ftp/parser/VMSFTPEntryParser.java

@@ -164,7 +164,7 @@ public class VMSFTPEntryParser extends ConfigurableFTPFileEntryParserImpl {
 
       //Set file permission.
       //VMS has (SYSTEM,OWNER,GROUP,WORLD) users that can contain
-      //R (read) W (write) E (execute) D (delete)
+      //R (read) W (write) E (accept) D (delete)
 
       //iterate for OWNER GROUP WORLD permissions
       for (int access = 0; access < 3; access++) {

FtpComponent/src/main/java/com/arialyy/aria/ftp/FtpRecordHandler.java

@@ -17,11 +17,11 @@ package com.arialyy.aria.ftp;
 
 import com.arialyy.aria.core.TaskRecord;
 import com.arialyy.aria.core.ThreadRecord;
-import com.arialyy.aria.core.common.AbsRecordHandlerAdapter;
+import com.arialyy.aria.core.common.RecordHandler;
 import com.arialyy.aria.core.common.RecordHelper;
 import com.arialyy.aria.core.config.Configuration;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.inf.IRecordHandler;
+import com.arialyy.aria.core.loader.IRecordHandler;
 import com.arialyy.aria.core.wrapper.AbsTaskWrapper;
 import com.arialyy.aria.core.wrapper.ITaskWrapper;
 import com.arialyy.aria.util.RecordUtil;
@@ -31,9 +31,9 @@ import java.util.ArrayList;
  * @Author lyy
  * @Date 2019-09-19
  */
-public class FtpRecordAdapter extends AbsRecordHandlerAdapter {
+public class FtpRecordHandler extends RecordHandler {
 
-  public FtpRecordAdapter(AbsTaskWrapper wrapper) {
+  public FtpRecordHandler(AbsTaskWrapper wrapper) {
     super(wrapper);
   }
 

FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDLoaderAdapter.java

@@ -18,13 +18,13 @@ package com.arialyy.aria.ftp.download;
 import com.arialyy.aria.core.TaskRecord;
 import com.arialyy.aria.core.common.RecordHandler;
 import com.arialyy.aria.core.common.SubThreadConfig;
-import com.arialyy.aria.core.inf.IRecordHandler;
+import com.arialyy.aria.core.loader.IRecordHandler;
 import com.arialyy.aria.core.task.AbsNormalLoaderAdapter;
 import com.arialyy.aria.core.task.IThreadTask;
 import com.arialyy.aria.core.task.ThreadTask;
 import com.arialyy.aria.core.wrapper.AbsTaskWrapper;
 import com.arialyy.aria.core.wrapper.ITaskWrapper;
-import com.arialyy.aria.ftp.FtpRecordAdapter;
+import com.arialyy.aria.ftp.FtpRecordHandler;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.aria.util.FileUtil;
 import java.io.File;
@@ -66,7 +66,7 @@ public class FtpDLoaderAdapter extends AbsNormalLoaderAdapter {
   }
 
   @Override public IRecordHandler recordHandler(AbsTaskWrapper wrapper) {
-    FtpRecordAdapter adapter = new FtpRecordAdapter(wrapper);
+    FtpRecordHandler adapter = new FtpRecordHandler(wrapper);
     RecordHandler handler = new RecordHandler(wrapper);
     handler.setAdapter(adapter);
     return handler;

FtpComponent/src/main/java/com/arialyy/aria/ftp/download/FtpDirDLoaderUtil.java

@@ -21,7 +21,7 @@ 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.download.DTaskWrapper;
-import com.arialyy.aria.core.group.AbsGroupUtil;
+import com.arialyy.aria.core.group.AbsGroupLoaderUtil;
 import com.arialyy.aria.core.group.AbsSubDLoadUtil;
 import com.arialyy.aria.core.inf.IEntity;
 import com.arialyy.aria.core.inf.OnFileInfoCallback;
@@ -37,7 +37,7 @@ import java.util.concurrent.locks.ReentrantLock;
  * Created by Aria.Lao on 2017/7/27.
  * ftp文件夹下载工具
  */
-public class FtpDirDLoaderUtil extends AbsGroupUtil {
+public class FtpDirDLoaderUtil extends AbsGroupLoaderUtil {
   private ReentrantLock LOCK = new ReentrantLock();
   private Condition condition = LOCK.newCondition();
 

FtpComponent/src/main/java/com/arialyy/aria/ftp/upload/FtpULoaferAdapter.java

@@ -21,10 +21,10 @@ import com.arialyy.aria.core.common.RecordHandler;
 import com.arialyy.aria.core.common.SubThreadConfig;
 import com.arialyy.aria.core.task.ThreadTask;
 import com.arialyy.aria.core.wrapper.AbsTaskWrapper;
-import com.arialyy.aria.core.inf.IRecordHandler;
+import com.arialyy.aria.core.loader.IRecordHandler;
 import com.arialyy.aria.core.task.IThreadTask;
 import com.arialyy.aria.core.wrapper.ITaskWrapper;
-import com.arialyy.aria.ftp.FtpRecordAdapter;
+import com.arialyy.aria.ftp.FtpRecordHandler;
 
 /**
  * @Author lyy
@@ -48,7 +48,7 @@ class FtpULoaferAdapter extends AbsNormalLoaderAdapter {
   }
 
   @Override public IRecordHandler recordHandler(AbsTaskWrapper wrapper) {
-    FtpRecordAdapter adapter = new FtpRecordAdapter(wrapper);
+    FtpRecordHandler adapter = new FtpRecordHandler(wrapper);
     RecordHandler handler = new RecordHandler(wrapper);
     handler.setAdapter(adapter);
     return handler;