bandwidth precision improvement

ModsListDownloader/scripts/release.sh

@@ -4,8 +4,8 @@ then
 fi
 -rm release-${VER}.zip 2> /dev/null
 mv mcDownloader.jar ModPackDl.jar
-echo "java -jar ModPackDl.jar -t -v" > run.sh
-echo "java -jar ModPackDl.jar -t -v" > run.bat
+echo "java -jar ModPackDl.jar --thread 2 -v" > run.sh
+echo "java -jar ModPackDl.jar --thread 2 -v" > run.bat
 echo "pause" >> run.bat
 zip release-${VER}.zip ModPackDl.jar run.sh run.bat
 rm run.sh

ModsListDownloader/src/downloader/Log.java

@@ -8,23 +8,27 @@ public class Log {
 	private static PrintStream lastStream = System.out;
 
 	public static void e(String who, String msg) {
-		printNonStatic(String.valueOf(who) + "  :  " + msg, System.err);
+		printNonStatic("[ERROR]" + who + "  :  " + msg, System.err);
 	}
+
+	public static void w(String who, String msg) {
+		printNonStatic("[WARN]" + who + "  :  " + msg, System.out);
+    }
 	
 	public static void i(String who, String msg) {
-		if(Main.verbose) printNonStatic(String.valueOf(who) + "  :  " + msg, System.out);
+		if(Main.verbose) printNonStatic("[INFO]" + who + "  :  " + msg, System.out);
 	}
 
 	private static void printNonStatic(String line, PrintStream stream) {
 		//erase last stream since we used \r
 		lastStream.print("");
 		stream.println(line);
-		stream.print(staticLine + "\r");
+		stream.print(staticLine + "                 \r");
 		lastStream = stream;
 	}
 
 	public static void setStaticPrint(String staticString) {
 		staticLine = staticString;
-		System.out.print(staticString + "\r");
+		System.out.print(staticString + "                    \r");
 	}
 }

ModsListDownloader/src/downloader/Main.java

@@ -10,18 +10,25 @@ import java.util.Iterator;
 public class Main {	
 
 	public static boolean verbose;
-	public static boolean checkingonly;
 	public static Integer threadNb;
     public static String mcVersion;
 
 	public static void main(String[] args) {
-		mcVersion = "1.12.2";
-
+		if(mcVersion == null) {
+			mcVersion = "1.12.2";
+		}
+		else {
+			if(!isVersionValid()) {
+				Log.e("main", "the version number provided is invalid");
+				System.exit(1);
+			}
+		}
 		checkModsDirectory();
 		new DatabaseVersionManager().updateIfNeeded();
 		interpretArgs(args);
 		//no threading option called => only one thread will be used
 		if( threadNb == null)threadNb = 1;
+		Log.i("Main", "Running on " + threadNb + " thread");
 		new ModUpdater().update();
 	}
 
@@ -44,55 +51,73 @@ public class Main {
 		while (it.hasNext()) {
 			String cmd = it.next();
 			switch (cmd) {
-				case "--check":
-					System.out.println("--check is not avaliable");
-					checkingonly = true;
-					continue;
 				case "-t":
+					Log.w("main", "Warning using -t option can lead to corruption during download if you have a lot of cores or a slow internet");
+
 					if (threadNb != null) {
 						Log.e("main", "error conflicting arguments --thread and -t");
 						System.exit(1);
 					}
 
 					if (cores <= 0) {
-						Log.i("main","java think you have no cpu core... sooo lets go for 4");
-						threadNb = Integer.valueOf(4);
-						continue;
+						Log.i("main","java think you have no cpu core... sooo lets go for 2");
+						threadNb = Integer.valueOf(2);
+						break;
 					} 
 					Log.i("main", "running on " + cores + " thread");
 					threadNb = Integer.valueOf(cores);
-					continue;
+					break;
 
 				case "-v":
 					verbose = true;
-					continue;
+					break;
+
+				case "-version":
+					checkNext(it);
+					mcVersion = it.next();
+					break;
 					
 				case "--thread":
 					if (threadNb != null) {
 						Log.e("main", "error conflicting arguments --thread and -t");
 						System.exit(1);
 					} 
-					if (!it.hasNext()) {
-						Log.e("main", "arguments invalid please refer to --help");
-						System.exit(1);
-					} 
+					checkNext(it);
 					String threadNumber = it.next();
 					if (threadNumber.matches("[0-9]*")) {
 						threadNb = Integer.valueOf(Integer.parseInt(threadNumber));
-						continue;
+						break;
 					} 
 					Log.e("main","arguments invalid please refer to --help");
 					System.exit(1);
-					continue;
+					break;
 
 				case "--help":
-					Log.i("main", "use --check to check without updating\nuse --help to see this help\nuse -v to see verbose\nuse --threads to specify the number of threads\nuse -t to set the number of thread automaticaly");
+					Log.i("main", "use --help to see this help\nuse -v to see verbose\nuse --threads to specify the number of threads\nuse -t to set the number of thread automaticaly");
 					System.exit(0);
-					continue;
+					break;
 				default:
 					Log.e("main", "unknown args " + cmd + "\nsee --help for help");
 					System.exit(1);
 			} 
 		} 
 	}
+
+	private static boolean isVersionValid() {
+		switch(mcVersion.split(".").length) {
+			case 2:
+				return mcVersion.matches("[0-9]*\\.[0-9]*");
+			case 3:
+				return mcVersion.matches("[0-9]*\\.[0-9]*\\.[0-9]*");
+			default:
+				return false;
+		}
+	}
+
+	private static void checkNext(Iterator<String> it) {
+		if (!it.hasNext()) {
+			Log.e("main", "arguments invalid please refer to --help");
+			System.exit(1);
+		} 
+	}
 }

