@@ -34,9 +34,11 @@ private FileUtils() {
3434 }
3535
3636 /**
37+ * 关闭IO
38+ *
3739 * @param closeable closeable
3840 */
39- private static void closeIO (Closeable closeable ) {
41+ public static void closeIO (Closeable closeable ) {
4042 if (closeable == null ) return ;
4143 try {
4244 closeable .close ();
@@ -132,7 +134,8 @@ public static boolean createOrExistsDir(String dirPath) {
132134 * @return {@code true}: 存在或创建成功<br>{@code false}: 不存在或创建失败
133135 */
134136 public static boolean createOrExistsDir (File file ) {
135- return file != null && (file .exists () && file .isDirectory () || file .mkdirs ());
137+ // 如果存在，是目录则返回true，是文件则返回false，不存在则返回是否创建成功
138+ return file != null && (file .exists () ? file .isDirectory () : file .mkdirs ());
136139 }
137140
138141 /**
@@ -153,7 +156,8 @@ public static boolean createOrExistsFile(String filePath) {
153156 */
154157 public static boolean createOrExistsFile (File file ) {
155158 if (file == null ) return false ;
156- if (file .exists () && file .isFile ()) return true ;
159+ // 如果存在，是文件则返回true，是目录则返回false
160+ if (file .exists ()) return file .isFile ();
157161 if (!createOrExistsDir (file .getParentFile ())) return false ;
158162 try {
159163 return file .createNewFile ();
@@ -215,22 +219,29 @@ private static boolean copyOrMoveDir(String srcDirPath, String destDirPath, bool
215219 */
216220 private static boolean copyOrMoveDir (File srcDir , File destDir , boolean isMove ) {
217221 if (srcDir == null || destDir == null ) return false ;
222+ // 如果目标目录在源目录中则返回false，看不懂的话好好想想递归怎么结束
223+ // srcPath : F:\\MyGithub\\AndroidUtilCode\\utilcode\\src\\test\\res
224+ // destPath: F:\\MyGithub\\AndroidUtilCode\\utilcode\\src\\test\\res1
225+ // 为防止以上这种情况出现出现误判，须分别在后面加个路径分隔符
226+ String srcPath = srcDir .getPath () + File .separator ;
227+ String destPath = destDir .getPath () + File .separator ;
228+ if (destPath .contains (srcPath )) return false ;
218229 // 源文件不存在或者不是目录则返回false
219230 if (!srcDir .exists () || !srcDir .isDirectory ()) return false ;
220231 // 目标目录不存在返回false
221232 if (!createOrExistsDir (destDir )) return false ;
222- File [] srcDirFiles = srcDir .listFiles ();
223- for (File srcDirFile : srcDirFiles ) {
224- File oneDestFile = new File (destDir .getPath () + File .separator
225- + srcDirFile .getName ());
226- if (srcDirFile .isFile ()) {
227- copyOrMoveFile (srcDirFile , oneDestFile , isMove );
228- } else if (srcDirFile .isDirectory ()) {
229- copyOrMoveDir (srcDirFile , oneDestFile , isMove );
233+ File [] files = srcDir .listFiles ();
234+ for (File file : files ) {
235+ File oneDestFile = new File (destPath + file .getName ());
236+ if (file .isFile ()) {
237+ // 如果操作失败返回false
238+ if (!copyOrMoveFile (file , oneDestFile , isMove )) return false ;
239+ } else if (file .isDirectory ()) {
240+ // 如果操作失败返回false
241+ if (!copyOrMoveDir (file , oneDestFile , isMove )) return false ;
230242 }
231- if (isMove && !deleteFile (srcDirFile )) return false ;
232243 }
233- return true ;
244+ return ! isMove || deleteDir ( srcDir ) ;
234245 }
235246
236247 /**
@@ -262,7 +273,8 @@ private static boolean copyOrMoveFile(File srcFile, File destFile, boolean isMov
262273 // 目标目录不存在返回false
263274 if (!createOrExistsDir (destFile .getParentFile ())) return false ;
264275 try {
265- return writeFileFromIS (destFile , new FileInputStream (srcFile ), false ) && !(isMove && !deleteFile (srcFile ));
276+ return writeFileFromIS (destFile , new FileInputStream (srcFile ), false )
277+ && !(isMove && !deleteFile (srcFile ));
266278 } catch (FileNotFoundException e ) {
267279 e .printStackTrace ();
268280 return false ;
@@ -276,8 +288,8 @@ private static boolean copyOrMoveFile(File srcFile, File destFile, boolean isMov
276288 * @param destDirPath 目标目录路径
277289 * @return {@code true}: 复制成功<br>{@code false}: 复制失败
278290 */
279- public boolean copyDir (String srcDirPath , String destDirPath ) {
280- return moveDir (getFileByPath (srcDirPath ), getFileByPath (destDirPath ));
291+ public static boolean copyDir (String srcDirPath , String destDirPath ) {
292+ return copyDir (getFileByPath (srcDirPath ), getFileByPath (destDirPath ));
281293 }
282294
283295 /**
@@ -296,7 +308,7 @@ public static boolean copyDir(File srcDir, File destDir) {
296308 *
297309 * @param srcFilePath 源文件路径
298310 * @param destFilePath 目标文件路径
299- * @return {@code true}: 复制拷贝成功 <br>{@code false}: 复制失败
311+ * @return {@code true}: 复制成功 <br>{@code false}: 复制失败
300312 */
301313 public static boolean copyFile (String srcFilePath , String destFilePath ) {
302314 return copyFile (getFileByPath (srcFilePath ), getFileByPath (destFilePath ));
@@ -320,7 +332,7 @@ public static boolean copyFile(File srcFile, File destFile) {
320332 * @param destDirPath 目标目录路径
321333 * @return {@code true}: 移动成功<br>{@code false}: 移动失败
322334 */
323- public boolean moveDir (String srcDirPath , String destDirPath ) {
335+ public static boolean moveDir (String srcDirPath , String destDirPath ) {
324336 return moveDir (getFileByPath (srcDirPath ), getFileByPath (destDirPath ));
325337 }
326338
@@ -363,7 +375,7 @@ public static boolean moveFile(File srcFile, File destFile) {
363375 * @param dirPath 目录路径
364376 * @return {@code true}: 删除成功<br>{@code false}: 删除失败
365377 */
366- public boolean deleteDir (String dirPath ) {
378+ public static boolean deleteDir (String dirPath ) {
367379 return deleteDir (getFileByPath (dirPath ));
368380 }
369381
@@ -373,9 +385,11 @@ public boolean deleteDir(String dirPath) {
373385 * @param dir 目录
374386 * @return {@code true}: 删除成功<br>{@code false}: 删除失败
375387 */
376- public boolean deleteDir (File dir ) {
388+ public static boolean deleteDir (File dir ) {
377389 if (dir == null ) return false ;
390+ // 目录不存在返回true
378391 if (!dir .exists ()) return true ;
392+ // 不是目录返回false
379393 if (!dir .isDirectory ()) return false ;
380394 // 现在文件存在且是文件夹
381395 File [] files = dir .listFiles ();
@@ -436,7 +450,10 @@ public static boolean writeFileFromIS(File file, InputStream is, boolean append)
436450 try {
437451 os = new BufferedOutputStream (new FileOutputStream (file , append ));
438452 byte data [] = new byte [KB ];
439- while (is .read (data ) != -1 ) os .write (data );
453+ int len ;
454+ while ((len = is .read (data )) != -1 ) {
455+ os .write (data , 0 , len );
456+ }
440457 return true ;
441458 } catch (IOException e ) {
442459 e .printStackTrace ();
@@ -589,7 +606,8 @@ public static List<String> readFile2List(File file, String charsetName) {
589606 * @param charsetName 编码格式
590607 * @return 包含制定行的list
591608 */
592- public static List <String > readFile2List (String filePath , int start , int end , String charsetName ) {
609+ public static List <String > readFile2List (String filePath , int start , int end , String
610+ charsetName ) {
593611 return readFile2List (getFileByPath (filePath ), start , end , charsetName );
594612 }
595613
@@ -653,7 +671,12 @@ public static StringBuilder readFile2SB(File file, String charsetName) {
653671 BufferedReader reader = null ;
654672 try {
655673 sb = new StringBuilder ();
656- reader = new BufferedReader (new InputStreamReader (new FileInputStream (file ), charsetName ));
674+ if (StringUtils .isSpace (charsetName )) {
675+ reader = new BufferedReader (new FileReader (file ));
676+ } else {
677+ reader = new BufferedReader (new InputStreamReader (new FileInputStream (file ),
678+ charsetName ));
679+ }
657680 String line ;
658681 while ((line = reader .readLine ()) != null ) {
659682 sb .append (line );
0 commit comments