DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly multi-threaded File Reloading in GuiReplayViewer | https://trello.com/c/shUBbD2z/

Browse Source
This commit is contained in:
CrushedPixel
2015-07-05 15:36:05 +02:00
parent d62e74a6f7
commit 5f76577eed
1 changed files with 65 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java
View File

@@ -52,15 +52,12 @@ public class GuiReplayViewer extends GuiScreen implements GuiYesNoCallback {
private GuiButton deleteButton; private GuiButton deleteButton;
private boolean delete_file = false; private boolean delete_file = false;
public static GuiYesNo getYesNoGui(GuiYesNoCallback p_152129_0_, String file, int p_152129_2_) { private Thread fileReloader;
String s1 = I18n.format("replaymod.gui.viewer.delete.linea");
String s2 = "\'" + file + "\' " + I18n.format("replaymod.gui.viewer.delete.lineb");
String s3 = I18n.format("replaymod.gui.delete");
String s4 = I18n.format("replaymod.gui.cancel");
return new GuiYesNo(p_152129_0_, s1, s2, s3, s4, p_152129_2_);
}
private void reloadFiles() { private class FileReloaderThread extends Thread {
@Override
public void run() {
final GuiLoadingListEntry loadingListEntry = new GuiLoadingListEntry(); final GuiLoadingListEntry loadingListEntry = new GuiLoadingListEntry();
replayGuiList.clearEntries(); replayGuiList.clearEntries();
@@ -69,6 +66,7 @@ public class GuiReplayViewer extends GuiScreen implements GuiYesNoCallback {
replayFileList = new ArrayList<Pair<Pair<File, ReplayMetaData>, File>>(); replayFileList = new ArrayList<Pair<Pair<File, ReplayMetaData>, File>>();
for(File file : ReplayFileIO.getAllReplayFiles()) { for(File file : ReplayFileIO.getAllReplayFiles()) {
if(interrupted()) break;
try { try {
ReplayFile replayFile = new ReplayFile(file); ReplayFile replayFile = new ReplayFile(file);
ReplayMetaData metaData = replayFile.metadata().get(); ReplayMetaData metaData = replayFile.metadata().get();
@@ -93,12 +91,8 @@ public class GuiReplayViewer extends GuiScreen implements GuiYesNoCallback {
final FileInfo fileInfo = new FileInfo(-1, p.first().second(), null, null, final FileInfo fileInfo = new FileInfo(-1, p.first().second(), null, null,
-1, -1, -1, FilenameUtils.getBaseName(p.first().first().getName()), true, -1); -1, -1, -1, FilenameUtils.getBaseName(p.first().first().getName()), true, -1);
mc.addScheduledTask(new Runnable() {
@Override
public void run() {
replayGuiList.addEntry(index, new GuiReplayListEntry(replayGuiList, fileInfo, p.second())); replayGuiList.addEntry(index, new GuiReplayListEntry(replayGuiList, fileInfo, p.second()));
}
});
} catch(Exception e) { } catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -111,6 +105,15 @@ public class GuiReplayViewer extends GuiScreen implements GuiYesNoCallback {
} }
}); });
} }
}
public static GuiYesNo getYesNoGui(GuiYesNoCallback p_152129_0_, String file, int p_152129_2_) {
String s1 = I18n.format("replaymod.gui.viewer.delete.linea");
String s2 = "\'" + file + "\' " + I18n.format("replaymod.gui.viewer.delete.lineb");
String s3 = I18n.format("replaymod.gui.delete");
String s4 = I18n.format("replaymod.gui.cancel");
return new GuiYesNo(p_152129_0_, s1, s2, s3, s4, p_152129_2_);
}
@Override @Override
public void onGuiClosed() { public void onGuiClosed() {
@@ -126,17 +129,20 @@ public class GuiReplayViewer extends GuiScreen implements GuiYesNoCallback {
if(!this.initialized) { if(!this.initialized) {
replayGuiList = new ReplayList(this, this.mc, this.width, this.height, 32, this.height - 64, 36); replayGuiList = new ReplayList(this, this.mc, this.width, this.height, 32, this.height - 64, 36);
this.initialized = true; this.initialized = true;
new Thread(new Runnable() {
@Override
public void run() {
reloadFiles();
}
}, "replay-viewer-file-reloader").start();
} else { } else {
this.replayGuiList.setDimensions(this.width, this.height, 32, this.height - 64); this.replayGuiList.setDimensions(this.width, this.height, 32, this.height - 64);
} }
try {
if(fileReloader != null) {
fileReloader.interrupt();
fileReloader.join();
}
fileReloader = new FileReloaderThread();
fileReloader.start();
} catch(Exception e) {}
this.createButtons(); this.createButtons();
} }