Changeset 695

Timestamp:

03/07/10 15:19:30 (6 months ago)

Author:

fabman

Message:

Downloaded files are deleted once the download finishes
TEST_SUITE updated explaining how to backup (export to zip) a workspace's content

Location:

trunk

Files:

• TEST_SUITE (modified) (2 diffs)
• src/com/calenco/resource/workspace/ContentResource.java (modified) (9 diffs)

trunk/TEST_SUITE

@@ -1 @@
-Calenco V2 Test Suite (Last updated 2009-12-29)
+Calenco V2 Test Suite (Last updated 2010-03-07)
 
 This file describes some basic test procedures to excercise the V2 core. The
@@ -154 +154 @@
 - Try to get backup of a non-existing workspace, as sysadmin: MUST FAIL with 404
 curl -uadmin@calenco.com:admin -i http://localhost:9000/workspaces/Non%20Existing
-
+- Backup content of w1 (should get a zip file with a folder named 'content' with all content for w1 in it)
+curl -uadminw1@calenco.com:very_secret -HAccept:application/zip http://localhost:9000/workspaces/Workspace%201/content > W1.zip
 
 11. List files

trunk/src/com/calenco/resource/workspace/ContentResource.java

@@ -76 +76 @@
 import org.apache.commons.io.input.AutoCloseInputStream;
 import org.json.JSONObject;
+import org.restlet.Request;
+import org.restlet.Response;
+import org.restlet.Uniform;
 import org.restlet.data.CharacterSet;
 import org.restlet.data.Disposition;
@@ -121 +124 @@
     String path = null;
     String fileName = null;
+    File tempFile = null;
 
     @Override
@@ -169 +173 @@
         }
         path = String.format("%s/content%s", workspace.href, "".equals(fileName) ? fileName : "/" + fileName);
+        setOnSent(new CleanupTempFile());
     }
 
@@ -460 +465 @@
                     ContentDAO dao = new ContentDAO(session, workspace);
                     if (MediaType.APPLICATION_ZIP.equals(mt)) { // Export
-                        File exportFile = dao.export();
-                        FileUtils.forceDeleteOnExit(exportFile);
-                        Representation rep = new FileRepresentation(exportFile, mt);
+                        tempFile = dao.export();
+                        Representation rep = new FileRepresentation(tempFile, mt);
                         Disposition disposition = new Disposition(Disposition.TYPE_ATTACHMENT);
-                        disposition.setFilename(exportFile.getName());
-                        disposition.setSize(exportFile.length());
+                        disposition.setFilename(tempFile.getName());
+                        disposition.setSize(tempFile.length());
                         rep.setDisposition(disposition);
                         return rep;
@@ -533 +537 @@
                             Set<Association> deps = adao.findByKindFrom(Association.HAS_DEP_CALLED, content.href);
                             storeDeps(session, deps, Language.INTL, tempFolder);
-                            File zipFile = new File(Constants.IO_TMPDIR, String.format("%s-EXPORT-%d.zip", langOrFile, rstart));
-                            new Packer().zip(tempFolder, zipFile);
-                            FileRepresentation rep = new FileRepresentation(zipFile, MediaType.APPLICATION_ZIP);
+                            tempFile = new File(Constants.IO_TMPDIR, String.format("%s-EXPORT-%d.zip", langOrFile, rstart));
+                            new Packer().zip(tempFolder, tempFile);
+                            FileRepresentation rep = new FileRepresentation(tempFile, MediaType.APPLICATION_ZIP);
                             return rep;
                         } else { // Stream file back
@@ -551 +555 @@
                                 return new EmptyRepresentation(); // No entity body allowed with http 304 responses
                             }
-                            File tempFile = File.createTempFile("cco", null); // NOI18N
-                            FileUtils.forceDeleteOnExit(tempFile);
+                            tempFile = File.createTempFile("cco", null); // NOI18N
                             FileOutputStream fos = FileUtils.openOutputStream(tempFile);
                             IOUtils.copy(new AutoCloseInputStream(content.getFstream()), fos);
@@ -654 +657 @@
                             Set<Association> deps = adao.findByKindFrom(Association.HAS_DEP_CALLED, content.href);
                             storeDeps(session, deps, lang, tempFolder);
-                            File zipFile = new File(Constants.IO_TMPDIR, String.format("%s-EXPORT-%d.zip", file, rstart));
-                            new Packer().zip(tempFolder, zipFile);
-                            FileRepresentation rep = new FileRepresentation(zipFile, MediaType.APPLICATION_ZIP);
+                            tempFile = new File(Constants.IO_TMPDIR, String.format("%s-EXPORT-%d.zip", file, rstart));
+                            new Packer().zip(tempFolder, tempFile);
+                            FileRepresentation rep = new FileRepresentation(tempFile, MediaType.APPLICATION_ZIP);
                             return rep;
                         } else { // Stream back
@@ -672 +675 @@
                                 return new EmptyRepresentation(); // No entity body allowed with http 304 responses
                             }
-                            File tempFile = File.createTempFile("cco", null);
-                            FileUtils.forceDeleteOnExit(tempFile);
+                            tempFile = File.createTempFile("cco", null);
                             FileOutputStream fos = FileUtils.openOutputStream(tempFile);
                             IOUtils.copy(new AutoCloseInputStream(content.getFstream()), fos);
@@ -1235 +1237 @@
         new AssociationDAO(session, workspace).add(hasAuthor);
     }
-    
+
+
+    /**
+     * Delete temporary file, if any. This is used to delete files after they
+     *  have been downloaded by the client.
+     */
+    class CleanupTempFile implements Uniform {
+        @Override
+        public void handle(Request rqst, Response rspns) {
+            if (Method.GET.equals(rqst.getMethod()) && tempFile != null) {
+                FileUtils.deleteQuietly(tempFile);
+            }
+        }
+    }
+
 }