Merge pull request #220 from wttech/file-manager-repo

File manager - repo

Author: krystian-panek-vmltech

core/src/main/java/dev/vml/es/acm/core/code/CodeContext.java

@@ -40,8 +40,6 @@ public class CodeContext {
 
     private final NotificationManager notifier;
 
-    private final FileManager fileManager;
-
     public CodeContext(OsgiContext osgiContext, ResourceResolver resourceResolver) {
         this.osgiContext = osgiContext;
         this.resourceResolver = resourceResolver;
@@ -52,7 +50,6 @@ public CodeContext(OsgiContext osgiContext, ResourceResolver resourceResolver) {
         this.activator = new Activator(resourceResolver, osgiContext);
         this.formatter = new Formatter();
         this.notifier = osgiContext.getService(NotificationManager.class);
-        this.fileManager = osgiContext.getService(FileManager.class);
         this.binding = createBinding();
 
         this.extensionScripts = findExtensionScripts();
@@ -141,8 +138,4 @@ public Formatter getFormatter() {
     public NotificationManager getNotifier() {
         return notifier;
     }
-
-    public FileManager getFileManager() {
-        return fileManager;
-    }
 }

core/src/main/java/dev/vml/es/acm/core/code/CodeOutputFile.java

@@ -67,9 +67,6 @@ public class ExecutionQueue implements JobExecutor, EventListener {
     @Reference
     private Executor executor;
 
-    @Reference
-    private FileManager fileManager;
-
     private ExecutorService jobAsyncExecutor;
 
     private Config config;

core/src/main/java/dev/vml/es/acm/core/code/ExecutionQueue.java

@@ -2,97 +2,73 @@
 
 import dev.vml.es.acm.core.AcmConstants;
 import dev.vml.es.acm.core.AcmException;
-import java.io.*;
-import java.nio.file.Files;
-import java.text.SimpleDateFormat;
+import dev.vml.es.acm.core.repo.Repo;
+import dev.vml.es.acm.core.repo.RepoResource;
+import java.io.InputStream;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.sling.api.resource.ResourceResolver;
 
-@Component(immediate = true, service = FileManager.class)
 public class FileManager {
 
-    private static final String ROOT_DIRNAME = "file";
+    private Repo repo;
 
-    private File tempDir;
+    private RepoResource root;
 
-    @Activate
-    protected void activate() {
-        this.tempDir =
-                FileUtils.getTempDirectory().toPath().resolve(AcmConstants.CODE).toFile();
+    public FileManager(ResourceResolver resolver) {
+        this.repo = Repo.quiet(resolver);
+        this.root = repo.get(AcmConstants.VAR_ROOT + "/file");
     }
 
-    public File tempDir() {
-        return tempDir;
+    public Optional<String> find(String path) {
+        RepoResource resource = findResource(path);
+        return resource != null ? Optional.of(resource.getPath()) : Optional.empty();
     }
 
-    public File root() {
-        return tempDir.toPath().resolve(ROOT_DIRNAME).toFile();
-    }
-
-    public File get(String path) {
-        File targetFile = new File(path);
-        validatePath(targetFile);
-        return targetFile;
-    }
-
-    public File save(InputStream stream, String fileName) {
-        try {
-            String datePath = new SimpleDateFormat("yyyy/MM/dd").format(new Date());
-            String randomDir = UUID.randomUUID().toString();
-            File dir = new File(root(), datePath + "/" + randomDir);
-            if (!dir.exists() && !dir.mkdirs()) {
-                throw new AcmException("File directory cannot be created: " + dir.getAbsolutePath());
-            }
-            File file = new File(dir, fileName);
-            validatePath(file);
-            if (file.exists()) {
-                throw new AcmException("File already exists: " + file.getAbsolutePath());
-            }
-            try (OutputStream out = Files.newOutputStream(file.toPath())) {
-                IOUtils.copy(stream, out);
+    public RepoResource findResource(String path) {
+        RepoResource relative = root.child(path);
+        if (relative.exists()) {
+            return relative;
+        }
+        if (StringUtils.startsWith(path, root.getPath() + "/")) {
+            RepoResource absolute = repo.get(path);
+            if (absolute.exists()) {
+                return absolute;
             }
-            return file;
-        } catch (IOException e) {
-            throw new AcmException("File cannot be saved: " + fileName, e);
         }
+        return null;
     }
 
-    public File delete(String path) {
-        File file = get(path);
-        if (!file.exists()) {
-            throw new AcmException(String.format("File to be deleted does not exist '%s'!", path));
-        }
-        if (!file.delete()) {
-            throw new AcmException(String.format("File cannot be deleted '%s'!", path));
-        }
-        return file;
+    public String save(String fileName, InputStream stream) {
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
+        String formattedDate = now.format(formatter);
+        RepoResource fileResource = root.child(
+                String.format("%s/%s/%s", formattedDate, UUID.randomUUID().toString(), fileName));
+        fileResource.parent().ensureRegularFolder();
+        fileResource.saveFile("application/octet-stream", stream); // TODO tika?
+        return fileResource.getPath();
     }
 
-    public List<File> deleteAll(List<String> paths) {
+    public List<String> deleteAll(List<String> paths) {
         if (paths == null || paths.isEmpty()) {
             return Collections.emptyList();
         }
         return paths.stream().map(this::delete).collect(Collectors.toList());
     }
 
-    private void validatePath(File targetFile) {
-        try {
-            File rootDir = root();
-            String rootCanonical = rootDir.getCanonicalPath();
-            String targetCanonical = targetFile.getCanonicalPath();
-            if (!targetCanonical.startsWith(rootCanonical + File.separator) && !targetCanonical.equals(rootCanonical)) {
-                throw new AcmException(String.format(
-                        "File path '%s' must be within the root directory '%s'!", targetFile.getPath(), rootCanonical));
-            }
-        } catch (IOException e) {
-            throw new AcmException(String.format("File path resolution error '%s'!", targetFile.getPath()), e);
+    public String delete(String path) {
+        RepoResource resource = findResource(path);
+        if (resource == null) {
+            throw new AcmException(String.format("File to be deleted does not exist '%s'!", path));
         }
+        resource.delete();
+        return resource.getPath();
     }
 }

core/src/main/java/dev/vml/es/acm/core/code/FileManager.java

@@ -1,11 +1,10 @@
 package dev.vml.es.acm.core.code.input;
 
 import dev.vml.es.acm.core.code.InputType;
-import java.io.File;
 
-public class FileInput extends AbstractFileInput<File> {
+public class FileInput extends AbstractFileInput<String> {
 
     public FileInput(String name) {
-        super(name, InputType.FILE, File.class);
+        super(name, InputType.FILE, String.class);
     }
 }

core/src/main/java/dev/vml/es/acm/core/code/input/FileInput.java

@@ -1,16 +1,15 @@
 package dev.vml.es.acm.core.code.input;
 
 import dev.vml.es.acm.core.code.InputType;
-import java.io.File;
 
-public class MultiFileInput extends AbstractFileInput<File[]> {
+public class MultiFileInput extends AbstractFileInput<String[]> {
 
     private Integer min;
 
     private Integer max;
 
     public MultiFileInput(String name) {
-        super(name, InputType.MULTIFILE, File[].class);
+        super(name, InputType.MULTIFILE, String[].class);
     }
 
     public Integer getMin() {

core/src/main/java/dev/vml/es/acm/core/code/input/MultiFileInput.java

@@ -1,18 +1,17 @@
 package dev.vml.es.acm.core.servlet;
 
-import java.io.File;
 import java.io.Serializable;
 import java.util.List;
 
 public class FileOutput implements Serializable {
 
-    private List<File> files;
+    private List<String> files;
 
-    public FileOutput(List<File> files) {
+    public FileOutput(List<String> files) {
         this.files = files;
     }
 
-    public List<File> getFiles() {
+    public List<String> getFiles() {
         return files;
     }
 }

core/src/main/java/dev/vml/es/acm/core/servlet/FileOutput.java

@@ -6,7 +6,6 @@
 import static dev.vml.es.acm.core.util.ServletUtils.stringsParam;
 
 import dev.vml.es.acm.core.code.FileManager;
-import java.io.File;
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
@@ -17,7 +16,6 @@
 import org.apache.sling.api.servlets.ServletResolverConstants;
 import org.apache.sling.api.servlets.SlingAllMethodsServlet;
 import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,17 +35,15 @@ public class FileServlet extends SlingAllMethodsServlet {
 
     private static final String PATH_PARAM = "path";
 
-    @Reference
-    private transient FileManager manager;
-
     @Override
     protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response) throws IOException {
         try {
-            List<File> filesUploaded = new LinkedList<>();
+            List<String> filesUploaded = new LinkedList<>();
+            FileManager manager = new FileManager(request.getResourceResolver());
             for (Part part : request.getParts()) {
                 if (part.getSubmittedFileName() != null) {
-                    File file = manager.save(part.getInputStream(), part.getSubmittedFileName());
-                    filesUploaded.add(file);
+                    String filePath = manager.save(part.getSubmittedFileName(), part.getInputStream());
+                    filesUploaded.add(filePath);
                 }
             }
             FileOutput output = new FileOutput(filesUploaded);
@@ -65,7 +61,8 @@ protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse
     protected void doDelete(SlingHttpServletRequest request, SlingHttpServletResponse response) throws IOException {
         try {
             List<String> paths = stringsParam(request, PATH_PARAM);
-            List<File> deleted = manager.deleteAll(paths);
+            FileManager manager = new FileManager(request.getResourceResolver());
+            List<String> deleted = manager.deleteAll(paths);
             FileOutput output = new FileOutput(deleted);
             respondJson(response, ok("Files deleted successfully", output));
         } catch (Exception e) {

core/src/main/java/dev/vml/es/acm/core/servlet/FileServlet.java

@@ -16,8 +16,13 @@ boolean canRun() {
 }
 
 void doRun() {
+    def pageThumnail = repo.get(inputs.value("pageThumbnailFile"))
     def page = repo.get(inputs.value("pagePath"))
-    def pageImage = page.child("jcr:content/image").ensure("nt:unstructured")
-    pageImage.child("file/jcr:content/dam:thumbnails").delete()
-    pageImage.child("file").saveFile("image/jpeg", inputs.value("pageThumbnailFile"))
+    try {
+        def pageImage = page.child("jcr:content/image").ensure("nt:unstructured")
+        pageImage.child("file/jcr:content/dam:thumbnails").delete()
+        pageImage.child("file").saveFile("image/jpeg", pageThumnail.readFileAsStream())
+    } finally {
+        pageThumnail.delete()
+    }
 }

ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/manual/example/ACME-202_page-thumbnail.groovy

@@ -15,5 +15,6 @@ documentation: |
   
   Usage:
   ```groovy
-  def file = inputs.value("imageFile") // java.io.File
+  def file = repo.get(inputs.value("imageFile"))
+  file.readFileAsStream()
   ```