Marc/ModsListDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refacto + recovery code from uncommited on my old pc

Browse Source
This commit is contained in:
marc barbier
2021-07-07 21:45:33 +02:00
parent 2a6b802bb0
commit 7c88e6cf2f
12 changed files with 496 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files
downloader/CurseForgeModFile.java
+26 -26
View File
@@ -1,30 +1,30 @@
package downloader; package downloader;
public class CurseForgeModFile extends ProjectInfo{ public class CurseForgeModFile extends ProjectInfo {
private int projectID;
private int fileID;
private boolean clientOnly;
public CurseForgeModFile(ProjectInfo pj, int projectID, int fileID, boolean clientOnly) {
this(pj.getSlug(), pj.getName(), pj.getDesc(), projectID, fileID, clientOnly);
}
private int projectID; public CurseForgeModFile(String slug, String name, String desc, int projectID, int fileID, boolean clientOnly) {
private int fileID; super(slug, name, desc);
private boolean clientOnly; this.projectID = projectID;
this.fileID = fileID;
public CurseForgeModFile(ProjectInfo pj,int projectID,int fileID,boolean clientOnly) this.clientOnly = clientOnly;
{ }
this(pj.getSlug(),pj.getName(),pj.getDesc(),projectID,fileID,clientOnly);
} public int getFileID() {
return this.fileID;
public CurseForgeModFile(String slug, String name, String desc,int projectID,int fileID,boolean clientOnly) { }
super(slug, name, desc);
this.projectID=projectID; public int getProjectID() {
this.fileID=fileID; return this.projectID;
this.clientOnly=clientOnly; }
}
public boolean isClientOnly() {
public int getFileID() { return this.clientOnly;
return fileID; }
}
public int getProjectID() {
return projectID;
}
public boolean isClientOnly() {
return clientOnly;
}
} }
downloader/DBConnector.java
+9 -17
View File
@@ -8,36 +8,28 @@ import java.sql.SQLException;
public class DBConnector { public class DBConnector {
private Connection conn; private Connection conn;
/**
* Connect to a sample database
*
* @throws SQLException
*/
public void connect(String dbFile) throws SQLException { public void connect(String dbFile) throws SQLException {
conn = null; this.conn = null;
try { try {
// db parameters
String url = "jdbc:sqlite:" + dbFile; String url = "jdbc:sqlite:" + dbFile;
Log.i("DB",url); Log.i("DB", url);
// create a connection to the database this.conn = DriverManager.getConnection(url);
conn = DriverManager.getConnection(url);
} catch (SQLException e) { } catch (SQLException e) {
System.out.println(e.getMessage()); System.out.println(e.getMessage());
throw e; throw e;
} }
} }
public void close() throws SQLException { public void close() throws SQLException {
conn.close(); this.conn.close();
} }
public ResultSet executeRequest(String sql) { public ResultSet executeRequest(String sql) {
try { try {
return conn.createStatement().executeQuery(sql); return this.conn.createStatement().executeQuery(sql);
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} return null;
return null; }
} }
} }
downloader/Database.java
+100 -106
View File
@@ -1,5 +1,8 @@
package downloader; package downloader;
import com.google.gson.Gson;
import downloader.forgeSvc.ForgeSvcEntry;
import downloader.forgeSvc.ForgeSvcFile;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
@@ -7,220 +10,211 @@ import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.compress.utils.IOUtils;
import com.google.gson.Gson;
import downloader.forgeSvc.ForgeSvcEntry;
import downloader.forgeSvc.ForgeSvcFile;
public class Database { public class Database {
String version; String version;
DBConnector connector; DBConnector connector;
Gson gson; Gson gson;
IntegrityChecker integrityChecker; IntegrityChecker integrityChecker;
File dbVer;
File dbVer = new File("dbVersion");
public Database() { public Database() {
dbVer = new File("dbVersion"); if (this.dbVer.exists()) {
if (dbVer.exists()) {
try { try {
BufferedReader bfr = new BufferedReader(new FileReader(dbVer)); BufferedReader bfr = new BufferedReader(new FileReader(this.dbVer));
this.version = bfr.readLine(); this.version = bfr.readLine();
bfr.close(); bfr.close();
this.connector = new DBConnector();
connector = new DBConnector(); this.connector.connect((new File("database.dat")).getAbsolutePath());
connector.connect(new File("database.dat").getAbsolutePath()); } catch (IOException|SQLException e) {
this.dbVer.delete();
} catch (IOException | SQLException e) { this.version = "";
dbVer.delete(); }
version = "";
}
} else { } else {
version = ""; this.version = "";
} }
gson = new Gson(); this.gson = new Gson();
integrityChecker = new IntegrityChecker(); this.integrityChecker = new IntegrityChecker();
} }
public void updateDatabase() { public void updateDatabase() {
try { try {
File decompressedDatabase;
String dbVersion = HttpHelper.readStringFromUrl("http://files.mcdex.net/data/latest.v5"); String dbVersion = HttpHelper.readStringFromUrl("http://files.mcdex.net/data/latest.v5");
if (dbVersion.equals(version)) { if (dbVersion.equals(this.version)) {
Log.i("DB", "alredy up to date"); Log.i("DB", "alredy up to date");
return; return;
} }
if (dbVersion.equals("error")) { if (dbVersion.equals("error") || dbVersion.trim().equals("")) {
Log.i("DB", "an error ocured"); Log.i("DB", "an error ocured");
return; System.exit(1);
} }
Log.i("DB", "newer version found"); Log.i("DB", "newer version found");
if (!this.version.isEmpty()) { if (!this.version.isEmpty()) {
Log.i("DB", "current=" + this.version + " remote=" + dbVersion); Log.i("DB", "current=" + this.version + " remote=" + dbVersion);
} else { } else {
Log.i("DB", "new=" + dbVersion); Log.i("DB", "new=" + dbVersion);
} }
Log.i("DB", "fetching=http://files.mcdex.net/data/mcdex-v5-" + dbVersion + ".dat.bz2");
Log.i("DB", "fetching=" + "http://files.mcdex.net/data/mcdex-v5-" + dbVersion + ".dat.bz2");
File archive = HttpHelper.readFileFromUrl("http://files.mcdex.net/data/mcdex-v5-" + dbVersion + ".dat.bz2"); File archive = HttpHelper.readFileFromUrl("http://files.mcdex.net/data/mcdex-v5-" + dbVersion + ".dat.bz2");
Log.i("DB", "download finished"); Log.i("DB", "download finished");
Log.i("DB", "decompressing db"); Log.i("DB", "decompressing db");
File decompressedDatabase;
try { try {
decompressedDatabase = decompressBz2(archive, "database.dat"); decompressedDatabase = decompressBz2(archive, "database.dat");
} catch (IOException e) { } catch (IOException e) {
Log.i("DB", "cannot extract database"); Log.i("DB", "cannot extract database");
return; return;
} }
Log.i("DB", "done"); Log.i("DB", "done");
Log.i("DB", "loading the database"); Log.i("DB", "loading the database");
connector = new DBConnector(); this.connector = new DBConnector();
try { try {
connector.connect(decompressedDatabase.getAbsolutePath()); this.connector.connect(decompressedDatabase.getAbsolutePath());
} catch (SQLException e) { } catch (SQLException e) {
return; return;
} }
Log.i("DB", "database loaded"); Log.i("DB", "database loaded");
this.version = dbVersion; this.version = dbVersion;
Log.i("DB", "saving db data"); Log.i("DB", "saving db data");
dbVer.delete(); this.dbVer.delete();
try { try {
dbVer.createNewFile(); this.dbVer.createNewFile();
PrintWriter p = new PrintWriter(dbVer); PrintWriter p = new PrintWriter(this.dbVer);
p.print(version); p.print(this.version);
p.close(); p.close();
} catch (Exception e) { } catch (Exception e) {
Log.e("DB", "failed to save db"); Log.e("DB", "failed to save db");
} }
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
Log.i("DB", "database link is dead"); Log.i("DB", "database link is dead");
System.exit(1); System.exit(1);
} }
} }
private File decompressBz2(File inputFile, String outputFile) throws IOException { private File decompressBz2(File inputFile, String outputFile) throws IOException {
BZip2CompressorInputStream input = new BZip2CompressorInputStream( BZip2CompressorInputStream input = new BZip2CompressorInputStream(
new BufferedInputStream(new FileInputStream(inputFile))); new BufferedInputStream(new FileInputStream(inputFile)));
File decompressedFile = new File(outputFile); File decompressedFile = new File(outputFile);
FileOutputStream output = new FileOutputStream(decompressedFile); FileOutputStream output = new FileOutputStream(decompressedFile);
IOUtils.copy(input, output); IOUtils.copy((InputStream)input, output);
return decompressedFile; return decompressedFile;
} }
private int findProjectBySlug(String slug, int ptype) { private int findProjectBySlug(String slug, int ptype) {
int modID = -1; int modID = -1;
ResultSet rs = connector.executeRequest("select projectid from projects where type =" + ptype + " and slug =\"" ResultSet rs = this.connector.executeRequest("select projectid from projects where type =" + ptype + " and slug =\"" +
+ slug.trim().toLowerCase() + "\""); slug.trim().toLowerCase() + "\"");
try { try {
if (rs.next()) { if (rs.next()) {
modID = rs.getInt("projectid"); modID = rs.getInt("projectid");
} else { } else {
Log.e("DB", "not found " + slug); Log.e("DB", "not found " + slug);
return -1; return -1;
} }
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
return -1; return -1;
} }
return modID; return modID;
} }
private int findModBySlug(String slug) { private int findModBySlug(String slug) {
return findProjectBySlug(slug, 0); return findProjectBySlug(slug, 0);
} }
private ProjectInfo getProjectInfo(int projectId) { private ProjectInfo getProjectInfo(int projectId) {
ResultSet rs = connector.executeRequest( ResultSet rs = this.connector.executeRequest(
"select slug, name, description from projects where projectid = " + projectId + " and type = 0"); "select slug, name, description from projects where projectid = " + projectId + " and type = 0");
try { try {
if (rs.next()) { if (rs.next())
return new ProjectInfo(rs.getString("slug"), rs.getString("name"), rs.getString("description")); return new ProjectInfo(rs.getString("slug"), rs.getString("name"), rs.getString("description"));
} } catch (SQLException sQLException) {}
} catch (SQLException e) {
}
return null; return null;
} }
public boolean fetchMod(String string) { public boolean fetchMod(String string) {
String name = string.split("/")[5]; String name = string.split("/")[5];
int modID = findModBySlug(name); int modID = findModBySlug(name);
if (modID == -1) { if (modID == -1) {
Log.e("DB", "could not find mod id"); Log.e("DB", "could not find mod id");
return false; return false;
} }
ProjectInfo pj = getProjectInfo(modID); ProjectInfo pj = getProjectInfo(modID);
if (pj == null) if (pj == null)
return false; return false;
CurseForgeModFile modfile = new CurseForgeModFile(pj, modID, -1, false); CurseForgeModFile modfile = new CurseForgeModFile(pj, modID, -1, false);
ForgeSvcFile file = getLastestFile("1.12.2", modfile); ForgeSvcFile file = getLastestFile("1.12.2", modfile);
if (file != null) { if (file != null) {
try { try {
String downloadUrl = file.getDownloadUrl(modID);
Log.i("MOD", "checking " + pj.getName().replace(" ", "-"));
// si on connais le mod alors on se base si son fichier sinon on essay de le
// trouver
boolean upToDate; boolean upToDate;
if (integrityChecker.isModIdKnown(modID)) { String downloadUrl = file.getDownloadUrl(modID);
Log.i("DB", "found"); if (Main.isVersbose())
upToDate = integrityChecker Log.i("MOD", "checking " + pj.getName().replace(" ", "-"));
.checkAndDelete(new File("mods/" + HttpHelper.getFileNameFromURL(downloadUrl)), modID); if (this.integrityChecker.isModIdKnown(modID)) {
if (Main.isVersbose())
Log.i("DB", "found " + name);
upToDate = this.integrityChecker
.checkAndDelete(new File("mods/" + HttpHelper.getFileNameFromURL(downloadUrl)), modID);
} else { } else {
Log.i("DB", "NEW MOD DETECTED "+modID); Log.i("DB", "NEW MOD DETECTED " + modID);
upToDate = integrityChecker.checkAndDelete( upToDate = this.integrityChecker.checkAndDelete(
new File("mods/" + HttpHelper.getFileNameFromURL(downloadUrl)), pj.getSlug()); new File("mods/" + HttpHelper.getFileNameFromURL(downloadUrl)), pj.getSlug());
} }
if (!upToDate) { if (!upToDate) {
// on remplace les espace par des tiret pour eviter toute confusion if (Main.isVersbose())
Log.i("MOD", "downloading " + pj.getName().replace(" ", "-")); Log.i("MOD", "downloading " + pj.getName().replace(" ", "-"));
HttpHelper.readFileFromUrlToFolder(downloadUrl, "mods"); if (!Main.isCheckingOnly())
Log.i("MOD", "download finished"); HttpHelper.readFileFromUrlToFolder(downloadUrl, "mods");
if (!integrityChecker.isModIdKnown(modID)) { if (Main.isVersbose())
integrityChecker.addModsToTheList(HttpHelper.getFileNameFromURL(downloadUrl), modID); Log.i("MOD", "download finished");
Log.i("DB", "added a mod to the registry"); if (!this.integrityChecker.isModIdKnown(modID) && !Main.isCheckingOnly()) {
} this.integrityChecker.addModsToTheList(HttpHelper.getFileNameFromURL(downloadUrl), modID);
} if (Main.isVersbose())
Log.i("DB", "added a mod to the registry");
}
}
return true; return true;
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
e.printStackTrace(); e.printStackTrace();
} }
} else { } else {
Log.e("DB", "no file in server"); Log.e("DB", "no file in server");
} }
return false; return false;
} }
public ForgeSvcFile getLastestFile(String minecraftVer, CurseForgeModFile mod) { public ForgeSvcFile getLastestFile(String minecraftVer, CurseForgeModFile mod) {
String projectUrl = "https://addons-ecs.forgesvc.net/api/v2/addon/" + mod.getProjectID(); String jsonProject, projectUrl = "https://addons-ecs.forgesvc.net/api/v2/addon/" + mod.getProjectID();
String jsonProject;
try { try {
jsonProject = HttpHelper.readStringFromUrl(projectUrl); jsonProject = HttpHelper.readStringFromUrl(projectUrl);
if (jsonProject.equals("error")) if (jsonProject.equals("error"))
return null; return null;
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
} }
ForgeSvcEntry entry = (ForgeSvcEntry)this.gson.fromJson(jsonProject, ForgeSvcEntry.class);
ForgeSvcEntry entry = gson.fromJson(jsonProject, ForgeSvcEntry.class); byte b;
int i;
for (ForgeSvcFile f : entry.getFiles()) { ForgeSvcFile[] arrayOfForgeSvcFile;
if (f.getGameVersion().equals(minecraftVer)) { for (i = (arrayOfForgeSvcFile = entry.getFiles()).length, b = 0; b < i; ) {
return f; ForgeSvcFile f = arrayOfForgeSvcFile[b];
} if (f.getGameVersion().equals(minecraftVer))
} return f;
b++;
}
return null; return null;
} }
} }
downloader/HttpHelper.java
+53 -87
View File
@@ -4,143 +4,109 @@ import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.nio.file.attribute.FileAttribute;
public class HttpHelper { public class HttpHelper {
public static String readStringFromUrl(String urlToFetch) throws MalformedURLException { public static String readStringFromUrl(String urlToFetch) throws MalformedURLException {
URL url = new URL(urlToFetch);
HttpURLConnection con; HttpURLConnection con;
URL url = new URL(urlToFetch);
try { try {
con = (HttpURLConnection) url.openConnection(); con = (HttpURLConnection)url.openConnection();
} catch (IOException e1) { } catch (IOException e1) {
e1.printStackTrace(); e1.printStackTrace();
return "error"; return "error";
} }
String str = ""; String str = "";
try {
try (InputStream in = con.getInputStream()) { Exception exception2, exception1 = null;
// par tranche de 4mo } catch (IOException iOException) {}
for (;;) {
byte[] buffer = new byte[4096];
int nbBytesRead = in.read(buffer);
if (nbBytesRead < 0)
break;
for (int i = 0; i < nbBytesRead; i++) {
str += (char) buffer[i];
}
}
} catch (IOException e) {
}
return str; return str;
} }
public static File readFileFromUrl(String urlToFetch) throws MalformedURLException { public static File readFileFromUrl(String urlToFetch) throws MalformedURLException {
String[] url = urlToFetch.split("/"); String[] url = urlToFetch.split("/");
if (url.length == 0) if (url.length == 0)
throw new MalformedURLException(); throw new MalformedURLException();
return readFileFromUrl(urlToFetch, url[url.length - 1]); return readFileFromUrl(urlToFetch, url[url.length - 1]);
} }
public static File readFileFromUrl(String urlToFetch, String filename) throws MalformedURLException { public static File readFileFromUrl(String urlToFetch, String filename) throws MalformedURLException {
return readFileFromUrl(urlToFetch, new File(filename)); return readFileFromUrl(urlToFetch, new File(filename));
} }
public static File readFileFromUrlToFolder(String urlToFetch, String folder) throws MalformedURLException { public static File readFileFromUrlToFolder(String urlToFetch, String folder) throws MalformedURLException {
String name = getFileNameFromURL(urlToFetch); String name = getFileNameFromURL(urlToFetch);
if(name == null)throw new MalformedURLException(); if (name == null)
throw new MalformedURLException();
return readFileFromUrlToFolder(urlToFetch, folder,name); return readFileFromUrlToFolder(urlToFetch, folder, name);
} }
public static File readFileFromUrlToFolder(String urlToFetch, String folder,String name) throws MalformedURLException { public static File readFileFromUrlToFolder(String urlToFetch, String folder, String name) throws MalformedURLException {
try { try {
Files.createDirectories(Paths.get(folder)); Files.createDirectories(Paths.get(folder, new String[0]), (FileAttribute<?>[])new FileAttribute[0]);
} catch (IOException e) { } catch (IOException e) {
Log.e("HTTPHelper","could not create folder"); Log.e("HTTPHelper", "could not create folder");
return null; return null;
} }
if (!folder.endsWith("/")) if (!folder.endsWith("/"))
folder += "/"; folder = String.valueOf(folder) + "/";
return readFileFromUrl(urlToFetch, new File((String.valueOf(folder) + name.toLowerCase()).trim()));
return readFileFromUrl(urlToFetch, new File((folder + name.toLowerCase()).trim()));
} }
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);
HttpURLConnection con; HttpURLConnection con;
FileOutputStream downloadingWriter;
URL url = new URL(urlToFetch);
try { try {
con = (HttpURLConnection) url.openConnection(); con = (HttpURLConnection)url.openConnection();
} catch (IOException e1) { } catch (IOException e1) {
e1.printStackTrace(); e1.printStackTrace();
return null; return null;
} }
File downloadingFile = destination; File downloadingFile = destination;
System.out.println(downloadingFile.getAbsolutePath()); System.out.println(downloadingFile.getAbsolutePath());
if (downloadingFile.exists())
if (downloadingFile.exists()) { return downloadingFile;
return downloadingFile; try {
} else { System.out.println(downloadingFile);
try { downloadingFile.createNewFile();
System.out.println(downloadingFile); } catch (IOException e) {
downloadingFile.createNewFile(); Log.e("HTTPHelper", "permission error could not write file");
} catch (IOException e) { e.printStackTrace();
Log.e("HTTPHelper","permission error could not write file"); System.exit(1);
e.printStackTrace(); }
System.exit(1);
}
}
FileOutputStream downloadingWriter;
try { try {
downloadingWriter = new FileOutputStream(downloadingFile); downloadingWriter = new FileOutputStream(downloadingFile);
} catch (FileNotFoundException e1) { } catch (FileNotFoundException e1) {
e1.printStackTrace(); e1.printStackTrace();
return null; return null;
// imposible vu qu'on l'a crée precedament }
} try {
Exception exception1 = null, exception2 = null;
try (InputStream in = con.getInputStream()) { try {
//int totalRead = 0;
// on lit par tranche de 4mo } finally {
byte[] buffer = new byte[4096]; exception2 = null;
if (exception1 == null) {
while (true) { exception1 = exception2;
int bytesRead = in.read(buffer); } else if (exception1 != exception2) {
if (bytesRead < 0) exception1.addSuppressed(exception2);
break; }
//totalRead += bytesRead; }
downloadingWriter.write(buffer, 0, bytesRead); } catch (IOException iOException) {
//TODO afficher cette valeur si on a un ui return null;
//System.out.println("\r" + totalRead); }
}
downloadingWriter.close();
return downloadingFile;
} catch (IOException e) {
}
return null;
} }
public static String getFileNameFromURL(String url) public static String getFileNameFromURL(String url) {
{
String[] urlsplit = url.split("/"); String[] urlsplit = url.split("/");
if (urlsplit.length == 0) if (urlsplit.length == 0)
return null; return null;
return urlsplit[urlsplit.length - 1]; return urlsplit[urlsplit.length - 1];
} }
} }
downloader/IntegrityChecker.java
+81 -104
View File
@@ -11,150 +11,127 @@ import java.util.TreeMap;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
public class IntegrityChecker { public class IntegrityChecker {
public String[] fileList; public String[] fileList = (new File("mods")).list();
public SortedMap<Integer, String> installedMods;
public File modsMap;
@SuppressWarnings("unchecked") public SortedMap<Integer, String> installedMods;
public IntegrityChecker()
{ public File modsMap = new File("mods/modsMap.sav");
fileList = new File("mods").list();
modsMap = new File("mods/modsMap.sav"); public IntegrityChecker() {
if(modsMap.exists()) if (this.modsMap.exists()) {
{
try { try {
ObjectInputStream ois = new ObjectInputStream(new FileInputStream(modsMap)); ObjectInputStream ois = new ObjectInputStream(new FileInputStream(this.modsMap));
installedMods = (SortedMap<Integer, String>) ois.readObject(); this.installedMods = (SortedMap<Integer, String>)ois.readObject();
if(installedMods == null)installedMods = new TreeMap<>(); if (this.installedMods == null)
this.installedMods = new TreeMap<>();
ois.close(); ois.close();
} catch (Exception e) { } catch (Exception e) {
installedMods = new TreeMap<>(); this.installedMods = new TreeMap<>();
modsMap.delete(); this.modsMap.delete();
} }
}else { } else {
try { try {
modsMap.createNewFile(); this.modsMap.createNewFile();
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
} }
try { try {
ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(modsMap)); ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(this.modsMap));
oos.writeObject(installedMods); oos.writeObject(this.installedMods);
oos.close(); oos.close();
} catch (IOException e) { } catch (IOException e) {
Log.e("SAV", "erreur pas de sauvegarde"); Log.e("SAV", "erreur pas de sauvegarde");
System.exit(1); System.exit(1);
} }
} }
public boolean checkAndDelete(File modToDownload, int modid) { public boolean checkAndDelete(File modToDownload, int modid) {
String alredyInstalledName = installedMods.get(modid).toLowerCase(); String alredyInstalledName = ((String)this.installedMods.get(Integer.valueOf(modid))).toLowerCase();
File alredyInstalledMods= null; File alredyInstalledMods = null;
//on cherche le fichier local affin de ne pas voir d'erreur avec la casse
File dir = new File("mods/"); File dir = new File("mods/");
for(String fileName : dir.list()) byte b;
{ int i;
if(fileName.equalsIgnoreCase(alredyInstalledName)) String[] arrayOfString;
{ for (i = (arrayOfString = dir.list()).length, b = 0; b < i; ) {
alredyInstalledMods = new File("mods/"+fileName); String fileName = arrayOfString[b];
} if (fileName.equalsIgnoreCase(alredyInstalledName))
} alredyInstalledMods = new File("mods/" + fileName);
if(alredyInstalledMods == null) { b++;
Log.e("IntegrityChecker", "alredy installed mod not found ("+alredyInstalledName+")"); }
installedMods.remove(modid); if (alredyInstalledMods == null) {
Log.e("IntegrityChecker", "alredy installed mod not found (" + alredyInstalledName + ")");
this.installedMods.remove(Integer.valueOf(modid));
return false; return false;
} }
if (alredyInstalledMods.exists()) { if (alredyInstalledMods.exists()) {
try { try {
//si sa balance une exception sa veut dire que le jar n'est pas lisible (new ZipFile(alredyInstalledMods)).close();
new ZipFile(alredyInstalledMods).close();
} catch (IOException e) { } catch (IOException e) {
Log.i("integrityChecker","Corruption detected redownloading"); Log.i("integrityChecker", "Corruption detected redownloading");
alredyInstalledMods.delete(); alredyInstalledMods.delete();
installedMods.remove(modid); this.installedMods.remove(Integer.valueOf(modid));
updateFile(); updateFile();
return false; return false;
} }
if(!modToDownload.getAbsolutePath().equalsIgnoreCase(alredyInstalledMods.getAbsolutePath())) if (!modToDownload.getAbsolutePath().equalsIgnoreCase(alredyInstalledMods.getAbsolutePath())) {
{
alredyInstalledMods.delete(); alredyInstalledMods.delete();
Log.i("integrityChecker","Outdated mod detected redownloading ("+alredyInstalledName+" -> "+modToDownload.getName()+")"); Log.i("integrityChecker", "Outdated mod detected redownloading (" + alredyInstalledName + " -> " + modToDownload.getName() + ")");
installedMods.remove(modid); this.installedMods.remove(Integer.valueOf(modid));
updateFile(); updateFile();
return false; return false;
} }
return true; return true;
}else { }
if(modToDownload.exists()) if (modToDownload.exists()) {
{ this.installedMods.put(Integer.valueOf(modid), modToDownload.getName());
installedMods.put(modid, modToDownload.getName()); updateFile();
updateFile(); Log.i("interessting", modToDownload.getName());
Log.i("interessting", modToDownload.getName()); }
}
}
return false; return false;
} }
public boolean checkAndDelete(File modToDownload, String slug) { public boolean checkAndDelete(File modToDownload, String slug) {
if (modToDownload.exists()) { if (modToDownload.exists())
try { try {
//si sa balance une exception sa veut dire que le jar n'est pas lisible (new ZipFile(modToDownload)).close();
new ZipFile(modToDownload).close(); return true;
} catch (IOException e) { } catch (IOException e) {
Log.i("integrityChecker","Corruption detected redownloading"); Log.i("integrityChecker", "Corruption detected redownloading");
modToDownload.delete(); modToDownload.delete();
return false;
}
for (String s : fileList) {
if (s.contains(slug)) {
if (!modToDownload.getName().contains(s)) {
new File(s).delete();
Log.i("integrityChecker","Corruption detected redownloading");
return false;
}
return true;
}
}
return false; return false;
}
} byte b;
int i;
String[] arrayOfString;
for (i = (arrayOfString = this.fileList).length, b = 0; b < i; ) {
String s = arrayOfString[b];
if (s.toLowerCase().contains(slug.trim())) {
if (modToDownload.getName().trim().equalsIgnoreCase(s.trim()))
return true;
(new File(s)).delete();
break;
}
b++;
}
return false; return false;
} }
/** public void addModsToTheList(String fileName, int modID) {
* un chemin d'acces ne marche pas this.installedMods.put(Integer.valueOf(modID), fileName);
* @param fileName Main.changes.set(Main.changes.get() + 1);
* @param modID
*/
public void addModsToTheList(String fileName,int modID)
{
installedMods.put(modID, fileName);
updateFile();
} }
public boolean isModIdKnown(int modId) public boolean isModIdKnown(int modId) {
{ return (this.installedMods.get(Integer.valueOf(modId)) != null);
return installedMods.get(modId) != null;
} }
private void updateFile() public void updateFile() {
{
try { try {
modsMap.delete(); this.modsMap.delete();
//modsMap.createNewFile(); ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(this.modsMap));
ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(modsMap)); oos.writeObject(this.installedMods);
oos.writeObject(installedMods);
oos.close(); oos.close();
} catch (IOException e) {} } catch (IOException iOException) {}
} }
} }
downloader/Log.java
+5 -6
View File
@@ -1,12 +1,11 @@
package downloader; package downloader;
public class Log { public class 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.err.println(who + " : "+msg);
} }
public static void i(String who,String msg)
{ public static void i(String who, String msg) {
System.out.println(who +" : "+msg); System.out.println(String.valueOf(who) + " : " + msg);
} }
} }
downloader/Main.java
+143 -46
View File
@@ -8,71 +8,168 @@ import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.nio.file.attribute.FileAttribute;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
public class Main { public class Main {
public static void main(String[] args) throws FileNotFoundException, IOException, URISyntaxException { private static File f = null;
private static boolean verbose = false;
private static boolean checkingonly = false;
public static final AtomicInteger changes = new AtomicInteger(0);
private static Integer threadNb = null;
public static void main(String[] args) throws FileNotFoundException, IOException, URISyntaxException {
try { try {
Files.createDirectories(Paths.get("mods")); Files.createDirectories(Paths.get("mods", new String[0]), (FileAttribute<?>[])new FileAttribute[0]);
} catch (IOException e) { } catch (IOException e) {
Log.e("HTTPHelper","could not create folder"); Log.e("HTTPHelper", "could not create folder");
System.exit(0); System.exit(0);
} }
interpretArgs(args);
if (f == null)
f = new File("modpack.txt");
if (!f.exists()) {
System.out.println("file not found");
System.exit(1);
}
IntegrityChecker updateManager = new IntegrityChecker(); IntegrityChecker updateManager = new IntegrityChecker();
Database db = new Database(); Database db = new Database();
db.updateDatabase(); db.updateDatabase();
File f;
if(args.length == 0)f = new File("modpack.txt");
else f = new File(args[0]);
BufferedReader in = new BufferedReader(new FileReader(f)); BufferedReader in = new BufferedReader(new FileReader(f));
if (threadNb == null)
threadNb = Integer.valueOf(4);
List<Thread> threads = new ArrayList<>(threadNb.intValue());
while (in.ready()) { while (in.ready()) {
String line = in.readLine(); String line = in.readLine();
if (!isAComment(line)) { if (!isAComment(line)) {
if(line.startsWith("direct=")) checkThreadState(threads);
{ Thread newLineTerpreter = new NewLineInterpreter(line, updateManager, db);
String url = line.replaceFirst("direct=.*@", ""); newLineTerpreter.start();
String filename=extractNameFromLink(line); threads.add(newLineTerpreter);
}
//le slug est une nom de mods qui se trouve dans le nom du fichier }
String slug = extractSlugFromLink(line); checkThreadState(threads);
//on check si le mods est pas déja installé et si il est a jours
boolean upToDate = updateManager.checkAndDelete(new File("mods/"+filename), slug);
if(!upToDate)
{
Log.i("main","downloading "+ filename);
HttpHelper.readFileFromUrlToFolder(url,"mods",filename);
Log.i("main","done");
}
}else {
if (line.split("/").length >= 5 && !db.fetchMod(line)) {
Log.e("main","error could not get " + line);
}
}
}
}
in.close(); in.close();
while (threads.size() != 0) {
try {
Thread.sleep(100L);
} catch (InterruptedException interruptedException) {}
checkThreadState(threads);
}
if (changes.get() != 0 && verbose)
Log.i("Main", "changed " + changes.get() + " mod(s)");
Log.i("Main", "finished"); Log.i("Main", "finished");
} }
private static String extractSlugFromLink(String line) { private static void checkThreadState(List<Thread> threads) {
char[] chars = new char[line.length()-line.indexOf(";")-"direct=".length()+1]; do {
line.getChars("direct=".length(), line.indexOf(";"), chars, 0); if (threads.size() >= threadNb.intValue())
return new String(chars); try {
Thread.sleep(100L);
} catch (InterruptedException interruptedException) {}
Iterator<Thread> it = threads.iterator();
while (it.hasNext()) {
Thread t = it.next();
if (!t.isAlive())
it.remove();
}
} while (threads.size() >= threadNb.intValue());
} }
private static String extractNameFromLink(String line) { private static void interpretArgs(String[] args) {
char[] chars = new char[line.indexOf("@")-line.indexOf(";")]; Iterator<String> it = Arrays.<String>asList(args).iterator();
line.getChars(line.indexOf(";")+1, line.indexOf("@"), chars, 0); while (it.hasNext()) {
return new String(chars); String cmd = it.next();
if (cmd.startsWith("-")) {
String nbt;
int cores;
String str1;
switch ((str1 = cmd).hashCode()) {
case -1629068440:
if (!str1.equals("--check"))
break;
checkingonly = true;
continue;
case 1511:
if (!str1.equals("-t"))
break;
if (threadNb != null) {
System.out.println("error conflicting arguments --thread and -t");
System.exit(1);
}
cores = Runtime.getRuntime().availableProcessors();
if (cores <= 0) {
System.out.println("java think you have no cpu core... sooo lets go for 4");
threadNb = Integer.valueOf(4);
continue;
}
System.out.println("running on " + cores + " thread");
threadNb = Integer.valueOf(cores);
continue;
case 1513:
if (!str1.equals("-v"))
break;
verbose = true;
continue;
case 48044553:
if (!str1.equals("--threads"))
break;
if (threadNb != null) {
System.out.println("error conflicting arguments --thread and -t");
System.exit(1);
}
if (!it.hasNext()) {
System.err.println("arguments invalid please refer to --help");
System.exit(1);
}
nbt = it.next();
if (nbt.matches("[0-9]*")) {
threadNb = Integer.valueOf(Integer.parseInt(nbt));
continue;
}
System.err.println("arguments invalid please refer to --help");
System.exit(1);
continue;
case 1333013276:
if (!str1.equals("--file"))
break;
if (!it.hasNext()) {
System.err.println("arguments invalid please refer to --help");
System.exit(1);
}
f = new File(it.next());
continue;
case 1333069025:
if (!str1.equals("--help"))
break;
System.out.println("use --file to specify the modfile\nuse --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");
System.exit(0);
continue;
}
System.err.print("unknown args " + cmd + "\n" +
"see --help for help");
System.exit(1);
}
}
} }
public static boolean isAComment(String line) {
public static boolean isAComment(String line)
{
return line.startsWith("//"); return line.startsWith("//");
} }
public static boolean isVersbose() {
return verbose;
}
public static boolean isCheckingOnly() {
return checkingonly;
}
} }
downloader/NewLineInterpreter.java
+58
View File
@@ -0,0 +1,58 @@
package downloader;
import java.io.File;
import java.net.MalformedURLException;
public class NewLineInterpreter extends Thread {
private String line;
private IntegrityChecker updateManager;
private Database db;
public NewLineInterpreter(String line, IntegrityChecker updateManager, Database db) {
this.line = line;
this.updateManager = updateManager;
this.db = db;
}
public void run() {
super.run();
interpretLine();
}
private void interpretLine() {
if (this.line.startsWith("direct=")) {
String url = this.line.replaceFirst("direct=.*@", "");
String filename = extractNameFromLink(this.line).toLowerCase();
String slug = extractSlugFromLink(this.line).toLowerCase();
boolean upToDate = this.updateManager.checkAndDelete(new File("mods/" + filename), slug);
if (!upToDate) {
if (Main.isVersbose())
Log.i("main", "downloading " + filename);
if (!Main.isCheckingOnly())
try {
HttpHelper.readFileFromUrlToFolder(url, "mods", filename);
} catch (MalformedURLException e) {
Log.e("main", "error bad mod url " + this.line);
}
} else if (Main.isVersbose()) {
Log.i("main", "alredy installed");
}
} else if ((this.line.split("/")).length >= 5 && !this.db.fetchMod(this.line)) {
Log.e("main", "error could not get " + this.line);
}
}
private String extractSlugFromLink(String line) {
char[] chars = new char[line.length() - line.indexOf(";") - "direct=".length() + 1];
line.getChars("direct=".length(), line.indexOf(";"), chars, 0);
return new String(chars);
}
private String extractNameFromLink(String line) {
char[] chars = new char[line.indexOf("@") - line.indexOf(";")];
line.getChars(line.indexOf(";") + 1, line.indexOf("@"), chars, 0);
return new String(chars);
}
}
downloader/ProjectInfo.java
+11 -8
View File
@@ -1,24 +1,27 @@
package downloader; package downloader;
public class ProjectInfo { public class ProjectInfo {
private String slug, name, desc; private String slug;
private String name;
private String desc;
public ProjectInfo(String slug, String name, String desc) { public ProjectInfo(String slug, String name, String desc) {
super();
this.slug = slug; this.slug = slug;
this.name = name; this.name = name;
this.desc = desc; this.desc = desc;
} }
public String getDesc() { public String getDesc() {
return desc; return this.desc;
} }
public String getName() { public String getName() {
return name; return this.name;
} }
public String getSlug() { public String getSlug() {
return slug; return this.slug;
} }
} }
downloader/forgeSvc/ForgeSvcEntry.java
+1 -1
View File
@@ -4,6 +4,6 @@ public class ForgeSvcEntry {
private ForgeSvcFile[] gameVersionLatestFiles; private ForgeSvcFile[] gameVersionLatestFiles;
public ForgeSvcFile[] getFiles() { public ForgeSvcFile[] getFiles() {
return gameVersionLatestFiles; return this.gameVersionLatestFiles;
} }
} }
downloader/forgeSvc/ForgeSvcFile.java
+8 -8
View File
@@ -1,8 +1,7 @@
package downloader.forgeSvc; package downloader.forgeSvc;
import java.net.MalformedURLException;
import downloader.HttpHelper; import downloader.HttpHelper;
import java.net.MalformedURLException;
public class ForgeSvcFile { public class ForgeSvcFile {
private String gameVersion; private String gameVersion;
@@ -11,21 +10,22 @@ public class ForgeSvcFile {
private String projectFileName; private String projectFileName;
public String getGameVersion() { public String getGameVersion() {
return gameVersion; return this.gameVersion;
} }
public int getFileType() { public int getFileType() {
return fileType; return this.fileType;
} }
public int getProjectFileId() { public int getProjectFileId() {
return projectFileId; return this.projectFileId;
} }
public String getProjectFileName() { public String getProjectFileName() {
return projectFileName; return this.projectFileName;
} }
public String getDownloadUrl(int modID) throws MalformedURLException { public String getDownloadUrl(int modID) throws MalformedURLException {
return HttpHelper.readStringFromUrl("https://addons-ecs.forgesvc.net/api/v2/addon/"+modID+"/file/"+projectFileId+"/download-url"); return HttpHelper.readStringFromUrl("https://addons-ecs.forgesvc.net/api/v2/addon/" + modID + "/file/" + this.projectFileId + "/download-url");
} }
} }
scripts/build.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
javac \ javac \
-d objs\ -d objs\
-cp libs/commons-compress-1.20.jar:libs/gson-2.8.7.jar\ -cp libs/commons-compress-1.20.jar:libs/gson-2.8.7.jar:libs/gson-2.8.6.jar\
downloader/*.java downloader/forgeSvc/*.java downloader/*.java downloader/forgeSvc/*.java