Updated copyright
[pithos-web-client] / src / gr / grnet / pithos / web / client / commands / ToTrashCommand.java
index e4a2262..8d7ed28 100644 (file)
@@ -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
  */
 package gr.grnet.pithos.web.client.commands;
 
-import com.google.gwt.core.client.Scheduler;
-
-import gr.grnet.pithos.web.client.DeleteFolderDialog;
 import gr.grnet.pithos.web.client.Pithos;
 import gr.grnet.pithos.web.client.foldertree.File;
 import gr.grnet.pithos.web.client.foldertree.Folder;
 import gr.grnet.pithos.web.client.foldertree.Resource;
 import gr.grnet.pithos.web.client.rest.DeleteRequest;
-import gr.grnet.pithos.web.client.rest.PostRequest;
+import gr.grnet.pithos.web.client.rest.GetRequest;
 import gr.grnet.pithos.web.client.rest.PutRequest;
 import gr.grnet.pithos.web.client.rest.RestException;
 
 import java.util.Iterator;
 import java.util.List;
 
-
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.core.client.Scheduler;
+import com.google.gwt.http.client.Response;
+import com.google.gwt.http.client.URL;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.ui.PopupPanel;
 
@@ -82,7 +81,13 @@ public class ToTrashCommand implements Command{
                 @SuppressWarnings("unchecked")
                                @Override
                 public void execute() {
-                    app.updateFolder(((List<File>) resource).get(0).getParent(), true, null);
+                    app.updateFolder(((List<File>) resource).get(0).getParent(), true, new Command() {
+                                               
+                                               @Override
+                                               public void execute() {
+                                                       app.updateTrash(false, null);
+                                               }
+                                       });
                 }
             });
         }
