Story/vspc 204

vspace/pom.xml

@@ -27,7 +27,7 @@
         <db.user>vspace</db.user>
         <db.password>vspace</db.password>
         <uploaded.files.path></uploaded.files.path>
-
+        <downloaded.files.path></downloaded.files.path>
         <email.user></email.user>
         <email.password></email.password>
         <email.host></email.host>

vspace/src/main/java/edu/asu/diging/vspace/core/data/ExhibitionDownloadRepository.java

@@ -0,0 +1,13 @@
+package edu.asu.diging.vspace.core.data;
+
+import java.util.List;
+
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import edu.asu.diging.vspace.core.model.impl.ExhibitionDownload;
+
+public interface ExhibitionDownloadRepository extends PagingAndSortingRepository<ExhibitionDownload, String> {
+
+    List<ExhibitionDownload> findAllByOrderByCreationDateDesc();
+
+}

vspace/src/main/java/edu/asu/diging/vspace/core/exception/ExhibitionDownloadNotFoundException.java

@@ -0,0 +1,14 @@
+package edu.asu.diging.vspace.core.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(value = HttpStatus.NOT_FOUND, reason = "Exhibition Download folder Not Found")
+
+public class ExhibitionDownloadNotFoundException extends Exception{
+    private static final long serialVersionUID = 1L;
+
+    public ExhibitionDownloadNotFoundException(String id) {
+        super("Exhibition download folder with id " + id + " not found");
+    }
+}

vspace/src/main/java/edu/asu/diging/vspace/core/file/IStorageEngine.java

@@ -7,9 +7,10 @@
 
 public interface IStorageEngine {
 
-	String storeFile(byte[] fileContent, String filename, String directory) throws FileStorageException;
+    String storeFile(byte[] fileContent, String filename, String directory, String path) throws FileStorageException;
 
-	byte[] getImageContent(String directory, String filename) throws IOException;
+    byte[] getImageContent(String directory, String filename) throws IOException;
 
-	boolean renameImage(IVSImage image, String newFileName);
+    boolean renameImage(IVSImage image, String newFileName);
+
 }

vspace/src/main/java/edu/asu/diging/vspace/core/file/impl/StorageEngine.java

