dorkbox/Utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed dependency on SLF4J (all but 2 cases were for debugging)

Browse Source
This commit is contained in:
nathan 2018-08-18 20:04:46 +02:00
parent f1c4068194
commit f0923fb201
1 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/dorkbox/util/FileUtil.java
View File

@ -33,9 +33,6 @@ import java.util.List;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* File related utilities. * File related utilities.
* <p/> * <p/>
@ -50,7 +47,8 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings({"WeakerAccess", "Duplicates", "unused"}) @SuppressWarnings({"WeakerAccess", "Duplicates", "unused"})
public public
class FileUtil { class FileUtil {
private static final Logger logger = LoggerFactory.getLogger(FileUtil.class); private static final boolean DEBUG = false;
/** /**
* The Unix separator character. * The Unix separator character.
*/ */
@ -213,14 +211,19 @@ class FileUtil {
File temp = new File(dest.getPath() + "_old"); File temp = new File(dest.getPath() + "_old");
if (temp.exists()) { if (temp.exists()) {
if (!temp.delete()) { if (!temp.delete()) {
logger.warn("Failed to delete old intermediate file {}.", temp); if (DEBUG) {
System.err.println("Failed to delete old intermediate file: " + temp);
}
// the subsequent code will probably fail // the subsequent code will probably fail
} }
} }
if (dest.renameTo(temp)) { if (dest.renameTo(temp)) {
if (source.renameTo(dest)) { if (source.renameTo(dest)) {
if (temp.delete()) { if (temp.delete()) {
logger.warn("Failed to delete intermediate file {}.", temp); if (DEBUG) {
System.err.println("Failed to delete intermediate file: " + temp);
}
} }
return true; return true;
} }
@ -237,12 +240,18 @@ class FileUtil {
IO.close(fin); IO.close(fin);
if (!source.delete()) { if (!source.delete()) {
logger.warn("Failed to delete {} after brute force copy to {}.", source, dest); if (DEBUG) {
System.err.println("Failed to delete '" + source + "' after brute force copy to '" + dest + "'.");
}
} }
return true; return true;
} catch (IOException ioe) { } catch (IOException ioe) {
logger.warn("Failed to copy {} to {}.", source, dest, ioe); if (DEBUG) {
System.err.println("Failed to copy '" + source + "' to '" + dest + "'.");
ioe.printStackTrace();
}
return false; return false;
} finally { } finally {
@ -321,7 +330,9 @@ class FileUtil {
String normalizedout = normalize(out).getAbsolutePath(); String normalizedout = normalize(out).getAbsolutePath();
if (normalizedIn.equalsIgnoreCase(normalizedout)) { if (normalizedIn.equalsIgnoreCase(normalizedout)) {
logger.warn("Source equals destination! " + normalizedIn); if (DEBUG) {
System.err.println("Source equals destination! " + normalizedIn);
}
return out; return out;
} }
@ -333,9 +344,8 @@ class FileUtil {
parentOut.mkdirs(); parentOut.mkdirs();
} }
Logger logger2 = logger; if (DEBUG) {
if (logger2.isTraceEnabled()) { System.err.println("Copying file: '" + in + "' --> '" + out + "'");
logger2.trace("Copying file: {} --> {}", in, out);
} }
FileChannel sourceChannel = null; FileChannel sourceChannel = null;
@ -345,7 +355,7 @@ class FileUtil {
destinationChannel = new FileOutputStream(normalizedout).getChannel(); destinationChannel = new FileOutputStream(normalizedout).getChannel();
if (sourceChannel.size() == 0) { if (sourceChannel.size() == 0) {
logger2.warn("Source size is ZERO: " + normalizedIn); System.err.println("Source size is ZERO: " + normalizedIn);
} }
sourceChannel.transferTo(0, sourceChannel.size(), destinationChannel); sourceChannel.transferTo(0, sourceChannel.size(), destinationChannel);
@ -385,9 +395,8 @@ class FileUtil {
String normalizedOne = normalize(one).getAbsolutePath(); String normalizedOne = normalize(one).getAbsolutePath();
String normalizedTwo = normalize(two).getAbsolutePath(); String normalizedTwo = normalize(two).getAbsolutePath();
Logger logger2 = logger; if (DEBUG) {
if (logger2.isTraceEnabled()) { System.err.println("Concat'ing file: '" + one + "' --> '" + two + "'");
logger2.trace("Cocating file: {} --> {}", one, two);
} }
FileChannel channelOne = null; FileChannel channelOne = null;
@ -505,9 +514,8 @@ class FileUtil {
if (!dest.exists()) { if (!dest.exists()) {
//noinspection ResultOfMethodCallIgnored //noinspection ResultOfMethodCallIgnored
dest.mkdir(); dest.mkdir();
Logger logger2 = logger; if (DEBUG) {
if (logger2.isTraceEnabled()) { System.err.println("Directory copied from '" + src + "' --> '" + dest + "'");
logger2.trace("Directory copied from {} --> {}", src, dest);
} }
} }
@ -559,9 +567,8 @@ class FileUtil {
if (!dest.exists()) { if (!dest.exists()) {
//noinspection ResultOfMethodCallIgnored //noinspection ResultOfMethodCallIgnored
dest.mkdir(); dest.mkdir();
Logger logger2 = logger; if (DEBUG) {
if (logger2.isTraceEnabled()) { System.err.println("Directory copied from '" + src + "' --> '" + dest + "'");
logger2.trace("Directory copied from {} --> {}", src, dest);
} }
} }
@ -616,7 +623,7 @@ class FileUtil {
boolean thingsDeleted = false; boolean thingsDeleted = false;
boolean ignored = false; boolean ignored = false;
Logger logger2 = logger;
if (file.isDirectory()) { if (file.isDirectory()) {
File[] files = file.listFiles(); File[] files = file.listFiles();
if (files != null) { if (files != null) {
@ -631,8 +638,8 @@ class FileUtil {
for (String name : namesToIgnore) { for (String name : namesToIgnore) {
if (name.charAt(0) == UNIX_SEPARATOR && name.equals(name2)) { if (name.charAt(0) == UNIX_SEPARATOR && name.equals(name2)) {
// only name match if our name To Ignore starts with a / or \ // only name match if our name To Ignore starts with a / or \
if (logger2.isTraceEnabled()) { if (DEBUG) {
logger2.trace("Skipping delete dir: {}", file2); System.err.println("Skipping delete dir: " + file2);
} }
ignored = true; ignored = true;
delete = false; delete = false;
@ -640,8 +647,8 @@ class FileUtil {
} }
else if (name.equals(name2Full)) { else if (name.equals(name2Full)) {
// full path match // full path match
if (logger2.isTraceEnabled()) { if (DEBUG) {
logger2.trace("Skipping delete dir: {}", file2); System.err.println("Skipping delete dir: " + file2);
} }
ignored = true; ignored = true;
delete = false; delete = false;
@ -650,8 +657,8 @@ class FileUtil {
} }
if (delete) { if (delete) {
if (logger2.isTraceEnabled()) { if (DEBUG) {
logger2.trace("Deleting dir: {}", file2); System.err.println("Deleting dir: " + file2);
} }
delete(file2, namesToIgnore); delete(file2, namesToIgnore);
} }
@ -660,8 +667,8 @@ class FileUtil {
for (String name : namesToIgnore) { for (String name : namesToIgnore) {
if (name.charAt(0) != UNIX_SEPARATOR && name.equals(name2)) { if (name.charAt(0) != UNIX_SEPARATOR && name.equals(name2)) {
// only name match // only name match
if (logger2.isTraceEnabled()) { if (DEBUG) {
logger2.trace("Skipping delete file: {}", file2); System.err.println("Skipping delete file: " + file2);
} }
ignored = true; ignored = true;
delete = false; delete = false;
@ -669,8 +676,8 @@ class FileUtil {
} }
else if (name.equals(name2Full)) { else if (name.equals(name2Full)) {
// full path match // full path match
if (logger2.isTraceEnabled()) { if (DEBUG) {
logger2.trace("Skipping delete file: {}", file2); System.err.println("Skipping delete file: " + file2);
} }
ignored = true; ignored = true;
delete = false; delete = false;
@ -679,8 +686,8 @@ class FileUtil {
} }
if (delete) { if (delete) {
if (logger2.isTraceEnabled()) { if (DEBUG) {
logger2.trace("Deleting file: {}", file2); System.err.println("Deleting file: " + file2);
} }
thingsDeleted |= file2.delete(); thingsDeleted |= file2.delete();
} }
@ -691,14 +698,14 @@ class FileUtil {
// don't try to delete the dir if there was an ignored file in it // don't try to delete the dir if there was an ignored file in it
if (ignored) { if (ignored) {
if (logger2.isTraceEnabled()) { if (DEBUG) {
logger2.trace("Skipping deleting file: {}", file); System.err.println("Skipping deleting file: " + file);
} }
return false; return false;
} }
if (logger2.isTraceEnabled()) { if (DEBUG) {
logger2.trace("Deleting file: {}", file); System.err.println("Deleting file: " + file);
} }
thingsDeleted |= file.delete(); thingsDeleted |= file.delete();
@ -717,9 +724,8 @@ class FileUtil {
String path = normalize(location).getAbsolutePath(); String path = normalize(location).getAbsolutePath();
if (location.mkdirs()) { if (location.mkdirs()) {
Logger logger2 = logger; if (DEBUG) {
if (logger2.isTraceEnabled()) { System.err.println("Created directory: " + path);
logger2.trace("Created directory: {}", path);
} }
} }