Skip to content
This repository was archived by the owner on Mar 6, 2024. It is now read-only.

Commit 12c9ea6

Browse files
easepaneasepan
committed
支持拖曳文件，窗口自适应
1 parent b956269 commit 12c9ea6

File tree

8 files changed

+285
-311
lines changed

8 files changed

+285
-311
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
113113
**4. 其他**
114114

115-
- [**下载可执行的jar包**](http://oq3iwfipo.bkt.clouddn.com/tools/zhazhapan/qiniu.jar?v=4 "七牛云——对象存储管理工具jar包下载地址")
115+
- [**下载可执行的jar包**](http://oq3iwfipo.bkt.clouddn.com/tools/zhazhapan/qiniu.jar?v=5 "七牛云——对象存储管理工具jar包下载地址")
116116

117117
- [**历史版本**](https://github.com/zhazhapan/qiniu/releases)
118118

‎src/main/java/com/zhazhapan/qiniu/QiManager.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.qiniu.http.Response;
2020
import com.qiniu.storage.BucketManager;
2121
import com.qiniu.storage.model.BatchStatus;
22-
import com.zhazhapan.qiniu.config.QiConfig;
22+
import com.zhazhapan.qiniu.config.QiConfiger;
2323
import com.zhazhapan.qiniu.controller.MainWindowController;
2424
import com.zhazhapan.qiniu.model.FileInfo;
2525
import com.zhazhapan.qiniu.modules.constant.Values;
@@ -265,7 +265,7 @@ public boolean moveFile(String fromBucket, String fromKey, String toBucket, Stri
265265
* 移动或复制文件
266266
*/
267267
public boolean moveOrCopyFile(String fromBucket, String fromKey, String toBucket, String toKey, FileAction action) {
268-
if (new QiConfig().checkNet()) {
268+
if (new QiConfiger().checkNet()) {
269269
String log = "move file '" + fromKey + "' from bucket '" + fromBucket + "' to bucket '" + toBucket
270270
+ "', and rename file '" + toKey + "'";
271271
try {
@@ -290,7 +290,7 @@ public boolean moveOrCopyFile(String fromBucket, String fromKey, String toBucket
290290
* 修改文件类型
291291
*/
292292
public boolean changeType(String fileName, String newType, String bucket) {
293-
if (new QiConfig().checkNet()) {
293+
if (new QiConfiger().checkNet()) {
294294
String log = "change file '" + fileName + "' type '" + newType + "' on bucket '" + bucket;
295295
try {
296296
QiniuApplication.bucketManager.changeMime(bucket, fileName, newType);
@@ -309,7 +309,7 @@ public boolean changeType(String fileName, String newType, String bucket) {
309309
* 批量删除文件，单次批量请求的文件数量不得超过1000
310310
*/
311311
public void deleteFiles(ObservableList<FileInfo> fileInfos, String bucket) {
312-
if (Checker.isNotEmpty(fileInfos) && new QiConfig().checkNet()) {
312+
if (Checker.isNotEmpty(fileInfos) && new QiConfiger().checkNet()) {
313313
// 生成待删除的文件列表
314314
String[] files = new String[fileInfos.size()];
315315
ArrayList<FileInfo> seletecFileInfos = new ArrayList<FileInfo>();

‎src/main/java/com/zhazhapan/qiniu/config/ConfigLoader.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static void loadConfig() {
5656
String ak = json.get("accesskey").getAsString();
5757
String sk = json.get("secretkey").getAsString();
5858
QiniuApplication.key = new Key(ak, sk);
59-
new QiConfig().createAuth(ak, sk);
59+
new QiConfiger().createAuth(ak, sk);
6060
} catch (Exception e) {
6161
logger.error("read key from configuration failed, message: " + e.getMessage());
6262
Dialogs.showException(Values.LOAD_CONFIG_ERROR, e);
@@ -144,7 +144,7 @@ public static void showInputKeyDialog() {
144144
}
145145

146146
public static void writeKey(String accessKey, String secretKey) {
147-
new QiConfig().createAuth(accessKey, secretKey);
147+
new QiConfiger().createAuth(accessKey, secretKey);
148148
QiniuApplication.key = new Key(accessKey, secretKey);
149149
writeConfig();
150150
}

‎src/main/java/com/zhazhapan/qiniu/config/QiConfig.java renamed to ‎src/main/java/com/zhazhapan/qiniu/config/QiConfiger.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
*
2828
*/
2929

30-
public class QiConfig {
30+
public class QiConfiger {
3131

32-
private Logger logger = Logger.getLogger(QiConfig.class);
32+
private Logger logger = Logger.getLogger(QiConfiger.class);
3333

3434
/**
3535
* 创建上传需要的Auth

‎src/main/java/com/zhazhapan/qiniu/controller/MainWindowController.java

+29-6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.zhazhapan.qiniu.ThreadPool;
2525
import com.zhazhapan.qiniu.QiManager.FileAction;
2626
import com.zhazhapan.qiniu.config.ConfigLoader;
27-
import com.zhazhapan.qiniu.config.QiConfig;
27+
import com.zhazhapan.qiniu.config.QiConfiger;
2828
import com.zhazhapan.qiniu.model.FileInfo;
2929
import com.zhazhapan.qiniu.modules.constant.Values;
3030
import com.zhazhapan.qiniu.util.Checker;
@@ -51,7 +51,9 @@
5151
import javafx.scene.control.TextField;
5252
import javafx.scene.control.cell.PropertyValueFactory;
5353
import javafx.scene.control.cell.TextFieldTableCell;
54+
import javafx.scene.input.DragEvent;
5455
import javafx.scene.input.KeyEvent;
56+
import javafx.scene.input.TransferMode;
5557
import javafx.stage.FileChooser;
5658
import javafx.util.Pair;
5759

@@ -208,7 +210,7 @@ private void initialize() {
208210
bucketDomainTextField.setText(Values.DOMAIN_CONFIG_ERROR);
209211
}
210212
ThreadPool.executor.submit(() -> {
211-
if (new QiConfig().configUploadEnv(zones[0], newValue)) {
213+
if (new QiConfiger().configUploadEnv(zones[0], newValue)) {
212214
// 加载文件列表
213215
setResTableData();
214216
// 刷新流量带宽统计
@@ -227,6 +229,22 @@ private void initialize() {
227229
toIntro1.setOnAction(e -> Utils.openLink("http://blog.csdn.net/qq_26954773/article/details/78245100"));
228230
}
229231

232+
/**
233+
* 拖曳文件至TextArea
234+
*/
235+
public void dragFileOver(DragEvent event) {
236+
logger.info("drog file in textarea");
237+
event.acceptTransferModes(TransferMode.ANY);
238+
}
239+
240+
/**
241+
* 拖曳文件松开鼠标
242+
*/
243+
public void dragFileDropped(DragEvent event) {
244+
logger.info("drag file dropped");
245+
setFiles(event.getDragboard().getFiles());
246+
}
247+
230248
/**
231249
* 开始日期或结束日期改变，刷新流量、带宽统计
232250
*/
@@ -461,7 +479,7 @@ public void setBucketCount() {
461479
* 刷新资源列表
462480
*/
463481
public void refreshResTable() {
464-
if (!new QiConfig().checkNet()) {
482+
if (!new QiConfiger().checkNet()) {
465483
Dialogs.showWarning(Values.NET_ERROR);
466484
return;
467485
}
@@ -525,10 +543,15 @@ public void selectFile() {
525543
FileChooser chooser = new FileChooser();
526544
chooser.setTitle(Values.FILE_CHOOSER_TITLE);
527545
chooser.setInitialDirectory(new File(System.getProperty("user.home")));
528-
List<File> files = chooser.showOpenMultipleDialog(QiniuApplication.stage);
546+
setFiles(chooser.showOpenMultipleDialog(QiniuApplication.stage));
547+
}
548+
549+
public void setFiles(List<File> files) {
529550
if (Checker.isNotEmpty(files)) {
530551
for (File file : files) {
531-
selectedFileTextArea.insertText(0, file.getAbsolutePath() + "\r\n");
552+
if (!selectedFileTextArea.getText().contains(file.getAbsolutePath())) {
553+
selectedFileTextArea.insertText(0, file.getAbsolutePath() + "\r\n");
554+
}
532555
}
533556
}
534557
}
@@ -641,7 +664,7 @@ public void openConfigFile() {
641664
public void resetKey() {
642665
boolean ok = new Dialogs().showInputKeyDialog();
643666
if (ok && Checker.isNotEmpty(zoneText.getText())) {
644-
new QiConfig().configUploadEnv(zoneText.getText(), bucketChoiceCombo.getValue());
667+
new QiConfiger().configUploadEnv(zoneText.getText(), bucketChoiceCombo.getValue());
645668
}
646669
}
647670

‎src/main/java/com/zhazhapan/qiniu/modules/constant/Values.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class Values {
5353

5454
public static final String UPLOAD_SUCCESS = "上传文件成功";
5555

56-
public static final String UPLOADING = "文件上传中。。。。。。\r\n";
56+
public static final String UPLOADING = "文件上传中，请耐心等待。。。。。。\r\n";
5757

5858
public static final String NEED_SCHOOSE_BUCKET_OR_FILE = "请先选择一个存储空间或文件";
5959

0 commit comments

Comments
 (0)