@@ -8,7 +8,16 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.stream.Stream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
@@ -20,20 +29,23 @@
 @Component
 @PropertySource({"classpath:config.properties", "${appConfigFile:classpath:}/app.properties"})
 public class StorageEngine implements IStorageEngine {
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
 	@Value("${uploads_path}")
 	private String path;
 
 	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.file.impl.IStorageEngine#storeFile(byte[], java.lang.String, java.lang.String)
-	 */
-	@Override
-	public String storeFile(byte[] fileContent, String filename, String directory) throws FileStorageException {
-		File parent = new File(path + File.separator + directory);
-		if (!parent.exists()) {
-			parent.mkdir();
-		}
-		File file = new File(parent.getAbsolutePath() + File.separator + filename);
+     * @see edu.asu.diging.vspace.core.file.impl.IStorageEngine#storeFile(byte[], java.lang.String, java.lang.String)
+     */
+    @Override
+    public String storeFile(byte[] fileContent, String filename, String directory, String path) throws FileStorageException {
+        File parent = new File(path +   (directory!= null ? File.separator + directory : "" ));
+        if (!parent.exists()) {
+            parent.mkdir();
+        }
+        File file = new File(parent.getAbsolutePath() + File.separator + filename);
+
+
         BufferedOutputStream stream;
         try {
             stream = new BufferedOutputStream(new FileOutputStream(file));
@@ -48,7 +60,8 @@ public String storeFile(byte[] fileContent, String filename, String directory) t
         }
 
         return directory;
-	}
+    }
+
 
 	@Override
 	public byte[] getImageContent(String directory, String filename) throws IOException {
@@ -89,4 +102,77 @@ public boolean renameImage(IVSImage image, String newFileName) {
 	    File renamedFile = new File(path + File.separator + image.getId() + File.separator + newFileName);
 	    return currentFile.renameTo(renamedFile);
 	}
+
+
+
+
+    public String createFolder(String folderName, String path ) {
+        File folder = new File(path + File.separator + folderName);
+        if (!folder.exists()) {
+            folder.mkdir();
+        }
+
+        return folder.getAbsolutePath();
+
+	}
+
+
+	/**
+	 * Converts the given folder into a zip folder and returna byte array.
+	 * 
+	 * @param folderPath
+	 * @return
+	 * @throws IOException
+	 */
+    public byte[] generateZipFolder(String folderPath) throws IOException {
+        Path zipFile = Paths.get(folderPath);
+
+        try (           
+	            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+	            BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(byteArrayOutputStream);
+	            ZipOutputStream responseZipStream = new ZipOutputStream(bufferedOutputStream);
+
+	            Stream<Path> paths = Files.walk(zipFile)) {
+            paths
+	        .filter(path -> !Files.isDirectory(path))
+	        .forEach(path -> {
+	            ZipEntry  zipEntry = new ZipEntry(zipFile.relativize(path).toString());
+	            try {
+	                responseZipStream.putNextEntry(zipEntry);
+	                Files.copy(path, responseZipStream);
+	                responseZipStream.closeEntry();
+
+	            } catch (IOException e) {
+	                System.err.println(e);
+	            }
+	        });
+            IOUtils.close(responseZipStream);
+            IOUtils.close(bufferedOutputStream);
+            IOUtils.close(byteArrayOutputStream);
+
+            return byteArrayOutputStream.toByteArray();
+
+        } catch (IOException e) {
+            throw new IOException(e);
+        }      
+
+    }
+
+
+
+	/**
+	 * Copies given image to imagesFolderPath
+	 * 
+	 * @param image
+	 * @param imagesFolderPath
+	 */
+    public void copyImageToFolder(IVSImage image, String imagesFolderPath) {
+        try {
+            byte[] byteArray = getImageContent(image.getId(), image.getFilename());
+            storeFile(byteArray, image.getFilename(),image.getId(), imagesFolderPath );
+
+        } catch (IOException | FileStorageException e) {
+            logger.error("Could not copy images" , e);
+        }     
+    }
 }

vspace/src/main/java/edu/asu/diging/vspace/core/model/IExhibitionDownload.java

@@ -0,0 +1,5 @@
+package edu.asu.diging.vspace.core.model;
+
+public interface IExhibitionDownload {
+
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExhibitionDownload.java

@@ -0,0 +1,63 @@
+package edu.asu.diging.vspace.core.model.impl;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
+
+import edu.asu.diging.vspace.core.model.IExhibitionDownload;
+
+@Entity
+public class ExhibitionDownload extends VSpaceElement  implements IExhibitionDownload{
+
+    @Id
+    @GeneratedValue(generator = "exhibit_download_id_generator")
+    @GenericGenerator(name = "exhibit_download_id_generator", parameters = @Parameter(name = "prefix", value = "EXHDWNLD"), strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
+    private String id;
+
+    private String folderPath;
+
+    private String folderName;
+
+
+    public ExhibitionDownload() {
+        super();
+    }
+
+    public ExhibitionDownload(String folderPath, String folderName) {
+        super();
+        this.folderPath = folderPath;
+        this.folderName = folderName;
+    }
+
+    @Override
+    public String getId() {
+        return this.id;    }
+
+    @Override
+    public void setId(String id) {
+        this.id = id;
+
+    }
+
+    public String getFolderPath() {
+        return folderPath;
+    }
+
+    public void setFolderPath(String folderPath) {
+        this.folderPath = folderPath;
+    }
+
+
+    public String getFolderName() {
+        return folderName;
+    }
+
+    public void setFolderName(String folderName) {
+        this.folderName = folderName;
+    }
+
+
+}

vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ContentBlockManager.java

@@ -1,11 +1,13 @@
 package edu.asu.diging.vspace.core.services.impl;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import org.apache.tika.Tika;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -73,6 +75,9 @@ public class ContentBlockManager implements IContentBlockManager {
 
     @Autowired
     private ContentBlockRepository contentBlockRepository;
+
+    @Value("${uploads_path}")
+    private String uploadsPath;
 
     /*
      * (non-Javadoc)
@@ -118,7 +123,7 @@ private void storeImageFile(byte[] image, IVSImage slideContentImage, String fil
         if (slideContentImage != null) {
             String relativePath = null;
             try {
-                relativePath = storage.storeFile(image, filename, slideContentImage.getId());
+                relativePath = storage.storeFile(image, filename, slideContentImage.getId(), uploadsPath);
             } catch (FileStorageException e) {
                 throw new ImageCouldNotBeStoredException(e);
             }