external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix order of operations in GuiDownloader

Browse Source
This commit is contained in:
myk
2013-03-17 22:43:34 +00:00
parent f5db3f4430
commit 4d14ccc377
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/forge/gui/download/GuiDownloader.java
View File

@@ -23,6 +23,7 @@ import java.awt.event.ActionListener;
import java.io.File; 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.net.ConnectException; import java.net.ConnectException;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
@@ -226,14 +227,7 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
} }
private void update(final int card, final File dest) { private void update(final int card, final File dest) {
EventQueue.invokeLater(new Runnable() {
final class Worker implements Runnable {
private final int card;
Worker(final int card) {
this.card = card;
}
@Override @Override
public void run() { public void run() {
GuiDownloader.this.fireStateChanged(); GuiDownloader.this.fireStateChanged();
@@ -242,10 +236,10 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
final int a = GuiDownloader.this.getAverageTimePerObject(); final int a = GuiDownloader.this.getAverageTimePerObject();
if (this.card != GuiDownloader.this.cards.size()) { if (card != GuiDownloader.this.cards.size()) {
sb.append(this.card + "/" + GuiDownloader.this.cards.size() + " - "); sb.append(card + "/" + GuiDownloader.this.cards.size() + " - ");
long t2Go = (GuiDownloader.this.cards.size() - this.card) * a; long t2Go = (GuiDownloader.this.cards.size() - card) * a;
if (t2Go > 3600000) { if (t2Go > 3600000) {
sb.append(String.format("%02d:", t2Go / 3600000)); sb.append(String.format("%02d:", t2Go / 3600000));
@@ -259,10 +253,9 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
} }
sb.append(String.format("%02d remaining.", t2Go / 1000)); sb.append(String.format("%02d remaining.", t2Go / 1000));
} else { } else {
sb.append(String.format("%d of %d items finished! Please close!", sb.append(String.format("%d of %d items finished! Please close!",
this.card, GuiDownloader.this.cards.size())); card, GuiDownloader.this.cards.size()));
btnStart.setText("OK"); btnStart.setText("OK");
btnStart.addActionListener(actOK); btnStart.addActionListener(actOK);
btnStart.setEnabled(true); btnStart.setEnabled(true);
@@ -270,12 +263,12 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
} }
GuiDownloader.this.barProgress.setString(sb.toString()); GuiDownloader.this.barProgress.setString(sb.toString());
System.out.println((this.card + 1) + "/" + GuiDownloader.this.cards.size() + " - " + dest); System.out.println(card + "/" + GuiDownloader.this.cards.size() + " - " + dest);
} }
} });
EventQueue.invokeLater(new Worker(card));
} }
@Override
public final void run() { public final void run() {
final Random r = MyRandom.getRandom(); final Random r = MyRandom.getRandom();
@@ -303,8 +296,8 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
final File fileDest = new File(kv.getKey()); final File fileDest = new File(kv.getKey());
final File base = fileDest.getParentFile(); final File base = fileDest.getParentFile();
update(iCard++, fileDest); ReadableByteChannel rbc = null;
FileOutputStream fos = null;
try { try {
// test for folder existence // test for folder existence
if (!base.exists() && !base.mkdir()) { // create folder if not found if (!base.exists() && !base.mkdir()) { // create folder if not found
@@ -323,13 +316,9 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
continue; continue;
} }
ReadableByteChannel rbc = Channels.newChannel(conn.getInputStream()); rbc = Channels.newChannel(conn.getInputStream());
FileOutputStream fos = new FileOutputStream(fileDest); fos = new FileOutputStream(fileDest);
fos.getChannel().transferFrom(rbc, 0, 1 << 24); fos.getChannel().transferFrom(rbc, 0, 1 << 24);
fos.flush();
fos.close();
rbc.close();
} catch (final ConnectException ce) { } catch (final ConnectException ce) {
System.out.println("Connection refused for url: " + url); System.out.println("Connection refused for url: " + url);
} catch (final MalformedURLException mURLe) { } catch (final MalformedURLException mURLe) {
@@ -339,8 +328,17 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
System.out.println(String.format(formatStr, fileDest.getName(), url, fnfe.getMessage())); System.out.println(String.format(formatStr, fileDest.getName(), url, fnfe.getMessage()));
} catch (final Exception ex) { } catch (final Exception ex) {
Log.error("LQ Pictures", "Error downloading pictures", ex); Log.error("LQ Pictures", "Error downloading pictures", ex);
} finally {
if (null != rbc) {
try { rbc.close(); } catch (IOException e) { System.out.println("error closing input stream"); }
}
if (null != fos) {
try { fos.close(); } catch (IOException e) { System.out.println("error closing output stream"); }
}
} }
update(++iCard, fileDest);
// throttle to reduce load on the server // throttle to reduce load on the server
try { try {
Thread.sleep(r.nextInt(50) + 50); Thread.sleep(r.nextInt(50) + 50);