From ae6a2cb0aeb53fc2b8a85860bb254d4f2581377b Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Sat, 28 Jul 2012 10:04:52 +0000
Subject: [PATCH] * make sure each filebot instance gets it's own locked
 ehcache dir

---
 installer/deb/filebot.sh                      |  2 +-
 installer/ipkg/filebot.sh                     |  2 +-
 installer/portable/FileBot.l4j.ini            |  2 +-
 installer/portable/filebot.sh                 |  2 +-
 source/ehcache.xml                            |  2 +-
 source/net/sourceforge/filebot/Main.java      | 65 ++++++++++++++++---
 .../filebot/cli/ArgumentProcessor.java        |  2 +-
 .../net/sourceforge/tuned/FileUtilities.java  |  6 ++
 8 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh
index e602ecaa..5cc1e1e3 100644
--- a/installer/deb/filebot.sh
+++ b/installer/deb/filebot.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -Dunixfs=false -Xmx256m -Dapplication.deployment=deb -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=25000 -jar /usr/share/filebot/FileBot.jar "$@"
+java -Dunixfs=false -Xmx256m -Dapplication.deployment=deb -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/.temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=25000 -jar /usr/share/filebot/FileBot.jar "$@"
diff --git a/installer/ipkg/filebot.sh b/installer/ipkg/filebot.sh
index 2b08b588..dd2113c2 100644
--- a/installer/ipkg/filebot.sh
+++ b/installer/ipkg/filebot.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -Dunixfs=false -Dapplication.deployment=ipkg -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=25000 -jar /usr/share/filebot/FileBot.jar "$@"
+java -Dunixfs=false -Dapplication.deployment=ipkg -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/.temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=25000 -jar /usr/share/filebot/FileBot.jar "$@"
diff --git a/installer/portable/FileBot.l4j.ini b/installer/portable/FileBot.l4j.ini
index eb1ffed6..9123d1de 100644
--- a/installer/portable/FileBot.l4j.ini
+++ b/installer/portable/FileBot.l4j.ini
@@ -21,7 +21,7 @@
 -Dsun.net.client.defaultReadTimeout=25000
 
 # put all temporary files here
--Djava.io.tmpdir="%EXEDIR%/temp"
+-Djava.io.tmpdir="%EXEDIR%/.temp"
 
 # look for native libs here
 -Djna.library.path="%EXEDIR%"
diff --git a/installer/portable/filebot.sh b/installer/portable/filebot.sh
index 51fe0a92..c1449182 100644
--- a/installer/portable/filebot.sh
+++ b/installer/portable/filebot.sh
@@ -3,4 +3,4 @@ SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
 dir_bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
-java -Dunixfs=false -Xmx256m -Dapplication.deployment=portable "-Dapplication.dir=$dir_bin" "-Djava.io.tmpdir=$dir_bin/temp" "-Duser.home=$dir_bin" "-Djna.library.path=$dir_bin" "-Djava.library.path=$dir_bin" -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=25000 -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory -Dnet.sourceforge.tuned.prefs.file=prefs.properties -jar "$dir_bin/FileBot.jar" "$@"
\ No newline at end of file
+java -Dunixfs=false -Xmx256m -Dapplication.deployment=portable "-Dapplication.dir=$dir_bin" "-Djava.io.tmpdir=$dir_bin/.temp" "-Duser.home=$dir_bin" "-Djna.library.path=$dir_bin" "-Djava.library.path=$dir_bin" -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=25000 -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory -Dnet.sourceforge.tuned.prefs.file=prefs.properties -jar "$dir_bin/FileBot.jar" "$@"
\ No newline at end of file
diff --git a/source/ehcache.xml b/source/ehcache.xml
index 8c187f24..7021839a 100644
--- a/source/ehcache.xml
+++ b/source/ehcache.xml
@@ -3,7 +3,7 @@
 	<!--
 	Persistent disk store location
 	-->
-	<diskStore path="${ehcache.disk.store.dir}" />
+	<diskStore path="${cache.disk.store.dir}" />
 	
 	<!--
 	Mandatory Default Cache configuration. These settings will be applied to caches
diff --git a/source/net/sourceforge/filebot/Main.java b/source/net/sourceforge/filebot/Main.java
index d39cb000..b74e8321 100644
--- a/source/net/sourceforge/filebot/Main.java
+++ b/source/net/sourceforge/filebot/Main.java
@@ -5,6 +5,7 @@ package net.sourceforge.filebot;
 import static java.awt.GraphicsEnvironment.*;
 import static javax.swing.JFrame.*;
 import static net.sourceforge.filebot.Settings.*;
