Implement delete plugin

3 files changed, 104 insertions, 22 deletions

diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java b/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java
index 1bca676..1e33d2f 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java
+++ b/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java
@@ -257,12 +257,14 @@ public class DefaultPluginManager implements PluginManager {
         // expand all plugin archives

         FileFilter zipFilter = new ZipFileFilter();

         File[] zipFiles = pluginsDirectory.listFiles(zipFilter);

-        for (File zipFile : zipFiles) {

-        	try {

-				expandPluginArchive(zipFile);

-			} catch (IOException e) {

-				log.error(e.getMessage(), e);

-			}

+        if (zipFiles != null) {

+        	for (File zipFile : zipFiles) {

+        		try {

+        			expandPluginArchive(zipFile);

+        		} catch (IOException e) {

+        			log.error(e.getMessage(), e);

+        		}

+        	}

         }

 

         // check for no plugins

@@ -271,20 +273,24 @@ public class DefaultPluginManager implements PluginManager {
         filterList.add(new NotFileFilter(createHiddenPluginFilter()));

         FileFilter pluginsFilter = new AndFileFilter(filterList);

         File[] directories = pluginsDirectory.listFiles(pluginsFilter);

-        log.debug("Found possible {} plugins: {}", directories.length, Arrays.asList(directories));

-        if (directories.length == 0) {

+        List<File> dirArray = new ArrayList<File>();

+        if (directories != null) {

+        	dirArray.addAll(Arrays.asList(directories));

+        }

+        log.debug("Found possible {} plugins: {}", dirArray.size(), dirArray);

+        if (dirArray.size() == 0) {

         	log.info("No plugins");

         	return;

         }

 

         // load any plugin from plugins directory

-        for (File directory : directories) {

-            try {

-                loadPlugin(directory);

-            } catch (PluginException e) {

-				log.error(e.getMessage(), e);

-            }

-        }

+       	for (File directory : dirArray) {

+       		try {

+       			loadPlugin(directory);

+       		} catch (PluginException e) {

+       			log.error(e.getMessage(), e);

+       		}

+       	}

 

         // resolve 'unresolvedPlugins'

         try {

@@ -333,6 +339,51 @@ public class DefaultPluginManager implements PluginManager {
     	return false;

     }

 

+    @Override

+	public boolean deletePlugin(String pluginId) {

+    	if (!plugins.containsKey(pluginId)) {

+    		throw new IllegalArgumentException(String.format("Unknown pluginId %s", pluginId));

+    	}

+		PluginWrapper pw = getPlugin(pluginId);

+		PluginState state = stopPlugin(pluginId);

+

+		if (PluginState.STOPPED != state) {

+			log.error(String.format("Failed to stop plugin %s on delete", pluginId));

+			return false;

+		}

+

+		if (!unloadPlugin(pluginId)) {

+			log.error(String.format("Failed to unload plugin %s on delete", pluginId));

+			return false;

+		}

+

+		File pluginFolder = new File(pluginsDirectory, pw.getPluginPath());

+		File pluginZip = null;

+

+		FileFilter zipFilter = new ZipFileFilter();

+        File[] zipFiles = pluginsDirectory.listFiles(zipFilter);

+        if (zipFiles != null) {

+        	// strip prepended / from the plugin path

+        	String dirName = pw.getPluginPath().substring(1);

+        	// find the zip file that matches the plugin path

+        	for (File zipFile : zipFiles) {

+        		String name = zipFile.getName().substring(0, zipFile.getName().lastIndexOf('.'));

+        		if (name.equals(dirName)) {

+        			pluginZip = zipFile;

+        			break;

+        		}

+        	}

+        }

+

+		if (pluginFolder.exists()) {

+			FileUtils.delete(pluginFolder);

+		}

+		if (pluginZip != null && pluginZip.exists()) {

+			FileUtils.delete(pluginZip);

+		}

+		return true;

+	}

+

     /**

      * Get plugin class loader for this path.

      */

diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginManager.java b/pf4j/src/main/java/ro/fortsoft/pf4j/PluginManager.java
index 6ffe4cf..57fb890 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginManager.java
+++ b/pf4j/src/main/java/ro/fortsoft/pf4j/PluginManager.java
@@ -79,6 +79,14 @@ public interface PluginManager {
      */
     public boolean unloadPlugin(String pluginId);
 
+    /**
+     * Deletes a plugin.
+     *
+     * @param pluginId
+     * @return true if the plugin was deleted
+     */
+    public boolean deletePlugin(String pluginId);
+
 	public PluginClassLoader getPluginClassLoader(String pluginId);
 
 	public <T> List<T> getExtensions(Class<T> type);
diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/util/FileUtils.java b/pf4j/src/main/java/ro/fortsoft/pf4j/util/FileUtils.java
index 0b8c38a..68cc2b3 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/util/FileUtils.java
+++ b/pf4j/src/main/java/ro/fortsoft/pf4j/util/FileUtils.java
@@ -1,11 +1,11 @@
 /*
  * Copyright 2012 Decebal Suiu
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with
  * the License. You may obtain a copy of the License in the LICENSE file, or at:
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
@@ -25,11 +25,11 @@ import java.util.List;
  */
 public class FileUtils {
 
-	public static List<String> readLines(File file, boolean ignoreComments) throws IOException {		
+	public static List<String> readLines(File file, boolean ignoreComments) throws IOException {
 		if (!file.exists() || !file.isFile()) {
 			return Collections.emptyList();
 		}
-		
+
 		List<String> lines = new ArrayList<String>();
 
 		BufferedReader reader = null;
@@ -46,8 +46,31 @@ public class FileUtils {
 				reader.close();
 			}
 		}
-		
+
 		return lines;
 	}
-	
+
+	/**
+	 * Delete a file or recursively delete a folder.
+	 *
+	 * @param fileOrFolder
+	 * @return true, if successful
+	 */
+	public static boolean delete(File fileOrFolder) {
+		boolean success = false;
+		if (fileOrFolder.isDirectory()) {
+			File [] files = fileOrFolder.listFiles();
+			if (files != null) {
+				for (File file : files) {
+					if (file.isDirectory()) {
+						success |= delete(file);
+					} else {
+						success |= file.delete();
+					}
+				}
+			}
+		}
+		success |= fileOrFolder.delete();
+		return success;
+	}
 }