lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-12 00:28:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: hutool-extra ftp 保持 false == variable 的写法

Browse Source
This commit is contained in:
xhzou 2022-09-26 16:30:19 +08:00
parent 775caa9911
commit 8bbe6bbf71
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hutool-extra/src/main/java/cn/hutool/extra/ftp/AbstractFtp.java
View File

@ -163,13 +163,13 @@ public abstract class AbstractFtp implements Closeable {
if (StrUtil.isNotEmpty(s)) { if (StrUtil.isNotEmpty(s)) {
boolean exist = true; boolean exist = true;
try { try {
if (!cd(s)) { if (false == cd(s)) {
exist = false; exist = false;
} }
} catch (FtpException e) { } catch (FtpException e) {
exist = false; exist = false;
} }
if (!exist) { if (false == exist) {
//目录不存在时创建 //目录不存在时创建
mkdir(s); mkdir(s);
cd(s); cd(s);

20
hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
View File

@ -220,7 +220,7 @@ public class Ftp extends AbstractFtp {
throw new IORuntimeException(e); throw new IORuntimeException(e);
} }
final int replyCode = client.getReplyCode(); // 是否成功登录服务器 final int replyCode = client.getReplyCode(); // 是否成功登录服务器
if (!FTPReply.isPositiveCompletion(replyCode)) { if (false == FTPReply.isPositiveCompletion(replyCode)) {
try { try {
client.disconnect(); client.disconnect();
} catch (IOException e) { } catch (IOException e) {
@ -355,7 +355,7 @@ public class Ftp extends AbstractFtp {
String fileName; String fileName;
for (FTPFile ftpFile : ftpFiles) { for (FTPFile ftpFile : ftpFiles) {
fileName = ftpFile.getName(); fileName = ftpFile.getName();
if (!StrUtil.equals(".", fileName) && !StrUtil.equals("..", fileName)) { if (false == StrUtil.equals(".", fileName) && false == StrUtil.equals("..", fileName)) {
if (null == filter || filter.accept(ftpFile)) { if (null == filter || filter.accept(ftpFile)) {
result.add(ftpFile); result.add(ftpFile);
} }
@ -376,7 +376,7 @@ public class Ftp extends AbstractFtp {
String pwd = null; String pwd = null;
if (StrUtil.isNotBlank(path)) { if (StrUtil.isNotBlank(path)) {
pwd = pwd(); pwd = pwd();
if (!cd(path)) { if (false == cd(path)) {
throw new FtpException("Change dir to [{}] error, maybe path not exist!", path); throw new FtpException("Change dir to [{}] error, maybe path not exist!", path);
} }
} }
@ -440,7 +440,7 @@ public class Ftp extends AbstractFtp {
final String pwd = pwd(); final String pwd = pwd();
final String fileName = FileUtil.getName(path); final String fileName = FileUtil.getName(path);
final String dir = StrUtil.removeSuffix(path, fileName); final String dir = StrUtil.removeSuffix(path, fileName);
if (!cd(dir)) { if (false == cd(dir)) {
throw new FtpException("Change dir to [{}] error, maybe dir not exist!", path); throw new FtpException("Change dir to [{}] error, maybe dir not exist!", path);
} }
@ -471,7 +471,7 @@ public class Ftp extends AbstractFtp {
childPath = StrUtil.format("{}/{}", dirPath, name); childPath = StrUtil.format("{}/{}", dirPath, name);
if (ftpFile.isDirectory()) { if (ftpFile.isDirectory()) {
// 上级和本级目录除外 // 上级和本级目录除外
if (!".".equals(name) && !"..".equals(name)) { if (false == ".".equals(name) && false == "..".equals(name)) {
delDir(childPath); delDir(childPath);
} }
} else { } else {
@ -558,7 +558,7 @@ public class Ftp extends AbstractFtp {
if (StrUtil.isNotBlank(destPath)) { if (StrUtil.isNotBlank(destPath)) {
mkDirs(destPath); mkDirs(destPath);
if (!cd(destPath)) { if (false == cd(destPath)) {
throw new FtpException("Change dir to [{}] error, maybe dir not exist!", destPath); throw new FtpException("Change dir to [{}] error, maybe dir not exist!", destPath);
} }
} }
@ -651,9 +651,9 @@ public class Ftp extends AbstractFtp {
srcFile = StrUtil.format("{}/{}", sourcePath, fileName); srcFile = StrUtil.format("{}/{}", sourcePath, fileName);
destFile = FileUtil.file(destDir, fileName); destFile = FileUtil.file(destDir, fileName);
if (!ftpFile.isDirectory()) { if (false == ftpFile.isDirectory()) {
// 本地不存在文件或者ftp上文件有修改则下载 // 本地不存在文件或者ftp上文件有修改则下载
if (!FileUtil.exist(destFile) if (false == FileUtil.exist(destFile)
|| (ftpFile.getTimestamp().getTimeInMillis() > destFile.lastModified())) { || (ftpFile.getTimestamp().getTimeInMillis() > destFile.lastModified())) {
download(srcFile, destFile); download(srcFile, destFile);
} }
@ -677,7 +677,7 @@ public class Ftp extends AbstractFtp {
if (outFile.isDirectory()) { if (outFile.isDirectory()) {
outFile = new File(outFile, fileName); outFile = new File(outFile, fileName);
} }
if (!outFile.exists()) { if (false == outFile.exists()) {
FileUtil.touch(outFile); FileUtil.touch(outFile);
} }
try (OutputStream out = FileUtil.getOutputStream(outFile)) { try (OutputStream out = FileUtil.getOutputStream(outFile)) {
@ -714,7 +714,7 @@ public class Ftp extends AbstractFtp {
pwd = pwd(); pwd = pwd();
} }
if (!cd(path)) { if (false == cd(path)) {
throw new FtpException("Change dir to [{}] error, maybe dir not exist!", path); throw new FtpException("Change dir to [{}] error, maybe dir not exist!", path);
} }