X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FProjectInsertPage.java;h=c1a5f4682cdeae2716efe4e27130625352b1f603;hb=79931b3dcd2fa355953d01f26eb027bded6b2ad3;hp=984e6df818ca16cc5dff7011092589c20c25cce8;hpb=0738b9f85c31813c0a6f02b3a51422192c96eb31;p=jSite.git

diff --git a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
index 984e6df..c1a5f46 100644
--- a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
+++ b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
@@ -1,6 +1,5 @@
 /*
- * jSite - a tool for uploading websites into Freenet
- * Copyright (C) 2006 David Roden
+ * jSite - ProjectInsertPage.java - Copyright © 2006–2012 David Roden
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +33,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;
@@ -46,12 +47,15 @@ import javax.swing.JProgressBar;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 
+import de.todesbaum.jsite.application.AbortedException;
 import de.todesbaum.jsite.application.Freenet7Interface;
 import de.todesbaum.jsite.application.InsertListener;
 import de.todesbaum.jsite.application.Project;
 import de.todesbaum.jsite.application.ProjectInserter;
 import de.todesbaum.jsite.i18n.I18n;
 import de.todesbaum.jsite.i18n.I18nContainer;
+import de.todesbaum.util.freenet.fcp2.PriorityClass;
+import de.todesbaum.util.io.StreamCopier.ProgressListener;
 import de.todesbaum.util.swing.TWizard;
 import de.todesbaum.util.swing.TWizardPage;
 
@@ -62,6 +66,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;
 
@@ -83,6 +90,12 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 	/** The number of inserted blocks. */
 	private volatile int insertedBlocks;
 
+	/** Whether the “copy URI to clipboard” button was used. */
+	private boolean uriCopied;
+
+	/** Whether the insert is currently running. */
+	private volatile boolean running = false;
+
 	/**
 	 * Creates a new progress insert wizard page.
 	 *
@@ -195,7 +208,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 	public void pageAdded(TWizard wizard) {
 		this.wizard.setPreviousName(I18n.getMessage("jsite.wizard.previous"));
 		this.wizard.setPreviousEnabled(false);
-		this.wizard.setNextName(I18n.getMessage("jsite.wizard.next"));
+		this.wizard.setNextName(I18n.getMessage("jsite.general.cancel"));
 		this.wizard.setQuitName(I18n.getMessage("jsite.wizard.quit"));
 	}
 
@@ -203,12 +216,52 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 	 * Starts the insert.
 	 */
 	public void startInsert() {
-		wizard.setNextEnabled(false);
+		running = true;
 		copyURIAction.setEnabled(false);
 		progressBar.setValue(0);
 		progressBar.setString(I18n.getMessage("jsite.insert.starting"));
 		progressBar.setFont(progressBar.getFont().deriveFont(Font.PLAIN));
-		projectInserter.start();
+		projectInserter.start(new ProgressListener() {
+
+			public void onProgress(final long copied, final long length) {
+				SwingUtilities.invokeLater(new Runnable() {
+
+					/**
+					 * {@inheritDoc}
+					 */
+					@SuppressWarnings("synthetic-access")
+					public void run() {
+						int divisor = 1;
+						while (((copied / divisor) > Integer.MAX_VALUE) || ((length / divisor) > Integer.MAX_VALUE)) {
+							divisor *= 10;
+						}
+						progressBar.setMaximum((int) (length / divisor));
+						progressBar.setValue((int) (copied / divisor));
+						progressBar.setString("Uploaded: " + copied + " / " + length);
+					}
+				});
+			}
+		});
+	}
+
+	/**
+	 * Stops the currently running insert.
+	 */
+	public void stopInsert() {
+		if (running) {
+			wizard.setNextEnabled(false);
+			projectInserter.stop();
+		}
+	}
+
+	/**
+	 * Returns whether the insert is currently running.
+	 *
+	 * @return {@code true} if the insert is currently running, {@code false}
+	 *         otherwise
+	 */
+	public boolean isRunning() {
+		return running;
 	}
 
 	/**
@@ -250,6 +303,37 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 		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;
+	}
+
+	/**
+	 * Sets whether to use the “early encode“ flag for the insert.
+	 *
+	 * @param useEarlyEncode
+	 *            {@code true} to set the “early encode” flag for the insert,
+	 *            {@code false} otherwise
+	 */
+	public void setUseEarlyEncode(boolean useEarlyEncode) {
+		projectInserter.setUseEarlyEncode(useEarlyEncode);
+	}
+
+	/**
+	 * Sets the insert priority.
+	 *
+	 * @param priority
+	 *            The insert priority
+	 */
+	public void setPriority(PriorityClass priority) {
+		projectInserter.setPriority(priority);
+	}
+
 	//
 	// INTERFACE InsertListener
 	//