ModsListDownloader/src/downloader/ModUpdater.java

@@ -9,13 +9,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 import downloader.forgeSvc.ForgeSvcFile;
+import downloader.helper.ArchiveHelper;
 import downloader.helper.HttpHelper;
 
 public class ModUpdater {
 	private DirectUpdateManager directUpdateManager;
 	private CurseUpdateManager curseUpdateManager;
 	private Database db;
-	private final String ME = "ModUpdater";
+	private static final String ME = "ModUpdater";
 
 	public ModUpdater() {
 		this.db = new Database();
@@ -32,6 +33,14 @@ public class ModUpdater {
         }
 
         //parse and download
+		startProcessingThreads(modsList);
+		checkForFailures();
+
+		Log.i(ME, "finished");
+		curseUpdateManager.updateFile();
+	}
+
+	private void startProcessingThreads(File modsList) {
 		List<Thread> threads = new ArrayList<>(Main.threadNb);
 		try {
 			BufferedReader in = new BufferedReader(new FileReader(modsList));
@@ -43,10 +52,8 @@ public class ModUpdater {
 					threads.add(t);
 				}
 
-				while(Main.threadNb == threads.size()) {
-					try {
-						Thread.sleep(10);
-					} catch (InterruptedException e) {}
+				while(Main.threadNb >= threads.size()) {
+					threadSleep();
 				}
 			}
 			in.close();
@@ -54,15 +61,45 @@ public class ModUpdater {
 			e.printStackTrace();
 			System.exit(1);
 		}
+		waitThreadsEnd(threads);
+	}
 
-		//on attend la fin des threads
-		while( !threads.isEmpty() ) {
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException e) {}
+	private void checkForFailures() {
+		if(! UpdaterThread.failedLines.isEmpty()) {
+			List<String> failures = new ArrayList<>(UpdaterThread.failedLines);
+			UpdaterThread.failedLines.clear();
+
+
+			Log.e(ME, "filed to download " + failures.size());
+			Log.e(ME, "Retrying but slower");
+
+			for(String line : failures) {
+				Thread t = new UpdaterThread(line, db, directUpdateManager, curseUpdateManager, null);
+				t.start();
+				try {
+					t.join();
+				} catch (InterruptedException e) {}
+			}
+
+			if(! UpdaterThread.failedLines.isEmpty()) {
+				Log.e(ME, "could not download the following mods : ");
+				for(String s: failures) {
+					Log.e(ME, "    " + s);
+				}
+			}
 		}
-		Log.i(ME, "finished");
-		curseUpdateManager.updateFile();
+	}
+
+	private void waitThreadsEnd(List<Thread> threads) {
+		while( !threads.isEmpty() ) {
+			threadSleep();
+		}
+	}
+
+	private void threadSleep() {
+		try {
+			Thread.sleep(10);
+		} catch (InterruptedException e) {}
 	}
 
 	public static boolean isAComment(String line)
@@ -79,6 +116,7 @@ final class UpdaterThread extends Thread {
 	private final CurseUpdateManager curseUpdateManager;
 	private final List<Thread> threads;
 	private static final String ME = "ModUpdaterThread";
+	protected static final List<String> failedLines = new ArrayList<>();
 
 	public UpdaterThread(String line, Database db, DirectUpdateManager directUpdateManager, CurseUpdateManager curseUpdateManager, List<Thread> threads) {
 		super(line);
@@ -91,26 +129,39 @@ final class UpdaterThread extends Thread {
 
 	@Override
 	public void run() {
-		if(line.startsWith("direct="))
-		{
-			handleDirectDownload(line);
-		} else if (line.startsWith("del=")) {
-			String[] delete = line.split("del=");
-			if(new File("mods/" + delete[1]).delete()) {
-				Log.i(ME, "Successfully removed " + delete[1]);
+		try {
+				//used for post download checks
+			File downloadedFile = null;
+			if(line.startsWith("direct=") && line.contains(";")  && line.contains("@"))
+			{
+				downloadedFile = handleDirectDownload(line);
+			} else if (line.startsWith("del=")) {
+				String[] delete = line.split("del=");
+				if(new File("mods/" + delete[1]).delete()) {
+					Log.i(ME, "Successfully removed " + delete[1]);
+				}
 			}
-		}
-		else {
-			if (line.split("/").length >= 5) {
-				handleCurseDownload(line);
+			else {
+				if (line.split("/").length >= 5 && line.contains("curseforge")) {
+					downloadedFile = handleCurseDownload(line);
+				} else {
+					Log.e(ME, "unrecognized line: " + line);
+				}
 			}
-		}
+
+			if(downloadedFile != null && !ArchiveHelper.checkJarIntegrity(downloadedFile)) {
+				downloadedFile.delete();
+				failedLines.add(line);
+			}
+		} catch(Exception e) { e.printStackTrace(); }
+		
+
 		super.run();
 		//on se retire de la pool d'execution
-		this.threads.remove(this);
+		if(this.threads != null)this.threads.remove(this);
 	}
 
-	private void handleDirectDownload(String line) {
+	private File handleDirectDownload(String line) {
 		String url = line.replaceFirst("direct=.*@", "");
 		String filename=extractNameFromLink(line);
 		
@@ -122,15 +173,16 @@ final class UpdaterThread extends Thread {
 		{
 			Log.i(ME,"downloading "+ filename);
 			try {
-				HttpHelper.readFileFromUrlToFolder(url,"mods",filename);
 				Log.i(ME,"done");
+				return HttpHelper.readFileFromUrlToFolder(url,"mods",filename);
 			} catch (MalformedURLException e) {
 				Log.e(ME, "could not update mod, error while downloading");
 			}
 		}
+		return null;
 	}
 
-	private void handleCurseDownload(String line) {
+	private File handleCurseDownload(String line) {
 		String name = line.split("/")[5];
 		int modID = db.findModBySlug(name);
 		ProjectInfo pj = db.getProjectInfo(modID);
@@ -157,13 +209,14 @@ final class UpdaterThread extends Thread {
 
 				if (!upToDate) {
 					Log.i("MOD", "downloading  " + pj.getName().replace(" ", "-")); 
-					HttpHelper.readFileFromUrlToFolder(downloadUrl, "mods"); 
+					File downloaded = HttpHelper.readFileFromUrlToFolder(downloadUrl, "mods"); 
 					
 					Log.i("MOD", "download finished");
 					if (!this.curseUpdateManager.isModIdKnown(modID)) {
 						this.curseUpdateManager.addModsToTheList(HttpHelper.getFileNameFromURL(downloadUrl), modID);
 						Log.i("DB", "added a mod to the registry"); 
 					} 
+					return downloaded;
 				} 
 			} catch (MalformedURLException e) {
 				e.printStackTrace();
@@ -171,6 +224,7 @@ final class UpdaterThread extends Thread {
 		} else {
 			Log.e("DB", "no file in server");
 		} 
+		return null;
     }
 
 	private static String extractNameFromLink(String line) {

ModsListDownloader/src/downloader/helper/HttpHelper.java

@@ -13,6 +13,7 @@ import java.nio.file.Paths;
 import java.util.Locale;
 
 import downloader.Log;
+import downloader.Main;
 
 public class HttpHelper {
 	private HttpHelper() {}
@@ -121,14 +122,13 @@ public class HttpHelper {
 				int bytesRead = in.read(buffer);
 				if (bytesRead < 0)
 					break;
-				{
-					double elapsed = ( System.currentTimeMillis() - start ) / 1000;
-					if(elapsed != 0) {
-						long estimatedBandwith = (long) (bytesRead / elapsed);
-						//display the estimate
-						Log.setStaticPrint(formatBandwidth(estimatedBandwith));
-						start = System.currentTimeMillis();
-					}
+					
+				double elapsed = ( System.currentTimeMillis() - start ) / 1000;
+				if(elapsed != 0) {
+					long estimatedBandwith = (long) (bytesRead / elapsed);
+					//display the estimate
+					Log.setStaticPrint("estimated bandwidth :" + formatBandwidth(estimatedBandwith * Main.threadNb));
+					start = System.currentTimeMillis();
 				}
 				downloadingWriter.write(buffer, 0, 	bytesRead);
 			}