don't add file to classpath if the file is already present on the classpath - Test #67

Mumfrey
1 parent 1bc2d41a
Showing 4 changed files with 39 additions and 3 deletions
java/common/com/mumfrey/liteloader/core/api/EnumeratorModuleFolder.java
java/common/com/mumfrey/liteloader/interfaces/LoadableFile.java
java/common/com/mumfrey/liteloader/launch/ClassPathUtilities.java
java/common/com/mumfrey/liteloader/launch/LoaderProperties.java
@@ -48,12 +48,13 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 	protected boolean readJarFiles;
 	protected boolean loadTweaks;
+	protected boolean forceInjection;
 	/**
 	 * True if this is a versioned folder and the enumerator should also try to load tweak jars which would normally be ignored
 	 */
 	protected final boolean loadTweakJars;
-
+	
 	public EnumeratorModuleFolder(LiteLoaderCoreAPI coreAPI, File directory, boolean loadTweakJars)
 	{
 		this.coreAPI         = coreAPI;
@@ -66,6 +67,7 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 	{
 		this.loadTweaks = properties.loadTweaksEnabled();
 		this.readJarFiles = properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_SEARCH_JARFILES, true);
+		this.forceInjection = properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_FORCE_INJECTION, false);
 		this.coreAPI.writeDiscoverySettings();
 	}
@@ -77,6 +79,7 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 	public void writeSettings(LoaderEnvironment environment, LoaderProperties properties)
 	{
 		properties.setBooleanProperty(LoaderProperties.OPTION_SEARCH_JARFILES, this.readJarFiles);
+		properties.setBooleanProperty(LoaderProperties.OPTION_FORCE_INJECTION, this.forceInjection);
 	}
 	/* (non-Javadoc)
@@ -146,6 +149,7 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 		for (File file : this.directory.listFiles(this.getFilenameFilter()))
 		{
 			LoadableFile candidateFile = new LoadableFile(file);
+			candidateFile.setForceInjection(this.forceInjection);
 			try
 			{
 				this.inspectFile(enumerator, candidateFile);
@@ -39,6 +39,8 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
 	 */
 	protected boolean injected;
+	protected boolean forceInjection;
+	
 	/**
 	 * Position to inject the mod file at in the class path, if blank injects at the bottom as usual, alternatively
 	 * the developer can specify "top" to inject at the top, "base" to inject above the game jar, or "above: name" to
@@ -87,6 +89,7 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
 	{
 		super(file.getAbsolutePath());
 		this.displayName = this.getName();
+		this.forceInjection = file.forceInjection;
 		this.assignJarMetaData(file);
 	}
@@ -295,6 +298,15 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
 		return new ArrayList<String>();
 	}
+	public boolean isInjectionForced()
+	{
+		return this.forceInjection;
+	}
+	
+	public void setForceInjection(boolean forceInjection)
+	{
+		this.forceInjection = forceInjection;
+	}
 	@Override
 	public boolean isInjected()
@@ -307,6 +319,15 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
 	{
 		if (!this.injected)
 		{
+			this.injected = true;
+			
+			boolean isOnClassPath = ClassPathUtilities.isJarOnClassPath(this, classLoader);
+			if (!this.forceInjection && isOnClassPath)
+			{
+				LiteLoaderLogger.info("%s already exists on the classpath, skipping injection", this);
+				return false;
+			}
+			
 			ClassPathUtilities.injectIntoClassPath(classLoader, this.getURL(), this.getInjectionStrategy());
 			if (injectIntoParent)
@@ -314,8 +335,8 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
 				LiteLoaderTweaker.addURLToParentClassLoader(this.getURL());
 			}
-			this.injected = true;
 			return true;
+			
 		}
 		return false;
@@ -232,11 +232,21 @@ public abstract class ClassPathUtilities
 	 */
 	public static boolean isJarOnClassPath(File jarFile)
 	{
+		URLClassLoader classLoader = (URLClassLoader)Launch.class.getClassLoader();
+		return ClassPathUtilities.isJarOnClassPath(jarFile, classLoader);
+	}
+
+	/**
+	 * @param jarFile
+	 * @param classLoader
+	 */
+	public static boolean isJarOnClassPath(File jarFile, URLClassLoader classLoader)
+	{
 		try
 		{
 			String jarURL = jarFile.toURI().toURL().toString();
-			URL[] classPath = ((URLClassLoader)Launch.class.getClassLoader()).getURLs();
+			URL[] classPath = classLoader.getURLs();
 			for (URL classPathEntry : classPath)
 			{
 				if (classPathEntry.toString().equals(jarURL))
@@ -96,4 +96,5 @@ public interface LoaderProperties
 	public static final String OPTION_SEARCH_MODS       = "search.mods";
 	public static final String OPTION_SEARCH_CLASSPATH  = "search.classpath";
 	public static final String OPTION_SEARCH_JARFILES   = "search.jarfiles";
+	public static final String OPTION_FORCE_INJECTION   = "forceInjection";
 }