ftp 文件夹

2017-07-26 18:02:25 +08:00
parent 10d208bad7
commit a5b41c0d2e
10 changed files with 363 additions and 102 deletions
--- a/Aria/src/main/java/com/arialyy/aria/core/download/DownloadTaskEntity.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/DownloadTaskEntity.java
@@ -25,11 +25,6 @@ import com.arialyy.aria.orm.OneToOne;
 */
 public class DownloadTaskEntity extends AbsTaskEntity<DownloadEntity> {

-  /**
-   * 账号和密码
-   */
-  @Ignore public String userName, userPw, account;
-
  @OneToOne(table = DownloadEntity.class, key = "downloadPath") public DownloadEntity entity;

  /**
--- a/Aria/src/main/java/com/arialyy/aria/core/download/FtpDirDownloadTarget.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/FtpDirDownloadTarget.java
@@ -16,6 +16,7 @@
 package com.arialyy.aria.core.download;

 import android.text.TextUtils;
+import android.util.Log;
 import com.arialyy.aria.core.inf.AbsTaskEntity;
 import com.arialyy.aria.orm.DbEntity;

@@ -24,7 +25,8 @@ import com.arialyy.aria.orm.DbEntity;
 * ftp文件夹下载
 */
 public class FtpDirDownloadTarget
-    extends BaseGroupTarget<FtpDownloadTarget, DownloadGroupTaskEntity> {
+    extends BaseGroupTarget<FtpDirDownloadTarget, DownloadGroupTaskEntity> {
+  private final String TAG = "FtpDirDownloadTarget";
  private String serverIp, remotePath, mGroupName;
  private int port;

@@ -58,4 +60,44 @@ public class FtpDirDownloadTarget
    }
    mEntity = mTaskEntity.entity;
  }
+
+  /**
+   * 设置字符编码
+   */
+  public FtpDirDownloadTarget charSet(String charSet) {
+    if (TextUtils.isEmpty(charSet)) return this;
+    mTaskEntity.charSet = charSet;
+    return this;
+  }
+
+  /**
+   * ftp 用户登录信息
+   *
+   * @param userName ftp用户名
+   * @param password ftp用户密码
+   */
+  public FtpDirDownloadTarget login(String userName, String password) {
+    return login(userName, password, null);
+  }
+
+  /**
+   * ftp 用户登录信息
+   *
+   * @param userName ftp用户名
+   * @param password ftp用户密码
+   * @param account ftp账号
+   */
+  public FtpDirDownloadTarget login(String userName, String password, String account) {
+    if (TextUtils.isEmpty(userName)) {
+      Log.e(TAG, "用户名不能为null");
+      return this;
+    } else if (TextUtils.isEmpty(password)) {
+      Log.e(TAG, "密码不能为null");
+      return this;
+    }
+    mTaskEntity.userName = userName;
+    mTaskEntity.userPw = password;
+    mTaskEntity.account = account;
+    return this;
+  }
 }
