fix bad fetch

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

@@ -34,7 +34,7 @@ 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");

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

@@ -1,6 +1,7 @@
 package downloader;
 
 import java.io.File;
+import java.io.IOException;
 
 import downloader.helper.ArchiveHelper;
 import downloader.helper.SlugHelper;
@@ -13,13 +14,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

@@ -4,7 +4,7 @@ public class Log {
 	private Log() {}
 
 	public static void e(String who, String msg) {
-		System.err.println(String.valueOf(who) + "  :  " + msg);
+		System.out.println(String.valueOf(who) + "  :  " + msg);
 	}
 	
 	public static void i(String who, String msg) {

ModsListDownloader/src/downloader/ModUpdater.java

@@ -16,6 +16,7 @@ public class ModUpdater {
     private DirectUpdateManager directUpdateManager;
     private CurseUpdateManager curseUpdateManager;
     private Database db;
+	private final String ME = "ModUpdater";
     
     public ModUpdater() {
         this.db = new Database();
@@ -27,7 +28,7 @@ public class ModUpdater {
 		File modsList = new File("modpack.txt");
 
         if(!(modsList.exists() && modsList.isFile())) {
-            Log.e("Updater", "[ERROR]no mod file found exiting...");
+            Log.e(ME, "[ERROR]no mod file found exiting...");
             System.exit(1);
         }
 
@@ -50,12 +51,19 @@ public class ModUpdater {
 				}
 		    }
             in.close();
-            Log.i("Main", "finished");
-
         } catch( IOException e ) {
             e.printStackTrace();
             System.exit(1);
         }
+		
+		//on attend la fin des threads
+		while( !threads.isEmpty() ) {
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {}
+		}
+		Log.i(ME, "finished");
+		curseUpdateManager.updateFile();
     }
 
     public static boolean isAComment(String line)
@@ -71,9 +79,10 @@ final class UpdaterThread extends Thread {
 	private final DirectUpdateManager directUpdateManager;
 	private final CurseUpdateManager curseUpdateManager;
 	private final List<Thread> threads;
+	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;
@@ -88,7 +97,9 @@ final class UpdaterThread extends Thread {
 			handleDirectDownload(line);
 		} else if (line.startsWith("del=")) {
 			String[] delete = line.split("del=");
-			new File(delete[1]).delete();
+			if(new File("mods/" + delete[1]).delete()) {
+				Log.i(ME, "Successfully removed " + delete[1]);
+			}
 		}
 		else {
 			if (line.split("/").length >= 5) {
@@ -110,12 +121,12 @@ 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);
-                Log.i("main","done");
+                Log.i(ME,"done");
             } catch (MalformedURLException e) {
-                Log.e("ModUpdater", "could not update mod, error while downloading");
+                Log.e(ME, "could not update mod, error while downloading");
             }
 		}
     }
@@ -139,11 +150,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

@@ -90,13 +90,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");