X-Git-Url: https://code.grnet.gr/git/pithos-web-client/blobdiff_plain/4baffab1bdb98316ca4b0b9df15ecb999852ffc8..cae2a8db2f7374b3dc9308ce08981dc21b4c7284:/src/gr/grnet/pithos/web/client/Pithos.java diff --git a/src/gr/grnet/pithos/web/client/Pithos.java b/src/gr/grnet/pithos/web/client/Pithos.java index 60643d7..ac81537 100644 --- a/src/gr/grnet/pithos/web/client/Pithos.java +++ b/src/gr/grnet/pithos/web/client/Pithos.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 GRNET S.A. All rights reserved. + * Copyright 2011-2012 GRNET S.A. All rights reserved. * * Redistribution and use in source and binary forms, with or * without modification, are permitted provided that the following @@ -50,11 +50,10 @@ import gr.grnet.pithos.web.client.othersharedtree.OtherSharedTreeView; import gr.grnet.pithos.web.client.othersharedtree.OtherSharedTreeViewModel; import gr.grnet.pithos.web.client.rest.DeleteRequest; import gr.grnet.pithos.web.client.rest.GetRequest; +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 gr.grnet.pithos.web.client.tagtree.TagTreeView; -import gr.grnet.pithos.web.client.tagtree.TagTreeViewModel; import java.util.ArrayList; import java.util.HashMap; @@ -75,12 +74,15 @@ import com.google.gwt.http.client.RequestBuilder; import com.google.gwt.http.client.RequestCallback; import com.google.gwt.http.client.RequestException; import com.google.gwt.http.client.Response; +import com.google.gwt.http.client.URL; +import com.google.gwt.i18n.client.NumberFormat; import com.google.gwt.json.client.JSONArray; import com.google.gwt.json.client.JSONObject; 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.ImageResource; +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.Event; @@ -88,13 +90,12 @@ import com.google.gwt.user.client.History; import com.google.gwt.user.client.Window; 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.HTML; import com.google.gwt.user.client.ui.HasHorizontalAlignment; import com.google.gwt.user.client.ui.HasVerticalAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.HorizontalSplitPanel; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.PushButton; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.view.client.SelectionChangeEvent; @@ -114,7 +115,7 @@ public class Pithos implements EntryPoint, ResizeHandler { * Instantiate an application-level image bundle. This object will provide * programmatic access to all the images needed by widgets. */ - private static Images images = (Images) GWT.create(Images.class); + static Images images = (Images) GWT.create(Images.class); public String getUsername() { return username; @@ -136,6 +137,10 @@ public class Pithos implements EntryPoint, ResizeHandler { groupTreeView.updateGroupNode(group); } + public void updateMySharedRoot() { + mysharedTreeView.updateRoot(); + } + public void updateSharedFolder(Folder f, boolean showfiles) { mysharedTreeView.updateFolder(f, showfiles); } @@ -144,14 +149,6 @@ public class Pithos implements EntryPoint, ResizeHandler { otherSharedTreeView.updateFolder(f, showfiles); } - public void updateTag(Tag t) { - tagTreeView.updateTag(t); - } - - public void updateTags() { - tagTreeViewModel.initialize(getAllTags()); - } - public List getAllTags() { List tagList = new ArrayList(); for (Folder f : account.getContainers()) { @@ -170,18 +167,18 @@ public class Pithos implements EntryPoint, ResizeHandler { * An aggregate image bundle that pulls together all the images for this * application into a single bundle. */ - public interface Images extends TopPanel.Images, FileList.Images { + public interface Images extends TopPanel.Images, FileList.Images, ToolsMenu.Images { @Source("gr/grnet/pithos/resources/document.png") ImageResource folders(); - @Source("gr/grnet/pithos/resources/edit_group_22.png") - ImageResource groups(); - - @Source("gr/grnet/pithos/resources/search.png") - ImageResource search(); + @Source("gr/grnet/pithos/resources/advancedsettings.png") + @ImageOptions(width=32, height=32) + ImageResource tools(); } + private Throwable error; + /** * The Application Clipboard implementation; */ @@ -195,7 +192,7 @@ public class Pithos implements EntryPoint, ResizeHandler { /** * The panel that contains the various system messages. */ - private MessagePanel messagePanel = new MessagePanel(Pithos.images); + private MessagePanel messagePanel = new MessagePanel(this, Pithos.images); /** * The bottom panel that contains the status bar. @@ -224,12 +221,6 @@ public class Pithos implements EntryPoint, ResizeHandler { */ private Object currentSelection; - - /** - * The WebDAV password of the current user - */ - private String webDAVPassword; - public HashMap userFullNameMap = new HashMap(); private String username = null; @@ -239,32 +230,44 @@ public class Pithos implements EntryPoint, ResizeHandler { */ private String token; - protected SingleSelectionModel folderTreeSelectionModel; - protected FolderTreeViewModel folderTreeViewModel; - protected FolderTreeView folderTreeView; + VerticalPanel trees; + + SingleSelectionModel folderTreeSelectionModel; + FolderTreeViewModel folderTreeViewModel; + FolderTreeView folderTreeView; - protected SingleSelectionModel mysharedTreeSelectionModel; - private MysharedTreeViewModel mysharedTreeViewModel; - private MysharedTreeView mysharedTreeView; + SingleSelectionModel mysharedTreeSelectionModel; + MysharedTreeViewModel mysharedTreeViewModel; + MysharedTreeView mysharedTreeView = null;; protected SingleSelectionModel otherSharedTreeSelectionModel; - private OtherSharedTreeViewModel otherSharedTreeViewModel; - private OtherSharedTreeView otherSharedTreeView; + OtherSharedTreeViewModel otherSharedTreeViewModel; + OtherSharedTreeView otherSharedTreeView = null; - protected SingleSelectionModel tagTreeSelectionModel; - private TagTreeViewModel tagTreeViewModel; - private TagTreeView tagTreeView; - - private GroupTreeViewModel groupTreeViewModel; + GroupTreeViewModel groupTreeViewModel; private GroupTreeView groupTreeView; + TreeView selectedTree; protected AccountResource account; - private Folder trash; - - @SuppressWarnings("rawtypes") - private List selectionModels = new ArrayList(); + Folder trash; + + List treeViews = new ArrayList(); + @SuppressWarnings("rawtypes") List selectionModels = new ArrayList(); + + Button upload; + + private HTML usedBytes; + + private HTML totalBytes; + + private HTML usedPercent; + + private HTML numOfFiles; + + private Toolbar toolbar; + @Override public void onModuleLoad() { if (parseUserCredentials()) @@ -272,141 +275,143 @@ public class Pithos implements EntryPoint, ResizeHandler { } private void initialize() { - VerticalPanel outer = new VerticalPanel(); - outer.setWidth("100%"); + boolean bareContent = Window.Location.getParameter("noframe") != null; + String contentWidth = bareContent ? "100%" : "75%"; - topPanel = new TopPanel(this, Pithos.images); - topPanel.setWidth("100%"); - outer.add(topPanel); - - messagePanel.setWidth("100%"); + VerticalPanel outer = new VerticalPanel(); + outer.setWidth("100%"); + if (!bareContent) { + outer.addStyleName("pithos-outer"); + } + + if (!bareContent) { + topPanel = new TopPanel(this, Pithos.images); + topPanel.setWidth("100%"); + outer.add(topPanel); + outer.setCellHorizontalAlignment(topPanel, HasHorizontalAlignment.ALIGN_CENTER); + } + messagePanel.setVisible(false); outer.add(messagePanel); outer.setCellHorizontalAlignment(messagePanel, HasHorizontalAlignment.ALIGN_CENTER); - - - // Inner contains the various lists. - inner.sinkEvents(Event.ONCONTEXTMENU); - inner.setWidth("100%"); - - HorizontalPanel rightside = new HorizontalPanel(); - rightside.addStyleName("pithos-rightSide"); - rightside.setSpacing(5); - - PushButton parentButton = new PushButton(new Image(images.asc()), new ClickHandler() { + outer.setCellVerticalAlignment(messagePanel, HasVerticalAlignment.ALIGN_MIDDLE); + + HorizontalPanel header = new HorizontalPanel(); + header.addStyleName("pithos-header"); + header.setWidth(contentWidth); + if (bareContent) + header.addStyleName("pithos-header-noframe"); + upload = new Button("Upload File", new ClickHandler() { @Override - public void onClick(@SuppressWarnings("unused") ClickEvent event) { - + public void onClick(ClickEvent event) { + if (getSelection() != null) + new UploadFileCommand(Pithos.this, null, getSelection()).execute(); } }); - parentButton.addStyleName("pithos-parentButton"); - rightside.add(parentButton); - - HTML folderStatistics = new HTML("5 Files (size: 1.1GB)"); + upload.addStyleName("pithos-uploadButton"); + header.add(upload); + header.setCellHorizontalAlignment(upload, HasHorizontalAlignment.ALIGN_LEFT); + header.setCellVerticalAlignment(upload, HasVerticalAlignment.ALIGN_MIDDLE); + + toolbar = new Toolbar(this); + header.add(toolbar); + header.setCellHorizontalAlignment(toolbar, HasHorizontalAlignment.ALIGN_CENTER); + header.setCellVerticalAlignment(toolbar, HasVerticalAlignment.ALIGN_MIDDLE); + + HorizontalPanel folderStatistics = new HorizontalPanel(); folderStatistics.addStyleName("pithos-folderStatistics"); - rightside.add(folderStatistics); - inner.add(rightside); - inner.setCellHorizontalAlignment(rightside, HasHorizontalAlignment.ALIGN_RIGHT); - inner.setCellVerticalAlignment(rightside, HasVerticalAlignment.ALIGN_MIDDLE); - inner.setCellHeight(rightside, "60px"); + numOfFiles = new HTML(); + folderStatistics.add(numOfFiles); + folderStatistics.setCellVerticalAlignment(numOfFiles, HasVerticalAlignment.ALIGN_MIDDLE); + HTML numOfFilesLabel = new HTML(" Files"); + folderStatistics.add(numOfFilesLabel); + folderStatistics.setCellVerticalAlignment(numOfFilesLabel, HasVerticalAlignment.ALIGN_MIDDLE); + header.add(folderStatistics); + header.setCellHorizontalAlignment(folderStatistics, HasHorizontalAlignment.ALIGN_RIGHT); + header.setCellVerticalAlignment(folderStatistics, HasVerticalAlignment.ALIGN_MIDDLE); + header.setCellWidth(folderStatistics, "40px"); + outer.add(header); + outer.setCellHorizontalAlignment(header, HasHorizontalAlignment.ALIGN_CENTER); + // Inner contains the various lists.nner + inner.sinkEvents(Event.ONCONTEXTMENU); + inner.setWidth("100%"); folderTreeSelectionModel = new SingleSelectionModel(); folderTreeSelectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() { @Override - public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { + public void onSelectionChange(SelectionChangeEvent event) { if (folderTreeSelectionModel.getSelectedObject() != null) { - deselectOthers(folderTreeSelectionModel); + deselectOthers(folderTreeView, folderTreeSelectionModel); + applyPermissions(folderTreeSelectionModel.getSelectedObject()); Folder f = folderTreeSelectionModel.getSelectedObject(); - updateFolder(f, true, null); + updateFolder(f, true, new Command() { + + @Override + public void execute() { + updateStatistics(); + } + }); } + showRelevantToolbarButtons(); } }); selectionModels.add(folderTreeSelectionModel); folderTreeViewModel = new FolderTreeViewModel(this, folderTreeSelectionModel); folderTreeView = new FolderTreeView(folderTreeViewModel); - + treeViews.add(folderTreeView); + fileList = new FileList(this, images, folderTreeView); inner.add(fileList); - mysharedTreeSelectionModel = new SingleSelectionModel(); - mysharedTreeSelectionModel.addSelectionChangeHandler(new Handler() { - @Override - public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { - if (mysharedTreeSelectionModel.getSelectedObject() != null) { - deselectOthers(mysharedTreeSelectionModel); - updateSharedFolder(mysharedTreeSelectionModel.getSelectedObject(), true); - } - } - }); - selectionModels.add(mysharedTreeSelectionModel); - mysharedTreeViewModel = new MysharedTreeViewModel(this, mysharedTreeSelectionModel); - mysharedTreeView = new MysharedTreeView(mysharedTreeViewModel); - - otherSharedTreeSelectionModel = new SingleSelectionModel(); - otherSharedTreeSelectionModel.addSelectionChangeHandler(new Handler() { - @Override - public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { - if (otherSharedTreeSelectionModel.getSelectedObject() != null) { - deselectOthers(otherSharedTreeSelectionModel); - updateOtherSharedFolder(otherSharedTreeSelectionModel.getSelectedObject(), true); - } - } - }); - selectionModels.add(otherSharedTreeSelectionModel); - otherSharedTreeViewModel = new OtherSharedTreeViewModel(this, otherSharedTreeSelectionModel); - otherSharedTreeView = new OtherSharedTreeView(otherSharedTreeViewModel); - - tagTreeSelectionModel = new SingleSelectionModel(); - tagTreeSelectionModel.addSelectionChangeHandler(new Handler() { - @Override - public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { - if (tagTreeSelectionModel.getSelectedObject() != null) { - deselectOthers(tagTreeSelectionModel); - Tag t = tagTreeSelectionModel.getSelectedObject(); - updateTag(t); - } - } - }); - selectionModels.add(tagTreeSelectionModel); - tagTreeViewModel = new TagTreeViewModel(this, tagTreeSelectionModel); - tagTreeView = new TagTreeView(tagTreeViewModel); - groupTreeViewModel = new GroupTreeViewModel(this); groupTreeView = new GroupTreeView(groupTreeViewModel); + treeViews.add(groupTreeView); + + trees = new VerticalPanel(); + trees.setWidth("100%"); - VerticalPanel trees = new VerticalPanel(); - - Button upload = new Button("Upload File", new ClickHandler() { - @Override - public void onClick(@SuppressWarnings("unused") ClickEvent event) { - new UploadFileCommand(Pithos.this, null, folderTreeView.getSelection()).execute(); - } - }); - upload.addStyleName("pithos-uploadButton"); - trees.add(upload); HorizontalPanel treeHeader = new HorizontalPanel(); treeHeader.addStyleName("pithos-treeHeader"); - treeHeader.add(new HTML("Total Files: 6 | Used: 2.1 of 50 GB (4.2%)")); + 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(mysharedTreeView); - trees.add(otherSharedTreeView); -// trees.add(tagTreeView); trees.add(groupTreeView); // Add the left and right panels to the split panel. splitPanel.setLeftWidget(trees); splitPanel.setRightWidget(inner); - splitPanel.setSplitPosition("25%"); + splitPanel.setSplitPosition("35%"); splitPanel.setSize("100%", "100%"); splitPanel.addStyleName("pithos-splitPanel"); + splitPanel.setWidth(contentWidth); outer.add(splitPanel); + outer.setCellHorizontalAlignment(splitPanel, HasHorizontalAlignment.ALIGN_CENTER); - statusPanel = new StatusPanel(); - outer.add(statusPanel); - + if (!bareContent) { + statusPanel = new StatusPanel(); + statusPanel.setWidth("100%"); + outer.add(statusPanel); + outer.setCellHorizontalAlignment(statusPanel, HasHorizontalAlignment.ALIGN_CENTER); + } + else + splitPanel.addStyleName("pithos-splitPanel-noframe"); // Hook the window resize event, so that we can adjust the UI. Window.addResizeHandler(this); @@ -430,26 +435,83 @@ public class Pithos implements EntryPoint, ResizeHandler { Scheduler.get().scheduleDeferred(new ScheduledCommand() { @Override public void execute() { - fetchAccount(); + fetchAccount(new Command() { + + @Override + public void execute() { + if (!account.hasHomeContainer()) + createHomeContainer(account, this); + else if (!account.hasTrashContainer()) + createTrashContainer(this); + else { + for (Folder f : account.getContainers()) + if (f.getName().equals(Pithos.TRASH_CONTAINER)) { + trash = f; + break; + } + folderTreeViewModel.initialize(account, new Command() { + + @Override + public void execute() { + createMySharedTree(); + } + }); + groupTreeViewModel.initialize(); + showStatistics(); + } + } + }); } }); + +// Scheduler.get().scheduleDeferred(new Command() { +// +// @Override +// public void execute() { +// displayError("lalala"); +// +// } +// }); } - @SuppressWarnings({ "rawtypes", "unchecked" }) - public void deselectOthers(SingleSelectionModel model) { + public void applyPermissions(Folder f) { + if (f != null) { + if (f.isInTrash()) + upload.setEnabled(false); + else { + Boolean[] perms = f.getPermissions().get(username); + if (f.getOwner().equals(username) || (perms != null && perms[1] != null && perms[1])) { + upload.setEnabled(true); + } + else + upload.setEnabled(false); + } + } + else + upload.setEnabled(false); + } + + @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)) s.setSelected(s.getSelectedObject(), false); } - public void showFiles(Folder f) { + public void showFiles(final Folder f) { Set files = f.getFiles(); showFiles(files); } public void showFiles(Set files) { - //Iterator iter = files.iterator(); - //fetchFile(iter, files); fileList.setFiles(new ArrayList(files)); } @@ -459,18 +521,24 @@ public class Pithos implements EntryPoint, ResizeHandler { String path = file.getUri() + "?format=json"; GetRequest getFile = new GetRequest(File.class, getApiPath(), username, path, file) { @Override - public void onSuccess(@SuppressWarnings("unused") File _result) { + public void onSuccess(File _result) { fetchFile(iter, files); } @Override public void onError(Throwable t) { GWT.log("Error getting file", t); + setError(t); if (t instanceof RestException) displayError("Error getting file: " + ((RestException) t).getHttpStatusText()); else displayError("System error fetching file: " + t.getMessage()); } + + @Override + protected void onUnauthorized(Response response) { + sessionExpired(); + } }; getFile.setHeader("X-Auth-Token", "0000"); Scheduler.get().scheduleDeferred(getFile); @@ -493,6 +561,10 @@ public class Pithos implements EntryPoint, ResizeHandler { 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(); @@ -502,7 +574,8 @@ public class Pithos implements EntryPoint, ResizeHandler { token = authSplit[1]; return true; } - Cookies.setCookie(conf.authCookie(), username + conf.cookieSeparator() + token); + + Cookies.setCookie(conf.authCookie(), username + conf.cookieSeparator() + token, null, "", "/", false); return true; } @@ -510,85 +583,125 @@ public class Pithos implements EntryPoint, ResizeHandler { * Redirect the user to the login page for authentication. */ protected void authenticateUser() { - Configuration conf = (Configuration) GWT.create(Configuration.class); - Window.Location.assign(Window.Location.getHost() + conf.loginUrl() + "?next=" + Window.Location.getHref()); + Window.Location.assign("/im/login"); } - protected void fetchAccount() { + protected void fetchAccount(final Command callback) { String path = "?format=json"; GetRequest getAccount = new GetRequest(AccountResource.class, getApiPath(), username, path) { @Override public void onSuccess(AccountResource _result) { account = _result; - if (!account.hasHomeContainer()) - createHomeContainer(account); - else if (!account.hasTrashContainer()) - createTrashContainer(); - else { - for (Folder f : account.getContainers()) - if (f.getName().equals(Pithos.TRASH_CONTAINER)) { - trash = f; - break; - } - folderTreeViewModel.initialize(account); - groupTreeViewModel.initialize(); - } + if (callback != null) + callback.execute(); } @Override public void onError(Throwable t) { GWT.log("Error getting account", t); + setError(t); if (t instanceof RestException) displayError("Error getting account: " + ((RestException) t).getHttpStatusText()); else displayError("System error fetching user data: " + t.getMessage()); } + + @Override + protected void onUnauthorized(Response response) { + sessionExpired(); + } }; getAccount.setHeader("X-Auth-Token", token); Scheduler.get().scheduleDeferred(getAccount); } - protected void createHomeContainer(final AccountResource account) { + public void updateStatistics() { + HeadRequest headAccount = new HeadRequest(AccountResource.class, getApiPath(), username, "", account) { + + @Override + public void onSuccess(AccountResource _result) { + showStatistics(); + } + + @Override + public void onError(Throwable t) { + GWT.log("Error getting account", t); + setError(t); + if (t instanceof RestException) + displayError("Error getting account: " + ((RestException) t).getHttpStatusText()); + else + displayError("System error fetching user data: " + t.getMessage()); + } + + @Override + protected void onUnauthorized(Response response) { + sessionExpired(); + } + }; + headAccount.setHeader("X-Auth-Token", token); + 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) { @Override - public void onSuccess(@SuppressWarnings("unused") Resource result) { - if (!account.hasTrashContainer()) - createTrashContainer(); + public void onSuccess(Resource result) { + if (!_account.hasTrashContainer()) + createTrashContainer(callback); else - fetchAccount(); + fetchAccount(callback); } @Override public void onError(Throwable t) { GWT.log("Error creating pithos", t); + setError(t); if (t instanceof RestException) displayError("Error creating pithos: " + ((RestException) t).getHttpStatusText()); else displayError("System error Error creating pithos: " + t.getMessage()); } + + @Override + protected void onUnauthorized(Response response) { + sessionExpired(); + } }; createPithos.setHeader("X-Auth-Token", getToken()); Scheduler.get().scheduleDeferred(createPithos); } - protected void createTrashContainer() { + protected void createTrashContainer(final Command callback) { String path = "/" + Pithos.TRASH_CONTAINER; PutRequest createPithos = new PutRequest(getApiPath(), getUsername(), path) { @Override - public void onSuccess(@SuppressWarnings("unused") Resource result) { - fetchAccount(); + public void onSuccess(Resource result) { + fetchAccount(callback); } @Override public void onError(Throwable t) { GWT.log("Error creating pithos", t); + setError(t); if (t instanceof RestException) displayError("Error creating pithos: " + ((RestException) t).getHttpStatusText()); else displayError("System error Error creating pithos: " + t.getMessage()); } + + @Override + protected void onUnauthorized(Response response) { + sessionExpired(); + } }; createPithos.setHeader("X-Auth-Token", getToken()); Scheduler.get().scheduleDeferred(createPithos); @@ -612,7 +725,7 @@ public class Pithos implements EntryPoint, ResizeHandler { protected void onWindowResized(int height) { // Adjust the split panel to take up the available room in the window. - int newHeight = height - splitPanel.getAbsoluteTop() - 60; + int newHeight = height - splitPanel.getAbsoluteTop(); if (newHeight < 1) newHeight = 1; splitPanel.setHeight("" + newHeight); @@ -687,10 +800,6 @@ public class Pithos implements EntryPoint, ResizeHandler { return token; } - public String getWebDAVPassword() { - return webDAVPassword; - } - public static native void preventIESelection() /*-{ $doc.body.onselectstart = function () { return false; }; }-*/; @@ -723,14 +832,13 @@ public class Pithos implements EntryPoint, ResizeHandler { } public void deleteFolder(final Folder folder) { - String path = getApiPath() + getUsername() + "/" + folder.getContainer() + "?format=json&delimiter=/&prefix=" + folder.getPrefix(); + 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("If-Modified-Since", "0"); builder.setHeader("X-Auth-Token", getToken()); try { builder.sendRequest("", new RequestCallback() { @Override - public void onResponseReceived(@SuppressWarnings("unused") Request request, Response response) { + public void onResponseReceived(Request request, Response response) { if (response.getStatusCode() == Response.SC_OK) { JSONValue json = JSONParser.parseStrict(response.getText()); JSONArray array = json.isArray(); @@ -742,7 +850,8 @@ public class Pithos implements EntryPoint, ResizeHandler { } @Override - public void onError(@SuppressWarnings("unused") Request request, Throwable exception) { + public void onError(Request request, Throwable exception) { + setError(exception); displayError("System error unable to delete folder: " + exception.getMessage()); } }); @@ -751,23 +860,29 @@ public class Pithos implements EntryPoint, ResizeHandler { } } - public void deleteObject(final Folder folder, final int i, final JSONArray array) { + void deleteObject(final Folder folder, final int i, final JSONArray array) { if (i < array.size()) { JSONObject o = array.get(i).isObject(); if (o != null && !o.containsKey("subdir")) { JSONString name = o.get("name").isString(); String path = "/" + folder.getContainer() + "/" + name.stringValue(); - DeleteRequest delete = new DeleteRequest(getApiPath(), getUsername(), path) { + DeleteRequest delete = new DeleteRequest(getApiPath(), folder.getOwner(), URL.encode(path)) { @Override - public void onSuccess(@SuppressWarnings("unused") Resource result) { + public void onSuccess(Resource result) { deleteObject(folder, i + 1, array); } @Override public void onError(Throwable t) { GWT.log("", t); + setError(t); displayError("System error unable to delete folder: " + t.getMessage()); } + + @Override + protected void onUnauthorized(Response response) { + sessionExpired(); + } }; delete.setHeader("X-Auth-Token", getToken()); Scheduler.get().scheduleDeferred(delete); @@ -775,14 +890,13 @@ public class Pithos implements EntryPoint, ResizeHandler { else if (o != null) { String subdir = o.get("subdir").isString().stringValue(); subdir = subdir.substring(0, subdir.length() - 1); - String path = getApiPath() + getUsername() + "/" + folder.getContainer() + "?format=json&delimiter=/&prefix=" + subdir; + String path = getApiPath() + getUsername() + "/" + folder.getContainer() + "?format=json&delimiter=/&prefix=" + URL.encodeQueryString(subdir) + "&t=" + System.currentTimeMillis(); RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, path); - builder.setHeader("If-Modified-Since", "0"); builder.setHeader("X-Auth-Token", getToken()); try { builder.sendRequest("", new RequestCallback() { @Override - public void onResponseReceived(@SuppressWarnings("unused") Request request, Response response) { + public void onResponseReceived(Request request, Response response) { if (response.getStatusCode() == Response.SC_OK) { JSONValue json = JSONParser.parseStrict(response.getText()); JSONArray array2 = json.isArray(); @@ -797,7 +911,8 @@ public class Pithos implements EntryPoint, ResizeHandler { } @Override - public void onError(@SuppressWarnings("unused") Request request, Throwable exception) { + public void onError(Request request, Throwable exception) { + setError(exception); displayError("System error unable to delete folder: " + exception.getMessage()); } }); @@ -808,15 +923,22 @@ public class Pithos implements EntryPoint, ResizeHandler { } else { String path = folder.getUri(); - DeleteRequest deleteFolder = new DeleteRequest(getApiPath(), getUsername(), path) { + DeleteRequest deleteFolder = new DeleteRequest(getApiPath(), getUsername(), URL.encode(path)) { @Override - public void onSuccess(@SuppressWarnings("unused") Resource result) { - updateFolder(folder.getParent(), true, null); + public void onSuccess(Resource result) { + updateFolder(folder.getParent(), true, new Command() { + + @Override + public void execute() { + updateStatistics(); + } + }); } @Override public void onError(Throwable t) { GWT.log("", t); + setError(t); if (t instanceof RestException) { if (((RestException) t).getHttpStatusCode() != Response.SC_NOT_FOUND) displayError("Unable to delete folder: "+((RestException) t).getHttpStatusText()); @@ -826,6 +948,11 @@ public class Pithos implements EntryPoint, ResizeHandler { else displayError("System error unable to delete folder: " + t.getMessage()); } + + @Override + protected void onUnauthorized(Response response) { + sessionExpired(); + } }; deleteFolder.setHeader("X-Auth-Token", getToken()); Scheduler.get().scheduleDeferred(deleteFolder); @@ -836,28 +963,37 @@ public class Pithos implements EntryPoint, ResizeHandler { return folderTreeView; } - public void copyFiles(final Iterator iter, final String targetUri, final Command callback) { + public void copyFiles(final Iterator iter, final String targetUsername, final String targetUri, final Command callback) { if (iter.hasNext()) { File file = iter.next(); String path = targetUri + "/" + file.getName(); - PutRequest copyFile = new PutRequest(getApiPath(), getUsername(), path) { + PutRequest copyFile = new PutRequest(getApiPath(), targetUsername, path) { @Override - public void onSuccess(@SuppressWarnings("unused") Resource result) { - copyFiles(iter, targetUri, callback); + public void onSuccess(Resource result) { + copyFiles(iter, targetUsername, targetUri, callback); } @Override public void onError(Throwable t) { GWT.log("", t); + setError(t); if (t instanceof RestException) { displayError("Unable to copy file: " + ((RestException) t).getHttpStatusText()); } else displayError("System error unable to copy file: "+t.getMessage()); } + + @Override + protected void onUnauthorized(Response response) { + sessionExpired(); + } }; copyFile.setHeader("X-Auth-Token", getToken()); - copyFile.setHeader("X-Copy-From", file.getUri()); + copyFile.setHeader("X-Copy-From", URL.encodePathSegment(file.getUri())); + if (!file.getOwner().equals(targetUsername)) + copyFile.setHeader("X-Source-Account", URL.encodePathSegment(file.getOwner())); + copyFile.setHeader("Content-Type", file.getContentType()); Scheduler.get().scheduleDeferred(copyFile); } else if (callback != null) { @@ -865,45 +1001,76 @@ public class Pithos implements EntryPoint, ResizeHandler { } } - public void copySubfolders(final Iterator iter, final String targetUri, final Command callback) { + public void copySubfolders(final Iterator iter, final String targetUsername, final String targetUri, final Command callback) { if (iter.hasNext()) { final Folder f = iter.next(); - copyFolder(f, targetUri, callback); + copyFolder(f, targetUsername, targetUri, new Command() { + + @Override + public void execute() { + copySubfolders(iter, targetUsername, targetUri, callback); + } + }); } else if (callback != null) { callback.execute(); } } - public void copyFolder(final Folder f, final String targetUri, final Command callback) { + public void copyFolder(final Folder f, final String targetUsername, final String targetUri, final Command callback) { String path = targetUri + "/" + f.getName(); - PutRequest createFolder = new PutRequest(getApiPath(), getUsername(), path) { + PutRequest createFolder = new PutRequest(getApiPath(), targetUsername, path) { @Override - public void onSuccess(@SuppressWarnings("unused") Resource result) { - Iterator iter = f.getFiles().iterator(); - copyFiles(iter, targetUri + "/" + f.getName(), new Command() { - @Override - public void execute() { - Iterator iterf = f.getSubfolders().iterator(); - copySubfolders(iterf, targetUri + "/" + f.getName(), new Command() { - @Override - public void execute() { - callback.execute(); - } - }); - } - }); + public void onSuccess(Resource result) { + GetRequest getFolder = new GetRequest(Folder.class, getApiPath(), f.getOwner(), "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + URL.encodeQueryString(f.getPrefix()), f) { + + @Override + public void onSuccess(final Folder _f) { + Iterator iter = _f.getFiles().iterator(); + copyFiles(iter, targetUsername, targetUri + "/" + _f.getName(), new Command() { + @Override + public void execute() { + Iterator iterf = _f.getSubfolders().iterator(); + copySubfolders(iterf, targetUsername, targetUri + "/" + _f.getName(), callback); + } + }); + } + + @Override + public void onError(Throwable t) { + GWT.log("", t); + setError(t); + if (t instanceof RestException) { + displayError("Unable to get folder: " + ((RestException) t).getHttpStatusText()); + } + else + displayError("System error getting folder: " + t.getMessage()); + } + + @Override + protected void onUnauthorized(Response response) { + sessionExpired(); + } + }; + getFolder.setHeader("X-Auth-Token", getToken()); + Scheduler.get().scheduleDeferred(getFolder); } @Override public void onError(Throwable t) { GWT.log("", t); - if (t instanceof RestException) { - displayError("Unable to create folder:" + ((RestException) t).getHttpStatusText()); + setError(t); + if (t instanceof RestException) { + displayError("Unable to create folder: " + ((RestException) t).getHttpStatusText()); } else - displayError("System error creating folder:" + t.getMessage()); + displayError("System error creating folder: " + t.getMessage()); } + + @Override + protected void onUnauthorized(Response response) { + sessionExpired(); + } }; createFolder.setHeader("X-Auth-Token", getToken()); createFolder.setHeader("Accept", "*/*"); @@ -933,4 +1100,111 @@ public class Pithos implements EntryPoint, ResizeHandler { account.addGroup(newGroup); groupTreeView.updateGroupNode(null); } + + public void removeGroup(Group group) { + account.removeGroup(group); + updateGroupsNode(); + } + + public TreeView getSelectedTree() { + return selectedTree; + } + + public Folder getSelection() { + return selectedTree.getSelection(); + } + + public void showFolderStatistics(int folderFileCount) { + numOfFiles.setHTML(String.valueOf(folderFileCount)); + } + + public GroupTreeView getGroupTreeView() { + return groupTreeView; + } + + public void sessionExpired() { + new SessionExpiredDialog(this).center(); + } + + public void updateRootFolder(Command callback) { + updateFolder(account.getPithos(), false, callback); + } + + void createMySharedTree() { + mysharedTreeSelectionModel = new SingleSelectionModel(); + mysharedTreeSelectionModel.addSelectionChangeHandler(new Handler() { + @Override + public void onSelectionChange(SelectionChangeEvent event) { + if (mysharedTreeSelectionModel.getSelectedObject() != null) { + deselectOthers(mysharedTreeView, mysharedTreeSelectionModel); + upload.setEnabled(false); + updateSharedFolder(mysharedTreeSelectionModel.getSelectedObject(), true); + } + showRelevantToolbarButtons(); + } + }); + selectionModels.add(mysharedTreeSelectionModel); + mysharedTreeViewModel = new MysharedTreeViewModel(Pithos.this, mysharedTreeSelectionModel); + mysharedTreeViewModel.initialize(new Command() { + + @Override + public void execute() { + mysharedTreeView = new MysharedTreeView(mysharedTreeViewModel); + trees.insert(mysharedTreeView, 2); + treeViews.add(mysharedTreeView); + createOtherSharedTree(); + } + }); + } + + void createOtherSharedTree() { + otherSharedTreeSelectionModel = new SingleSelectionModel(); + otherSharedTreeSelectionModel.addSelectionChangeHandler(new Handler() { + @Override + public void onSelectionChange(SelectionChangeEvent event) { + if (otherSharedTreeSelectionModel.getSelectedObject() != null) { + deselectOthers(otherSharedTreeView, otherSharedTreeSelectionModel); + otherSharedTreeView.addStyleName("cellTreeWidget-selectedTree"); + applyPermissions(otherSharedTreeSelectionModel.getSelectedObject()); + updateOtherSharedFolder(otherSharedTreeSelectionModel.getSelectedObject(), true); + } + showRelevantToolbarButtons(); + } + }); + selectionModels.add(otherSharedTreeSelectionModel); + otherSharedTreeViewModel = new OtherSharedTreeViewModel(Pithos.this, otherSharedTreeSelectionModel); + otherSharedTreeViewModel.initialize(new Command() { + + @Override + public void execute() { + otherSharedTreeView = new OtherSharedTreeView(otherSharedTreeViewModel); + trees.insert(otherSharedTreeView, 3); + treeViews.add(otherSharedTreeView); + } + }); + } + + public void logoff() { + Configuration conf = (Configuration) GWT.create(Configuration.class); + Cookies.removeCookie(conf.authCookie(), "/"); + Cookies.removeCookie(conf.authTokenCookie(), "/"); + for (String s: Cookies.getCookieNames()) + if (s.startsWith(conf.shibSessionCookiePrefix())) + Cookies.removeCookie(s, "/"); + Window.Location.assign("/im/logout"); + } + + public String getErrorData() { + if (error != null) + return error.toString(); + return ""; + } + + public void setError(Throwable t) { + error = t; + } + + public void showRelevantToolbarButtons() { + toolbar.showRelevantButtons(); + } }