Issue 373

Add Speed and Time Remaining
Cancel Button disables itself when transfer completes.

Send/Wait for the correct acks (Acks are total bytes recieved so far, not bytes recieved this time)
Fix fast-dcc support (Treated as turbo, but with acks at the end.)

git-svn-id: http://svn.dmdirc.com/trunk@4045 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/addons/dcc/DCCSend.java

@@ -271,7 +271,6 @@ public class DCCSend extends DCC {
 			transferFile = new File(filename);
 			if (transferType == TransferType.RECEIVE) {
 				fileOut = new DataOutputStream(new FileOutputStream(transferFile.getAbsolutePath(), (startpos > 0)));
-				//System.out.println("Appending: "+(startpos > 0));
 			}
 			out = new DataOutputStream(socket.getOutputStream());
 			in = new DataInputStream(socket.getInputStream());
@@ -327,8 +326,10 @@ public class DCCSend extends DCC {
 			readSize = readSize + bytesRead;
 			
 			if (bytesRead > 0) {
+				if (handler != null) { handler.dataTransfered(this, bytesRead); }
 				fileOut.write(data, 0, bytesRead);
-				out.writeInt(bytesRead);
+				// Send ack
+				out.writeInt(readSize);
 				out.flush();
 				if (readSize == size) {
 					fileOut.close();
@@ -353,7 +354,6 @@ public class DCCSend extends DCC {
 	 *         called again.
 	 */
 	protected boolean handleSend() {
-		if (fileIn == null) { return true; }
 		try {
 			final byte[] data = new byte[blockSize];
 			int bytesRead = fileIn.read(data);
@@ -364,15 +364,35 @@ public class DCCSend extends DCC {
 				out.write(data, 0, bytesRead);
 				out.flush();
 				
+				// Wait for acknowlegement packet.
 				if (!turbo) {
-					while (bytesRead > 0) {
-						bytesRead = bytesRead - in.readInt();
-					}
+					int bytesRecieved;
+					do {
+						bytesRecieved = in.readInt();
+					} while ((readSize - bytesRecieved) > 0);
 				}
 				
 				if (readSize == size) {
 					fileIn.close();
 					fileIn = null;
+					
+					// Process all the ack packets that may have been sent.
+					// In true turbo dcc mode, none will have been sent and the socket
+					// will just close, in fast-dcc mode all the acks will be here,
+					// So keep reading acks untill the socket closes (IOException) or we
+					// have recieved all the acks.
+					if (turbo) {
+						int ack = 0;
+						do {
+							try {
+								ack = in.readInt();
+							} catch (IOException e) {
+								break;
+							}
+						} while (ack > 0 && (readSize - ack) > 0);
+					}
+					
+					return false;
 				}
 				
 				return true;

src/com/dmdirc/addons/dcc/DCCSendWindow.java

@@ -54,12 +54,27 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
 	/** Total data transfered */
 	private long transferCount = 0;
 	
+	/** Time Started */
+	private long timeStarted = 0;
+	
 	/** Progress Bar */
 	private final JProgressBar progress = new JProgressBar();
 	
 	/** Status Label */
 	private final JLabel status = new JLabel("Status: Waiting");
 	
+	/** Speed Label */
+	private final JLabel speed = new JLabel("Speed: Unknown");
+	
+	/** Time Label */
+	private final JLabel remaining = new JLabel("Time Remaining: Unknown");
+	
+	/** Time Taken */
+	private final JLabel taken = new JLabel("Time Taken: 00:00");
+	
+	/** Button */
+	private final JButton button = new JButton("Cancel");
+	
 	/**
 	 * Creates a new instance of DCCSendWindow with a given DCCSend object.
 	 *
@@ -78,8 +93,6 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
 		
 		getContentPane().setLayout(new MigLayout());
 		
-		transferCount = dcc.getFileStart();
-		
 		progress.setMinimum(0);
 		progress.setMaximum(100);
 		progress.setStringPainted(true);
@@ -93,11 +106,12 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
 			getContentPane().add(new JLabel("From: "+targetNick), "wrap");
 		}
 		getContentPane().add(status, "wrap");
+		getContentPane().add(speed, "wrap");
+		getContentPane().add(remaining, "wrap");
+		getContentPane().add(taken, "wrap");
 		getContentPane().add(progress, "growx, wrap");
 		
-		final JButton button = new JButton("Cancel");
 		button.addActionListener(this);
-		
 		getContentPane().add(button, "wrap, align right");
 		
 		plugin.addWindow(this);
@@ -106,7 +120,7 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
 	/** {@inheritDoc} */
 	public void actionPerformed(final ActionEvent e) {
 		if (e.getActionCommand().equals("Cancel")) {
-			((JButton)e.getSource()).setEnabled(false);
+			button.setEnabled(false);
 			dcc.close();
 		}
 	}
@@ -119,7 +133,7 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
 	 */
 	public void dataTransfered(final DCCSend dcc, final int bytes) {
 		transferCount += bytes;
-		final double percent = (100.00 / dcc.getFileSize()) * transferCount;
+		final double percent = (100.00 / dcc.getFileSize()) * (transferCount + dcc.getFileStart());
 		
 		if (dcc.getType() == DCCSend.TransferType.SEND) {
 			status.setText("Status: Sending");
@@ -127,9 +141,51 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
 			status.setText("Status: Recieving");
 		}
 		
+		updateSpeedAndTime();
+		
 		progress.setValue((int)Math.floor(percent));
 	}
 	
+	/**
+	 * Update the transfer speed, time remaining and time taken labels.
+	 */
+	public void updateSpeedAndTime() {
+		final long time = (System.currentTimeMillis() - timeStarted) / 1000;
+		final double bytesPerSecond = (time > 0) ? (transferCount / time) : 0;
+		
+		if (bytesPerSecond > 1048576) {
+			speed.setText(String.format("Speed: %.2f MB/s", (bytesPerSecond/1048576)));
+		} else if (bytesPerSecond > 1024) {
+			speed.setText(String.format("Speed: %.2f KB/s", (bytesPerSecond/1024)));
+		} else {
+			speed.setText(String.format("Speed: %f B/s", bytesPerSecond));
+		}
+		
+		final long remaningBytes = dcc.getFileSize() - dcc.getFileStart() - transferCount;
+		final double remainingSeconds = (bytesPerSecond > 0) ? (remaningBytes / bytesPerSecond) : 1;
+		
+		remaining.setText(String.format("Time Remaining: %s", duration((int)Math.floor(remainingSeconds))));
+		taken.setText(String.format("Time Taken: %s", duration(time)));
+	}
+	
+	/**
+	 * Get the duration in seconds as a string.
+	 *
+	 * @param secondsInput to get duration for
+	 * @return Duration as a string
+	 */
+	private String duration(final long secondsInput) {
+		final StringBuilder result = new StringBuilder();
+		final long hours = (secondsInput / 3600);
+		final long minutes = (secondsInput / 60 % 60);
+		final long seconds = (secondsInput % 60);
+		
+		if (hours > 0) { result.append(hours+":"); }
+		result.append(String.format("%0,2d:%0,2d",minutes,seconds));
+		
+		return result.toString();
+	}
+	
 	/**
 	 * Called when the socket is closed
 	 *
@@ -137,11 +193,13 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
 	 */
 	@Override
 	public void socketClosed(final DCCSend dcc) {
+		button.setEnabled(false);
 		if (transferCount == dcc.getFileSize()) {
 			status.setText("Status: Transfer Compelete.");
 		} else {
 			status.setText("Status: Transfer Failed.");
 		}
+		updateSpeedAndTime();
 	}
 	
 	/**
@@ -152,6 +210,7 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
 	@Override
 	public void socketOpened(final DCCSend dcc) {
 		status.setText("Status: Socket Opened");
+		timeStarted = System.currentTimeMillis();
 	}
 	
 	/**