X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FProjectInsertPage.java;h=e8e2154572a6880255fb107545cab516611458eb;hb=ba4e6f7bf958b489adfbef0e84543340abec0ab4;hp=dc82f53e9c171dfc3f4b10f28f0002892cebe62f;hpb=5af7e82a86fa1e64a1c8d34f303c3a393c6ecd87;p=jSite.git

diff --git a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
index dc82f53..e8e2154 100644
--- a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
+++ b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
@@ -34,6 +34,8 @@ import java.awt.event.KeyEvent;
 import java.text.DateFormat;
 import java.text.MessageFormat;
 import java.util.Date;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
@@ -62,6 +64,9 @@ import de.todesbaum.util.swing.TWizardPage;
  */
 public class ProjectInsertPage extends TWizardPage implements InsertListener, ClipboardOwner {
 
+	/** The logger. */
+	private static final Logger logger = Logger.getLogger(ProjectInsertPage.class.getName());
+
 	/** The project inserter. */
 	private ProjectInserter projectInserter;
 
@@ -80,6 +85,12 @@ 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;
+
+	/** Whether the “copy URI to clipboard” button was used. */
+	private boolean uriCopied;
+
 	/**
 	 * Creates a new progress insert wizard page.
 	 *
@@ -235,6 +246,28 @@ 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);
+	}
+
+	/**
+	 * Returns whether the “copy URI to clipboard” button was used.
+	 *
+	 * @return {@code true} if an URI was copied to clipboard, {@code false}
+	 *         otherwise
+	 */
+	public boolean wasUriCopied() {
+		return uriCopied;
+	}
+
 	//
 	// INTERFACE InsertListener
 	//
@@ -272,12 +305,32 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 				requestURITextField.setText(uri);
 			}
 		});
+		logger.log(Level.FINEST, "Insert generated URI: " + uri);
+		int slash = uri.indexOf('/');
+		slash = uri.indexOf('/', slash + 1);
+		int secondSlash = uri.indexOf('/', slash + 1);
+		if (secondSlash == -1) {
+			secondSlash = uri.length();
+		}
+		String editionNumber = uri.substring(slash + 1, secondSlash);
+		logger.log(Level.FINEST, "Extracted edition number: " + editionNumber);
+		int edition = -1;
+		try {
+			edition = Integer.valueOf(editionNumber);
+		} catch (NumberFormatException nfe1) {
+			/* ignore. */
+		}
+		logger.log(Level.FINEST, "Insert edition: " + edition + ", Project edition: " + project.getEdition());
+		if ((edition != -1) && (edition == project.getEdition())) {
+			JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.reinserted-edition"), I18n.getMessage("jsite.insert.reinserted-edition.title"), JOptionPane.INFORMATION_MESSAGE);
+		}
 	}
 
 	/**
 	 * {@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")
@@ -289,7 +342,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 				progressString.append(progress).append("% (");
 				progressString.append(succeeded + failed + fatal).append('/').append(total);
 				progressString.append(") (");
-				progressString.append(formatNumber(succeeded * 32.0 / ((System.currentTimeMillis() - startTime) / 1000), 1));
+				progressString.append(getTransferRate());
 				progressString.append(' ').append(I18n.getMessage("jsite.insert.k-per-s")).append(')');
 				progressBar.setString(progressString.toString());
 				if (finalized) {
@@ -304,7 +357,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.general.okay"), copyURILabel }, copyURILabel);
+			if (selectedValue == 1) {
+				actionCopyURI();
+			}
 		} else {
 			if (cause == null) {
 				JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.insert-failed"), null, JOptionPane.ERROR_MESSAGE);
@@ -317,7 +374,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);
 			}
@@ -332,6 +389,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 	 * Copies the request URI of the project to the clipboard.
 	 */
 	private void actionCopyURI() {
+		uriCopied = true;
 		Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
 		clipboard.setContents(new StringSelection(requestURITextField.getText()), this);
 	}
@@ -358,6 +416,15 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 		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
 	//