Initial version of the new left pane (issue #2318)
[pithos-web-client] / src / gr / grnet / pithos / web / client / Pithos.java
index 28f5d89..b39939b 100644 (file)
@@ -53,7 +53,6 @@ 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 java.util.ArrayList;
 import java.util.HashMap;
@@ -64,6 +63,7 @@ import java.util.Set;
 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;
@@ -75,6 +75,7 @@ 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.Dictionary;
 import com.google.gwt.i18n.client.NumberFormat;
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONObject;
@@ -131,8 +132,8 @@ public class Pithos implements EntryPoint, ResizeHandler {
         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) {
@@ -344,9 +345,15 @@ public class Pithos implements EntryPoint, ResizeHandler {
                                public void execute() {
                                        updateStatistics();
                                }
-                       });
+                       }, true);
+                       showRelevantToolbarButtons();
                 }
-                showRelevantToolbarButtons();
+                               else {
+                                       if (getSelectedTree().equals(folderTreeView))
+                                               setSelectedTree(null);
+                                       if (getSelectedTree() == null)
+                                               showRelevantToolbarButtons();
+                               }
             }
         });
         selectionModels.add(folderTreeSelectionModel);
@@ -458,14 +465,20 @@ public class Pithos implements EntryPoint, ResizeHandler {
             }
         });
         
-//        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) {
@@ -496,7 +509,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
                        c.removeStyleName("cellTreeWidget-selectedTree");
        
         for (SingleSelectionModel s : selectionModels)
-            if (!s.equals(model))
+            if (!s.equals(model) && s.getSelectedObject() != null)
                 s.setSelected(s.getSelectedObject(), false);
     }
 
@@ -516,8 +529,9 @@ public class Pithos implements EntryPoint, ResizeHandler {
         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 = conf.authCookie();
+            String cookie = otherProperties.get("authCookie");
             String auth = Cookies.getCookie(cookie);
             if (auth == null) {
                 authenticateUser();
@@ -534,10 +548,15 @@ public class Pithos implements EntryPoint, ResizeHandler {
                        }
                        username = authSplit[0];
                        token = authSplit[1];
-                       return true;
         }
-        
-               Cookies.setCookie(conf.authCookie(), username + conf.cookieSeparator() + token, null, "", "/", false);
+        else
+               Cookies.setCookie(otherProperties.get("authCookie"), username + conf.cookieSeparator() + token, null, "", "/", false);
+
+        String gotoUrl = Window.Location.getParameter("goto");
+               if (gotoUrl != null && gotoUrl.length() > 0) {
+                       Window.Location.assign(gotoUrl);
+                       return false;
+               }
                return true;
     }
 
@@ -545,7 +564,8 @@ public class Pithos implements EntryPoint, ResizeHandler {
         * Redirect the user to the login page for authentication.
         */
        protected void authenticateUser() {
-        Window.Location.assign(config.loginUrl());
+               Dictionary otherProperties = Dictionary.getDictionary("otherProperties");
+        Window.Location.assign(otherProperties.get("loginUrl") + Window.Location.getHref());
        }
 
        protected void fetchAccount(final Command callback) {
@@ -793,7 +813,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
                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());
@@ -806,7 +826,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
                         JSONArray array = json.isArray();
                         int i = 0;
                         if (array != null) {
-                            deleteObject(folder, i, array);
+                            deleteObject(folder, i, array, callback);
                         }
                     }
                 }
@@ -822,7 +842,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
         }
     }
 
-    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")) {
@@ -831,7 +851,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
                 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
@@ -868,7 +888,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
                                         array.set(l++, array2.get(j));
                                     }
                                 }
-                                deleteObject(folder, i + 1, array);
+                                deleteObject(folder, i + 1, array, callback);
                             }
                         }
 
@@ -892,9 +912,12 @@ public class Pithos implements EntryPoint, ResizeHandler {
                                                
                                                @Override
                                                public void execute() {
+                                                       folderTreeSelectionModel.setSelected(folder.getParent(), true);
                                                        updateStatistics();
+                                                       if (callback != null)
+                                                               callback.execute();
                                                }
-                                       });
+                                       }, true);
                 }
 
                 @Override
@@ -1050,7 +1073,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
        }
 
        public void updateTrash(boolean showFiles, Command callback) {
-               updateFolder(trash, showFiles, callback);
+               updateFolder(trash, showFiles, callback, true);
        }
 
        public void updateGroupsNode() {
@@ -1072,6 +1095,10 @@ public class Pithos implements EntryPoint, ResizeHandler {
                return selectedTree;
        }
        
+       public void setSelectedTree(TreeView selected) {
+               selectedTree = selected;
+       }
+
        public Folder getSelection() {
                return selectedTree.getSelection();
        }
@@ -1089,7 +1116,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
        }
 
        public void updateRootFolder(Command callback) {
-               updateFolder(account.getPithos(), false, callback);
+               updateFolder(account.getPithos(), false, callback, true);
        }
 
        void createMySharedTree() {
@@ -1101,8 +1128,14 @@ public class Pithos implements EntryPoint, ResizeHandler {
                            deselectOthers(mysharedTreeView, mysharedTreeSelectionModel);
                            upload.setEnabled(false);
                            updateSharedFolder(mysharedTreeSelectionModel.getSelectedObject(), true);
+                                       showRelevantToolbarButtons();
                        }
-                       showRelevantToolbarButtons();
+                               else {
+                                       if (getSelectedTree().equals(mysharedTreeView))
+                                               setSelectedTree(null);
+                                       if (getSelectedTree() == null)
+                                               showRelevantToolbarButtons();
+                               }
                    }
                });
                selectionModels.add(mysharedTreeSelectionModel);
@@ -1129,8 +1162,14 @@ public class Pithos implements EntryPoint, ResizeHandler {
                            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);
@@ -1140,7 +1179,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
                        @Override
                        public void execute() {
                            otherSharedTreeView = new OtherSharedTreeView(otherSharedTreeViewModel);
-                               trees.insert(otherSharedTreeView, 3);
+                               trees.insert(otherSharedTreeView, 2);
                                treeViews.add(otherSharedTreeView);
                        }
                });
@@ -1181,64 +1220,70 @@ public class Pithos implements EntryPoint, ResizeHandler {
        }
 
        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) {