--- a/Aria/src/main/java/com/arialyy/aria/core/download/downloader/AbsFtpInfoThread.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/downloader/AbsFtpInfoThread.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2016 AriaLyy(https://github.com/AriaLyy/Aria)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.arialyy.aria.core.download.downloader;
+
+import android.text.TextUtils;
+import android.util.Log;
+import com.arialyy.aria.core.AriaManager;
+import com.arialyy.aria.core.inf.AbsEntity;
+import com.arialyy.aria.core.inf.AbsGroupEntity;
+import com.arialyy.aria.core.inf.AbsTaskEntity;
+import com.arialyy.aria.util.CommonUtil;
+import java.io.IOException;
+import org.apache.commons.net.ftp.FTP;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
+import org.apache.commons.net.ftp.FTPReply;
+
+/**
+ * Created by Aria.Lao on 2017/7/25.
+ * 获取ftp文件夹信息
+ */
+abstract class AbsFtpInfoThread<ENTITY extends AbsEntity, TASK_ENTITY extends AbsTaskEntity<ENTITY>>
+    implements Runnable {
+
+  private final String TAG = "HttpFileInfoThread";
+  private ENTITY mEntity;
+  private TASK_ENTITY mTaskEntity;
+  private int mConnectTimeOut;
+  private OnFileInfoCallback mCallback;
+  private boolean isDir = false;
+
+  AbsFtpInfoThread(TASK_ENTITY taskEntity, OnFileInfoCallback callback) {
+    mTaskEntity = taskEntity;
+    mEntity = taskEntity.getEntity();
+    mConnectTimeOut =
+        AriaManager.getInstance(AriaManager.APP).getDownloadConfig().getConnectTimeOut();
+    mCallback = callback;
+    isDir = mEntity instanceof AbsGroupEntity;
+  }
+
+  @Override public void run() {
+    FTPClient client = null;
+    try {
+      client = new FTPClient();
+      String[] pp = mEntity.getKey().split("/")[2].split(":");
+      String fileName = mTaskEntity.remotePath;
+      client.connect(pp[0], Integer.parseInt(pp[1]));
+      if (!TextUtils.isEmpty(mTaskEntity.account)) {
+        client.login(mTaskEntity.userName, mTaskEntity.userPw);
+      } else {
+        client.login(mTaskEntity.userName, mTaskEntity.userPw, mTaskEntity.account);
+      }
+      int reply = client.getReplyCode();
+      if (!FTPReply.isPositiveCompletion(reply)) {
+        client.disconnect();
+        failDownload("无法连接到ftp服务器，错误码为：" + reply);
+        return;
+      }
+      client.setDataTimeout(mConnectTimeOut);
+      client.enterLocalPassiveMode();
+      client.setFileType(FTP.BINARY_FILE_TYPE);
+      FTPFile[] files =
+          client.listFiles(CommonUtil.strCharSetConvert(fileName, mTaskEntity.charSet));
+      long size = getFileSize(files, client, fileName);
+      mEntity.setFileSize(size);
+      mTaskEntity.code = reply;
+      mEntity.update();
+      mTaskEntity.update();
+      mCallback.onComplete(mEntity.getKey(), reply);
+    } catch (IOException e) {
+      failDownload(e.getMessage());
+    } finally {
+      if (client != null) {
+        try {
+          client.logout();
+          client.disconnect();
+        } catch (IOException e) {
+          e.printStackTrace();
+        }
+      }
+    }
+  }
+
+  /**
+   * 遍历FTP服务器上对应文件或文件夹大小
+   *
+   * @throws IOException
+   */
+  private long getFileSize(FTPFile[] files, FTPClient client, String dirName) throws IOException {
+    long size = 0;
+    String path = dirName + "/";
+    for (FTPFile file : files) {
+      if (file.isFile()) {
+        size += file.getSize();
+      } else {
+        size += getFileSize(client.listFiles(
+            CommonUtil.strCharSetConvert(path + file.getName(), mTaskEntity.charSet)), client,
+            path + file.getName());
+      }
+    }
+    return size;
+  }
+
+  /**
+   * 处理FTP文件信息
+   *
+   * @param remotePath ftp服务器文件夹路径
+   * @param ftpFile ftp服务器上对应的文件
+   */
+  void handleFile(String remotePath, FTPFile ftpFile) {
+  }
+
+  private void failDownload(String errorMsg) {
+    Log.e(TAG, errorMsg);
+    if (mCallback != null) {
+      mCallback.onFail(mEntity.getKey(), errorMsg);
+    }
+  }
+}
--- a/Aria/src/main/java/com/arialyy/aria/core/download/downloader/FtpDirInfoThread.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/downloader/FtpDirInfoThread.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2016 AriaLyy(https://github.com/AriaLyy/Aria)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.arialyy.aria.core.download.downloader;
+
+import com.arialyy.aria.core.download.DownloadGroupEntity;
+import com.arialyy.aria.core.download.DownloadGroupTaskEntity;
+import org.apache.commons.net.ftp.FTPFile;
+
+/**
+ * Created by Aria.Lao on 2017/7/25.
+ * 获取ftp文件夹信息
+ */
+class FtpDirInfoThread extends AbsFtpInfoThread<DownloadGroupEntity, DownloadGroupTaskEntity> {
+
+  FtpDirInfoThread(DownloadGroupTaskEntity taskEntity, OnFileInfoCallback callback) {
+    super(taskEntity, callback);
+  }
+
+  @Override void handleFile(String remotePath, FTPFile ftpFile) {
+    super.handleFile(remotePath, ftpFile);
+  }
+}
--- a/Aria/src/main/java/com/arialyy/aria/core/download/downloader/FtpFileInfoThread.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/downloader/FtpFileInfoThread.java
@@ -15,105 +15,16 @@
 */
 package com.arialyy.aria.core.download.downloader;

-import android.text.TextUtils;
-import android.util.Log;
-import com.arialyy.aria.core.AriaManager;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.download.DownloadTaskEntity;
-import com.arialyy.aria.util.CommonUtil;
-import java.io.IOException;
-import org.apache.commons.net.ftp.FTP;
-import org.apache.commons.net.ftp.FTPClient;
-import org.apache.commons.net.ftp.FTPFile;
-import org.apache.commons.net.ftp.FTPReply;

 /**
 * Created by Aria.Lao on 2017/7/25.
 * 获取ftp文件信息
 */
-class FtpFileInfoThread implements Runnable {
-
-  private final String TAG = "HttpFileInfoThread";
-  private DownloadEntity mEntity;
-  private DownloadTaskEntity mTaskEntity;
-  private int mConnectTimeOut;
-  private OnFileInfoCallback mCallback;
+class FtpFileInfoThread extends AbsFtpInfoThread<DownloadEntity, DownloadTaskEntity> {

  FtpFileInfoThread(DownloadTaskEntity taskEntity, OnFileInfoCallback callback) {
-    this.mTaskEntity = taskEntity;
-    mEntity = taskEntity.getEntity();
-    mConnectTimeOut =
-        AriaManager.getInstance(AriaManager.APP).getDownloadConfig().getConnectTimeOut();
-    mCallback = callback;
-  }
-
-  @Override public void run() {
-    FTPClient client = null;
-    try {
-      client = new FTPClient();
-      String[] pp = mEntity.getDownloadUrl().split("/")[2].split(":");
-      String fileName = mTaskEntity.remotePath;
-      client.connect(pp[0], Integer.parseInt(pp[1]));
-      if (!TextUtils.isEmpty(mTaskEntity.account)) {
-        client.login(mTaskEntity.userName, mTaskEntity.userPw);
-      } else {
-        client.login(mTaskEntity.userName, mTaskEntity.userPw, mTaskEntity.account);
-      }
-      int reply = client.getReplyCode();
-      if (!FTPReply.isPositiveCompletion(reply)) {
-        client.disconnect();
-        failDownload("无法连接到ftp服务器，错误码为：" + reply);
-        return;
-      }
-      client.setDataTimeout(mConnectTimeOut);
-      client.enterLocalPassiveMode();
-      client.setFileType(FTP.BINARY_FILE_TYPE);
-      FTPFile[] files =
-          client.listFiles(CommonUtil.strCharSetConvert(fileName, mTaskEntity.charSet));
-      long size = getFileSize(files, client, fileName);
-      mEntity.setFileSize(size);
-      mTaskEntity.code = reply;
-      mEntity.update();
-      mTaskEntity.update();
-      mCallback.onComplete(mEntity.getDownloadUrl(), reply);
-    } catch (IOException e) {
-      failDownload(e.getMessage());
-    } finally {
-      if (client != null) {
-        try {
-          client.logout();
-          client.disconnect();
-        } catch (IOException e) {
-          e.printStackTrace();
-        }
-      }
-    }
-  }
-
-  /**
-   * 遍历FTP服务器上对应文件或文件夹大小
-   *
-   * @throws IOException
-   */
-  private long getFileSize(FTPFile[] files, FTPClient client, String dirName) throws IOException {
-    long size = 0;
-    String path = dirName + "/";
-    for (FTPFile file : files) {
-      if (file.isFile()) {
-        size += file.getSize();
-      } else {
-        size += getFileSize(client.listFiles(
-            CommonUtil.strCharSetConvert(path + file.getName(), mTaskEntity.charSet)), client,
-            path + file.getName());
-      }
-    }
-    return size;
-  }
-
-  private void failDownload(String errorMsg) {
-    Log.e(TAG, errorMsg);
-    if (mCallback != null) {
-      mCallback.onFail(mEntity.getDownloadUrl(), errorMsg);
-    }
+    super(taskEntity, callback);
  }
 }
--- a/Aria/src/main/java/com/arialyy/aria/core/inf/AbsTaskEntity.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/inf/AbsTaskEntity.java
@@ -39,6 +39,11 @@ public abstract class AbsTaskEntity<ENTITY extends AbsEntity> extends DbEntity {
   */
  public String remotePath;

+  /**
+   * 账号和密码
+   */
+  @Ignore public String userName, userPw, account;
+
  /**
   * 请求类型
   * {@link AbsTaskEntity#HTTP}、{@link AbsTaskEntity#FTP}