From 94f5e5ade45a46f89eb2b09ac55c7869051ba959 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sat, 26 Nov 2016 01:37:09 +0800 Subject: [PATCH] Compatibility fix --- source/net/filebot/ApplicationFolder.java | 2 +- source/net/filebot/CacheManager.java | 7 ++----- source/net/filebot/Main.java | 6 +++--- source/net/filebot/format/MediaBindingBean.java | 2 +- source/net/filebot/format/SecureCompiledScript.java | 2 +- source/net/filebot/media/MediaDetection.java | 2 +- source/net/filebot/media/ReleaseInfo.java | 2 +- source/net/filebot/ui/rename/RenamePanel.java | 2 +- 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/source/net/filebot/ApplicationFolder.java b/source/net/filebot/ApplicationFolder.java index 7036c929..8c2f17a9 100644 --- a/source/net/filebot/ApplicationFolder.java +++ b/source/net/filebot/ApplicationFolder.java @@ -21,7 +21,7 @@ public enum ApplicationFolder { this.path = new File(path); } - public File getFile() { + public File get() { return path; } diff --git a/source/net/filebot/CacheManager.java b/source/net/filebot/CacheManager.java index 4b270e2f..ae8f0e96 100644 --- a/source/net/filebot/CacheManager.java +++ b/source/net/filebot/CacheManager.java @@ -66,11 +66,8 @@ public class CacheManager { } private File acquireDiskStore() throws IOException { - // prepare cache folder for this application instance - File cacheRoot = ApplicationFolder.Cache.getFile(); - for (int i = 0; i < 10; i++) { - File cache = new File(cacheRoot, Integer.toString(i)); + File cache = ApplicationFolder.Cache.resolve(String.valueOf(i)); // make sure cache is readable and writable createFolders(cache); @@ -124,7 +121,7 @@ public class CacheManager { } // serious error, abort - throw new IOException("Unable to acquire cache lock: " + cacheRoot); + throw new IOException("Unable to acquire cache lock: " + ApplicationFolder.Cache.get().getAbsolutePath()); } private static class ShutdownHook extends Thread { diff --git a/source/net/filebot/Main.java b/source/net/filebot/Main.java index cc7f5525..6f16abfa 100644 --- a/source/net/filebot/Main.java +++ b/source/net/filebot/Main.java @@ -91,7 +91,7 @@ public class Main { // clear caches if (args.clearCache()) { log.info("Clear cache"); - for (File folder : getChildren(ApplicationFolder.Cache.getFile(), FOLDERS)) { + for (File folder : getChildren(ApplicationFolder.Cache.get(), FOLDERS)) { log.fine("* Delete " + folder); delete(folder); } @@ -377,8 +377,8 @@ public class Main { public static void initializeLogging(ArgumentBean args) throws IOException { // make sure that these folders exist - ApplicationFolder.TemporaryFiles.getFile().mkdirs(); - ApplicationFolder.AppData.getFile().mkdirs(); + ApplicationFolder.TemporaryFiles.get().mkdirs(); + ApplicationFolder.AppData.get().mkdirs(); if (args.runCLI()) { // CLI logging settings diff --git a/source/net/filebot/format/MediaBindingBean.java b/source/net/filebot/format/MediaBindingBean.java index ad7c457d..8c63e45a 100644 --- a/source/net/filebot/format/MediaBindingBean.java +++ b/source/net/filebot/format/MediaBindingBean.java @@ -928,7 +928,7 @@ public class MediaBindingBean { @Define("home") public File getUserHome() { - return ApplicationFolder.UserHome.getFile(); + return ApplicationFolder.UserHome.get(); } @Define("output") diff --git a/source/net/filebot/format/SecureCompiledScript.java b/source/net/filebot/format/SecureCompiledScript.java index 459d938f..11e9957a 100644 --- a/source/net/filebot/format/SecureCompiledScript.java +++ b/source/net/filebot/format/SecureCompiledScript.java @@ -57,7 +57,7 @@ public class SecureCompiledScript extends CompiledScript { // write permissions for cache and temp folders for (ApplicationFolder it : ApplicationFolder.values()) { - permissions.add(new FilePermission(it.getFile().getAbsolutePath() + File.separator + "-", "read, write, delete")); + permissions.add(new FilePermission(it.get().getAbsolutePath() + File.separator + "-", "read, write, delete")); } return permissions; diff --git a/source/net/filebot/media/MediaDetection.java b/source/net/filebot/media/MediaDetection.java index c8ad506b..0b0af836 100644 --- a/source/net/filebot/media/MediaDetection.java +++ b/source/net/filebot/media/MediaDetection.java @@ -1012,7 +1012,7 @@ public class MediaDetection { } public static boolean isStructureRoot(File folder) throws Exception { - return isVolumeRoot(folder) || releaseInfo.getStructureRootPattern().matcher(folder.getName()).matches() || ApplicationFolder.UserHome.getFile().equals(folder.getParentFile()); + return isVolumeRoot(folder) || releaseInfo.getStructureRootPattern().matcher(folder.getName()).matches() || ApplicationFolder.UserHome.get().equals(folder.getParentFile()); } public static File getStructureRoot(File file) throws Exception { diff --git a/source/net/filebot/media/ReleaseInfo.java b/source/net/filebot/media/ReleaseInfo.java index 3eeaeae4..c0f00f52 100644 --- a/source/net/filebot/media/ReleaseInfo.java +++ b/source/net/filebot/media/ReleaseInfo.java @@ -220,7 +220,7 @@ public class ReleaseInfo { if (volumeRoots == null) { Set volumes = new HashSet(); - File home = ApplicationFolder.UserHome.getFile(); + File home = ApplicationFolder.UserHome.get(); List roots = getFileSystemRoots(); // user root folder diff --git a/source/net/filebot/ui/rename/RenamePanel.java b/source/net/filebot/ui/rename/RenamePanel.java index 9290188a..6158622c 100644 --- a/source/net/filebot/ui/rename/RenamePanel.java +++ b/source/net/filebot/ui/rename/RenamePanel.java @@ -160,7 +160,7 @@ public class RenamePanel extends JComponent { renameModel.useFormatter(FileInfo.class, new FileNameFormatter()); } - RenameListCellRenderer cellrenderer = new RenameListCellRenderer(renameModel, ApplicationFolder.UserHome.getFile()); + RenameListCellRenderer cellrenderer = new RenameListCellRenderer(renameModel, ApplicationFolder.UserHome.get()); namesList.getListComponent().setCellRenderer(cellrenderer); filesList.getListComponent().setCellRenderer(cellrenderer);