添加（上传下载）进度显示

easepan · easepan · commit b647b90eef5a · 2017-10-31T18:38:58.000+08:00
diff --git a/src/main/java/com/zhazhapan/qiniu/Downloader.java b/src/main/java/com/zhazhapan/qiniu/Downloader.java
@@ -13,6 +13,7 @@
 import org.apache.log4j.Logger;
 
 import com.zhazhapan.qiniu.config.ConfigLoader;
+import com.zhazhapan.qiniu.controller.MainWindowController;
 import com.zhazhapan.qiniu.modules.constant.Values;
 import com.zhazhapan.qiniu.util.Checker;
 import com.zhazhapan.qiniu.util.Formatter;
@@ -28,6 +29,8 @@ public class Downloader {
 
 	private Logger logger = Logger.getLogger(Downloader.class);
 
+	private double progress = 0;
+
 	/**
 	 * 下载文件
 	 */
@@ -46,6 +49,11 @@ public void downloadFromNet(String downloadURL) {
 			}
 			ConfigLoader.writeConfig();
 		}
+		MainWindowController main = MainWindowController.getInstance();
+		Platform.runLater(() -> {
+			main.downloadProgress.setVisible(true);
+			main.downloadProgress.setProgress(0);
+		});
 		ThreadPool.executor.submit(() -> {
 			checkDownloadPath();
 			logger.info("start to download url: " + downloadURL);
@@ -59,10 +67,16 @@ public void downloadFromNet(String downloadURL) {
 				URL url = new URL(downloadURL);
 				URLConnection conn = url.openConnection();
 				InputStream inStream = conn.getInputStream();
+				double size = conn.getContentLength();
+				progress = 0;
 				FileOutputStream fs = new FileOutputStream(file);
 				byte[] buffer = new byte[1024];
 				while ((byteread = inStream.read(buffer)) != -1) {
 					fs.write(buffer, 0, byteread);
+					Platform.runLater(() -> {
+						progress += 1024;
+						main.downloadProgress.setProgress(progress / size);
+					});
 				}
 				inStream.close();
 				fs.close();
@@ -72,6 +86,7 @@ public void downloadFromNet(String downloadURL) {
 				logger.error(log);
 				Platform.runLater(() -> Dialogs.showException(Values.DOWNLOAD_FILE_ERROR, e));
 			}
+			Platform.runLater(() -> main.downloadProgress.setVisible(false));
 		});
 	}
 