@@ -273,6 +357,14 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 	 */
 	public void projectUploadFinished(Project project) {
 		startTime = System.currentTimeMillis();
+		SwingUtilities.invokeLater(new Runnable() {
+
+			@SuppressWarnings("synthetic-access")
+			public void run() {
+				progressBar.setString(I18n.getMessage("jsite.insert.starting"));
+				progressBar.setValue(0);
+			}
+		});
 	}
 
 	/**
@@ -287,6 +379,25 @@ 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);
+		}
 	}
 
 	/**
@@ -298,6 +409,9 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 
 			@SuppressWarnings("synthetic-access")
 			public void run() {
+				if (total == 0) {
+					return;
+				}
 				progressBar.setMaximum(total);
 				progressBar.setValue(succeeded + failed + fatal);
 				int progress = (succeeded + failed + fatal) * 100 / total;
@@ -319,17 +433,22 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 	 * {@inheritDoc}
 	 */
 	public void projectInsertFinished(Project project, boolean success, Throwable cause) {
+		running = false;
 		if (success) {
 			String copyURILabel = I18n.getMessage("jsite.insert.okay-copy-uri");
-			String selectedValue = (String) JOptionPane.showInputDialog(this, I18n.getMessage("jsite.insert.inserted"), I18n.getMessage("jsite.insert.done.title"), JOptionPane.INFORMATION_MESSAGE, null, new Object[] { I18n.getMessage("jsite.insert.okay"), copyURILabel }, copyURILabel);
-			if (copyURILabel.equals(selectedValue)) {
+			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.ok"), copyURILabel }, copyURILabel);
+			if (selectedValue == 1) {
 				actionCopyURI();
 			}
 		} else {
 			if (cause == null) {
-				JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.insert-failed"), null, JOptionPane.ERROR_MESSAGE);
+				JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.insert-failed"), I18n.getMessage("jsite.insert.insert-failed.title"), JOptionPane.ERROR_MESSAGE);
 			} else {
-				JOptionPane.showMessageDialog(this, MessageFormat.format(I18n.getMessage("jsite.insert.insert-failed-with-cause"), cause.getMessage()), null, JOptionPane.ERROR_MESSAGE);
+				if (cause instanceof AbortedException) {
+					JOptionPane.showMessageDialog(this, I18n.getMessage("jsite.insert.insert-aborted"), I18n.getMessage("jsite.insert.insert-aborted.title"), JOptionPane.INFORMATION_MESSAGE);
+				} else {
+					JOptionPane.showMessageDialog(this, MessageFormat.format(I18n.getMessage("jsite.insert.insert-failed-with-cause"), cause.getMessage()), I18n.getMessage("jsite.insert.insert-failed.title"), JOptionPane.ERROR_MESSAGE);
+				}
 			}
 		}
 		SwingUtilities.invokeLater(new Runnable() {
@@ -338,6 +457,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 			public void run() {
 				progressBar.setValue(progressBar.getMaximum());
 				progressBar.setString(I18n.getMessage("jsite.insert.done") + " (" + getTransferRate() + " " + I18n.getMessage("jsite.insert.k-per-s") + ")");
+				wizard.setNextName(I18n.getMessage("jsite.wizard.next"));
 				wizard.setNextEnabled(true);
 				wizard.setQuitEnabled(true);
 			}
@@ -352,6 +472,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);
 	}