bandwith wip

Create LICENSE

LICENSE

@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org>

ModsListDownloader/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "java.project.referencedLibraries": [
+        "lib/**/*.jar"
+    ]
+}

ModsListDownloader/src/downloader/CurseForgeModFile.java

@@ -1,29 +1,25 @@
 package downloader;
 
 public class CurseForgeModFile extends ProjectInfo {
-  	private int projectID;
+	private int projectID;
-  	private int fileID;
+	private int fileID;
-  	private boolean clientOnly;
+	private boolean clientOnly;	
-	
+	public CurseForgeModFile(ProjectInfo pj, int projectID, int fileID, boolean clientOnly) {
-  	public CurseForgeModFile(ProjectInfo pj, int projectID, int fileID, boolean clientOnly) {
+		this(pj.getSlug(), pj.getName(), pj.getDesc(), projectID, fileID, clientOnly);
-  		this(pj.getSlug(), pj.getName(), pj.getDesc(), projectID, fileID, clientOnly);
+	}	
-  	}
+	public CurseForgeModFile(String slug, String name, String desc, int projectID, int fileID, boolean clientOnly) {
-
+		super(slug, name, desc);
-  	public CurseForgeModFile(String slug, String name, String desc, int projectID, int fileID, boolean clientOnly) {
+		this.projectID = projectID;
-  		super(slug, name, desc);
+		this.fileID = fileID;
-  		this.projectID = projectID;
+		this.clientOnly = clientOnly;
-  		this.fileID = fileID;
+	}	
-  		this.clientOnly = clientOnly;
+	public int getFileID() {
-  	}
+		return this.fileID;
-
+	}
-  	public int getFileID() {
+	public int getProjectID() {
-  		return this.fileID;
+		return this.projectID;
-  	}
+	}
-  	public int getProjectID() {
+	public boolean isClientOnly() {
-  		return this.projectID;
+		return this.clientOnly;
-  	}
+	}
-
-  	public boolean isClientOnly() {
-  		return this.clientOnly;
-  	}
 }

ModsListDownloader/src/downloader/CurseUpdateManager.java

