Merge branch 'hotfix/0.2.2'

Author: Nincodedo

pom.xml

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

src/main/java/com/nincraft/modpackdownloader/container/CurseFile.java

@@ -74,8 +74,7 @@ public String buildProjectUrl() {
 		return String.format(Reference.CURSEFORGE_BASE_URL + "%s" + Reference.COOKIE_TEST_1, getProjectID());
 	}
 
-	@Override
-	public String getDownloadUrl() {
+	public String getCurseForgeDownloadUrl() {
 		return String.format(Reference.CURSEFORGE_BASE_URL + "%s-%s/files/%s/download", getProjectID(), getProjectName(),
 				getFileID());
 	}

src/main/java/com/nincraft/modpackdownloader/handler/CurseFileHandler.java

@@ -26,17 +26,17 @@
 @Log4j2
 public class CurseFileHandler extends ModHandler {
 
-	private static void downloadCurseMod(final CurseFile curseFile) {
+	private static void downloadCurseMod(CurseFile curseFile) {
 		try {
-			curseFile.setFileName(getCurseForgeDownloadLocation(curseFile));
+			curseFile = getCurseForgeDownloadLocation(curseFile);
 			DownloadHelper.downloadFile(curseFile);
 		} catch (IOException e) {
 			log.error(e);
 		}
 	}
 
-	private static String getCurseForgeDownloadLocation(final CurseFile curseFile) throws IOException {
-		String url = curseFile.getDownloadUrl();
+	private static CurseFile getCurseForgeDownloadLocation(final CurseFile curseFile) throws IOException {
+		String url = curseFile.getCurseForgeDownloadUrl();
 		String projectName = curseFile.getName();
 		String encodedDownloadLocation = URLHelper.encodeSpaces(projectName);
 
@@ -71,9 +71,11 @@ private static String getCurseForgeDownloadLocation(final CurseFile curseFile) t
 			} else {
 				encodedDownloadLocation = projectName + Reference.JAR_FILE_EXT;
 			}
+			curseFile.setDownloadUrl(actualURL);
 		}
+		curseFile.setFileName(URLHelper.decodeSpaces(encodedDownloadLocation));
 
-		return URLHelper.decodeSpaces(encodedDownloadLocation);
+		return curseFile;
 	}
 
 	public static void updateCurseFile(final CurseFile curseFile) {

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

@@ -40,7 +40,7 @@ public static DownloadStatus downloadFile(final DownloadableFile downloadableFil
 		}
 		val decodedFileName = URLHelper.decodeSpaces(downloadableFile.getFileName());
 
-		if (FileSystemHelper.getDownloadedFile(decodedFileName, downloadableFile.getFolder()).exists()) {
+		if (FileSystemHelper.getDownloadedFile(decodedFileName, downloadableFile.getFolder()).exists() && !Reference.forceDownload) {
 			log.info(String.format("Found %s already downloaded, skipping", decodedFileName));
 			return DownloadStatus.SKIPPED;
 		}

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

@@ -1,7 +1,7 @@
 package com.nincraft.modpackdownloader.util;
 
 public class Reference {
-	public static final String CURSEFORGE_BASE_URL = "http://minecraft.curseforge.com/projects/";
+	public static final String CURSEFORGE_BASE_URL = "https://minecraft.curseforge.com/projects/";
 	public static final String CURSEFORGE_WIDGET_JSON_MOD = "mc-mods";
 	public static final String CURSEFORGE_WIDGET_JSON_MODPACK = "modpacks";
 	public static final String CURSEFORGE_WIDGET_JSON_URL = "http://widget.mcf.li/%s/minecraft/%s.json";