Work in progress. Do not rely on this commit
[pithos-web-client] / src / gr / grnet / pithos / web / client / commands / ToTrashCommand.java
index b0232d9..b5ece80 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 gr.grnet.pithos.web.client.Const;
 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.GetRequest;
+import gr.grnet.pithos.web.client.Resource;
 import gr.grnet.pithos.web.client.rest.PutRequest;
 import gr.grnet.pithos.web.client.rest.RestException;
 
@@ -81,13 +80,23 @@ public class ToTrashCommand implements Command{
                 @SuppressWarnings("unchecked")
                                @Override
                 public void execute() {
-                    app.updateFolder(((List<File>) resource).get(0).getParent(), true, new Command() {
-                                               
-                                               @Override
-                                               public void execute() {
-                                                       app.updateTrash(false, null);
-                                               }
-                                       });
+                       Folder f = ((List<File>) resource).get(0).getParent();
+                       if (app.isMySharedSelected())
+                               app.updateSharedFolder(f, true, new Command() {
+                                                       
+                                                       @Override
+                                                       public void execute() {
+                                                               app.updateTrash(false, null);
+                                                       }
+                                               });
+                       else
+                           app.updateFolder(f, true, new Command() {
+                                                       
+                                                       @Override
+                                                       public void execute() {
+                                                               app.updateTrash(false, null);
+                                                       }
+                                               }, true);
                 }
             });
         }
@@ -102,7 +111,7 @@ public class ToTrashCommand implements Command{
                                                public void execute() {
                                                        app.updateTrash(false, null);
                                                }
-                                       });
+                                       }, true);
                 }
             });
 
@@ -110,110 +119,17 @@ public class ToTrashCommand implements Command{
        }
 
     private void trashFolder(final Folder f, final Command callback) {
-        String path = "/" + Pithos.TRASH_CONTAINER + "/" + f.getPrefix();
-        PutRequest createFolder = new PutRequest(app.getApiPath(), app.getUsername(), path) {
-            @Override
-            public void onSuccess(@SuppressWarnings("unused") 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 execute() {
-                                                                               DeleteRequest deleteFolder = new DeleteRequest(app.getApiPath(), _f.getOwner(), _f.getUri()) {
-                                                                                       
-                                                                                       @Override
-                                                                                       public void onSuccess(@SuppressWarnings("unused") 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);
-                                                                       }
-                                                               });
-                                               }
-                                           });
-                                       }
-
-                                       @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", "*/*");
-        createFolder.setHeader("Content-Length", "0");
-        createFolder.setHeader("Content-Type", "application/folder");
-        Scheduler.get().scheduleDeferred(createFolder);
+       String path = "/" + Const.TRASH_CONTAINER + "/" + f.getPrefix();
+       app.copyFolder(f, app.getUserID(), path, true, callback);
     }
-
-
-    
+  
     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) {
+            String path = "/" + Const.TRASH_CONTAINER + "/" + file.getPath();
+            PutRequest trashFile = new PutRequest(app, app.getApiPath(), app.getUserID(), path) {
                 @Override
-                public void onSuccess(@SuppressWarnings("unused") Resource result) {
+                public void onSuccess(Resource result) {
                     trashFiles(iter, callback);
                 }
 
@@ -233,8 +149,9 @@ public class ToTrashCommand implements Command{
                                        app.sessionExpired();
                                }
             };
-            trashFile.setHeader("X-Auth-Token", app.getToken());
+            trashFile.setHeader("X-Auth-Token", app.getUserToken());
             trashFile.setHeader("X-Move-From", URL.encodePathSegment(file.getUri()));
+            trashFile.setHeader("Content-Type", file.getContentType());
             Scheduler.get().scheduleDeferred(trashFile);
         }
         else if (callback != null) {