@@ -6,14 +6,13 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.util.SortedMap;
+import java.util.concurrent.ConcurrentHashMap;
-import java.util.TreeMap;
 
 import downloader.helper.ArchiveHelper;
 import downloader.helper.SlugHelper;
 
 public class CurseUpdateManager {
-	private SortedMap<Integer, String> installedMods;
+	private ConcurrentHashMap<Integer, String> installedMods;
 	
 	public CurseUpdateManager()
 	{
@@ -27,18 +26,18 @@ public class CurseUpdateManager {
 		{
 			try {
 				ObjectInputStream ois = new ObjectInputStream(new FileInputStream(modsMapFile));
-				installedMods = (SortedMap<Integer, String>) ois.readObject();
+				installedMods = (ConcurrentHashMap<Integer, String>) ois.readObject();
 				ois.close();
 			} catch (Exception e) {
 				modsMapFile.delete();
 			}
-			if(installedMods == null)installedMods = new TreeMap<>();
 		}
+		if(installedMods == null)installedMods = new ConcurrentHashMap<>();
 		this.updateFile();
 	}
 
 	public boolean checkAndDelete(File modToDownload, int modid) {
-		String alredyInstalledName = installedMods.get(modid).toLowerCase();	
+		String alredyInstalledName = installedMods.get(modid).toLowerCase();
 		File alredyInstalledMods= null;
 		
 		//on cherche le fichier local affin de ne pas voir d'erreur avec la casse
@@ -61,7 +60,7 @@ public class CurseUpdateManager {
 
 		if (alredyInstalledMods.exists()) {
 			//we only check if the jar file still works
-			if(ArchiveHelper.checkJarIntegrity(alredyInstalledMods)) {
+			if(!ArchiveHelper.checkJarIntegrity(alredyInstalledMods)) {
 				alredyInstalledMods.delete();
 				installedMods.remove(modid);
 				updateFile();
@@ -110,18 +109,17 @@ public class CurseUpdateManager {
 	 * @param fileName
 	 * @param modID
 	 */
-	public void addModsToTheList(String fileName,int modID)
+	public synchronized void addModsToTheList(String fileName,int modID)
 	{
 		installedMods.put(modID, fileName);	
-		updateFile();
 	}
 	
-	public boolean isModIdKnown(int modId)
+	public synchronized boolean isModIdKnown(int modId)
 	{
 		return installedMods.get(modId) != null;
 	}
 	
-	private void updateFile()
+	public synchronized void updateFile()
 	{
 		File modsMap = new File("mods/modsMap.sav");
 		try {

ModsListDownloader/src/downloader/Database.java

@@ -13,14 +13,20 @@ import downloader.forgeSvc.ForgeSvcFile;
 import downloader.helper.HttpHelper;
 
 public class Database {
-	DBConnector connector;
+	private DBConnector connector;
+
+	private Gson gson;
+
+	private static final String ME = "Db";
 
-	Gson gson;
-			
 	public Database() {
 		try {
+			//work around to avoid
 			Class.forName("org.sqlite.JDBC");
-		} catch (ClassNotFoundException e1) {} //it will crash anyway
+		} catch (ClassNotFoundException e1) {
+			Log.e(ME, "Error sqLite was not found");
+			System.exit(1);
+		}
 
 		this.connector = new DBConnector();
 		try {
@@ -34,12 +40,12 @@ public class Database {
 	
 	private int findProjectBySlug(String slug, int ptype) {
 		int pjId = -1;
-		ResultSet rs = this.connector.executeRequest("select projectid from projects where type =" + ptype + " and slug LIKE \"%" + slug.trim().toLowerCase() + "%\"");
+		ResultSet rs = this.connector.executeRequest("select projectid from projects where type =" + ptype + " and slug LIKE \"" + slug.trim().toLowerCase() + "\"");
 		try {
 			if (rs.next()) {
 				pjId = rs.getInt("projectid");
 			} else {
-				Log.e("DB", "not found " + slug);
+				Log.e(ME, "not found " + slug);
 				return -1;
 			} 
 		} catch (SQLException e) {

ModsListDownloader/src/downloader/DatabaseVersionManager.java

@@ -4,7 +4,9 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.net.MalformedURLException;
 
 import downloader.helper.ArchiveHelper;
@@ -29,11 +31,22 @@ public class DatabaseVersionManager {
         if( version == null || !latestVersion.equals(version) ) {
             Log.i(ME, "new dbVersion avaliable downloading...");
             downloadDatabase(latestVersion);
+            saveDbVersion(latestVersion);
         } else {
             Log.i(ME, "update to Date");
         }
     }
 
+    private void saveDbVersion(String latestVersion) {
+        File versionFile = new File("dbVersion");
+        PrintWriter out;
+        try {
+            out = new PrintWriter(new FileWriter(versionFile));
+            out.println(latestVersion);
+            out.close();
+        } catch (IOException e) {}
+    }
+
     private void downloadDatabase(String dbVersion) {
         Log.i(ME, "fetching=" + "http://files.mcdex.net/data/mcdex-v5-" + dbVersion + ".dat.bz2");
         File archive;
@@ -81,8 +94,7 @@ public class DatabaseVersionManager {
                 versionFile.delete();
                 return null;
             }
-        } else {
-            throw new FileNotFoundException();
         }
+        throw new FileNotFoundException();
     }
 }

ModsListDownloader/src/downloader/DirectUpdateManager.java

@@ -13,13 +13,8 @@ public class DirectUpdateManager {
      * @return upToDate
      */
     public boolean checkAndDelete(String filename, String slug) {
-        File mod = new File("mods/"+filename);
+        File mod = new File("mods/"+filename.toLowerCase());
-
+        
-        if (!mod.isFile()) {
-            mod.delete();
-            return false;
-        }
-
         if (!mod.exists()) {
             SlugHelper.deleteBySlug(slug);
             return false;

ModsListDownloader/src/downloader/Log.java

@@ -1,13 +1,30 @@
 package downloader;
 
+import java.io.PrintStream;
+
 public class Log {
 	private Log() {}
+	private static String staticLine = "";
+	private static PrintStream lastStream = System.out;
 
 	public static void e(String who, String msg) {
-		System.err.println(String.valueOf(who) + "  :  " + msg);
+		printNonStatic(String.valueOf(who) + "  :  " + msg, System.err);
 	}
 	
 	public static void i(String who, String msg) {
-		if(Main.verbose)System.out.println(String.valueOf(who) + "  :  " + msg);
+		if(Main.verbose) printNonStatic(String.valueOf(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");
+		lastStream = stream;
+	}
+
+	public static void setStaticPrint(String staticString) {
+		staticLine = staticString;
+		System.out.print(staticString + "\r");
 	}
 }

ModsListDownloader/src/downloader/ModUpdater.java

@@ -7,24 +7,23 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Function;
 
 import downloader.forgeSvc.ForgeSvcFile;
 import downloader.helper.HttpHelper;
 
 public class ModUpdater {
-    private DirectUpdateManager directUpdateManager;
+	private DirectUpdateManager directUpdateManager;
-    private CurseUpdateManager curseUpdateManager;
+	private CurseUpdateManager curseUpdateManager;
-    private Database db;
+	private Database db;
 	private final String ME = "ModUpdater";
-    
-    public ModUpdater() {
-        this.db = new Database();
-        this.directUpdateManager = new DirectUpdateManager();
-        this.curseUpdateManager = new CurseUpdateManager();
-    }
 
-    public void update() {
+	public ModUpdater() {
+		this.db = new Database();
+		this.directUpdateManager = new DirectUpdateManager();
+		this.curseUpdateManager = new CurseUpdateManager();
+	}
+
+	public void update() {
 		File modsList = new File("modpack.txt");
 
         if(!(modsList.exists() && modsList.isFile())) {
@@ -35,8 +34,8 @@ public class ModUpdater {
         //parse and download
 		List<Thread> threads = new ArrayList<>(Main.threadNb);
 		try {
-		    BufferedReader in = new BufferedReader(new FileReader(modsList));
+			BufferedReader in = new BufferedReader(new FileReader(modsList));
-		    while (in.ready()) {
+			while (in.ready()) {
 				String line = in.readLine();
 				if (!isAComment(line)) {
 					Thread t = new UpdaterThread(line, db, directUpdateManager, curseUpdateManager, threads);
@@ -49,17 +48,24 @@ public class ModUpdater {
 						Thread.sleep(10);
 					} catch (InterruptedException e) {}
 				}
-		    }
+			}
-            in.close();
+			in.close();
-            Log.i(ME, "finished");
+		} catch( IOException e ) {
+			e.printStackTrace();
+			System.exit(1);
+		}
 
-        } catch( IOException e ) {
+		//on attend la fin des threads
-            e.printStackTrace();
+		while( !threads.isEmpty() ) {
-            System.exit(1);
+			try {
-        }
+				Thread.sleep(100);
-    }
+			} catch (InterruptedException e) {}
+		}
+		Log.i(ME, "finished");
+		curseUpdateManager.updateFile();
+	}
 
-    public static boolean isAComment(String line)
+	public static boolean isAComment(String line)
 	{
 		return line.startsWith("//");
 	}
@@ -75,7 +81,7 @@ final class UpdaterThread extends Thread {
 	private static final String ME = "ModUpdaterThread";
 
 	public UpdaterThread(String line, Database db, DirectUpdateManager directUpdateManager, CurseUpdateManager curseUpdateManager, List<Thread> threads) {
-		super();
+		super(line);
 		this.line = line;
 		this.db = db;
 		this.directUpdateManager = directUpdateManager;
@@ -105,7 +111,7 @@ final class UpdaterThread extends Thread {
 	}
 
 	private void handleDirectDownload(String line) {
-        String url = line.replaceFirst("direct=.*@", "");
+		String url = line.replaceFirst("direct=.*@", "");
 		String filename=extractNameFromLink(line);
 		
 		//le slug est une nom de mods qui se trouve dans le nom du fichier
@@ -114,21 +120,21 @@ final class UpdaterThread extends Thread {
 		boolean upToDate = directUpdateManager.checkAndDelete(filename, slug);
 		if(!upToDate)
 		{
-			Log.i("main","downloading "+ filename);
+			Log.i(ME,"downloading "+ filename);
 			try {
-                HttpHelper.readFileFromUrlToFolder(url,"mods",filename);
+				HttpHelper.readFileFromUrlToFolder(url,"mods",filename);
-                Log.i("main","done");
+				Log.i(ME,"done");
-            } catch (MalformedURLException e) {
+			} catch (MalformedURLException e) {
-                Log.e("ModUpdater", "could not update mod, error while downloading");
+				Log.e(ME, "could not update mod, error while downloading");
-            }
+			}
 		}
-    }
+	}
 
-    private void handleCurseDownload(String line) {
+	private void handleCurseDownload(String line) {
-        String name = line.split("/")[5];
+		String name = line.split("/")[5];
-        int modID = db.findModBySlug(name);
+		int modID = db.findModBySlug(name);
 		ProjectInfo pj = db.getProjectInfo(modID);
-        ForgeSvcFile svc = db.fetchMod(pj, modID);
+		ForgeSvcFile svc = db.fetchMod(pj, modID);
 
         if (svc != null) {
 			try {
@@ -143,11 +149,14 @@ final class UpdaterThread extends Thread {
 				else {
 					Log.i("DB", "NEW MOD DETECTED " + modID);
 					upToDate = this.curseUpdateManager.checkAndDelete(new File("mods/" + HttpHelper.getFileNameFromURL(downloadUrl)), pj.getSlug());
+					if(upToDate) {
+						Log.i("who", "file found");
+						this.curseUpdateManager.addModsToTheList("mods/" + HttpHelper.getFileNameFromURL(downloadUrl), modID);
+					}
 				} 
 
 				if (!upToDate) {
 					Log.i("MOD", "downloading  " + pj.getName().replace(" ", "-")); 
-					
 					HttpHelper.readFileFromUrlToFolder(downloadUrl, "mods"); 
 					
 					Log.i("MOD", "download finished");

ModsListDownloader/src/downloader/helper/HttpHelper.java

@@ -10,6 +10,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.Locale;
 
 import downloader.Log;
 
@@ -90,13 +91,11 @@ public class HttpHelper {
 		}
 
 		File downloadingFile = destination;
-		System.out.println(downloadingFile.getAbsolutePath());
 
 		if (downloadingFile.exists()) {
 			return downloadingFile;
 		} else {
 			try {
-				System.out.println(downloadingFile);
 				downloadingFile.createNewFile();
 			} catch (IOException e) {
 				Log.e("HTTPHelper","permission error could not write file");
@@ -113,6 +112,7 @@ public class HttpHelper {
 			// imposible vu qu'on l'a crée precedament
 		}
 
+		double start = System.currentTimeMillis();
 		try (InputStream in = con.getInputStream()) {
 			// on lit par tranche de 4mo
 			byte[] buffer = new byte[4096];
@@ -121,6 +121,15 @@ 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();
+					}
+				}
 				downloadingWriter.write(buffer, 0, 	bytesRead);
 			}
 			downloadingWriter.close();
@@ -129,7 +138,36 @@ public class HttpHelper {
 		return null;
 
 	}
-	
+
+	/**
+	 *
+	 * @param estimatedBandwith in o/s
+	 * @return
+	 */
+	private static String formatBandwidth(long estimatedBandwith) {
+		//is ko/s
+		if(estimatedBandwith > 1000) {
+			//is mo/s
+			if(estimatedBandwith > 1000 * 1000) {
+				return String.valueOf(estimatedBandwith/ (1000 * 1000)) + "M" + getLocalizedByte() + "/s";
+			} else {
+				return String.valueOf(estimatedBandwith/ 1000) + "K" + getLocalizedByte() + "/s";
+			}
+		} else {
+			return String.valueOf(estimatedBandwith) + getLocalizedByte() + "/s";
+		}
+	}
+
+	private static String getLocalizedByte() {
+		Locale l = Locale.getDefault();
+
+		if (l.equals(Locale.FRANCE) | l.equals(Locale.FRENCH)) {
+			return "O";
+		} else {
+			return "B";
+		}
+	}
+
 	public static String getFileNameFromURL(String url)
 	{
 		String[] urlsplit = url.split("/");