fix all copetition error
This commit is contained in:
@@ -6,14 +6,13 @@ import java.io.FileOutputStream;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.ObjectInputStream;
|
import java.io.ObjectInputStream;
|
||||||
import java.io.ObjectOutputStream;
|
import java.io.ObjectOutputStream;
|
||||||
import java.util.SortedMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import java.util.TreeMap;
|
|
||||||
|
|
||||||
import downloader.helper.ArchiveHelper;
|
import downloader.helper.ArchiveHelper;
|
||||||
import downloader.helper.SlugHelper;
|
import downloader.helper.SlugHelper;
|
||||||
|
|
||||||
public class CurseUpdateManager {
|
public class CurseUpdateManager {
|
||||||
private SortedMap<Integer, String> installedMods;
|
private ConcurrentHashMap<Integer, String> installedMods;
|
||||||
|
|
||||||
public CurseUpdateManager()
|
public CurseUpdateManager()
|
||||||
{
|
{
|
||||||
@@ -27,13 +26,13 @@ public class CurseUpdateManager {
|
|||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
ObjectInputStream ois = new ObjectInputStream(new FileInputStream(modsMapFile));
|
ObjectInputStream ois = new ObjectInputStream(new FileInputStream(modsMapFile));
|
||||||
installedMods = (SortedMap<Integer, String>) ois.readObject();
|
installedMods = (ConcurrentHashMap<Integer, String>) ois.readObject();
|
||||||
ois.close();
|
ois.close();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
modsMapFile.delete();
|
modsMapFile.delete();
|
||||||
}
|
}
|
||||||
if(installedMods == null)installedMods = new TreeMap<>();
|
|
||||||
}
|
}
|
||||||
|
if(installedMods == null)installedMods = new ConcurrentHashMap<>();
|
||||||
this.updateFile();
|
this.updateFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,7 +60,7 @@ public class CurseUpdateManager {
|
|||||||
|
|
||||||
if (alredyInstalledMods.exists()) {
|
if (alredyInstalledMods.exists()) {
|
||||||
//we only check if the jar file still works
|
//we only check if the jar file still works
|
||||||
if(ArchiveHelper.checkJarIntegrity(alredyInstalledMods)) {
|
if(!ArchiveHelper.checkJarIntegrity(alredyInstalledMods)) {
|
||||||
alredyInstalledMods.delete();
|
alredyInstalledMods.delete();
|
||||||
installedMods.remove(modid);
|
installedMods.remove(modid);
|
||||||
updateFile();
|
updateFile();
|
||||||
@@ -110,18 +109,17 @@ public class CurseUpdateManager {
|
|||||||
* @param fileName
|
* @param fileName
|
||||||
* @param modID
|
* @param modID
|
||||||
*/
|
*/
|
||||||
public void addModsToTheList(String fileName,int modID)
|
public synchronized void addModsToTheList(String fileName,int modID)
|
||||||
{
|
{
|
||||||
installedMods.put(modID, fileName);
|
installedMods.put(modID, fileName);
|
||||||
updateFile();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isModIdKnown(int modId)
|
public synchronized boolean isModIdKnown(int modId)
|
||||||
{
|
{
|
||||||
return installedMods.get(modId) != null;
|
return installedMods.get(modId) != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateFile()
|
public synchronized void updateFile()
|
||||||
{
|
{
|
||||||
File modsMap = new File("mods/modsMap.sav");
|
File modsMap = new File("mods/modsMap.sav");
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -4,7 +4,9 @@ import java.io.BufferedReader;
|
|||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.FileReader;
|
import java.io.FileReader;
|
||||||
|
import java.io.FileWriter;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.io.PrintWriter;
|
||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
|
|
||||||
import downloader.helper.ArchiveHelper;
|
import downloader.helper.ArchiveHelper;
|
||||||
@@ -29,11 +31,22 @@ public class DatabaseVersionManager {
|
|||||||
if( version == null || !latestVersion.equals(version) ) {
|
if( version == null || !latestVersion.equals(version) ) {
|
||||||
Log.i(ME, "new dbVersion avaliable downloading...");
|
Log.i(ME, "new dbVersion avaliable downloading...");
|
||||||
downloadDatabase(latestVersion);
|
downloadDatabase(latestVersion);
|
||||||
|
saveDbVersion(latestVersion);
|
||||||
} else {
|
} else {
|
||||||
Log.i(ME, "update to Date");
|
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) {
|
private void downloadDatabase(String dbVersion) {
|
||||||
Log.i(ME, "fetching=" + "http://files.mcdex.net/data/mcdex-v5-" + dbVersion + ".dat.bz2");
|
Log.i(ME, "fetching=" + "http://files.mcdex.net/data/mcdex-v5-" + dbVersion + ".dat.bz2");
|
||||||
File archive;
|
File archive;
|
||||||
@@ -81,8 +94,7 @@ public class DatabaseVersionManager {
|
|||||||
versionFile.delete();
|
versionFile.delete();
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
throw new FileNotFoundException();
|
throw new FileNotFoundException();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ public class Log {
|
|||||||
private Log() {}
|
private Log() {}
|
||||||
|
|
||||||
public static void e(String who, String msg) {
|
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) {
|
public static void i(String who, String msg) {
|
||||||
|
|||||||
@@ -51,12 +51,19 @@ public class ModUpdater {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
in.close();
|
in.close();
|
||||||
Log.i(ME, "finished");
|
|
||||||
|
|
||||||
} catch( IOException e ) {
|
} catch( IOException e ) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
System.exit(1);
|
System.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//on attend la fin des threads
|
||||||
|
while( !threads.isEmpty() ) {
|
||||||
|
try {
|
||||||
|
Thread.sleep(10);
|
||||||
|
} catch (InterruptedException e) {}
|
||||||
|
}
|
||||||
|
Log.i(ME, "finished");
|
||||||
|
curseUpdateManager.updateFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isAComment(String line)
|
public static boolean isAComment(String line)
|
||||||
@@ -143,6 +150,9 @@ final class UpdaterThread extends Thread {
|
|||||||
else {
|
else {
|
||||||
Log.i("DB", "NEW MOD DETECTED " + modID);
|
Log.i("DB", "NEW MOD DETECTED " + modID);
|
||||||
upToDate = this.curseUpdateManager.checkAndDelete(new File("mods/" + HttpHelper.getFileNameFromURL(downloadUrl)), pj.getSlug());
|
upToDate = this.curseUpdateManager.checkAndDelete(new File("mods/" + HttpHelper.getFileNameFromURL(downloadUrl)), pj.getSlug());
|
||||||
|
if(upToDate) {
|
||||||
|
this.curseUpdateManager.addModsToTheList("mods/" + HttpHelper.getFileNameFromURL(downloadUrl), modID);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!upToDate) {
|
if (!upToDate) {
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ public class HttpHelper {
|
|||||||
return readFileFromUrl(urlToFetch, new File((folder + name.toLowerCase()).trim()));
|
return readFileFromUrl(urlToFetch, new File((folder + name.toLowerCase()).trim()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//TODO: debug
|
||||||
private static File readFileFromUrl(String urlToFetch, File destination) throws MalformedURLException {
|
private static File readFileFromUrl(String urlToFetch, File destination) throws MalformedURLException {
|
||||||
URL url = new URL(urlToFetch);
|
URL url = new URL(urlToFetch);
|
||||||
HttpURLConnection con;
|
HttpURLConnection con;
|
||||||
|
|||||||
Reference in New Issue
Block a user