@@ -91,7 +96,13 @@ public class ToTrashCommand implements Command{
             trashFolder(toBeTrashed, new Command() {
                 @Override
                 public void execute() {
-                    app.updateFolder(toBeTrashed.getParent(), true, null);
+                    app.updateFolder(toBeTrashed.getParent(), true, new Command() {
+                                               
+                                               @Override
+                                               public void execute() {
+                                                       app.updateTrash(false, null);
+                                               }
+                                       });
                 }
             });
 
@@ -102,51 +113,90 @@ public class ToTrashCommand implements Command{
         String path = "/" + Pithos.TRASH_CONTAINER + "/" + f.getPrefix();
         PutRequest createFolder = new PutRequest(app.getApiPath(), app.getUsername(), path) {
             @Override
-            public void onSuccess(@SuppressWarnings("unused") Resource result) {
-                Iterator<File> iter = f.getFiles().iterator();
-                trashFiles(iter, new Command() {
-                    @Override
-                    public void execute() {
-                        Iterator<Folder> iterf = f.getSubfolders().iterator();
-                        trashSubfolders(iterf, new Command() {
-                                                       
-                                                       @Override
-                                                       public void execute() {
-                                                               DeleteRequest deleteFolder = new DeleteRequest(app.getApiPath(), f.getOwner(), f.getUri()) {
-                                                                       
-                                                                       @Override
-                                                                       public void onSuccess(Resource result) {
-                                                                               if (callback != null)
-                                                                                       callback.execute();
-                                                                       }
+            public void onSuccess(Resource result) {
+               GetRequest<Folder> getFolder = new GetRequest<Folder>(Folder.class, app.getApiPath(), f.getOwner(), "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + URL.encodeQueryString(f.getPrefix()), f) {
+
+                                       @Override
+                                       public void onSuccess(final Folder _f) {
+                                           Iterator<File> iter = _f.getFiles().iterator();
+                                           trashFiles(iter, new Command() {
+                                               @Override
+                                               public void execute() {
+                                                   Iterator<Folder> iterf = _f.getSubfolders().iterator();
+                                                   trashSubfolders(iterf, new Command() {
                                                                        
                                                                        @Override
-                                                                       public void onError(Throwable t) {
-                                                           GWT.log("", t);
-                                                           if (t instanceof RestException) {
-                                                               app.displayError("Unable to delete folder: " + ((RestException) t).getHttpStatusText());
-                                                           }
-                                                           else
-                                                               app.displayError("System error unable to delete folder: "+t.getMessage());
+                                                                       public void execute() {
+                                                                               DeleteRequest deleteFolder = new DeleteRequest(app.getApiPath(), _f.getOwner(), URL.encode(_f.getUri())) {
+                                                                                       
+                                                                                       @Override
+                                                                                       public void onSuccess(Resource _result) {
+                                                                                               if (callback != null)
+                                                                                                       callback.execute();
+                                                                                       }
+                                                                                       
+                                                                                       @Override
+                                                                                       public void onError(Throwable t) {
+                                                                           GWT.log("", t);
+                                                                                               app.setError(t);
+                                                                           if (t instanceof RestException) {
+                                                                               if (((RestException) t).getHttpStatusCode() == Response.SC_NOT_FOUND)
+                                                                                       onSuccess(null);
+                                                                               else
+                                                                                       app.displayError("Unable to delete folder: " + ((RestException) t).getHttpStatusText());
+                                                                           }
+                                                                           else
+                                                                               app.displayError("System error unable to delete folder: "+t.getMessage());
+                                                                                       }
+
+                                                                                       @Override
+                                                                                       protected void onUnauthorized(Response response) {
+                                                                                               app.sessionExpired();
+                                                                                       }
+                                                                               };
+                                                                               deleteFolder.setHeader("X-Auth-Token", app.getToken());
+                                                                               Scheduler.get().scheduleDeferred(deleteFolder);
                                                                        }
-                                                               };
-                                                               deleteFolder.setHeader("X-Auth-Token", app.getToken());
-                                                               Scheduler.get().scheduleDeferred(deleteFolder);
-                                                       }
-                                               });
-                    }
-                });
+                                                               });
+                                               }
+                                           });
+                                       }
+
+                                       @Override
+                                       public void onError(Throwable t) {
+                               GWT.log("", t);
+                                               app.setError(t);
+                               if (t instanceof RestException) {
+                                   app.displayError("Unable to get folder: " + ((RestException) t).getHttpStatusText());
+                               }
+                               else
+                                   app.displayError("System error getting folder: " + t.getMessage());
+                                       }
+
+                                       @Override
+                                       protected void onUnauthorized(Response response) {
+                                               app.sessionExpired();
+                                       }
+                               };
+                               getFolder.setHeader("X-Auth-Token", app.getToken());
+                               Scheduler.get().scheduleDeferred(getFolder);
             }
 
             @Override
             public void onError(Throwable t) {
                 GWT.log("", t);
+                               app.setError(t);
                 if (t instanceof RestException) {
                     app.displayError("Unable to create folder:" + ((RestException) t).getHttpStatusText());
                 }
                 else
                     app.displayError("System error creating folder:" + t.getMessage());
             }
+
+                       @Override
+                       protected void onUnauthorized(Response response) {
+                               app.sessionExpired();
+                       }
         };
         createFolder.setHeader("X-Auth-Token", app.getToken());
         createFolder.setHeader("Accept", "*/*");
@@ -155,28 +205,36 @@ public class ToTrashCommand implements Command{
         Scheduler.get().scheduleDeferred(createFolder);
     }
 
+
+    
     protected void trashFiles(final Iterator<File> iter, final Command callback) {
         if (iter.hasNext()) {
             File file = iter.next();
             String path = "/" + Pithos.TRASH_CONTAINER + "/" + file.getPath();
             PutRequest trashFile = new PutRequest(app.getApiPath(), app.getUsername(), path) {
                 @Override
-                public void onSuccess(@SuppressWarnings("unused") Resource result) {
+                public void onSuccess(Resource result) {
                     trashFiles(iter, callback);
                 }
 
                 @Override
                 public void onError(Throwable t) {
                     GWT.log("", t);
+                                       app.setError(t);
                     if (t instanceof RestException) {
                         app.displayError("Unable to copy file: " + ((RestException) t).getHttpStatusText());
                     }
                     else
                         app.displayError("System error unable to copy file: "+t.getMessage());
                 }
+
+                               @Override
+                               protected void onUnauthorized(Response response) {
+                                       app.sessionExpired();
+                               }
             };
             trashFile.setHeader("X-Auth-Token", app.getToken());
-            trashFile.setHeader("X-Move-From", file.getUri());
+            trashFile.setHeader("X-Move-From", URL.encodePathSegment(file.getUri()));
             Scheduler.get().scheduleDeferred(trashFile);
         }
         else if (callback != null) {
@@ -187,7 +245,13 @@ public class ToTrashCommand implements Command{
     protected void trashSubfolders(final Iterator<Folder> iter, final Command callback) {
         if (iter.hasNext()) {
             final Folder f = iter.next();
-            trashFolder(f, callback);
+            trashFolder(f, new Command() {
+                               
+                               @Override
+                               public void execute() {
+                                       trashSubfolders(iter, callback);
+                               }
+                       });
         }
         else  {
                app.updateTrash(false, callback);