diff --git a/src/main/java/com/zhazhapan/qiniu/QiManager.java b/src/main/java/com/zhazhapan/qiniu/QiManager.java
@@ -184,15 +184,10 @@ public void privateDownload(String fileName, String domain) {
 	 * 私有下载
 	 */
 	public void privateDownload(String fileName, String domain, Downloader downloader) {
-		try {
-			String encodedFileName = URLEncoder.encode(fileName, "utf-8");
-			String publicUrl = String.format("%s/%s", domain, encodedFileName);
-			// 自定义链接过期时间（小时）
-			long expireInSeconds = 24;
-			downloader.downloadFromNet(QiniuApplication.auth.privateDownloadUrl(publicUrl, expireInSeconds));
-		} catch (UnsupportedEncodingException e) {
-			urlError(e);
-		}
+		// 自定义链接过期时间（小时）
+		long expireInSeconds = 24;
+		String publicURL = getPublicURL(fileName, domain);
+		downloader.downloadFromNet(QiniuApplication.auth.privateDownloadUrl(publicURL, expireInSeconds));
 	}
 
 	public void publicDownload(String fileName, String domain) {
@@ -211,8 +206,8 @@ public void publicDownload(String fileName, String domain, Downloader downloader
 
 	public String getPublicURL(String fileName, String domain) {
 		try {
-			String encodedFileName = URLEncoder.encode(fileName, "utf-8");
-			return String.format("%s/%s", domain, encodedFileName);
+			String encodedFileName = URLEncoder.encode(fileName.replaceAll(" ", "qn_code_per_20"), "utf-8");
+			return String.format("%s/%s", domain, encodedFileName.replaceAll("qn_code_per_20", "%20"));
 		} catch (UnsupportedEncodingException e) {
 			urlError(e);
 			return null;
diff --git a/src/main/java/com/zhazhapan/qiniu/controller/MainWindowController.java b/src/main/java/com/zhazhapan/qiniu/controller/MainWindowController.java
@@ -44,6 +44,7 @@
 import javafx.scene.control.DatePicker;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
+import javafx.scene.control.ProgressBar;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
@@ -140,8 +141,16 @@ public class MainWindowController {
 	@FXML
 	private DatePicker endDate;
 
+	@FXML
+	public ProgressBar uploadProgress;
+
+	@FXML
+	public ProgressBar downloadProgress;
+
 	private static MainWindowController mainWindowController = null;
 
+	private double upProgress = 0;
+
 	private String status = "";
 
 	public static MainWindowController getInstance() {
@@ -568,7 +577,11 @@ public void uploadFile() {
 		}
 		// 新建一个上传文件的线程
 		ThreadPool.executor.submit(() -> {
-			Platform.runLater(() -> uploadStatusTextArea.insertText(0, Values.CONFIGING_UPLOAD_ENVIRONMENT));
+			Platform.runLater(() -> {
+				uploadProgress.setVisible(true);
+				uploadProgress.setProgress(0);
+				uploadStatusTextArea.insertText(0, Values.CONFIGING_UPLOAD_ENVIRONMENT);
+			});
 			String bucket = bucketChoiceCombo.getValue();
 			// 默认不指定key的情况下，以文件内容的hash值作为文件名
 			String key = Checker.checkNull(filePrefixCombo.getValue());
@@ -577,6 +590,9 @@ public void uploadFile() {
 			int end = Values.UPLOADING.length() - 2;
 			Platform.runLater(
 					() -> uploadStatusTextArea.deleteText(0, Values.CONFIGING_UPLOAD_ENVIRONMENT.length() - 1));
+			// 总文件数
+			double total = paths.length;
+			upProgress = 0;
 			for (String path : paths) {
 				if (Checker.isNotEmpty(path)) {
 					Platform.runLater(() -> uploadStatusTextArea.insertText(0, Values.UPLOADING));
@@ -614,6 +630,8 @@ public void uploadFile() {
 					Platform.runLater(() -> {
 						uploadStatusTextArea.deleteText(0, end);
 						uploadStatusTextArea.insertText(0, status);
+						// 设置上传的进度
+						uploadProgress.setProgress(++upProgress / total);
 					});
 				}
 				Platform.runLater(() -> selectedFileTextArea.deleteText(0, path.length() + (paths.length > 1 ? 1 : 0)));
@@ -623,6 +641,8 @@ public void uploadFile() {
 				uploadStatusTextArea.positionCaret(0);
 				// 清空待上传的文件列表
 				selectedFileTextArea.clear();
+				// 上传完成时，设置上传进度度不可见
+				uploadProgress.setVisible(false);
 			});
 			// 添加文件前缀到配置文件
 			if (Checker.isNotEmpty(key) && !QiniuApplication.prefix.contains(key)) {
diff --git a/src/main/java/com/zhazhapan/qiniu/modules/constant/Values.java b/src/main/java/com/zhazhapan/qiniu/modules/constant/Values.java
@@ -126,4 +126,6 @@ public class Values {
 	public static final String BUCKET_BANDWIDTH_COUNT = "空间带宽（KB）";
 
 	public static final long DATE_SPAN_OF_THIRTY_ONE = (long) 31 * 24 * 60 * 60 * 1000;
+
+	public static final String UPLOADING_OR_DOWNLOADING = "有文件正在上传或下载中，是否确认退出？";
 }
diff --git a/src/main/java/com/zhazhapan/qiniu/view/MainWindow.fxml b/src/main/java/com/zhazhapan/qiniu/view/MainWindow.fxml
@@ -11,6 +11,7 @@
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.ProgressBar?>
 <?import javafx.scene.control.Tab?>
 <?import javafx.scene.control.TabPane?>
 <?import javafx.scene.control.TableColumn?>
@@ -57,7 +58,7 @@
                               </TextArea>
                               <HBox alignment="TOP_CENTER" VBox.vgrow="NEVER">
                                  <children>
-                                    <Button maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#selectFile" prefHeight="27.0" prefWidth="156.0" text="选择文件" HBox.hgrow="ALWAYS">
+                                    <Button contentDisplay="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#selectFile" prefHeight="27.0" prefWidth="156.0" text="选择文件" HBox.hgrow="ALWAYS">
                                        <HBox.margin>
                                           <Insets right="10.0" />
                                        </HBox.margin>
@@ -277,7 +278,7 @@
                               <VBox prefHeight="58.0" prefWidth="600.0" VBox.vgrow="ALWAYS" />
                               <VBox prefHeight="548.0" prefWidth="643.0">
                                  <children>
-                                    <Label text="当前版本: v1.0.4">
+                                    <Label text="当前版本: v1.0.5">
                                        <font>
                                           <Font size="20.0" />
                                        </font>
@@ -446,37 +447,43 @@
       </TabPane>
    </center>
    <top>
-      <HBox BorderPane.alignment="CENTER">
-         <children>
-            <ComboBox fx:id="bucketChoiceCombo" minHeight="-Infinity" minWidth="-Infinity" prefHeight="27.0" prefWidth="205.0" promptText="还没有选择存储空间" HBox.hgrow="NEVER">
-               <HBox.margin>
-                  <Insets left="10.0" />
-               </HBox.margin>
-            </ComboBox>
-            <TextField fx:id="zoneText" editable="false" promptText="存储区域" HBox.hgrow="NEVER">
-               <HBox.margin>
-                  <Insets left="10.0" />
-               </HBox.margin>
-            </TextField>
-            <Button fx:id="bucketAddableButton" mnemonicParsing="false" onAction="#showBucketAddableDialog" text="添加存储空间" HBox.hgrow="NEVER">
-               <HBox.margin>
-                  <Insets left="10.0" />
-               </HBox.margin>
-            </Button>
-            <Button fx:id="resetKeyButton" mnemonicParsing="false" onAction="#resetKey" text="重置密钥" HBox.hgrow="NEVER">
-               <HBox.margin>
-                  <Insets left="10.0" />
-               </HBox.margin>
-            </Button>
-            <Button mnemonicParsing="false" onAction="#openConfigFile" text="打开配置文件" HBox.hgrow="NEVER">
-               <HBox.margin>
-                  <Insets left="10.0" />
-               </HBox.margin>
-            </Button>
-         </children>
+      <VBox BorderPane.alignment="CENTER">
          <BorderPane.margin>
-            <Insets bottom="10.0" top="10.0" />
+            <Insets />
          </BorderPane.margin>
-      </HBox>
+         <children>
+            <ProgressBar fx:id="uploadProgress" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="10.0" nodeOrientation="LEFT_TO_RIGHT" prefHeight="10.0" prefWidth="500.0" progress="0.0" style="-fx-border-color: transparent;" visible="false" VBox.vgrow="NEVER" />
+            <HBox VBox.vgrow="NEVER">
+               <children>
+                  <ComboBox fx:id="bucketChoiceCombo" minHeight="-Infinity" minWidth="-Infinity" prefHeight="27.0" prefWidth="205.0" promptText="还没有选择存储空间" HBox.hgrow="NEVER">
+                     <HBox.margin>
+                        <Insets left="10.0" />
+                     </HBox.margin>
+                  </ComboBox>
+                  <TextField fx:id="zoneText" editable="false" promptText="存储区域" HBox.hgrow="NEVER">
+                     <HBox.margin>
+                        <Insets left="10.0" />
+                     </HBox.margin>
+                  </TextField>
+                  <Button fx:id="bucketAddableButton" mnemonicParsing="false" onAction="#showBucketAddableDialog" text="添加存储空间" HBox.hgrow="NEVER">
+                     <HBox.margin>
+                        <Insets left="10.0" />
+                     </HBox.margin>
+                  </Button>
+                  <Button fx:id="resetKeyButton" mnemonicParsing="false" onAction="#resetKey" text="重置密钥" HBox.hgrow="NEVER">
+                     <HBox.margin>
+                        <Insets left="10.0" />
+                     </HBox.margin>
+                  </Button>
+                  <Button mnemonicParsing="false" onAction="#openConfigFile" text="打开配置文件" HBox.hgrow="NEVER">
+                     <HBox.margin>
+                        <Insets left="10.0" />
+                     </HBox.margin>
+                  </Button>
+               </children>
+            </HBox>
+            <ProgressBar fx:id="downloadProgress" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="10.0" prefHeight="10.0" prefWidth="500.0" progress="0.0" style="-fx-border-color: transparent;" visible="false" VBox.vgrow="NEVER" />
+         </children>
+      </VBox>
    </top>
 </BorderPane>
diff --git a/src/main/java/com/zhazhapan/qiniu/view/MainWindow.java b/src/main/java/com/zhazhapan/qiniu/view/MainWindow.java
@@ -4,6 +4,7 @@
 package com.zhazhapan.qiniu.view;
 
 import java.util.Date;
+import java.util.Optional;
 
 import org.apache.log4j.Logger;
 
@@ -18,8 +19,10 @@
 
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
+import javafx.scene.control.ButtonType;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
 
 /**
  * @author pantao
@@ -55,7 +58,17 @@ public void init() {
 			Dialogs.showFatalError(Values.INIT_APP_ERROR_HEADER, e);
 		}
 		stage.setTitle(Values.MAIN_TITLE);
-		stage.setOnCloseRequest((e) -> {
+		stage.setOnCloseRequest((WindowEvent event) -> {
+			// 判断是否有文件在上传下载
+			MainWindowController main = MainWindowController.getInstance();
+			if (main.downloadProgress.isVisible() || main.uploadProgress.isVisible()) {
+				Optional<ButtonType> result = Dialogs.showConfirmation(Values.UPLOADING_OR_DOWNLOADING);
+				if (result.get() != ButtonType.OK) {
+					// 取消退出事件
+					event.consume();
+					return;
+				}
+			}
 			ThreadPool.shutdown();
 			ConfigLoader.checkWorkPath();
 			FileExecutor executor = new FileExecutor();

Original file line number	Diff line number	Diff line change
`@@ -126,4 +126,6 @@ public class Values {`
`126`	`126`	`public static final String BUCKET_BANDWIDTH_COUNT = "空间带宽（KB）";`
`127`	`127`
`128`	`128`	`public static final long DATE_SPAN_OF_THIRTY_ONE = (long) 31 * 24 * 60 * 60 * 1000;`
	`129`	`+`
	`130`	`+ public static final String UPLOADING_OR_DOWNLOADING = "有文件正在上传或下载中，是否确认退出？";`
`129`	`131`	`}`