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

refactor global fin a tester

Browse Source
This commit is contained in:
marc barbier
2021-07-08 14:23:07 +02:00
parent f83140ee0e
commit 9da3e668a8
7 changed files with 278 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ModsListDownloader/src/downloader/IntegrityChecker.java → ModsListDownloader/src/downloader/CurseUpdateManager.java
+43 -64
View File
@@ -8,51 +8,39 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.zip.ZipFile;
public class IntegrityChecker { import downloader.helper.ArchiveHelper;
public String[] fileList; import downloader.helper.SlugHelper;
public SortedMap<Integer, String> installedMods;
public File modsMap; public class CurseUpdateManager {
private SortedMap<Integer, String> installedMods;
@SuppressWarnings("unchecked") public CurseUpdateManager()
public IntegrityChecker()
{ {
fileList = new File("mods").list(); loadModMapFromFile();
modsMap = new File("mods/modsMap.sav");
if(modsMap.exists())
{
try {
ObjectInputStream ois = new ObjectInputStream(new FileInputStream(modsMap));
installedMods = (SortedMap<Integer, String>) ois.readObject();
if(installedMods == null)installedMods = new TreeMap<>();
ois.close();
} catch (Exception e) {
installedMods = new TreeMap<>();
modsMap.delete();
}
}else {
try {
modsMap.createNewFile();
} catch (IOException e) {
e.printStackTrace();
}
}
try {
ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(modsMap));
oos.writeObject(installedMods);
oos.close();
} catch (IOException e) {
Log.e("SAV", "erreur pas de sauvegarde");
System.exit(1);
}
} }
@SuppressWarnings("unchecked")
private void loadModMapFromFile() {
File modsMapFile = new File("mods/modsMap.sav");
if(modsMapFile.exists())
{
try {
ObjectInputStream ois = new ObjectInputStream(new FileInputStream(modsMapFile));
installedMods = (SortedMap<Integer, String>) ois.readObject();
ois.close();
} catch (Exception e) {
modsMapFile.delete();
}
if(installedMods == null)installedMods = new TreeMap<>();
}
this.updateFile();
}
public boolean checkAndDelete(File modToDownload, int modid) { public boolean checkAndDelete(File modToDownload, int modid) {
String alredyInstalledName = installedMods.get(modid).toLowerCase(); String alredyInstalledName = installedMods.get(modid).toLowerCase();
File alredyInstalledMods= null; File alredyInstalledMods= null;
//on cherche le fichier local affin de ne pas voir d'erreur avec la casse //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()) for(String fileName : dir.list())
@@ -60,8 +48,10 @@ public class IntegrityChecker {
if(fileName.equalsIgnoreCase(alredyInstalledName)) if(fileName.equalsIgnoreCase(alredyInstalledName))
{ {
alredyInstalledMods = new File("mods/"+fileName); alredyInstalledMods = new File("mods/"+fileName);
break;
} }
} }
if(alredyInstalledMods == null) { if(alredyInstalledMods == null) {
Log.e("IntegrityChecker", "alredy installed mod not found ("+alredyInstalledName+")"); Log.e("IntegrityChecker", "alredy installed mod not found ("+alredyInstalledName+")");
installedMods.remove(modid); installedMods.remove(modid);
@@ -70,16 +60,14 @@ public class IntegrityChecker {
} }
if (alredyInstalledMods.exists()) { if (alredyInstalledMods.exists()) {
try { //we only check if the jar file still works
//si sa balance une exception sa veut dire que le jar n'est pas lisible if(ArchiveHelper.checkJarIntegrity(alredyInstalledMods)) {
new ZipFile(alredyInstalledMods).close();
} catch (IOException e) {
Log.i("integrityChecker","Corruption detected redownloading");
alredyInstalledMods.delete(); alredyInstalledMods.delete();
installedMods.remove(modid); installedMods.remove(modid);
updateFile(); updateFile();
return false; return false;
} }
if(!modToDownload.getAbsolutePath().equalsIgnoreCase(alredyInstalledMods.getAbsolutePath())) if(!modToDownload.getAbsolutePath().equalsIgnoreCase(alredyInstalledMods.getAbsolutePath()))
{ {
alredyInstalledMods.delete(); alredyInstalledMods.delete();
@@ -94,37 +82,25 @@ public class IntegrityChecker {
{ {
installedMods.put(modid, modToDownload.getName()); installedMods.put(modid, modToDownload.getName());
updateFile(); updateFile();
Log.i("interessting", modToDownload.getName()); Log.i("CurseUpdater","existing file detected adding it to the register: " + modToDownload.getName());
return true;
} }
} }
return false; return false;
} }
/**
* @return true == file ok
*/
public boolean checkAndDelete(File modToDownload, String slug) { public boolean checkAndDelete(File modToDownload, String slug) {
if (modToDownload.exists()) { if (modToDownload.exists()) {
try { if (ArchiveHelper.checkJarIntegrity(modToDownload)) {
//si sa balance une exception sa veut dire que le jar n'est pas lisible return true;
new ZipFile(modToDownload).close(); } else {
} catch (IOException e) { SlugHelper.deleteBySlug(slug);
Log.i("integrityChecker","Corruption detected redownloading");
modToDownload.delete();
return false; 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; return false;
} }
@@ -147,12 +123,15 @@ public class IntegrityChecker {
private void updateFile() private void updateFile()
{ {
File modsMap = new File("mods/modsMap.sav");
try { try {
modsMap.delete(); if(modsMap.exists())modsMap.delete();
ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(modsMap)); ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(modsMap));
oos.writeObject(installedMods); oos.writeObject(installedMods);
oos.close(); oos.close();
} catch (IOException e) {} } catch (IOException e) {
Log.e("SAV", "erreur pas de sauvegarde");
}
} }
} }
ModsListDownloader/src/downloader/Database.java
+29 -70
View File
@@ -4,6 +4,7 @@ import java.io.File;
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 java.util.Arrays;
import com.google.gson.Gson; import com.google.gson.Gson;
@@ -13,7 +14,6 @@ import downloader.helper.HttpHelper;
public class Database { public class Database {
DBConnector connector; DBConnector connector;
IntegrityChecker integrityChecker;
Gson gson; Gson gson;
@@ -25,18 +25,15 @@ public class Database {
//database hs //database hs
System.exit(1); System.exit(1);
} }
integrityChecker = new IntegrityChecker();
this.gson = new Gson(); this.gson = new Gson();
} }
private int findProjectBySlug(String slug, int ptype) { private int findProjectBySlug(String slug, int ptype) {
int modID = -1; int pjId = -1;
ResultSet rs = this.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 LIKE \"%" + slug.trim().toLowerCase() + "\"%");
slug.trim().toLowerCase() + "\"");
try { try {
if (rs.next()) { if (rs.next()) {
modID = rs.getInt("projectid"); pjId = rs.getInt("projectid");
} else { } else {
Log.e("DB", "not found " + slug); Log.e("DB", "not found " + slug);
return -1; return -1;
@@ -45,14 +42,14 @@ public class Database {
e.printStackTrace(); e.printStackTrace();
return -1; return -1;
} }
return modID; return pjId;
} }
private int findModBySlug(String slug) { public int findModBySlug(String slug) {
return findProjectBySlug(slug, 0); return findProjectBySlug(slug, 0);
} }
private ProjectInfo getProjectInfo(int projectId) { public ProjectInfo getProjectInfo(int projectId) {
ResultSet rs = this.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 {
@@ -62,59 +59,14 @@ public class Database {
return null; return null;
} }
public boolean fetchMod(String string) { public ForgeSvcFile fetchMod(ProjectInfo pj, int modID) {
String name = string.split("/")[5];
int modID = findModBySlug(name);
if (modID == -1) {
Log.e("DB", "could not find mod id");
return false;
}
ProjectInfo pj = getProjectInfo(modID);
if (pj == null)
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); return getLastestFile(modfile);
if (file != null) {
try {
boolean upToDate;
String downloadUrl = file.getDownloadUrl(modID);
if (Main.verbose)
Log.i("MOD", "checking " + pj.getName().replace(" ", "-"));
if (this.integrityChecker.isModIdKnown(modID)) {
if (Main.verbose)
Log.i("DB", "found " + name);
upToDate = this.integrityChecker
.checkAndDelete(new File("mods/" + HttpHelper.getFileNameFromURL(downloadUrl)), modID);
} else {
Log.i("DB", "NEW MOD DETECTED " + modID);
upToDate = this.integrityChecker.checkAndDelete(
new File("mods/" + HttpHelper.getFileNameFromURL(downloadUrl)), pj.getSlug());
}
if (!upToDate) {
if (Main.verbose)
Log.i("MOD", "downloading " + pj.getName().replace(" ", "-"));
if (!Main.checkingonly)
HttpHelper.readFileFromUrlToFolder(downloadUrl, "mods");
if (Main.verbose)
Log.i("MOD", "download finished");
if (!this.integrityChecker.isModIdKnown(modID) && !Main.checkingonly) {
this.integrityChecker.addModsToTheList(HttpHelper.getFileNameFromURL(downloadUrl), modID);
if (Main.verbose)
Log.i("DB", "added a mod to the registry");
}
}
return true;
} catch (MalformedURLException e) {
e.printStackTrace();
}
} else {
Log.e("DB", "no file in server");
}
return false;
} }
public ForgeSvcFile getLastestFile(String minecraftVer, CurseForgeModFile mod) { public ForgeSvcFile getLastestFile(CurseForgeModFile mod) {
String jsonProject, projectUrl = "https://addons-ecs.forgesvc.net/api/v2/addon/" + mod.getProjectID(); String jsonProject;
String projectUrl = "https://addons-ecs.forgesvc.net/api/v2/addon/" + mod.getProjectID();
try { try {
jsonProject = HttpHelper.readStringFromUrl(projectUrl); jsonProject = HttpHelper.readStringFromUrl(projectUrl);
if (jsonProject.equals("error")) if (jsonProject.equals("error"))
@@ -123,16 +75,23 @@ public class Database {
e.printStackTrace(); e.printStackTrace();
return null; return null;
} }
ForgeSvcEntry entry = (ForgeSvcEntry)this.gson.fromJson(jsonProject, ForgeSvcEntry.class); ForgeSvcEntry entry = this.gson.fromJson(jsonProject, ForgeSvcEntry.class);
byte b; ForgeSvcFile[] arrayOfForgeSvcFile = fileterGameVersion(entry.getFiles());
int i;
ForgeSvcFile[] arrayOfForgeSvcFile;
for (i = (arrayOfForgeSvcFile = entry.getFiles()).length, b = 0; b < i; ) { if(arrayOfForgeSvcFile.length == 0) return null;
ForgeSvcFile f = arrayOfForgeSvcFile[b];
if (f.getGameVersion().equals(minecraftVer)) //on par du pricipe qu'un id plus élevé => version plus récente
return f; ForgeSvcFile latest = arrayOfForgeSvcFile[0];
b++; for (int i = 1; i < arrayOfForgeSvcFile.length; i++) {
if( arrayOfForgeSvcFile[i].getProjectFileId() > latest.getProjectFileId() ) {
latest = arrayOfForgeSvcFile[i];
}
} }
return null; return latest;
}
private ForgeSvcFile[] fileterGameVersion(ForgeSvcFile[] arrayOfForgeSvcFile) {
return Arrays.stream(arrayOfForgeSvcFile).filter(x -> x.getGameVersion().equals(Main.mcVersion)).toArray(ForgeSvcFile[]::new);
} }
} }
ModsListDownloader/src/downloader/DirectUpdateManager.java
+31
View File
@@ -0,0 +1,31 @@
package downloader;
import java.io.File;
import downloader.helper.ArchiveHelper;
import downloader.helper.SlugHelper;
public class DirectUpdateManager {
/**
* @param filename
* @param slug
* @return upToDate
*/
public boolean checkAndDelete(String filename, String slug) {
File mod = new File("mods/"+filename);
if (!mod.isFile()) {
mod.delete();
return false;
}
if (!mod.exists()) {
SlugHelper.deleteBySlug(slug);
return false;
} else {
return ArchiveHelper.checkJarIntegrity(mod);
}
}
}
ModsListDownloader/src/downloader/Main.java
+4 -2
View File
@@ -12,13 +12,15 @@ public class Main {
public static boolean verbose; public static boolean verbose;
public static boolean checkingonly; public static boolean checkingonly;
public static Integer threadNb; public static Integer threadNb;
private static Database db; public static String mcVersion;
public static void main(String[] args) { public static void main(String[] args) {
this.mcVersion = "1.12.2";
checkModsDirectory(); checkModsDirectory();
new DatabaseVersionManager().updateIfNeeded(); new DatabaseVersionManager().updateIfNeeded();
db = new Database();
interpretArgs(args); interpretArgs(args);
new ModUpdater().update();
} }
public static void checkModsDirectory() { public static void checkModsDirectory() {
ModsListDownloader/src/downloader/ModUpdater.java
+136
View File
@@ -0,0 +1,136 @@
package downloader;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.net.MalformedURLException;
import downloader.forgeSvc.ForgeSvcFile;
import downloader.helper.HttpHelper;
public class ModUpdater {
private DirectUpdateManager directUpdateManager;
private CurseUpdateManager curseUpdateManager;
private Database db;
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()) {
Log.e("Updater", "[ERROR]no mod file found exiting...");
System.exit(1);
}
//parse and download
try {
BufferedReader in = new BufferedReader(new FileReader(modsList));
while (in.ready()) {
String line = in.readLine();
if (!isAComment(line)) {
if(line.startsWith("direct="))
{
handleDirectDownload(line);
} else if (line.startsWith("del=")) {
String[] delete = line.split("del=");
new File(delete[1]).delete();
}
else {
if (line.split("/").length >= 5) {
handleCurseDownload(line);
}
}
}
}
in.close();
Log.i("Main", "finished");
} catch( IOException e ) {
e.printStackTrace();
System.exit(1);
}
}
public void handleDirectDownload(String line) {
String url = line.replaceFirst("direct=.*@", "");
String filename=extractNameFromLink(line);
//le slug est une nom de mods qui se trouve dans le nom du fichier
String slug = extractSlugFromLink(line);
//on check si le mods est pas déja installé et si il est a jours
boolean upToDate = directUpdateManager.checkAndDelete(filename, slug);
if(!upToDate)
{
Log.i("main","downloading "+ filename);
try {
HttpHelper.readFileFromUrlToFolder(url,"mods",filename);
Log.i("main","done");
} catch (MalformedURLException e) {
Log.e("ModUpdater", "could not update mod, error while downloading");
}
}
}
public void handleCurseDownload(String line) {
String name = line.split("/")[5];
int modID = db.findModBySlug(name);
ProjectInfo pj = db.getProjectInfo(modID);
ForgeSvcFile svc = db.fetchMod(pj, modID);
if (svc != null) {
try {
boolean upToDate;
String downloadUrl = svc.getDownloadUrl(modID);
Log.i("MOD", "checking " + pj.getName().replace(" ", "-"));
if (this.curseUpdateManager.isModIdKnown(modID)) {
Log.i("DB", "found " + name);
upToDate = this.curseUpdateManager.checkAndDelete(new File("mods/" + HttpHelper.getFileNameFromURL(downloadUrl)), modID);
}
else {
Log.i("DB", "NEW MOD DETECTED " + modID);
upToDate = this.curseUpdateManager.checkAndDelete(new File("mods/" + HttpHelper.getFileNameFromURL(downloadUrl)), pj.getSlug());
}
if (!upToDate) {
Log.i("MOD", "downloading " + pj.getName().replace(" ", "-"));
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");
}
}
} catch (MalformedURLException e) {
e.printStackTrace();
}
} else {
Log.e("DB", "no file in server");
}
}
public static boolean isAComment(String line)
{
return line.startsWith("//");
}
private static 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 static 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);
}
}
ModsListDownloader/src/downloader/helper/ArchiveHelper.java
+19
View File
@@ -5,10 +5,13 @@ import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.jar.JarFile;
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 downloader.Log;
public class ArchiveHelper { public class ArchiveHelper {
private ArchiveHelper(){} private ArchiveHelper(){}
@@ -20,4 +23,20 @@ public class ArchiveHelper {
IOUtils.copy(input, output); IOUtils.copy(input, output);
return decompressedFile; return decompressedFile;
} }
/**
* @param mod
* @return true = fichier bon
*/
public static boolean checkJarIntegrity(File mod) {
try {
//si sa balance une exception sa veut dire que le jar n'est pas lisible
new JarFile(mod).close();
} catch (IOException e) {
Log.i("integrityChecker","Corruption detected redownloading");
mod.delete();
return false;
}
return true;
}
} }
ModsListDownloader/src/downloader/helper/SlugHelper.java
+16
View File
@@ -0,0 +1,16 @@
package downloader.helper;
import java.io.File;
public class SlugHelper {
public static void deleteBySlug(String slug) {
File modFolder = new File("mods");
File[] mods = modFolder.listFiles();
for( File mod : mods) {
if(mod.getName().toLowerCase().contains((slug.toLowerCase()))) {
mod.delete();
}
}
}
}