From d1ffa877b039ce0dde9856208a2c55811ee3bf13 Mon Sep 17 00:00:00 2001
From: CrushedPixel <crushedpixelmaps@gmail.com>
Date: Thu, 16 Jul 2015 14:01:46 +0200
Subject: [PATCH] Load download Folder from ReplayFileIO in
 DownloadedFileHandler DRY code in ReplayFileIO to retreive and create
 directories from config

---
 .../replaymod/registry/DownloadedFileHandler.java   |  4 ++--
 .../crushedpixel/replaymod/utils/ReplayFileIO.java  | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/eu/crushedpixel/replaymod/registry/DownloadedFileHandler.java b/src/main/java/eu/crushedpixel/replaymod/registry/DownloadedFileHandler.java
index 186c3baa..d77bc562 100644
--- a/src/main/java/eu/crushedpixel/replaymod/registry/DownloadedFileHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/registry/DownloadedFileHandler.java
@@ -4,6 +4,7 @@ import eu.crushedpixel.replaymod.ReplayMod;
 import eu.crushedpixel.replaymod.gui.elements.listeners.ProgressUpdateListener;
 import eu.crushedpixel.replaymod.online.authentication.AuthenticationHandler;
 import eu.crushedpixel.replaymod.utils.ReplayFile;
+import eu.crushedpixel.replaymod.utils.ReplayFileIO;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 
@@ -18,9 +19,8 @@ public class DownloadedFileHandler {
     private File downloadFolder;
 
     public DownloadedFileHandler() {
-        downloadFolder = new File(ReplayMod.replaySettings.getDownloadPath());
         try {
-            FileUtils.forceMkdir(downloadFolder);
+            downloadFolder = ReplayFileIO.getReplayDownloadFolder();
 
             for(File f : FileUtils.listFiles(downloadFolder, new String[]{"mcpr"}, false)) {
                 try {
diff --git a/src/main/java/eu/crushedpixel/replaymod/utils/ReplayFileIO.java b/src/main/java/eu/crushedpixel/replaymod/utils/ReplayFileIO.java
index 66493600..19deedd9 100755
--- a/src/main/java/eu/crushedpixel/replaymod/utils/ReplayFileIO.java
+++ b/src/main/java/eu/crushedpixel/replaymod/utils/ReplayFileIO.java
@@ -29,13 +29,18 @@ public class ReplayFileIO {
     private static final byte[] uniqueBytes = new byte[]{0, 1, 1, 2, 3, 5, 8};
 
     public static File getRenderFolder() throws IOException {
-        File folder = new File(ReplayMod.replaySettings.getRenderPath());
-        FileUtils.forceMkdir(folder);
-        return folder;
+        return makeFolderFromPath(ReplayMod.replaySettings.getRenderPath());
     }
 
     public static File getReplayFolder() throws IOException {
-        String path = ReplayMod.replaySettings.getRecordingPath();
+        return makeFolderFromPath(ReplayMod.replaySettings.getRecordingPath());
+    }
+
+    public static File getReplayDownloadFolder() throws IOException {
+        return makeFolderFromPath(ReplayMod.replaySettings.getDownloadPath());
+    }
+
+    private static File makeFolderFromPath(String path) throws IOException {
         File folder = new File(path);
         FileUtils.forceMkdir(folder);
         return folder;