*/
package gr.grnet.pithos.web.client;
+import gr.grnet.pithos.web.client.PithosDisclosurePanel.Style;
import gr.grnet.pithos.web.client.commands.UploadFileCommand;
import gr.grnet.pithos.web.client.foldertree.AccountResource;
import gr.grnet.pithos.web.client.foldertree.File;
import gr.grnet.pithos.web.client.rest.HeadRequest;
import gr.grnet.pithos.web.client.rest.PutRequest;
import gr.grnet.pithos.web.client.rest.RestException;
-import gr.grnet.pithos.web.client.tagtree.Tag;
import java.util.ArrayList;
import java.util.HashMap;
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
+import com.google.gwt.core.client.Scheduler.RepeatingCommand;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.json.client.JSONParser;
import com.google.gwt.json.client.JSONString;
import com.google.gwt.json.client.JSONValue;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.CssResource;
import com.google.gwt.resources.client.ImageResource;
+import com.google.gwt.resources.client.ClientBundle.Source;
import com.google.gwt.resources.client.ImageResource.ImageOptions;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.Cookies;
import com.google.gwt.user.client.ui.AbstractImagePrototype;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HasVerticalAlignment;
public static final Configuration config = GWT.create(Configuration.class);
+ public interface Style extends CssResource {
+ String commandAnchor();
+ }
+
+ public interface Resources extends ClientBundle {
+ @Source("Pithos.css")
+ Style pithosCss();
+ }
+
+ public static Resources resources = GWT.create(Resources.class);
+
/**
* Instantiate an application-level image bundle. This object will provide
* programmatic access to all the images needed by widgets.
return account;
}
- public void updateFolder(Folder f, boolean showfiles, Command callback) {
- folderTreeView.updateFolder(f, showfiles, callback);
+ public void updateFolder(Folder f, boolean showfiles, Command callback, final boolean openParent) {
+ folderTreeView.updateFolder(f, showfiles, callback, openParent);
}
public void updateGroupNode(Group group) {
mysharedTreeView.updateRoot();
}
- public void updateSharedFolder(Folder f, boolean showfiles) {
- mysharedTreeView.updateFolder(f, showfiles);
+ public void updateSharedFolder(Folder f, boolean showfiles, Command callback) {
+ mysharedTreeView.updateFolder(f, showfiles, callback);
}
+ public void updateSharedFolder(Folder f, boolean showfiles) {
+ updateSharedFolder(f, showfiles, null);
+ }
+
public void updateOtherSharedFolder(Folder f, boolean showfiles) {
otherSharedTreeView.updateFolder(f, showfiles);
}
OtherSharedTreeView otherSharedTreeView = null;
GroupTreeViewModel groupTreeViewModel;
- private GroupTreeView groupTreeView;
+ GroupTreeView groupTreeView;
TreeView selectedTree;
protected AccountResource account;
@SuppressWarnings("rawtypes") List<SingleSelectionModel> selectionModels = new ArrayList<SingleSelectionModel>();
- Button upload;
-
- private HTML usedBytes;
-
- private HTML totalBytes;
-
- private HTML usedPercent;
+ public Button upload;
private HTML numOfFiles;
}
private void initialize() {
+ resources.pithosCss().ensureInjected();
boolean bareContent = Window.Location.getParameter("noframe") != null;
String contentWidth = bareContent ? "100%" : "75%";
public void execute() {
updateStatistics();
}
- });
+ }, true);
+ showRelevantToolbarButtons();
}
- showRelevantToolbarButtons();
+ else {
+ if (getSelectedTree().equals(folderTreeView))
+ setSelectedTree(null);
+ if (getSelectedTree() == null)
+ showRelevantToolbarButtons();
+ }
}
});
selectionModels.add(folderTreeSelectionModel);
folderTreeView = new FolderTreeView(folderTreeViewModel);
treeViews.add(folderTreeView);
- fileList = new FileList(this, images, folderTreeView);
+ fileList = new FileList(this, images);
inner.add(fileList);
- groupTreeViewModel = new GroupTreeViewModel(this);
- groupTreeView = new GroupTreeView(groupTreeViewModel);
- treeViews.add(groupTreeView);
+ inner.add(createUploadArea());
trees = new VerticalPanel();
trees.setWidth("100%");
-
- HorizontalPanel treeHeader = new HorizontalPanel();
- treeHeader.addStyleName("pithos-treeHeader");
- treeHeader.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
- treeHeader.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
- HorizontalPanel statistics = new HorizontalPanel();
- statistics.addStyleName("pithos-statistics");
- statistics.add(new HTML("Used: "));
- usedBytes = new HTML();
- statistics.add(usedBytes);
- statistics.add(new HTML(" of "));
- totalBytes = new HTML();
- statistics.add(totalBytes);
- statistics.add(new HTML(" ("));
- usedPercent = new HTML();
- statistics.add(usedPercent);
- statistics.add(new HTML(")"));
- treeHeader.add(statistics);
- treeHeader.setCellHorizontalAlignment(statistics, HasHorizontalAlignment.ALIGN_LEFT);
- trees.add(treeHeader);
-
- trees.add(folderTreeView);
- trees.add(groupTreeView);
// Add the left and right panels to the split panel.
splitPanel.setLeftWidget(trees);
splitPanel.setRightWidget(inner);
- splitPanel.setSplitPosition("35%");
+ splitPanel.setSplitPosition("219px");
splitPanel.setSize("100%", "100%");
splitPanel.addStyleName("pithos-splitPanel");
splitPanel.setWidth(contentWidth);
trash = f;
break;
}
+ trees.add(folderTreeView);
folderTreeViewModel.initialize(account, new Command() {
@Override
createMySharedTree();
}
});
- groupTreeViewModel.initialize();
- showStatistics();
+
+ HorizontalPanel separator = new HorizontalPanel();
+ separator.addStyleName("pithos-statisticsSeparator");
+ separator.add(new HTML(""));
+ trees.add(separator);
+
+ groupTreeViewModel = new GroupTreeViewModel(Pithos.this);
+ groupTreeView = new GroupTreeView(groupTreeViewModel);
+ treeViews.add(groupTreeView);
+ trees.add(groupTreeView);
+ folderTreeView.showStatistics(account);
}
}
});
}
});
-// Scheduler.get().scheduleDeferred(new Command() {
-//
-// @Override
-// public void execute() {
-// displayError("lalala");
-//
-// }
-// });
+ Scheduler.get().scheduleFixedDelay(new RepeatingCommand() {
+
+ @Override
+ public boolean execute() {
+ Folder f = getSelection();
+ if (f != null) {
+ if (getSelectedTree().equals(folderTreeView))
+ updateFolder(f, true, null, false);
+ else if (getSelectedTree().equals(mysharedTreeView))
+ updateSharedFolder(f, true);
+ }
+ return true;
+ }
+ }, 3000);
}
public void applyPermissions(Folder f) {
if (f != null) {
- if (f.isInTrash())
+ if (f.isInTrash()) {
upload.setEnabled(false);
+ hideUploadArea();
+ }
else {
Boolean[] perms = f.getPermissions().get(username);
if (f.getOwner().equals(username) || (perms != null && perms[1] != null && perms[1])) {
upload.setEnabled(true);
+ showUploadArea();
}
- else
+ else {
upload.setEnabled(false);
+ hideUploadArea();
+ }
}
}
- else
+ else {
upload.setEnabled(false);
+ hideUploadArea();
+ }
}
@SuppressWarnings({ "rawtypes", "unchecked" })
public void deselectOthers(TreeView _selectedTree, SingleSelectionModel model) {
selectedTree = _selectedTree;
- for (Composite c : treeViews)
- if (c.equals(selectedTree))
- c.addStyleName("cellTreeWidget-selectedTree");
- else
- c.removeStyleName("cellTreeWidget-selectedTree");
-
for (SingleSelectionModel s : selectionModels)
- if (!s.equals(model))
+ if (!s.equals(model) && s.getSelectedObject() != null)
s.setSelected(s.getSelectedObject(), false);
}
* Parse and store the user credentials to the appropriate fields.
*/
private boolean parseUserCredentials() {
- username = Window.Location.getParameter("user");
- token = Window.Location.getParameter("token");
Configuration conf = (Configuration) GWT.create(Configuration.class);
Dictionary otherProperties = Dictionary.getDictionary("otherProperties");
- if (username == null || username.length() == 0 || token == null || token.length() == 0) {
- String cookie = otherProperties.get("authCookie");
- String auth = Cookies.getCookie(cookie);
- if (auth == null) {
- authenticateUser();
- return false;
- }
- if (auth.startsWith("\""))
- auth = auth.substring(1);
- if (auth.endsWith("\""))
- auth = auth.substring(0, auth.length() - 1);
- String[] authSplit = auth.split("\\" + conf.cookieSeparator(), 2);
- if (authSplit.length != 2) {
- authenticateUser();
- return false;
- }
- username = authSplit[0];
- token = authSplit[1];
- return true;
+ String cookie = otherProperties.get("authCookie");
+ String auth = Cookies.getCookie(cookie);
+ if (auth == null) {
+ authenticateUser();
+ return false;
}
-
- Cookies.setCookie(otherProperties.get("authCookie"), username + conf.cookieSeparator() + token, null, "", "/", false);
+ if (auth.startsWith("\""))
+ auth = auth.substring(1);
+ if (auth.endsWith("\""))
+ auth = auth.substring(0, auth.length() - 1);
+ String[] authSplit = auth.split("\\" + conf.cookieSeparator(), 2);
+ if (authSplit.length != 2) {
+ authenticateUser();
+ return false;
+ }
+ username = authSplit[0];
+ token = authSplit[1];
+
+ String gotoUrl = Window.Location.getParameter("goto");
+ if (gotoUrl != null && gotoUrl.length() > 0) {
+ Window.Location.assign(gotoUrl);
+ return false;
+ }
return true;
}
*/
protected void authenticateUser() {
Dictionary otherProperties = Dictionary.getDictionary("otherProperties");
- Window.Location.assign(otherProperties.get("loginUrl"));
+ Window.Location.assign(otherProperties.get("loginUrl") + Window.Location.getHref());
}
protected void fetchAccount(final Command callback) {
@Override
public void onSuccess(AccountResource _result) {
- showStatistics();
+ folderTreeView.showStatistics(account);
}
@Override
Scheduler.get().scheduleDeferred(headAccount);
}
- protected void showStatistics() {
- usedBytes.setHTML(String.valueOf(account.getFileSizeAsString()));
- totalBytes.setHTML(String.valueOf(account.getQuotaAsString()));
- NumberFormat nf = NumberFormat.getPercentFormat();
- usedPercent.setHTML(nf.format(account.getUsedPercentage()));
- }
-
protected void createHomeContainer(final AccountResource _account, final Command callback) {
String path = "/" + Pithos.HOME_CONTAINER;
PutRequest createPithos = new PutRequest(getApiPath(), getUsername(), path) {
History.newItem(key);
}
- public void deleteFolder(final Folder folder) {
+ public void deleteFolder(final Folder folder, final Command callback) {
String path = getApiPath() + folder.getOwner() + "/" + folder.getContainer() + "?format=json&delimiter=/&prefix=" + URL.encodeQueryString(folder.getPrefix()) + "&t=" + System.currentTimeMillis();
RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, path);
builder.setHeader("X-Auth-Token", getToken());
JSONArray array = json.isArray();
int i = 0;
if (array != null) {
- deleteObject(folder, i, array);
+ deleteObject(folder, i, array, callback);
}
}
}
}
}
- void deleteObject(final Folder folder, final int i, final JSONArray array) {
+ void deleteObject(final Folder folder, final int i, final JSONArray array, final Command callback) {
if (i < array.size()) {
JSONObject o = array.get(i).isObject();
if (o != null && !o.containsKey("subdir")) {
DeleteRequest delete = new DeleteRequest(getApiPath(), folder.getOwner(), URL.encode(path)) {
@Override
public void onSuccess(Resource result) {
- deleteObject(folder, i + 1, array);
+ deleteObject(folder, i + 1, array, callback);
}
@Override
array.set(l++, array2.get(j));
}
}
- deleteObject(folder, i + 1, array);
+ deleteObject(folder, i + 1, array, callback);
}
}
@Override
public void execute() {
+ folderTreeSelectionModel.setSelected(folder.getParent(), true);
updateStatistics();
+ if (callback != null)
+ callback.execute();
}
- });
+ }, true);
}
@Override
}
public void updateTrash(boolean showFiles, Command callback) {
- updateFolder(trash, showFiles, callback);
+ updateFolder(trash, showFiles, callback, true);
}
public void updateGroupsNode() {
groupTreeView.updateGroupNode(null);
}
- public void addGroup(String groupname) {
+ public Group addGroup(String groupname) {
Group newGroup = new Group(groupname);
account.addGroup(newGroup);
groupTreeView.updateGroupNode(null);
+ return newGroup;
}
public void removeGroup(Group group) {
return selectedTree;
}
+ public void setSelectedTree(TreeView selected) {
+ selectedTree = selected;
+ }
+
public Folder getSelection() {
- return selectedTree.getSelection();
+ if (selectedTree != null)
+ return selectedTree.getSelection();
+ return null;
}
public void showFolderStatistics(int folderFileCount) {
}
public void updateRootFolder(Command callback) {
- updateFolder(account.getPithos(), false, callback);
+ updateFolder(account.getPithos(), false, callback, true);
}
void createMySharedTree() {
if (mysharedTreeSelectionModel.getSelectedObject() != null) {
deselectOthers(mysharedTreeView, mysharedTreeSelectionModel);
upload.setEnabled(false);
+ hideUploadArea();
updateSharedFolder(mysharedTreeSelectionModel.getSelectedObject(), true);
+ showRelevantToolbarButtons();
}
- showRelevantToolbarButtons();
+ else {
+ if (getSelectedTree().equals(mysharedTreeView))
+ setSelectedTree(null);
+ if (getSelectedTree() == null)
+ showRelevantToolbarButtons();
+ }
}
});
selectionModels.add(mysharedTreeSelectionModel);
public void onSelectionChange(SelectionChangeEvent event) {
if (otherSharedTreeSelectionModel.getSelectedObject() != null) {
deselectOthers(otherSharedTreeView, otherSharedTreeSelectionModel);
- otherSharedTreeView.addStyleName("cellTreeWidget-selectedTree");
applyPermissions(otherSharedTreeSelectionModel.getSelectedObject());
updateOtherSharedFolder(otherSharedTreeSelectionModel.getSelectedObject(), true);
+ showRelevantToolbarButtons();
}
- showRelevantToolbarButtons();
+ else {
+ if (getSelectedTree().equals(otherSharedTreeView))
+ setSelectedTree(null);
+ if (getSelectedTree() == null)
+ showRelevantToolbarButtons();
+ }
}
});
selectionModels.add(otherSharedTreeSelectionModel);
@Override
public void execute() {
otherSharedTreeView = new OtherSharedTreeView(otherSharedTreeViewModel);
- trees.insert(otherSharedTreeView, 3);
+ trees.insert(otherSharedTreeView, 1);
treeViews.add(otherSharedTreeView);
}
});
}
public void scheduleFolderHeadCommand(final Folder folder, final Command callback) {
- HeadRequest<Folder> headFolder = new HeadRequest<Folder>(Folder.class, getApiPath(), folder.getOwner(), folder.getUri(), folder) {
-
- @Override
- public void onSuccess(Folder _result) {
- if (callback != null)
- callback.execute();
- }
-
- @Override
- public void onError(Throwable t) {
- if (t instanceof RestException) {
- if (((RestException) t).getHttpStatusCode() == Response.SC_NOT_FOUND) {
- final String path = folder.getUri();
- PutRequest newFolder = new PutRequest(getApiPath(), folder.getOwner(), path) {
- @Override
- public void onSuccess(Resource _result) {
- scheduleFolderHeadCommand(folder, callback);
- }
-
- @Override
- public void onError(Throwable _t) {
- GWT.log("", _t);
- setError(_t);
- if(_t instanceof RestException){
- displayError("Unable to create folder: " + ((RestException) _t).getHttpStatusText());
- }
- else
- displayError("System error creating folder: " + _t.getMessage());
- }
-
- @Override
- protected void onUnauthorized(Response response) {
- sessionExpired();
- }
- };
- newFolder.setHeader("X-Auth-Token", getToken());
- newFolder.setHeader("Content-Type", "application/folder");
- newFolder.setHeader("Accept", "*/*");
- newFolder.setHeader("Content-Length", "0");
- Scheduler.get().scheduleDeferred(newFolder);
- }
- else
- displayError("Error heading folder: " + ((RestException) t).getHttpStatusText());
- }
- else
- displayError("System error heading folder: " + t.getMessage());
-
- GWT.log("Error heading folder", t);
- setError(t);
- }
-
- @Override
- protected void onUnauthorized(Response response) {
- sessionExpired();
- }
- };
- headFolder.setHeader("X-Auth-Token", getToken());
- Scheduler.get().scheduleDeferred(headFolder);
+ if (folder == null) {
+ if (callback != null)
+ callback.execute();
+ }
+ else {
+ HeadRequest<Folder> headFolder = new HeadRequest<Folder>(Folder.class, getApiPath(), folder.getOwner(), folder.getUri(), folder) {
+
+ @Override
+ public void onSuccess(Folder _result) {
+ if (callback != null)
+ callback.execute();
+ }
+
+ @Override
+ public void onError(Throwable t) {
+ if (t instanceof RestException) {
+ if (((RestException) t).getHttpStatusCode() == Response.SC_NOT_FOUND) {
+ final String path = folder.getUri();
+ PutRequest newFolder = new PutRequest(getApiPath(), folder.getOwner(), path) {
+ @Override
+ public void onSuccess(Resource _result) {
+ scheduleFolderHeadCommand(folder, callback);
+ }
+
+ @Override
+ public void onError(Throwable _t) {
+ GWT.log("", _t);
+ setError(_t);
+ if(_t instanceof RestException){
+ displayError("Unable to create folder: " + ((RestException) _t).getHttpStatusText());
+ }
+ else
+ displayError("System error creating folder: " + _t.getMessage());
+ }
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
+ };
+ newFolder.setHeader("X-Auth-Token", getToken());
+ newFolder.setHeader("Content-Type", "application/folder");
+ newFolder.setHeader("Accept", "*/*");
+ newFolder.setHeader("Content-Length", "0");
+ Scheduler.get().scheduleDeferred(newFolder);
+ }
+ else
+ displayError("Error heading folder: " + ((RestException) t).getHttpStatusText());
+ }
+ else
+ displayError("System error heading folder: " + t.getMessage());
+
+ GWT.log("Error heading folder", t);
+ setError(t);
+ }
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
+ };
+ headFolder.setHeader("X-Auth-Token", getToken());
+ Scheduler.get().scheduleDeferred(headFolder);
+ }
}
public void scheduleFileHeadCommand(File f, final Command callback) {
headFile.setHeader("X-Auth-Token", getToken());
Scheduler.get().scheduleDeferred(headFile);
}
+
+ public boolean isMySharedSelected() {
+ return getSelectedTree().equals(getMySharedTreeView());
+ }
+
+ private FlowPanel createUploadArea() {
+ FlowPanel area = new FlowPanel();
+ area.getElement().setId("container");
+ HTML list = new HTML();
+ list.getElement().setId("filelist");
+ area.add(list);
+ Scheduler.get().scheduleDeferred(new ScheduledCommand() {
+
+ @Override
+ public void execute() {
+ setupUploadArea(Pithos.this, getToken());
+ }
+ });
+
+ return area;
+ }
+
+ native void setupUploadArea(Pithos app, String token) /*-{
+ $wnd.$("#container").pluploadQueue({
+ // General settings
+ runtimes : 'html5',
+ unique_names : true,
+ multiple_queues: true,
+ drop_element: 'filelist',
+
+ preinit: {
+ Init: function(up, info) {
+ if ($wnd.console && $wnd.console.log)
+ $wnd.console.log("Init fired");
+ up.settings.file_data_name = "X-Object-Data";
+ }
+ },
+
+ init: {
+ FilesAdded: function(up, files) {
+ $wnd.$('#container').css('border', '');
+ var api = app.@gr.grnet.pithos.web.client.Pithos::getApiPath()();
+ var folder = app.@gr.grnet.pithos.web.client.Pithos::getUploadFolder()();
+ var owner = folder.@gr.grnet.pithos.web.client.foldertree.Folder::getOwner()();
+ var uri = folder.@gr.grnet.pithos.web.client.foldertree.Folder::getUri()();
+ var path = api + owner + uri;
+ for (var j=0; j<files.length; j++) {
+ files[j].folder = folder;
+ files[j].url = path + "/" + files[j].name + "?X-Auth-Token=" + encodeURIComponent(token);
+ }
+ up.start();
+ },
+
+ BeforeUpload: function(up, file) {
+ if ($wnd.console && $wnd.console.log)
+ $wnd.console.log('About to upload ' + file.url);
+ up.settings.url = file.url;
+ },
+
+ FileUploaded: function(up, file, response) {
+ if ($wnd.console && $wnd.console.log) {
+ $wnd.console.log('File ' + file.name + ' uploaded');
+ $wnd.console.log('Response: ' + response);
+ }
+ up.removeFile(file);
+ var folder = app.@gr.grnet.pithos.web.client.Pithos::getUploadFolder()();
+ if (folder == file.folder)
+ app.@gr.grnet.pithos.web.client.Pithos::updateUploadFolder()();
+ },
+
+ UploadComplete: function(up, files) {
+ if ($wnd.console && $wnd.console.log)
+ $wnd.console.log('All files finished');
+ },
+
+ Error: function(up, error) {
+ if ($wnd.console && $wnd.console.log)
+ $wnd.console.log("Error occured:" + error);
+ }
+ }
+ });
+ var uploader = $wnd.$("#container").pluploadQueue();
+ if (uploader.runtime != 'html5')
+ $wnd.$("#container").hide();
+ else {
+ if ($wnd.console && $wnd.console.log) {
+ $wnd.console.log(uploader);
+ $wnd.console.log($wnd.plupload);
+ }
+ $wnd.$('.plupload_header').hide();
+ $wnd.$('.plupload_filelist_header').hide();
+ $wnd.$('#container_filelist').css('overflow-y', 'auto');
+ $wnd.$('.plupload_filelist_footer').hide();
+ $wnd.document.getElementById('container').addEventListener('dragenter', function(event) {
+ $wnd.$('#container').css('border', '3px inset');
+ }, false);
+ $wnd.document.getElementById('container').addEventListener('dragleave', function(event) {
+ $wnd.$('#container').css('border', '');
+ }, false);
+ }
+ }-*/;
+
+ private Folder getUploadFolder() {
+ if (folderTreeView.equals(getSelectedTree()) || otherSharedTreeView.equals(getSelectedTree())) {
+ return getSelection();
+ }
+ return null;
+ }
+
+ private void updateUploadFolder() {
+ if (folderTreeView.equals(getSelectedTree()) || otherSharedTreeView.equals(getSelectedTree())) {
+ Folder f = getSelection();
+ if (getSelectedTree().equals(getFolderTreeView()))
+ updateFolder(f, true, new Command() {
+
+ @Override
+ public void execute() {
+ updateStatistics();
+ }
+ }, false);
+ else
+ updateOtherSharedFolder(f, true);
+ }
+ }
+
+ public native void hideUploadArea() /*-{
+ $wnd.$("#container").hide();
+ }-*/;
+
+ public native void showUploadArea() /*-{
+ $wnd.$("#container").show();
+ }-*/;
}
projects / pithos-web-client / blobdiff