mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor

This commit is contained in:
Reinhard Pointner 2016-03-05 21:06:26 +00:00
parent 76f275ebae
commit 0e70aac95a
2 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/net/filebot/Main.java
View File

@ -1,7 +1,6 @@
package net.filebot; package net.filebot;
import static java.awt.GraphicsEnvironment.*; import static java.awt.GraphicsEnvironment.*;
import static java.util.regex.Pattern.*;
import static javax.swing.JOptionPane.*; import static javax.swing.JOptionPane.*;
import static net.filebot.Logging.*; import static net.filebot.Logging.*;
import static net.filebot.Settings.*; import static net.filebot.Settings.*;
@ -95,11 +94,9 @@ public class Main {
if (args.clearCache()) { if (args.clearCache()) {
// clear preferences and cache // clear preferences and cache
log.info("Clear cache and temporary files"); log.info("Clear cache and temporary files");
for (File folder : getChildren(getApplicationFolder().getAbsoluteFile(), FOLDERS)) { for (File folder : getChildren(getApplicationFolder().getCanonicalFile(), FOLDERS)) {
if (matches("cache|temp|grape|reports|logs", folder.getName())) { if (delete(folder)) {
if (delete(folder)) { log.config("* Delete " + folder);
log.config("* Delete " + folder);
}
} }
} }
@ -136,8 +133,7 @@ public class Main {
} }
// make sure java.io.tmpdir exists // make sure java.io.tmpdir exists
File tmpdir = new File(System.getProperty("java.io.tmpdir")); createFolders(getApplicationTempFolder());
createFolders(tmpdir);
// initialize this stuff before anything else // initialize this stuff before anything else
initializeCache(); initializeCache();
@ -149,22 +145,16 @@ public class Main {
System.setProperty("grape.root", new File(getApplicationFolder(), "grape").getAbsolutePath()); System.setProperty("grape.root", new File(getApplicationFolder(), "grape").getAbsolutePath());
System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.NoOpLog"); System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.NoOpLog");
if (args.unixfs) { System.setProperty("unixfs", Boolean.toString(args.unixfs));
System.setProperty("unixfs", "true"); System.setProperty("useExtendedFileAttributes", Boolean.toString(!args.disableExtendedAttributes));
} System.setProperty("useCreationDate", Boolean.toString(!args.disableExtendedAttributes));
if (args.disableExtendedAttributes) { System.setProperty("application.rename.history", Boolean.toString(!args.action.equalsIgnoreCase("test"))); // don't keep history of --action test rename operations
System.setProperty("useExtendedFileAttributes", "false");
System.setProperty("useCreationDate", "false");
}
if (args.action.equalsIgnoreCase("test")) {
System.setProperty("application.rename.history", "false"); // don't keep history of --action test rename operations
}
// make sure we can access application arguments at any time // make sure we can access application arguments at any time
Settings.setApplicationArgumentArray(argumentArray); setApplicationArgumentArray(argumentArray);
// initialize history spooler // initialize history spooler
HistorySpooler.getInstance().setPersistentHistoryEnabled(System.getProperty("application.rename.history") == null ? true : Boolean.parseBoolean(System.getProperty("application.rename.history"))); HistorySpooler.getInstance().setPersistentHistoryEnabled(useRenameHistory());
// CLI mode => run command-line interface and then exit // CLI mode => run command-line interface and then exit
if (args.runCLI()) { if (args.runCLI()) {
@ -459,6 +449,7 @@ public class Main {
private static void initializeCache() throws Exception { private static void initializeCache() throws Exception {
// prepare cache folder for this application instance // prepare cache folder for this application instance
File cacheRoot = getApplicationCache(); File cacheRoot = getApplicationCache();
createFolders(cacheRoot);
try { try {
for (int i = 0; true; i++) { for (int i = 0; true; i++) {

15
source/net/filebot/Settings.java
View File

@ -79,6 +79,10 @@ public final class Settings {
return Boolean.parseBoolean(System.getProperty("useCreationDate")); return Boolean.parseBoolean(System.getProperty("useCreationDate"));
} }
public static boolean useRenameHistory() {
return Boolean.parseBoolean(System.getProperty("application.rename.history", "true"));
}
public static String getApplicationDeployment() { public static String getApplicationDeployment() {
return System.getProperty("application.deployment", "jar"); return System.getProperty("application.deployment", "jar");
} }
@ -165,16 +169,13 @@ public final class Settings {
cacheFolder = new File(getApplicationFolder(), "cache"); cacheFolder = new File(getApplicationFolder(), "cache");
} }
// create folder if necessary
try {
createFolders(cacheFolder);
} catch (Exception e) {
throw new IllegalStateException("application.cache", e);
}
return cacheFolder; return cacheFolder;
} }
public static File getApplicationTempFolder() {
return new File(System.getProperty("java.io.tmpdir"));
}
public static File getRealUserHome() { public static File getRealUserHome() {
if (isMacSandbox()) { if (isMacSandbox()) {
// when running sandboxed applications user.home may point to the application-specific container // when running sandboxed applications user.home may point to the application-specific container