+import static net.sourceforge.tuned.FileUtilities.*;
 import static net.sourceforge.tuned.ui.TunedUtilities.*;
 
 import java.awt.Desktop;
@@ -14,8 +15,10 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.net.URI;
 import java.nio.ByteBuffer;
+import java.nio.channels.FileLock;
 import java.security.CodeSource;
 import java.security.Permission;
 import java.security.PermissionCollection;
@@ -86,6 +89,11 @@ public class Main {
 			if (args.clearUserData()) {
 				// clear preferences and cache
 				System.out.println("Reset preferences and clear cache");
+				for (File cache : getApplicationFolder().listFiles(FOLDERS)) {
+					if (cache.getName().startsWith(".")) {
+						delete(cache);
+					}
+				}
 				Settings.forPackage(Main.class).clear();
 				CacheManager.getInstance().clearAll();
 			}
@@ -314,15 +322,56 @@ public class Main {
 	/**
 	 * Shutdown ehcache properly, so that disk-persistent stores can actually be saved to disk
 	 */
-	private static void initializeCache() {
-		System.setProperty("ehcache.disk.store.dir", new File(getApplicationFolder(), "cache").getAbsolutePath());
-		Runtime.getRuntime().addShutdownHook(new Thread() {
-			
-			@Override
-			public void run() {
-				CacheManager.getInstance().shutdown();
+	private static void initializeCache() throws Exception {
+		// prepare cache folder for this application instance
+		File cacheRoot = new File(getApplicationFolder(), ".cache");
+		
+		try {
+			for (int i = 0; true; i++) {
+				File cache = new File(cacheRoot, String.format("%d", i));
+				if (!cache.isDirectory() && !cache.mkdirs()) {
+					throw new IOException("Failed to create cache dir: " + cache);
+				}
+				
+				File lockFile = new File(cache, ".lock");
+				final RandomAccessFile handle = new RandomAccessFile(lockFile, "rw");
+				final FileLock lock = handle.getChannel().tryLock();
+				if (lock != null) {
+					// setup cache dir for ehcache
+					System.setProperty("cache.disk.store.dir", cache.getAbsolutePath());
+					
+					// make sure to orderly shutdown cache
+					Runtime.getRuntime().addShutdownHook(new Thread() {
+						
+						@Override
+						public void run() {
+							CacheManager.getInstance().shutdown();
+							try {
+								lock.release();
+							} catch (Exception e) {
+								Logger.getLogger(Main.class.getName()).log(Level.WARNING, e.toString());
+							}
+							try {
+								handle.close();
+							} catch (Exception e) {
+								Logger.getLogger(Main.class.getName()).log(Level.WARNING, e.toString());
+							}
+						}
+					});
+					
+					// cache for this application instance is successfully set up and locked
+					return;
+				}
+				
+				// try next lock file
+				handle.close();
 			}
-		});
+		} catch (Exception e) {
+			Logger.getLogger(Main.class.getName()).log(Level.WARNING, e.toString(), e);
+		}
+		
+		// use cache root itself as fail-safe fallback
+		System.setProperty("cache.disk.store.dir", cacheRoot.getAbsolutePath());
 	}
 	
 	
diff --git a/source/net/sourceforge/filebot/cli/ArgumentProcessor.java b/source/net/sourceforge/filebot/cli/ArgumentProcessor.java
index 4a18328e..16c510bd 100644
--- a/source/net/sourceforge/filebot/cli/ArgumentProcessor.java
+++ b/source/net/sourceforge/filebot/cli/ArgumentProcessor.java
@@ -122,7 +122,7 @@ public class ArgumentProcessor {
 				}
 			} else {
 				// execute user script
-				System.setProperty("grape.root", new File(getApplicationFolder(), "grape").getAbsolutePath());
+				System.setProperty("grape.root", new File(getApplicationFolder(), ".grape").getAbsolutePath());
 				
 				Bindings bindings = new SimpleBindings();
 				bindings.put("args", args.getFiles(false));
diff --git a/source/net/sourceforge/tuned/FileUtilities.java b/source/net/sourceforge/tuned/FileUtilities.java
index 49f2d928..7db6fd1a 100644
--- a/source/net/sourceforge/tuned/FileUtilities.java
+++ b/source/net/sourceforge/tuned/FileUtilities.java
@@ -101,6 +101,12 @@ public final class FileUtilities {
 	}
 	
 	
+	public static boolean delete(File file) {
+		// delete files or files
+		return org.apache.commons.io.FileUtils.deleteQuietly(file);
+	}
+	
+	
 	public static byte[] readFile(File source) throws IOException {
 		InputStream in = new FileInputStream(source);