From 1a0db4f4e007b18707f875e8129e7b418da5f822 Mon Sep 17 00:00:00 2001
From: Christos Stathis <chstath@ebs.gr>
Date: Fri, 10 Feb 2012 17:53:53 +0200
Subject: [PATCH] Implemented background multiple upload (issue #1989)

---
 build.xml                                          |    2 +-
 .../grnet/pithos/web/client/FileUploadDialog.java  |  100 ++++++++++++++------
 src/gr/grnet/pithos/web/client/Pithos.java         |   20 +++-
 .../web/client/commands/UploadFileCommand.java     |    3 +-
 .../grnet/pithos/web/public/images/ajax-loader.gif |  Bin 0 -> 3208 bytes
 src/gr/grnet/pithos/web/public/pithos.css          |   18 ++--
 .../css/jquery.plupload.queue.css                  |    3 +-
 7 files changed, 104 insertions(+), 42 deletions(-)
 create mode 100644 src/gr/grnet/pithos/web/public/images/ajax-loader.gif

diff --git a/build.xml b/build.xml
index 12cdddc..c0a240a 100644
--- a/build.xml
+++ b/build.xml
@@ -84,7 +84,7 @@
 
     <target name="uploadCSSToVM">
         <scp todir="chstath@pithos.dev.grnet.gr:/var/www/pithos_web_client" keyfile="${ssh.key}" passphrase="${passphrase}">
-            <fileset dir="${gwt.www.dir}/${gwt.module}" includes="pithos.css"/>
+            <fileset dir="${src.dir}/${gwt.root.path}/public" includes="pithos.css"/>
         </scp>
     </target>
 
diff --git a/src/gr/grnet/pithos/web/client/FileUploadDialog.java b/src/gr/grnet/pithos/web/client/FileUploadDialog.java
index 1bb069a..4db59b9 100644
--- a/src/gr/grnet/pithos/web/client/FileUploadDialog.java
+++ b/src/gr/grnet/pithos/web/client/FileUploadDialog.java
@@ -41,6 +41,8 @@ import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.dom.client.KeyCodes;
+import com.google.gwt.event.logical.shared.CloseEvent;
+import com.google.gwt.event.logical.shared.CloseHandler;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.Event.NativePreviewEvent;
 import com.google.gwt.user.client.ui.Anchor;
@@ -54,6 +56,7 @@ import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.Hidden;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.VerticalPanel;
 
 /**
@@ -83,17 +86,15 @@ public class FileUploadDialog extends DialogBox {
 	/**
 	 * The widget's constructor.
 	 */
-	public FileUploadDialog(Pithos _app, Folder _folder) {
+	public FileUploadDialog(Pithos _app) {
 		app = _app;
-		folder = _folder;
-		foldernameLabel.setText(folder.getName());
 		Anchor close = new Anchor();
 		close.addStyleName("close");
 		close.addClickHandler(new ClickHandler() {
 			
 			@Override
 			public void onClick(ClickEvent event) {
-				hide();
+				close();
 			}
 		});
 		// Set the dialog's caption.
@@ -101,6 +102,8 @@ public class FileUploadDialog extends DialogBox {
 		setAnimationEnabled(true);
 		setGlassEnabled(true);
 		setStyleName("pithos-DialogBox");
+		setVisible(false);
+		
 		// Since we're going to add a FileUpload widget, we'll need to set the
 		// form to use the POST method, and multipart MIME encoding.
 		form.setEncoding(FormPanel.ENCODING_MULTIPART);
@@ -144,15 +147,6 @@ public class FileUploadDialog extends DialogBox {
 		panel.add(inner);
 		panel.setCellHorizontalAlignment(inner, HasHorizontalAlignment.ALIGN_CENTER);
 		
-		
-		Scheduler.get().scheduleDeferred(new Command() {
-			
-			@Override
-			public void execute() {
-				String path = app.getApiPath() + folder.getOwner() + folder.getUri();
-				setupUpload(FileUploadDialog.this, path, app.getToken());
-			}
-		});
 		setWidget(form);
 	}
 
@@ -190,22 +184,19 @@ public class FileUploadDialog extends DialogBox {
 					Init: function(up, info) {
 						$wnd.console.log("Init fired");
 						up.settings.file_data_name = "X-Object-Data";				
-						dlg.@gr.grnet.pithos.web.client.FileUploadDialog::center()();
-//						up.refresh();
-						return true;
 					}
 					
 				},
 				
 				init: {
-					PostInit: function(up) {
-						$wnd.console.log("PostInit fired");
-						//dlg.@gr.grnet.pithos.web.client.FileUploadDialog::center()();
+					FilesAdded: function(up, files) {
+						for (var j=0; j<files.length; j++)
+							files[j].url = up.path + "/" + files[j].name + "?X-Auth-Token=" + token;
 					},
 					
 					BeforeUpload: function(up, file) {
-						$wnd.console.log('About to upload ' + file.name);
-						up.settings.url = path + "/" + file.name + "?X-Auth-Token=" + token;
+						$wnd.console.log('About to upload ' + file.url);
+						up.settings.url = file.url;
 					},
 					
 					FileUploaded: function(up, file, response) {
@@ -215,25 +206,45 @@ public class FileUploadDialog extends DialogBox {
 					
 					UploadComplete: function(up, files) {
 						$wnd.console.log('All files finished');
+						dlg.@gr.grnet.pithos.web.client.FileUploadDialog::hideUploadIndicator()();
 						dlg.@gr.grnet.pithos.web.client.FileUploadDialog::refreshFolder()();
 					}
 				}
 			});
+			uploader = $wnd.$("#uploader").pluploadQueue();
 		}
 		else {
-			var previousSettings = uploader.settings;
-			var previousFiles = uploader.files;
-			$wnd.$("#uploader").pluploadQueue(previousSettings);
-			uploader = $wnd.$("#uploader").pluploadQueue();
-			uploader.trigger('FilesAdded', previousFiles);
-			for (var i=0; i<previousFiles.length; i++) {
-				var f = previousFiles[i];
-				if (f.status == $wnd.plupload.UPLOADING) {
-					uploader.trigger('UploadProgress', f);
+			var removeAll = true;
+			var files = uploader.files;
+			$wnd.console.log('About to check ' + files.length + ' files');
+			for (var i=0; i<files.length; i++) {
+				var f = files[i];
+				if (f.status != $wnd.plupload.DONE && f.status != $wnd.plupload.FAILED) {
+					removeAll = false;
 					break;
 				}
 			}
+			if (removeAll) {
+				$wnd.console.log('About to remove ' + files.length + ' files');
+				while (files.length > 0) {
+					uploader.removeFile(files[0]);
+				}
+				$wnd.console.log(uploader);
+			}
 		}
+		uploader.path = path;
+	}-*/;
+	
+	native boolean isUploading()/*-{
+		var uploader = $wnd.$("#uploader").pluploadQueue();
+		var files = uploader.files;
+		for (var i=0; i<files.length; i++) {
+			var f = files[i];
+			if (f.status == $wnd.plupload.UPLOADING) {
+				return true;
+			}
+		}
+		return false;
 	}-*/;
 	
 	@Override
@@ -246,8 +257,35 @@ public class FileUploadDialog extends DialogBox {
 			// escape is pressed.
 			switch (evt.getKeyCode()) {
 				case KeyCodes.KEY_ESCAPE:
-					hide();
+					close();
 					break;
 			}
 	}
+
+	public void setFolder(Folder folder) {
+		this.folder = folder;
+		foldernameLabel.setText(folder.getName());
+	}
+
+	@Override
+	public void center() {
+		app.hideUploadIndicator();
+		setVisible(true);
+		setModal(true);
+		super.center();
+		String path = app.getApiPath() + folder.getOwner() + folder.getUri();
+		setupUpload(this, path, app.getToken());
+		super.center();
+	}
+	
+	private void hideUploadIndicator() {
+		app.hideUploadIndicator();
+	}
+	
+	void close() {
+		setVisible(false);
+		setModal(false);
+		if (isUploading())
+			app.showUploadIndicator();
+	}
 }
diff --git a/src/gr/grnet/pithos/web/client/Pithos.java b/src/gr/grnet/pithos/web/client/Pithos.java
index 50b0f48..2adb7fd 100644
--- a/src/gr/grnet/pithos/web/client/Pithos.java
+++ b/src/gr/grnet/pithos/web/client/Pithos.java
@@ -270,6 +270,8 @@ public class Pithos implements EntryPoint, ResizeHandler {
     
     private Toolbar toolbar;
     
+    private FileUploadDialog fileUploadDialog;
+    
 	@Override
 	public void onModuleLoad() {
 		if (parseUserCredentials())
@@ -303,7 +305,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
         header.setWidth(contentWidth);
         if (bareContent)
         	header.addStyleName("pithos-header-noframe");
-        upload = new Button("Upload File", new ClickHandler() {
+        upload = new Button("Upload", new ClickHandler() {
             @Override
             public void onClick(ClickEvent event) {
             	if (getSelection() != null)
@@ -1212,4 +1214,20 @@ public class Pithos implements EntryPoint, ResizeHandler {
 	public void showRelevantToolbarButtons() {
 		toolbar.showRelevantButtons();
 	}
+
+	public FileUploadDialog getFileUploadDialog() {
+		if (fileUploadDialog == null)
+			fileUploadDialog = new FileUploadDialog(this);
+		return fileUploadDialog;
+	}
+
+	public void hideUploadIndicator() {
+		upload.removeStyleName("pithos-uploadButton-loading");
+		upload.setTitle("");
+	}
+	
+	public void showUploadIndicator() {
+		upload.addStyleName("pithos-uploadButton-loading");
+		upload.setTitle("Upload in progress. Click for details.");
+	}
 }
diff --git a/src/gr/grnet/pithos/web/client/commands/UploadFileCommand.java b/src/gr/grnet/pithos/web/client/commands/UploadFileCommand.java
index fc2f838..a97f161 100644
--- a/src/gr/grnet/pithos/web/client/commands/UploadFileCommand.java
+++ b/src/gr/grnet/pithos/web/client/commands/UploadFileCommand.java
@@ -67,7 +67,8 @@ public class UploadFileCommand implements Command {
 		if(containerPanel!=null)
 			containerPanel.hide();
 		
-        FileUploadDialog dlg = new FileUploadDialog(app, folder);
+        FileUploadDialog dlg = app.getFileUploadDialog();
+        dlg.setFolder(folder);
 		dlg.center();
 	}
 }
diff --git a/src/gr/grnet/pithos/web/public/images/ajax-loader.gif b/src/gr/grnet/pithos/web/public/images/ajax-loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3288d1035d70bb86517e2c233f1a904e41f06b29
GIT binary patch
literal 3208
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
Bt<?Yk

literal 0
HcmV?d00001

diff --git a/src/gr/grnet/pithos/web/public/pithos.css b/src/gr/grnet/pithos/web/public/pithos.css
index ac86b31..eb7de9d 100644
--- a/src/gr/grnet/pithos/web/public/pithos.css
+++ b/src/gr/grnet/pithos/web/public/pithos.css
@@ -49,10 +49,10 @@ table td {
 }
 
 a {
-	color: white;
-	text-decoration: none;
-}
-
+ 	color: white;
+ 	text-decoration: none;
+} 
+ 
 a:hover {
 	color: white;
 }
@@ -371,8 +371,8 @@ table.pithos-permList.props-labels {
 }
 
 .pithos-uploadButton {
-    background: none;
-    background-color: #ff7f2a;
+	background: none;
+	background-color: #ff7f2a;
     font-size: 120%;
     text-align: center;
     height: auto;
@@ -381,6 +381,12 @@ table.pithos-permList.props-labels {
     border: none;
 }
 
+.pithos-uploadButton-loading {
+	background: url(images/ajax-loader.gif) no-repeat;
+	background-position: 110px 0px;
+	background-color: #ff7f2a;
+}
+
 .pithos-uploadButton:HOVER {
     background-color: #f95;
 }
diff --git a/src/gr/grnet/pithos/web/public/plupload/js/jquery.plupload.queue/css/jquery.plupload.queue.css b/src/gr/grnet/pithos/web/public/plupload/js/jquery.plupload.queue/css/jquery.plupload.queue.css
index 3acc0ac..8caca2d 100644
--- a/src/gr/grnet/pithos/web/public/plupload/js/jquery.plupload.queue/css/jquery.plupload.queue.css
+++ b/src/gr/grnet/pithos/web/public/plupload/js/jquery.plupload.queue/css/jquery.plupload.queue.css
@@ -29,7 +29,7 @@
 }
 
 .plupload_disabled, a.plupload_disabled:hover {
-    color: #737373;
+    color: #737373 !important;
     border-color: #c5c5c5;
 /*    background: #ededed url('../img/buttons-disabled.png') no-repeat 0 center;*/
 	cursor: default;
@@ -127,7 +127,6 @@
 
 li.plupload_uploading {
 	background: #ECF3DC url('../img/backgrounds.gif') repeat-x 0 -238px;
-	background-color: #A1C8DB;
 }
 li.plupload_done {color:#AAA}
 
-- 
1.7.10.4