image manipulation WIP

Author: benodeveloper

src/main/java/com/benodeveloper/medialibrary/controllers/ImageController.java

@@ -1,39 +1,47 @@
 package com.benodeveloper.medialibrary.controllers;
 
+import java.nio.file.Path;
 import java.util.Arrays;
 
+import com.benodeveloper.medialibrary.entities.Media;
+import com.benodeveloper.medialibrary.services.ImageService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.nio.file.Paths;
+import java.util.UUID;
+
+import com.benodeveloper.medialibrary.services.StorageService;
+
 @RestController
 @RequestMapping("/api/media/images")
 public class ImageController {
 
-    public static final String[] ALLOWED_CONTENT_TYPE = new String[]{
-        "image/gif",
-        "image/jpeg",
-        "image/png",
-        "image/svg+xml",
-        "image/tiff",
-        "image/x-tiff",
-        "image/apng",
-        "image/avif",
-        "image/webp",};
+    private  final ImageService imageService;
+
+    public ImageController(ImageService imageService) {
+        this.imageService = imageService;
+    }
+
 
     @PostMapping("/upload")
-    public ResponseEntity<?> uploadImage(@RequestParam("image") MultipartFile file) {
-        // TODO: handle upload in a separate directory + convert image to jpeg or webp + crop images, ...
-        try {
-            if (!Arrays.asList(ALLOWED_CONTENT_TYPE).contains(file.getContentType())) {
-                throw new Exception("Unsupported image content type");
-            }
-            return ResponseEntity.ok(file.getOriginalFilename());
-        } catch (Exception e) {
-            return ResponseEntity.internalServerError().body(e.getMessage());
-        }
+    public ResponseEntity<?> uploadImage(@RequestParam("image") MultipartFile file) throws Exception {
+//        UUID mediaUUID = UUID.randomUUID();
+//        Path path = imageService.saveImage(file);
+////         storageService.saveFile(file, mediaUUID.toString());
+//
+//            Media media = Media.builder()
+//                    .UUID(mediaUUID)
+//                    .fileName(path.getFileName().toString())
+//                    .name(file.getOriginalFilename())
+//                    .fileType(file.getContentType())
+//                    .size(file.getSize())
+//                    .path(path.toString())
+//                    .build();
+        return ResponseEntity.ok("");
     }
 }

src/main/java/com/benodeveloper/medialibrary/controllers/MediaController.java

@@ -69,6 +69,7 @@ public ResponseEntity<?> getResource(@PathVariable("filename") String filename)
 
     /**
      * Get media by uuid.
+     *
      * @param uuid
      * @return
      */

src/main/java/com/benodeveloper/medialibrary/services/ImageService.java

@@ -0,0 +1,34 @@
+package com.benodeveloper.medialibrary.services;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Objects;
+
+import static com.benodeveloper.medialibrary.utils.ImageUtils.*;
+
+@Service
+public class ImageService {
+
+    private final StorageService storageService;
+
+    public ImageService(StorageService storageService) {
+        this.storageService = storageService;
+    }
+
+    public Path saveImage(MultipartFile file, String filename) throws Exception {
+        // TODO: handle upload in a separate directory + convert image to jpeg or webp +
+        // crop images, ...
+        if (!Arrays.asList(ALLOWED_CONTENT_TYPE).contains(file.getContentType()))
+            throw new Exception("Unsupported image content type");
+        if(!Objects.equals(file.getContentType(), JPG_CONTENT_TYPE)) {
+//            ConvertImageToJPG(file.getInputStream());
+        }
+
+        return storageService.saveFile(file, filename);
+    }
+}

src/main/java/com/benodeveloper/medialibrary/services/StorageService.java

@@ -49,11 +49,11 @@ public void init() {
      */
     public Optional<Resource> loadResource(String filename) throws MalformedURLException {
         var file = uploadPath.resolve(filename);
-        if(Files.exists(file) && Files.isReadable(file)) {
+        if (Files.exists(file) && Files.isReadable(file)) {
             var resource = new UrlResource(file.toUri());
             return Optional.of(resource);
         }
-        return  Optional.empty();
+        return Optional.empty();
     }
 
     public Stream<Path> loadAll() {
@@ -78,7 +78,19 @@ public Path saveFile(MultipartFile file, String filename) throws Exception {
         // get file extension
         String fileExtension = FilenameUtils.getExtension(file.getOriginalFilename());
         filename = filename + "." + fileExtension;
-        Path path = this.uploadPath.resolve(filename);
+
+        return SaveMultipartFile(file, this.uploadPath.resolve(filename));
+    }
+
+    /**
+     * Save Multipart file in a given path.
+     * 
+     * @param file
+     * @param path
+     * @return
+     * @throws Exception
+     */
+    public static Path SaveMultipartFile(MultipartFile file, Path path) throws Exception {
 
         if (Files.exists(path)) {
             throw new Exception("The file is already existed");

src/main/java/com/benodeveloper/medialibrary/utils/ImageUtils.java

@@ -0,0 +1,46 @@
+package com.benodeveloper.medialibrary.utils;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ImageUtils {
+
+    public  static String GIF_CONTENT_TYPE = "image/gif";
+    public  static String JPG_CONTENT_TYPE = "image/jpeg";
+    public  static String PNG_CONTENT_TYPE = "image/png";
+    public  static String TIFF_CONTENT_TYPE = "image/tiff";
+    public  static String X_TIFF_CONTENT_TYPE = "image/x-tiff";
+    public  static String APNG_CONTENT_TYPE = "image/apng";
+    public  static String AVIF_CONTENT_TYPE = "image/avif";
+    public  static String WEBP_CONTENT_TYPE = "image/webp";
+
+    public static String[] ALLOWED_CONTENT_TYPE = new String[]{
+            GIF_CONTENT_TYPE,
+            JPG_CONTENT_TYPE,
+            PNG_CONTENT_TYPE,
+            TIFF_CONTENT_TYPE,
+            X_TIFF_CONTENT_TYPE,
+            APNG_CONTENT_TYPE,
+            AVIF_CONTENT_TYPE,
+            WEBP_CONTENT_TYPE,
+    };
+
+    public static void ConvertImageToJPG(InputStream inputStream,String filename) throws IOException {
+        final BufferedImage image = ImageIO.read(inputStream);
+        inputStream.close();
+
+        final BufferedImage convertedImage = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_INT_RGB);
+        convertedImage.createGraphics().drawImage(image, 0, 0, Color.WHITE, null);
+        final FileOutputStream outputStream = new FileOutputStream(filename);
+        final boolean canWrite = ImageIO.write(convertedImage,"jpg", outputStream);
+        outputStream.close();
+
+        if(!canWrite) throw new IllegalArgumentException("Failed to write image.");
+
+    }
+}