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

refactoring ModUpdater

Browse Source
This commit is contained in:
marc barbier
2021-07-10 16:52:06 +02:00
parent 155f7ada2e
commit 6799681c6b
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ModsListDownloader/src/downloader/ModUpdater.java
+28 -17
View File
@@ -16,7 +16,7 @@ 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"; private static final String ME = "ModUpdater";
public ModUpdater() { public ModUpdater() {
this.db = new Database(); this.db = new Database();
@@ -33,6 +33,14 @@ public class ModUpdater {
} }
//parse and download //parse and download
startProcessingThreads(modsList);
checkForFailures();
Log.i(ME, "finished");
curseUpdateManager.updateFile();
}
private void startProcessingThreads(File modsList) {
List<Thread> threads = new ArrayList<>(Main.threadNb); List<Thread> threads = new ArrayList<>(Main.threadNb);
try { try {
BufferedReader in = new BufferedReader(new FileReader(modsList)); BufferedReader in = new BufferedReader(new FileReader(modsList));
@@ -44,10 +52,8 @@ public class ModUpdater {
threads.add(t); threads.add(t);
} }
while(Main.threadNb == threads.size()) { while(Main.threadNb >= threads.size()) {
try { threadSleep();
Thread.sleep(10);
} catch (InterruptedException e) {}
} }
} }
in.close(); in.close();
@@ -55,23 +61,20 @@ public class ModUpdater {
e.printStackTrace(); e.printStackTrace();
System.exit(1); System.exit(1);
} }
waitThreadsEnd(threads);
}
//on attend la fin des threads private void checkForFailures() {
while( !threads.isEmpty() ) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {}
}
if(! UpdaterThread.failedLines.isEmpty()) { if(! UpdaterThread.failedLines.isEmpty()) {
List<String> failures = new ArrayList<>(UpdaterThread.failedLines); List<String> failures = new ArrayList<>(UpdaterThread.failedLines);
UpdaterThread.failedLines.clear(); UpdaterThread.failedLines.clear();
Log.e(ME, "filed to download " + failures.size()); Log.e(ME, "filed to download " + failures.size());
Log.e(ME, "Retrying but slower"); Log.e(ME, "Retrying but slower");
for(String line : failures) { for(String line : failures) {
Thread t = new UpdaterThread(line, db, directUpdateManager, curseUpdateManager, threads); Thread t = new UpdaterThread(line, db, directUpdateManager, curseUpdateManager, null);
t.start(); t.start();
try { try {
t.join(); t.join();
@@ -85,10 +88,18 @@ public class ModUpdater {
} }
} }
} }
}
private void waitThreadsEnd(List<Thread> threads) {
while( !threads.isEmpty() ) {
threadSleep();
}
}
Log.i(ME, "finished"); private void threadSleep() {
curseUpdateManager.updateFile(); try {
Thread.sleep(10);
} catch (InterruptedException e) {}
} }
public static boolean isAComment(String line) public static boolean isAComment(String line)
@@ -105,7 +116,7 @@ final class UpdaterThread extends Thread {
private final CurseUpdateManager curseUpdateManager; private final CurseUpdateManager curseUpdateManager;
private final List<Thread> threads; private final List<Thread> threads;
private static final String ME = "ModUpdaterThread"; private static final String ME = "ModUpdaterThread";
public static final List<String> failedLines = new ArrayList<>(); protected static final List<String> failedLines = new ArrayList<>();
public UpdaterThread(String line, Database db, DirectUpdateManager directUpdateManager, CurseUpdateManager curseUpdateManager, List<Thread> threads) { public UpdaterThread(String line, Database db, DirectUpdateManager directUpdateManager, CurseUpdateManager curseUpdateManager, List<Thread> threads) {
super(line); super(line);
@@ -147,7 +158,7 @@ final class UpdaterThread extends Thread {
super.run(); super.run();
//on se retire de la pool d'execution //on se retire de la pool d'execution
this.threads.remove(this); if(this.threads != null)this.threads.remove(this);
} }
private File handleDirectDownload(String line) { private File handleDirectDownload(String line) {