Merge branch 'hotfix/0.3.2'

Author: Nincodedo

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.nincraft</groupId>
 	<artifactId>ModPackDownloader</artifactId>
-	<version>0.3.1</version>
+	<version>0.3.2</version>
 	<name>Mod Pack Downloader</name>
 	<packaging>jar</packaging>
 	<properties>

src/main/java/com/nincraft/modpackdownloader/processor/DownloadModsProcessor.java

@@ -4,6 +4,7 @@
 import com.nincraft.modpackdownloader.container.Manifest;
 import com.nincraft.modpackdownloader.container.Mod;
 import com.nincraft.modpackdownloader.handler.ForgeHandler;
+import com.nincraft.modpackdownloader.util.Arguments;
 import com.nincraft.modpackdownloader.util.DownloadHelper;
 import com.nincraft.modpackdownloader.util.Reference;
 import lombok.extern.log4j.Log4j2;
@@ -24,7 +25,7 @@ public DownloadModsProcessor(final List<File> manifestFiles) {
 	}
 
 	public static final void downloadMods(final Manifest manifest) {
-		setExecutorService(Executors.newFixedThreadPool(MOD_LIST.size() + 1));
+		setExecutorService(Executors.newFixedThreadPool(Arguments.maxDownloadThreads > 0 ? Arguments.maxDownloadThreads : MOD_LIST.size() + 1));
 		Runnable forgeThread = new Thread(() -> {
 			ForgeHandler.downloadForge(manifest.getMinecraftVersion(), manifest.getMinecraft().getModLoaders());
 		});

src/main/java/com/nincraft/modpackdownloader/util/Arguments.java

@@ -19,6 +19,8 @@ public class Arguments {
 	@Parameter(names = {"-releaseType"}, description = "Release type for Curse updates. Acceptable parameters" +
 			"are release, beta, and alpha", validateWith = ReleaseType.class)
 	public static String releaseType;
+	@Parameter(names = {"-maxDownloadThreads"}, description = "Max number of threads for downloading mods. The default is however many mods are in your manifest")
+	public static int maxDownloadThreads;
 
 	@Parameter(names = {"-forceDownload"}, description = "Forces downloading instead of pulling from the cache")
 	public static boolean forceDownload = false;

src/test/java/com/nincraft/modpackdownloader/ModPackDownloaderTest.java

@@ -62,6 +62,22 @@ public void testDownload() throws InterruptedException {
 		}
 	}
 
+	@Test
+	public void testDownloadOneThread() throws InterruptedException {
+		String[] args = {"-manifest", "src/test/resources/download-test.json", "-maxDownloadThreads", "1"};
+		ModPackDownloader.main(args);
+		File mod = null;
+		List<String> mods = new ArrayList<>(Arrays.asList("Thaumcraft-1.8.9-5.2.4.jar", "DimensionalDoors-2.2.5-test9.jar", "pants.jar", "forge-1.8.9-11.15.1.1902-1.8.9-installer.jar"));
+		List<String> checkFiles = addMods(mods);
+
+		for (String fileCheck : checkFiles) {
+			mod = new File(fileCheck);
+			log.info("Checking " + mod + ": " + mod.exists());
+			Assert.assertTrue(mod.exists());
+			mod.deleteOnExit();
+		}
+	}
+
 	@Test
 	public void testUpdate() throws InterruptedException, IOException, ParseException {
 		String manifestName = "src/test/resources/update-test.json";