From b3400a4c414ee0b9a4efb4d07d008aaf17fe81af Mon Sep 17 00:00:00 2001 From: kohgylw Date: Sun, 3 Feb 2019 08:47:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E8=A7=84=E6=9B=B4=E6=96=B0=20v1.0.14?= =?UTF-8?q?=20=E4=BF=AE=E6=AD=A3=E4=BA=86=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- TODO.txt | 4 ++++ pom.xml | 2 +- .../kohgylw/kiftd/ui/module/FSViewer.java | 6 +++--- .../FileSystemManager.java | 4 ++-- target/classes/META-INF/MANIFEST.MF | 2 +- .../maven/kohgylw/kiftd/pom.properties | 4 ++-- .../META-INF/maven/kohgylw/kiftd/pom.xml | 2 +- .../FileSystemManager.class | Bin 22099 -> 22099 bytes 9 files changed, 15 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 40fd109..c277a86 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## 欢迎访问kiftd源代码资源库！ ### Welcome to visit source of kiftd! -_当前版本：v1.0.13-RELEASE_ +_当前版本：v1.0.14-RELEASE_ ### 简介 _kiftd——一款便捷、开源、功能完善的个人&团队&小型团队网盘服务器系统。_ diff --git a/TODO.txt b/TODO.txt index 3793071..4270830 100644 --- a/TODO.txt +++ b/TODO.txt @@ -80,6 +80,10 @@ kiftd项目 计划表-2018-10-9 by 青阳龙野 -------------- 【已完成】优化了文件和文件夹的重命名逻辑——现在，无论是编辑文件夹还是重命名文件，若是用户不修改名称直接点击“修改”则也会提示修改成功。这一改动是为了令用户的操作体验更加舒适，同时也避免了修改文件夹权限时也必须修改文件夹名称的冗余操作。 +已完成 v1.0.14 +-------------- +【已完成】修正了文件导出功能中，存在同名文件时，“覆盖”与“保留两者”选项与实际操作相反的问题。 + diff --git a/pom.xml b/pom.xml index 6faf856..ec69fa3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ kohgylw kiftd - 1.0.13-RELEASE + 1.0.14-RELEASE jar kiftd diff --git a/src/main/java/kohgylw/kiftd/ui/module/FSViewer.java b/src/main/java/kohgylw/kiftd/ui/module/FSViewer.java index a99a5d6..34de405 100644 --- a/src/main/java/kohgylw/kiftd/ui/module/FSViewer.java +++ b/src/main/java/kohgylw/kiftd/ui/module/FSViewer.java @@ -178,13 +178,13 @@ public class FSViewer extends KiftdDynamicWindow { switch (JOptionPane.showConfirmDialog(window, "该路径存在" + exi + "个同名文件或文件夹，您希望覆盖它们么？（“是”覆盖，“否”保留两者，“取消”终止导入）", "导入", JOptionPane.YES_NO_CANCEL_OPTION)) { - case 0: + case JOptionPane.YES_OPTION: type = FileSystemManager.COVER; break; - case 1: + case JOptionPane.NO_OPTION: type = FileSystemManager.BOTH; break; - case 2: + case JOptionPane.CANCEL_OPTION: default: type = "CANCEL"; diff --git a/src/main/java/kohgylw/kiftd/util/file_system_manager/FileSystemManager.java b/src/main/java/kohgylw/kiftd/util/file_system_manager/FileSystemManager.java index beb190b..b57337b 100644 --- a/src/main/java/kohgylw/kiftd/util/file_system_manager/FileSystemManager.java +++ b/src/main/java/kohgylw/kiftd/util/file_system_manager/FileSystemManager.java @@ -625,12 +625,12 @@ public class FileSystemManager { if (Arrays.stream(path.listFiles()).parallel().filter((e) -> e.isFile()) .anyMatch((f) -> new String(f.getName().getBytes()).equals(node.getFileName()))) { switch (type) { - case BOTH: + case COVER: target = Arrays.stream(path.listFiles()).parallel().filter((e) -> e.isFile()) .filter((e) -> new String(e.getName().getBytes()).equals(node.getFileName())).findFirst() .get(); break; - case COVER: + case BOTH: target = new File(path, new String(FileNodeUtil.getNewNodeName(node, path).getBytes())); target.createNewFile(); break; diff --git a/target/classes/META-INF/MANIFEST.MF b/target/classes/META-INF/MANIFEST.MF index 5b49af2..945a922 100644 --- a/target/classes/META-INF/MANIFEST.MF +++ b/target/classes/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Implementation-Title: kiftd -Implementation-Version: 1.0.13-RELEASE +Implementation-Version: 1.0.14-RELEASE Built-By: kohgylw Implementation-Vendor-Id: kohgylw Build-Jdk: 1.8.0_131 diff --git a/target/classes/META-INF/maven/kohgylw/kiftd/pom.properties b/target/classes/META-INF/maven/kohgylw/kiftd/pom.properties index 01b0855..383db51 100644 --- a/target/classes/META-INF/maven/kohgylw/kiftd/pom.properties +++ b/target/classes/META-INF/maven/kohgylw/kiftd/pom.properties @@ -1,6 +1,6 @@ #Generated by Maven Integration for Eclipse -#Sun Jan 27 09:05:31 CST 2019 -version=1.0.13-RELEASE +#Sun Feb 03 08:44:08 CST 2019 +version=1.0.14-RELEASE groupId=kohgylw m2e.projectName=kiftd m2e.projectLocation=/Users/kohgylw/program/java-workspace/kiftd diff --git a/target/classes/META-INF/maven/kohgylw/kiftd/pom.xml b/target/classes/META-INF/maven/kohgylw/kiftd/pom.xml index 6faf856..ec69fa3 100644 --- a/target/classes/META-INF/maven/kohgylw/kiftd/pom.xml +++ b/target/classes/META-INF/maven/kohgylw/kiftd/pom.xml @@ -4,7 +4,7 @@ kohgylw kiftd - 1.0.13-RELEASE + 1.0.14-RELEASE jar kiftd diff --git a/target/classes/kohgylw/kiftd/util/file_system_manager/FileSystemManager.class b/target/classes/kohgylw/kiftd/util/file_system_manager/FileSystemManager.class index bc944115cdd6175f3744a74d35d2cb40cc942502..da50c922ff62e24f915e64d7ba0637050a578ac9 100644 GIT binary patch delta 18 acmcb-hVk+m#tjahlkfN_ZBFw1$O8aW%LsA+ delta 29 lcmcb-hVk+m#tjahe8S5aG9=lAxVAB#oyB0i+0T=e7XY7T30eRE