X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FProjectInsertPage.java;h=3b852a918bcfb7aef71ca2a9578f35a6079d53fd;hb=6363a6f5355700aea01514c2558f670470dcda82;hp=6c3654f7c29d4a76ec5214d5bfb1d72fa8842f24;hpb=e81a97d98fd60e011e75ac4131f4d8bed1154bfd;p=jSite.git
diff --git a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
index 6c3654f..3b852a9 100644
--- a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
+++ b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
@@ -80,6 +80,9 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
/** The start time of the insert. */
private long startTime = 0;
+ /** The number of inserted blocks. */
+ private volatile int insertedBlocks;
+
/**
* Creates a new progress insert wizard page.
*
@@ -164,7 +167,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
final JLabel progressLabel = new JLabel(I18n.getMessage("jsite.insert.progress") + ":");
projectInsertPanel.add(progressLabel, new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 18, 0, 0), 0, 0));
projectInsertPanel.add(progressBar, new GridBagConstraints(1, 3, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
- projectInsertPanel.add(new JButton(copyURIAction), new GridBagConstraints(0, 4, 2, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
+ projectInsertPanel.add(new JButton(copyURIAction), new GridBagConstraints(0, 4, 2, 1, 0.0, 0.0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(12, 18, 0, 0), 0, 0));
I18nContainer.getInstance().registerRunnable(new Runnable() {
@@ -209,17 +212,6 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
}
/**
- * Sets whether to activate the debug mode.
- *
- * @param debug
- * true
to activate the debug mode,
- * false
to deactivate.
- */
- public void setDebug(boolean debug) {
- projectInserter.setDebug(debug);
- }
-
- /**
* Sets the project to insert.
*
* @param project
@@ -246,6 +238,18 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
projectInserter.setFreenetInterface(freenetInterface);
}
+ /**
+ * Sets the project inserterâs temp directory.
+ *
+ * @see ProjectInserter#setTempDirectory(String)
+ * @param tempDirectory
+ * The temp directory to use, or {@code null} to use the system
+ * default
+ */
+ public void setTempDirectory(String tempDirectory) {
+ projectInserter.setTempDirectory(tempDirectory);
+ }
+
//
// INTERFACE InsertListener
//
@@ -254,12 +258,12 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
* {@inheritDoc}
*/
public void projectInsertStarted(final Project project) {
- startTime = System.currentTimeMillis();
+
SwingUtilities.invokeLater(new Runnable() {
@SuppressWarnings("synthetic-access")
public void run() {
- startTimeLabel.setText(DateFormat.getDateTimeInstance().format(new Date(startTime)));
+ startTimeLabel.setText(DateFormat.getDateTimeInstance().format(new Date()));
}
});
}
@@ -267,6 +271,13 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
/**
* {@inheritDoc}
*/
+ public void projectUploadFinished(Project project) {
+ startTime = System.currentTimeMillis();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public void projectURIGenerated(Project project, final String uri) {
SwingUtilities.invokeLater(new Runnable() {
@@ -282,6 +293,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
* {@inheritDoc}
*/
public void projectInsertProgress(Project project, final int succeeded, final int failed, final int fatal, final int total, final boolean finalized) {
+ insertedBlocks = succeeded;
SwingUtilities.invokeLater(new Runnable() {
@SuppressWarnings("synthetic-access")
@@ -291,8 +303,10 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
int progress = (succeeded + failed + fatal) * 100 / total;
StringBuilder progressString = new StringBuilder();
progressString.append(progress).append("% (");
- progressString.append(succeeded + failed + fatal).append("/").append(total);
- progressString.append(")");
+ progressString.append(succeeded + failed + fatal).append('/').append(total);
+ progressString.append(") (");
+ progressString.append(getTransferRate());
+ progressString.append(' ').append(I18n.getMessage("jsite.insert.k-per-s")).append(')');
progressBar.setString(progressString.toString());
if (finalized) {
progressBar.setFont(progressBar.getFont().deriveFont(Font.BOLD));
@@ -306,7 +320,11 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
*/
public void projectInsertFinished(Project project, boolean success, Throwable cause) {
if (success) {
- JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.inserted"), null, JOptionPane.INFORMATION_MESSAGE);
+ String copyURILabel = I18n.getMessage("jsite.insert.okay-copy-uri");
+ int selectedValue = JOptionPane.showOptionDialog(this, I18n.getMessage("jsite.insert.inserted"), I18n.getMessage("jsite.insert.done.title"), 0, JOptionPane.INFORMATION_MESSAGE, null, new Object[] { I18n.getMessage("jsite.insert.okay"), copyURILabel }, copyURILabel);
+ if (selectedValue == 1) {
+ actionCopyURI();
+ }
} else {
if (cause == null) {
JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.insert-failed"), null, JOptionPane.ERROR_MESSAGE);
@@ -319,7 +337,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
@SuppressWarnings("synthetic-access")
public void run() {
progressBar.setValue(progressBar.getMaximum());
- progressBar.setString(I18n.getMessage("jsite.insert.done"));
+ progressBar.setString(I18n.getMessage("jsite.insert.done") + " (" + getTransferRate() + " " + I18n.getMessage("jsite.insert.k-per-s") + ")");
wizard.setNextEnabled(true);
wizard.setQuitEnabled(true);
}
@@ -338,6 +356,37 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
clipboard.setContents(new StringSelection(requestURITextField.getText()), this);
}
+ /**
+ * Formats the given number so that it always has the the given number of
+ * fractional digits.
+ *
+ * @param number
+ * The number to format
+ * @param digits
+ * The number of fractional digits
+ * @return The formatted number
+ */
+ private String formatNumber(double number, int digits) {
+ int multiplier = (int) Math.pow(10, digits);
+ String formattedNumber = String.valueOf((int) (number * multiplier) / (double) multiplier);
+ if (formattedNumber.indexOf('.') == -1) {
+ formattedNumber += '.';
+ for (int digit = 0; digit < digits; digit++) {
+ formattedNumber += "0";
+ }
+ }
+ return formattedNumber;
+ }
+
+ /**
+ * Returns the formatted transfer rate at this point.
+ *
+ * @return The formatted transfer rate
+ */
+ private String getTransferRate() {
+ return formatNumber(insertedBlocks * 32.0 / ((System.currentTimeMillis() - startTime) / 1000), 1);
+ }
+
//
// INTERFACE ClipboardOwner
//