重构文件下载部分

Author: easepan

config.json

@@ -1,27 +1,13 @@
 {
- "accessKey": "dSVVN1U-9NJrPPpiidjjh26Iyk0g8i3S5Uh922Kf",
- "secretKey": "Up3J2F0Ay9dH-Htc4wMu3eee4kMa1ifP9g43-ucW",
- "buckets": [
- {
- "bucket": "share",
- "zone": "华南",
- "url": "share.qiniu.segocat.com"
- }
- ],
- "prefix": [
- "tools/zhazhapan/",
- "zhazhapan/md/",
- "pantao/resume/",
- "pantao/photo/",
- "pantao/certificate/",
- "blogs/",
- "zhazhapan/paper/",
- "zhazhapan/pdf/",
- "zhazhapan/mp4/",
- "tutorial/vspider/",
- "pantao/identify/",
- "git/efo/",
- "yunshi/document/"
- ],
- "download": "/Users/pantao/Desktop"
-}
+"accessKey":"dSVVN1U-9NJrPPpiidjjh26Iyk0g8i3S5Uh922Kf",
+"buckets":[
+{
+"bucket":"share",
+"url":"share.qiniu.segocat.com",
+"zone":"华南"
+}
+],
+"prefixes":[],
+"secretKey":"Up3J2F0Ay9dH-Htc4wMu3eee4kMa1ifP9g43-ucW",
+"storagePath":"/Users/pantao/Desktop"
+}

src/main/java/org/code4everything/qiniu/api/QiManager.java

@@ -20,7 +20,6 @@
 import org.code4everything.qiniu.api.config.SdkConfigurer;
 import org.code4everything.qiniu.constant.QiniuValueConsts;
 import org.code4everything.qiniu.controller.MainWindowController;
-import org.code4everything.qiniu.downloader.Downloader;
 import org.code4everything.qiniu.model.FileInfo;
 import org.code4everything.qiniu.util.QiniuUtils;
 import org.code4everything.qiniu.view.Dialogs;
@@ -168,10 +167,9 @@ public void downloadCdnLog(String logDate) {
  }
  try {
  CdnResult.LogListResult logRes = SdkConfigurer.getCdnManager().getCdnLogList(domains, logDate);
- Downloader downloader = new Downloader();
  for (Map.Entry<String, LogData[]> logs : logRes.data.entrySet()) {
  for (LogData log : logs.getValue()) {
- downloader.downloadFromNet(log.url);
+ QiniuUtils.download(log.url);
  }
  }
  } catch (QiniuException e) {
@@ -209,31 +207,23 @@ private void refreshFile(String[] files) {
  }
  }
 
- public void privateDownload(String fileName, String domain) {
- privateDownload(fileName, domain, new Downloader());
- }
-
  /**
  * 私有下载
  */
- public void privateDownload(String fileName, String domain, Downloader downloader) {
+ public void privateDownload(String fileName, String domain) {
  // 自定义链接过期时间（小时）
  long expireInSeconds = 24;
  String publicURL = getPublicURL(fileName, domain);
- downloader.downloadFromNet(SdkConfigurer.getAuth().privateDownloadUrl(publicURL, expireInSeconds));
- }
-
- public void publicDownload(String fileName, String domain) {
- publicDownload(fileName, domain, new Downloader());
+ QiniuUtils.download(SdkConfigurer.getAuth().privateDownloadUrl(publicURL, expireInSeconds));
  }
 
  /**
  * 公有下载
  */
- public void publicDownload(String fileName, String domain, Downloader downloader) {
+ public void publicDownload(String fileName, String domain) {
  String url = getPublicURL(fileName, domain);
  if (Checker.isNotEmpty(url)) {
- downloader.downloadFromNet(url);
+ QiniuUtils.download(url);
  }
  }
 

src/main/java/org/code4everything/qiniu/controller/MainWindowController.java

@@ -26,7 +26,6 @@
 import org.code4everything.qiniu.api.QiManager;
 import org.code4everything.qiniu.api.config.SdkConfigurer;
 import org.code4everything.qiniu.constant.QiniuValueConsts;
-import org.code4everything.qiniu.downloader.Downloader;
 import org.code4everything.qiniu.model.FileInfo;
 import org.code4everything.qiniu.util.ConfigUtils;
 import org.code4everything.qiniu.util.QiniuUtils;
@@ -377,7 +376,7 @@ public void refreshFile() {
  */
  public void downloadFromURL() {
  String url = Dialogs.showInputDialog(null, QiniuValueConsts.DOWNLOAD_URL, "http://example.com");
- new Downloader().downloadFromNet(url);
+ QiniuUtils.download(url);
  }
 
  /**
@@ -404,16 +403,15 @@ private void download(DownloadWay way) {
  if (Checker.isNotEmpty(selectedItems)) {
  QiManager manager = new QiManager();
  String domain = "http://" + bucketDomainTextField.getText();
- Downloader downloader = new Downloader();
  if (way == DownloadWay.PUBLIC) {
  logger.debug("start to public download");
  for (FileInfo fileInfo : selectedItems) {
- manager.publicDownload(fileInfo.getName(), domain, downloader);
+ manager.publicDownload(fileInfo.getName(), domain);
  }
  } else {
  logger.debug("start to private download");
  for (FileInfo fileInfo : selectedItems) {
- manager.privateDownload(fileInfo.getName(), domain, downloader);
+ manager.privateDownload(fileInfo.getName(), domain);
  }
  }
  }

src/main/java/org/code4everything/qiniu/downloader/Downloader.java

@@ -1,12 +1,17 @@
 package org.code4everything.qiniu.util;
 
+import cn.hutool.core.lang.Validator;
+import cn.hutool.http.HttpUtil;
 import com.zhazhapan.util.FileExecutor;
 import com.zhazhapan.util.Formatter;
+import com.zhazhapan.util.ThreadPool;
 import com.zhazhapan.util.Utils;
 import com.zhazhapan.util.dialog.Alerts;
 import org.apache.log4j.Logger;
+import org.code4everything.qiniu.QiniuApplication;
 import org.code4everything.qiniu.api.config.SdkConfigurer;
 import org.code4everything.qiniu.constant.QiniuValueConsts;
+import org.code4everything.qiniu.view.Dialogs;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,6 +29,28 @@ public class QiniuUtils {
 
  private QiniuUtils() {}
 
+ /**
+ * 下载文件
+ *
+ * @param url 文件链接
+ */
+ public static void download(String url) {
+ // 验证存储路径
+ if (Validator.isEmpty(QiniuApplication.getConfigBean().getStoragePath())) {
+ // 显示存储路径输入框
+ String storagePath = Dialogs.showInputDialog(null, QiniuValueConsts.CONFIG_DOWNLOAD_PATH,
+ Utils.getCurrentWorkDir());
+ if (Validator.isEmpty(storagePath)) {
+ return;
+ }
+ QiniuApplication.getConfigBean().setStoragePath(storagePath);
+ ConfigUtils.writeConfig();
+ }
+ final String dest = QiniuApplication.getConfigBean().getStoragePath();
+ // 下载文件
+ ThreadPool.executor.execute(() -> HttpUtil.downloadFile(url, dest));
+ }
+
  /**
  * 检查是否连接网络
  */