Update plugins to use filesDir

Change-Id: I7b86511d66a605d3f800b6d4171d65863cdae70c
Reviewed-on: http://gerrit.dmdirc.com/1216
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java

@@ -50,12 +50,9 @@ import java.util.ArrayList;
  *
  * @author Shane 'Dataforce' McCormack
  */
-public final class FreeDesktopNotificationsPlugin extends Plugin implements
-        ConfigChangeListener{
+public final class FreeDesktopNotificationsPlugin extends Plugin implements ConfigChangeListener {
     /** The DcopCommand we created */
     private FDNotifyCommand command = null;
-    /** Files dir */
-    private static final String filesDir  = Main.getConfigDir() + "plugins/freedesktop_notifications_files/";
     /** notification timeout. */
     private int timeout;
     /** notification icon. */
@@ -82,11 +79,13 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements
      * @return True if the notification was shown.
      */
     public boolean showNotification(final String title, final String message) {
+        if (getFilesDir() == null) { return false; }
+        
         final ArrayList<String> args = new ArrayList<String>();
         
         args.add("/usr/bin/env");
         args.add("python");
-        args.add(filesDir+"notify.py");
+        args.add(getFilesDirString() + "notify.py");
         args.add("-a");
         args.add("DMDirc");
         args.add("-i");
@@ -157,16 +156,10 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements
             try {
                 final ResourceManager res = pi.getResourceManager();
                 
-                // Make sure our files dir exists
-                final File newDir = new File(filesDir);
-                if (!newDir.exists()) {
-                    newDir.mkdirs();
-                }
-            
-                // Now extract the files needed
+                // Extract the files needed
                 try {
-                    res.extractResoucesEndingWith(newDir, ".py");
-                    res.extractResoucesEndingWith(newDir, ".png");
+                    res.extractResoucesEndingWith(getFilesDir(), ".py");
+                    res.extractResoucesEndingWith(getFilesDir(), ".png");
                 } catch (IOException ex) {
                     Logger.userError(ErrorLevel.MEDIUM, "Unable to extract files for Free desktop notifications: " + ex.getMessage(), ex);
                 }
@@ -188,7 +181,7 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements
     /** {@inheritDoc} */
     @Override
     public void domainUpdated() {
-        IdentityManager.getAddonIdentity().setOption(getDomain(), "general.icon", filesDir+"icon.png");
+        IdentityManager.getAddonIdentity().setOption(getDomain(), "general.icon", getFilesDirString() + "icon.png");
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/addons/mediasource_windows/DllSource.java

@@ -38,25 +38,31 @@ public class DllSource implements MediaSource {
     /** Use getArtistTitle */
     private final boolean useArtistTitle;
 
+    /** Parent Plugin. */
+    final WindowsMediaSourcePlugin parent;
+
     /**
      * Instantiates the media source.
      *
+     * @param parent The plugin that owns this DllSource
      * @param playerName Name of Player and DLL
      */
-    public DllSource(final String playerName) {
-        this(playerName, false);
+    public DllSource(final WindowsMediaSourcePlugin parent, final String playerName) {
+        this(parent, playerName, false);
     }
 
     /**
      * Instantiates the media source.
      *
+     * @param parent The plugin that owns this DllSource
      * @param playerName Name of Player and DLL
      * @param useArtistTitle True if getArtistTitle should be parsed rather than
      *                       using getArtist() and getTitle()
      */
-    public DllSource(final String playerName, final boolean useArtistTitle) {
+    public DllSource(final WindowsMediaSourcePlugin parent, final String playerName, final boolean useArtistTitle) {
         this.playerName = playerName;
         this.useArtistTitle = useArtistTitle;
+        this.parent = parent;
     }
 
     /** {@inheritDoc} */
@@ -72,13 +78,13 @@ public class DllSource implements MediaSource {
      * @return "Good" Output
      */
     private String getOutput(final String command) {
-        return WindowsMediaSourcePlugin.getOutput(playerName, command).getGoodOutput();
+        return parent.getOutput(playerName, command).getGoodOutput();
     }
 
     /** {@inheritDoc} */
     @Override
     public MediaSourceState getState() {
-        final MediaInfoOutput result = WindowsMediaSourcePlugin.getOutput(playerName, "getPlayState");
+        final MediaInfoOutput result = parent.getOutput(playerName, "getPlayState");
 
         if (result.getExitCode() == 0) {
             final String output = result.getGoodOutput();

src/com/dmdirc/addons/mediasource_windows/WindowsMediaSourcePlugin.java

@@ -47,17 +47,14 @@ public class WindowsMediaSourcePlugin extends Plugin implements MediaSourceManag
     /** Media sources. */
     private final List<MediaSource> sources;
 
-    /** Files dir */
-    private static final String filesDir = Main.getConfigDir() + "plugins/windowsmediasource_files/";
-
     /**
      * Creates a new instance of DcopMediaSourcePlugin.
      */
     public WindowsMediaSourcePlugin() {
         super();
         sources = new ArrayList<MediaSource>();
-        sources.add(new DllSource("Winamp", true));
-        sources.add(new DllSource("iTunes", false));
+        sources.add(new DllSource(this, "Winamp", true));
+        sources.add(new DllSource(this, "iTunes", false));
     }
 
     /** {@inheritDoc} */
@@ -73,9 +70,9 @@ public class WindowsMediaSourcePlugin extends Plugin implements MediaSourceManag
      * @param method Method to call
      * @return a MediaInfoOutput with the results
      */
-    protected static MediaInfoOutput getOutput(final String player, final String method) {
+    protected MediaInfoOutput getOutput(final String player, final String method) {
         try {
-            final Process myProcess = Runtime.getRuntime().exec(new String[]{filesDir + "GetMediaInfo.exe", player, method});
+            final Process myProcess = Runtime.getRuntime().exec(new String[]{getFilesDirString() + "GetMediaInfo.exe", player, method});
             final StringBuffer data = new StringBuffer();
             new StreamReader(myProcess.getErrorStream()).start();
             new StreamReader(myProcess.getInputStream(), data).start();
@@ -107,16 +104,10 @@ public class WindowsMediaSourcePlugin extends Plugin implements MediaSourceManag
         try {
             final ResourceManager res = pi.getResourceManager();
 
-            // Make sure our files dir exists
-            final File newDir = new File(filesDir);
-            if (!newDir.exists()) {
-                newDir.mkdirs();
-            }
-
-            // Now extract the .dlls and .exe
+            // Extract the .dlls and .exe
             try {
-                res.extractResoucesEndingWith(newDir, ".dll");
-                res.extractResoucesEndingWith(newDir, ".exe");
+                res.extractResoucesEndingWith(getFilesDir(), ".dll");
+                res.extractResoucesEndingWith(getFilesDir(), ".exe");
             } catch (IOException ex) {
                 Logger.userError(ErrorLevel.MEDIUM, "Unable to extract files for windows media source: " + ex.getMessage(), ex);
             }