重构文件操作部分

Author: easepan

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

@@ -6,19 +6,8 @@
 import com.qiniu.http.Response;
 import com.qiniu.storage.BucketManager;
 import com.qiniu.storage.model.BatchStatus;
-import com.zhazhapan.util.Checker;
-import com.zhazhapan.util.Formatter;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import org.apache.log4j.Logger;
-import org.code4everything.qiniu.QiniuApplication;
-import org.code4everything.qiniu.constant.QiniuValueConsts;
-import org.code4everything.qiniu.controller.MainWindowController;
-import org.code4everything.qiniu.model.FileBean;
-import org.code4everything.qiniu.util.DialogUtils;
-import org.code4everything.qiniu.util.QiniuUtils;
-
-import java.util.ArrayList;
+
 import java.util.Map;
 
 /**
@@ -31,20 +20,25 @@ public class SdkManager {
  /**
  * 自定义私有链接过期时间
  */
- private static final long EXPIRE_IN_SECONDS = 24 * 60 * 60;
+ private static final long EXPIRE_IN_SECONDS = 24 * 60 * 60L;
+
+ /**
+ * 文件列表大小
+ */
+ private static final int LIST_SIZE = 1000;
 
 
  /**
  * 获取空间带宽统计
  */
- public CdnResult.BandwidthResult getBucketBandwidth(String[] domains, String startDate, String endDate) throws QiniuException {
+ public CdnResult.BandwidthResult getBandwidthData(String[] domains, String startDate, String endDate) throws QiniuException {
  return SdkConfigurer.getCdnManager().getBandwidthData(domains, startDate, endDate, "day");
  }
 
  /**
  * 获取空间的流量统计
  */
- public CdnResult.FluxResult getBucketFlux(String[] domains, String startDate, String endDate) throws QiniuException {
+ public CdnResult.FluxResult getFluxData(String[] domains, String startDate, String endDate) throws QiniuException {
  return SdkConfigurer.getCdnManager().getFluxData(domains, startDate, endDate, "day");
  }
 
@@ -73,168 +67,65 @@ public String getPrivateUrl(String publicUrl) {
  /**
  * 更新镜像源
  */
- public void updateFile(String bucket, String key) {
- String log = "update file '" + key + "' on bucket '" + bucket;
- try {
- SdkConfigurer.getBucketManager().prefetch(bucket, key);
- LOGGER.info(log + "' success");
- } catch (QiniuException e) {
- LOGGER.error(log + "' error, message: " + e.getMessage());
- DialogUtils.showException(QiniuValueConsts.UPDATE_ERROR, e);
- }
+ public void prefetch(String bucket, String key) throws QiniuException {
+ SdkConfigurer.getBucketManager().prefetch(bucket, key);
  }
 
  /**
  * 设置文件生存时间
  */
- public void setFileLife(String bucket, String key, int days) {
- String log = "set file of '" + key + "' life to " + days + " day(s) ";
- try {
- SdkConfigurer.getBucketManager().deleteAfterDays(bucket, key, days);
- LOGGER.info(log + "success");
- } catch (QiniuException e) {
- LOGGER.error(log + "error, message: " + e.getMessage());
- DialogUtils.showException(QiniuValueConsts.MOVE_OR_RENAME_ERROR, e);
- }
+ public void deleteAfterDays(String bucket, String key, int days) throws QiniuException {
+ SdkConfigurer.getBucketManager().deleteAfterDays(bucket, key, days);
  }
 
  /**
- * 重命令文件
+ * 重命名文件
  */
- public Boolean renameFile(String bucket, String oldName, String newName) {
- return moveFile(bucket, oldName, bucket, newName);
+ public void renameFile(String bucket, String oldName, String newName) throws QiniuException {
+ moveFile(bucket, oldName, bucket, newName);
  }
 
  /**
  * 移动文件
  */
- private boolean moveFile(String fromBucket, String fromKey, String toBucket, String toKey) {
- return moveOrCopyFile(fromBucket, fromKey, toBucket, toKey, FileAction.MOVE);
+ public void moveFile(String srcBucket, String fromKey, String destBucket, String toKey) throws QiniuException {
+ moveOrCopyFile(srcBucket, fromKey, destBucket, toKey, FileAction.MOVE);
  }
 
  /**
  * 移动或复制文件
  */
- public boolean moveOrCopyFile(String fromBucket, String fromKey, String toBucket, String toKey, FileAction action) {
- if (QiniuUtils.checkNet()) {
- String log = "move file '" + fromKey + "' from bucket '" + fromBucket + "' to bucket '" + toBucket + "', "
- + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "and rename file '" + toKey + "'";
- try {
- if (action == FileAction.COPY) {
- log = log.replaceAll("^move", "copy");
- SdkConfigurer.getBucketManager().copy(fromBucket, fromKey, toBucket, toKey, true);
- } else {
- SdkConfigurer.getBucketManager().move(fromBucket, fromKey, toBucket, toKey, true);
- }
- LOGGER.info(log + " success");
- return true;
- } catch (QiniuException e) {
- LOGGER.error(log + " failed, message: " + e.getMessage());
- DialogUtils.showException(QiniuValueConsts.MOVE_OR_RENAME_ERROR, e);
- return false;
- }
+ public void moveOrCopyFile(String srcBucket, String srcKey, String destBucket, String destKey,
+ FileAction fileAction) throws QiniuException {
+ if (FileAction.COPY == fileAction) {
+ SdkConfigurer.getBucketManager().copy(srcBucket, srcKey, destBucket, destKey, true);
+ } else {
+ SdkConfigurer.getBucketManager().move(srcBucket, srcKey, destBucket, destKey, true);
  }
- return false;
  }
 
  /**
  * 修改文件类型
  */
- public boolean changeType(String fileName, String newType, String bucket) {
- if (QiniuUtils.checkNet()) {
- String log = "change file '" + fileName + "' type '" + newType + "' on bucket '" + bucket;
- try {
- SdkConfigurer.getBucketManager().changeMime(bucket, fileName, newType);
- LOGGER.info(log + "' success");
- return true;
- } catch (QiniuException e) {
- LOGGER.error(log + "' failed, message: " + e.getMessage());
- DialogUtils.showException(QiniuValueConsts.CHANGE_FILE_TYPE_ERROR, e);
- return false;
- }
- }
- return false;
+ public void changeMime(String fileName, String newType, String bucket) throws QiniuException {
+ SdkConfigurer.getBucketManager().changeMime(bucket, fileName, newType);
  }
 
  /**
  * 批量删除文件，单次批量请求的文件数量不得超过1000
  */
- public void deleteFiles(ObservableList<FileBean> fileInfos, String bucket) {
- if (Checker.isNotEmpty(fileInfos) && QiniuUtils.checkNet()) {
- // 生成待删除的文件列表
- String[] files = new String[fileInfos.size()];
- ArrayList<FileBean> seletecFileInfos = new ArrayList<>();
- int i = 0;
- for (FileBean fileInfo : fileInfos) {
- files[i++] = fileInfo.getName();
- seletecFileInfos.add(fileInfo);
- }
- try {
- BucketManager.BatchOperations batchOperations = new BucketManager.BatchOperations();
- batchOperations.addDeleteOp(bucket, files);
- Response response = SdkConfigurer.getBucketManager().batch(batchOperations);
- BatchStatus[] batchStatusList = response.jsonToObject(BatchStatus[].class);
- MainWindowController main = MainWindowController.getInstance();
- // 文件列表是否为搜索后结果
- boolean sear = Checker.isNotEmpty(main.searchTextField.getText());
- ObservableList<FileBean> currentRes = main.resTable.getItems();
- for (i = 0; i < files.length; i++) {
- BatchStatus status = batchStatusList[i];
- String file = files[i];
- if (status.code == 200) {
- LOGGER.info("delete file '" + file + "' success");
- QiniuApplication.data.remove(seletecFileInfos.get(i));
- QiniuApplication.totalLength--;
- QiniuApplication.totalSize -= Formatter.sizeToLong(seletecFileInfos.get(i).getSize());
- if (sear) {
- currentRes.remove(seletecFileInfos.get(i));
- }
- } else {
- LOGGER.error("delete file '" + file + "' failed, message: " + status.data.error);
- DialogUtils.showError("删除文件：" + file + " 失败");
- }
- }
- } catch (QiniuException e) {
- DialogUtils.showException(QiniuValueConsts.DELETE_ERROR, e);
- }
- MainWindowController.getInstance().setBucketCount();
- }
+ public BatchStatus[] batchDelete(String bucket, String[] keys) throws QiniuException {
+ BucketManager.BatchOperations batchOperations = new BucketManager.BatchOperations();
+ batchOperations.addDeleteOp(bucket, keys);
+ Response response = SdkConfigurer.getBucketManager().batch(batchOperations);
+ return response.jsonToObject(BatchStatus[].class);
  }
 
  /**
- * 获取空间文件列表，并映射到FileInfo
+ * 获取空间文件列表
  */
- public void listFileOfBucket() {
- MainWindowController main = MainWindowController.getInstance();
- // 列举空间文件列表
- String bucket = main.bucketChoiceCombo.getValue();
- BucketManager.FileListIterator iterator = SdkConfigurer.getBucketManager().createFileListIterator(bucket, "",
- QiniuValueConsts.BUCKET_LIST_LIMIT_SIZE, "");
- ArrayList<FileBean> files = new ArrayList<>();
- LOGGER.info("get file list of bucket: " + bucket);
- QiniuApplication.totalLength = 0;
- QiniuApplication.totalSize = 0;
- // 处理获取的file list结果
- while (iterator.hasNext()) {
- com.qiniu.storage.model.FileInfo[] items = iterator.next();
- for (com.qiniu.storage.model.FileInfo item : items) {
- QiniuApplication.totalLength++;
- QiniuApplication.totalSize += item.fsize;
- // 将七牛的时间单位（100纳秒）转换成毫秒，然后转换成时间
- String time = Formatter.timeStampToString(item.putTime / 10000);
- String size = Formatter.formatSize(item.fsize);
- FileBean file = new FileBean(item.key, item.mimeType, size, time);
- files.add(file);
- LOGGER.info("file name: " + item.key + ", file type: " + item.mimeType + ", file size: " + size + ", "
- + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "file time: " + time);
- }
- }
- QiniuApplication.data = FXCollections.observableArrayList(files);
- }
-
- private void urlError(Exception e) {
- LOGGER.error("generate url error: " + e.getMessage());
- DialogUtils.showException(QiniuValueConsts.GENERATE_URL_ERROR, e);
+ public BucketManager.FileListIterator getFileListIterator(String bucket) {
+ return SdkConfigurer.getBucketManager().createFileListIterator(bucket, "", LIST_SIZE, "");
  }
 
  public enum FileAction {

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

@@ -166,7 +166,7 @@ private void initialize() {
  nameCol.setOnEditCommit(v -> {
  String name;
  FileBean fileInfo = v.getTableView().getItems().get(v.getTablePosition().getRow());
- if (new SdkManager().renameFile(bucketChoiceCombo.getValue(), v.getOldValue(), v.getNewValue())) {
+ if (service.renameFile(bucketChoiceCombo.getValue(), v.getOldValue(), v.getNewValue())) {
  name = v.getNewValue();
  } else {
  name = v.getOldValue();
@@ -182,7 +182,7 @@ private void initialize() {
  typeCol.setOnEditCommit(v -> {
  FileBean fileInfo = v.getTableView().getItems().get(v.getTablePosition().getRow());
  String type;
- if (new SdkManager().changeType(fileInfo.getName(), v.getNewValue(), bucketChoiceCombo.getValue())) {
+ if (service.changeType(fileInfo.getName(), v.getNewValue(), bucketChoiceCombo.getValue())) {
  type = v.getNewValue();
  } else {
  type = v.getOldValue();
@@ -371,7 +371,7 @@ public void downloadCdnLog() {
  * 文件刷新，cdn相关
  */
  public void refreshFile() {
- service.refreshFile(resTable.getSelectionModel().getSelectedItems(), bucketDomainTextField.getText());
+ service.refreshFiles(resTable.getSelectionModel().getSelectedItems(), bucketDomainTextField.getText());
  }
 
  /**
@@ -411,7 +411,7 @@ private void download(DownloadWay way) {
  } else {
  logger.debug("start to private download");
  for (FileBean fileInfo : selectedItems) {
- service.publicDownload(fileInfo.getName(), bucketDomainTextField.getText());
+ service.privateDownload(fileInfo.getName(), bucketDomainTextField.getText());
  }
  }
  }
@@ -430,9 +430,8 @@ public void publicDownload() {
  public void updateFile() {
  ObservableList<FileBean> selectedItems = resTable.getSelectionModel().getSelectedItems();
  if (Checker.isNotEmpty(selectedItems)) {
- SdkManager manager = new SdkManager();
  for (FileBean fileInfo : selectedItems) {
- manager.updateFile(bucketChoiceCombo.getValue(), fileInfo.getName());
+ service.updateFiles(bucketChoiceCombo.getValue(), fileInfo.getName());
  }
  }
  }
@@ -447,9 +446,8 @@ public void setLife() {
  QiniuValueConsts.DEFAULT_FILE_LIFE);
  if (Checker.isNumber(lifeStr)) {
  int life = Formatter.stringToInt(lifeStr);
- SdkManager manager = new SdkManager();
  for (FileBean fileInfo : selectedItems) {
- manager.setFileLife(bucketChoiceCombo.getValue(), fileInfo.getName(), life);
+ service.setFilesLife(bucketChoiceCombo.getValue(), fileInfo.getName(), life);
  }
  }
  }
@@ -473,12 +471,11 @@ public void showFileMovableDialog() {
  if (Checker.isNotNull(pair)) {
  boolean useNewKey = Checker.isNotEmpty(pair.getValue()[1]);
  ObservableList<FileBean> resData = resTable.getItems();
- SdkManager manager = new SdkManager();
  for (FileBean fileInfo : selectedItems) {
  String fb = bucketChoiceCombo.getValue();
  String tb = pair.getValue()[0];
  String name = useNewKey ? pair.getValue()[1] : fileInfo.getName();
- boolean move = manager.moveOrCopyFile(fb, fileInfo.getName(), tb, name, pair.getKey());
+ boolean move = service.moveOrCopyFile(fb, fileInfo.getName(), tb, name, pair.getKey());
  if (pair.getKey() == SdkManager.FileAction.MOVE && move) {
  boolean sear = Checker.isNotEmpty(searchTextField.getText());
  if (fb.equals(tb)) {
@@ -506,8 +503,7 @@ public void showFileMovableDialog() {
  * 删除文件
  */
  public void deleteFiles() {
- ObservableList<FileBean> fileInfos = resTable.getSelectionModel().getSelectedItems();
- new SdkManager().deleteFiles(fileInfos, bucketChoiceCombo.getValue());
+ service.deleteFiles(resTable.getSelectionModel().getSelectedItems(), bucketChoiceCombo.getValue());
  }
 
  /**
@@ -572,7 +568,7 @@ public void refreshResTable() {
  */
  private void setResTableData() {
  ThreadPool.executor.submit(() -> {
- new SdkManager().listFileOfBucket();
+ service.listFile();
  Platform.runLater(() -> {
  resTable.setItems(QiniuApplication.data);
  setBucketCount();