Merge branch 'hotfix/0.3.3'

Nincodedo · Nincodedo · commit cbb7d8f85c6b · 2017-01-08T03:04:02.000-06:00
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.nincraft</groupId>
 	<artifactId>ModPackDownloader</artifactId>
-	<version>0.3.2</version>
+	<version>0.3.3</version>
 	<name>Mod Pack Downloader</name>
 	<packaging>jar</packaging>
 	<properties>
diff --git a/src/main/java/com/nincraft/modpackdownloader/ModPackDownloader.java b/src/main/java/com/nincraft/modpackdownloader/ModPackDownloader.java
@@ -44,12 +44,10 @@ public static void main(final String[] args) throws InterruptedException {
 
 		setupRepo();
 
-		if (Arguments.updateCurseModPack) {
-			if (ModPackManager.updateModPack()) {
-				ModPackManager.checkPastForgeVersion();
-				ModPackManager.handlePostDownload();
-			}
-			return;
+		if (Arguments.updateCurseModPack && ModPackManager.updateModPack()) {
+			ModPackManager.checkPastForgeVersion();
+			ModPackManager.handlePostDownload();
+			Arguments.downloadMods = true;
 		}
 
 		processManifests();
diff --git a/src/main/java/com/nincraft/modpackdownloader/container/CurseFile.java b/src/main/java/com/nincraft/modpackdownloader/container/CurseFile.java
@@ -77,7 +77,12 @@ public String buildProjectUrl() {
 	}
 
 	public String getCurseForgeDownloadUrl() {
-		return String.format(Reference.CURSEFORGE_BASE_URL + "%s/files/%s/download", getProjectName(),
+		return getCurseForgeDownloadUrl(true);
+	}
+
+	public String getCurseForgeDownloadUrl(boolean isCurseForge) {
+		String baseUrl = isCurseForge ? Reference.CURSEFORGE_BASE_URL : Reference.FTB_BASE_URL;
+		return String.format(baseUrl + "%s/files/%s/download", getProjectName(),
 				getFileID());
 	}
 
diff --git a/src/main/java/com/nincraft/modpackdownloader/handler/CurseFileHandler.java b/src/main/java/com/nincraft/modpackdownloader/handler/CurseFileHandler.java
@@ -33,12 +33,16 @@ private static void downloadCurseMod(CurseFile curseFile) {
 		}
 	}
 
-	private static CurseFile getCurseForgeDownloadLocation(final CurseFile curseFile) throws IOException {
-		val url = curseFile.getCurseForgeDownloadUrl();
+	public static CurseFile getCurseForgeDownloadLocation(final CurseFile curseFile) throws IOException {
+		return getCurseForgeDownloadLocation(curseFile, true);
+	}
+
+	public static CurseFile getCurseForgeDownloadLocation(final CurseFile curseFile, boolean isCurseForge) throws IOException {
+		val url = curseFile.getCurseForgeDownloadUrl(isCurseForge);
 		val projectName = curseFile.getName();
 		String encodedDownloadLocation = URLHelper.encodeSpaces(projectName);
 
-		if (!encodedDownloadLocation.contains(Reference.JAR_FILE_EXT)) {
+		if (!encodedDownloadLocation.contains(Reference.JAR_FILE_EXT) || !encodedDownloadLocation.contains(Reference.ZIP_FILE_EXT)) {
 			val newUrl = url + Reference.COOKIE_TEST_1;
 
 			HttpURLConnection conn = (HttpURLConnection) new URL(newUrl).openConnection();
@@ -48,7 +52,7 @@ private static CurseFile getCurseForgeDownloadLocation(final CurseFile curseFile
 			String actualURL = conn.getURL().toString();
 			int retryCount = 0;
 
-			while (conn.getResponseCode() != 200 || !actualURL.contains(Reference.JAR_FILE_EXT)) {
+			while (conn.getResponseCode() != 200 || !actualURL.contains(Reference.JAR_FILE_EXT) || !actualURL.contains(Reference.ZIP_FILE_EXT)) {
 				val headerLocation = conn.getHeaderField("Location");
 				if (headerLocation != null) {
 					actualURL = headerLocation;
@@ -65,7 +69,7 @@ private static CurseFile getCurseForgeDownloadLocation(final CurseFile curseFile
 			}
 
 			int lastIndexUrl = actualURL.lastIndexOf(Reference.URL_DELIMITER) + 1;
-			if (actualURL.substring(lastIndexUrl).contains(Reference.JAR_FILE_EXT)) {
+			if (actualURL.substring(lastIndexUrl).contains(Reference.JAR_FILE_EXT) || actualURL.substring(lastIndexUrl).contains(Reference.ZIP_FILE_EXT)) {
 				encodedDownloadLocation = actualURL.substring(lastIndexUrl);
 			} else {
 				encodedDownloadLocation = projectName + Reference.JAR_FILE_EXT;
diff --git a/src/main/java/com/nincraft/modpackdownloader/manager/ModPackManager.java b/src/main/java/com/nincraft/modpackdownloader/manager/ModPackManager.java
@@ -50,22 +50,32 @@ public static boolean updateModPack() {
 			modPack.setFileName(modPack.getFileName() + ".zip");
 		}
 		Arguments.modFolder = ".";
-		if (DownloadStatus.SKIPPED.equals(DownloadHelper.getInstance().downloadFile(modPack, false))) {
+		modPack.setDownloadUrl(modPack.getCurseForgeDownloadUrl());
+		getDownloadUrl(modPack, true);
+		DownloadStatus downloadStatus = DownloadHelper.getInstance().downloadFile(modPack, false);
+
+		if (DownloadStatus.FAILURE.equals(downloadStatus)) {
+			log.warn(String.format("Failed to download %s. Attempting redownload with FTB URL", modPack.getName()));
+			modPack.setDownloadUrl(modPack.getCurseForgeDownloadUrl(false));
+			getDownloadUrl(modPack, false);
+			downloadStatus = DownloadHelper.getInstance().downloadFile(modPack, false);
+		}
+
+		if (DownloadStatus.SKIPPED.equals(downloadStatus)) {
 			log.info(String.format("No new updates found for %s", modPack.getName()));
-			returnStatus = false;
 		}
+
+		returnStatus = checkSuccessfulDownloadStatus(downloadStatus);
 		Arguments.modFolder = "mods";
 		File modsFolder = new File(Arguments.modFolder);
 		File backupModsFolder = new File("backupmods");
-		try {
-			FileUtils.moveDirectory(modsFolder, backupModsFolder);
-		} catch (IOException e) {
-			log.error("Could not backup mod folder", e);
+		if (backupModsFolder(modsFolder, backupModsFolder)) {
 			return false;
 		}
 		try {
 			ZipFile modPackZip = new ZipFile(modPack.getFileName());
 			modPackZip.extractAll(".");
+			log.info("Successfully unzipped modpack");
 		} catch (ZipException e) {
 			log.error("Could not unzip modpack", e);
 			try {
@@ -84,6 +94,30 @@ public static boolean updateModPack() {
 		return returnStatus;
 	}
 
+	private static boolean backupModsFolder(File modsFolder, File backupModsFolder) {
+		if (modsFolder.exists()) {
+			try {
+				FileUtils.moveDirectory(modsFolder, backupModsFolder);
+			} catch (IOException e) {
+				log.error("Could not backup mod folder", e);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private static boolean checkSuccessfulDownloadStatus(DownloadStatus downloadStatus) {
+		return DownloadStatus.SUCCESS_DOWNLOAD.equals(downloadStatus) || DownloadStatus.SUCCESS_CACHE.equals(downloadStatus);
+	}
+
+	private static void getDownloadUrl(CurseFile modPack, boolean isCurseForge) {
+		try {
+			CurseFileHandler.getCurseForgeDownloadLocation(modPack, isCurseForge);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
 	public static void handlePostDownload() {
 		try {
 			File overrides = new File("overrides");
diff --git a/src/main/java/com/nincraft/modpackdownloader/util/Reference.java b/src/main/java/com/nincraft/modpackdownloader/util/Reference.java
@@ -2,6 +2,7 @@
 
 public class Reference {
 	public static final String CURSEFORGE_BASE_URL = "https://minecraft.curseforge.com/projects/";
+	public static final String FTB_BASE_URL = "https://www.feed-the-beast.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";
@@ -12,6 +13,7 @@ public class Reference {
 	public static final String MAC_FOLDER = "/Library/Application Support/modpackdownloader/";
 	public static final String OTHER_FOLDER = "/.modpackdownloader/";
 	public static final String JAR_FILE_EXT = ".jar";
+	public static final String ZIP_FILE_EXT = ".zip";
 	public static final int RETRY_COUNTER = 5;
 	public static final char URL_DELIMITER = '/';
 	public static final String DEFAULT_MANIFEST_FILE = "manifest.json";

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,12 @@ public String buildProjectUrl() {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public String getCurseForgeDownloadUrl() {`
`80`		`- return String.format(Reference.CURSEFORGE_BASE_URL + "%s/files/%s/download", getProjectName(),`
	`80`	`+ return getCurseForgeDownloadUrl(true);`
	`81`	`+ }`
	`82`	`+`
	`83`	`+ public String getCurseForgeDownloadUrl(boolean isCurseForge) {`
	`84`	`+ String baseUrl = isCurseForge ? Reference.CURSEFORGE_BASE_URL : Reference.FTB_BASE_URL;`
	`85`	`+ return String.format(baseUrl + "%s/files/%s/download", getProjectName(),`
`81`	`86`	`getFileID());`
`82`	`87`	`}`
`83`	`88`