Externalized thumbnail generation from controller; added insert to db

.gitignore

@@ -2,6 +2,7 @@
 # Compiled class file
 *.class
 .vscode
+database.db
 
 # Log file
 *.log

src/main/java/com/itdominator/api/ThumbnailApiApplication.java

@@ -2,10 +2,12 @@ package com.itdominator.api;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 
 @SpringBootApplication
+@ComponentScan("com.itdominator.api")
 @Configuration
 public class ThumbnailApiApplication {
 

src/main/java/com/itdominator/api/controller/ThumbnailerApiController.java

@@ -2,16 +2,13 @@ package com.itdominator.api.controller;
 
 
 import java.io.IOException;
-import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.validation.annotation.Validated;
@@ -23,7 +20,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.itdominator.api.dto.ThumbnailDto;
 import com.itdominator.api.dto.ThumbnailSearchCriteria;
+import com.itdominator.api.entities.Thumbnails;
 import com.itdominator.api.services.ThumbnailerService;
+import com.itdominator.api.util.Thumbnailer;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Max;
@@ -43,9 +42,7 @@ import lombok.extern.slf4j.Slf4j;
 public class ThumbnailerApiController {
 
     private final ThumbnailerService thumbnailerService;
-
+    private final Thumbnailer thumbnailer;
-    @Value("${videos.filter}")
-    private final String[] videoFilter;
 
 
     @PreAuthorize("hasRole('User')")
@@ -83,60 +80,24 @@ public class ThumbnailerApiController {
 
     @PreAuthorize("hasRole('User')")
     @GetMapping("/temp-videos-list-test")
-    public Set<String> getAllVideoFiles() {
+    public Set<String> getAllVideoFiles() throws IOException {
-        Set<Path> paths   = collectVideoFilePaths("/home/abaddon/Downloads");
+        Set<Path> paths   = thumbnailer.collectVideoFilePaths("/home/abaddon/Downloads");
         Set<String> files = new HashSet<>();
 
-        generateThumbnails(paths);
+        thumbnailer.generateThumbnails(paths);
         for (Path path : paths) {
-            files.add( path.getFileName().toString() );
+            String fileName = path.getFileName().toString();
+            String fileHash = DigestUtils.sha256Hex(fileName);
+
+            // files.add( path.getFileName().toString() );
+            files.add( path.toString() );
+
+            thumbnailerService.saveThumbnail( 
+                new Thumbnails(fileName, fileHash, Files.readAllBytes( Path.of("/tmp/" + fileHash + ".jpg") ) )
+            );
         }
 
         return files;
     }
 
-
-    public Set<Path> collectVideoFilePaths(final String dir) {
-        Set<Path> paths = new HashSet<>();
-
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream( Paths.get(dir) )) {
-            for (Path path : stream) {
-                if ( !Files.isDirectory(path) ) {
-                    String target = path.getFileName().toString();
-                    for (String filterItem : videoFilter) {
-                        if ( target.endsWith(filterItem) ) {
-                            paths.add(path);
-                        }
-                    }
-                }
-            }
-        } catch (IOException e) {
-            log.debug("Invalid path given to scan...");
-        }
-
-        return paths;
-    }
-
-    public void generateThumbnails(Set<Path> paths) {
-        for (Path path : paths) {
-            String fileName = path.getFileName().toString();
-            String fileHash = DigestUtils.sha256Hex(fileName);
-            generateThumbnail(path.toString(), "/home/abaddon/Downloads/tmp/" + fileHash + ".jpg","65%");
-        }
-    }
-
-
-
-    // proc = subprocess.Popen([self.FFMPG_THUMBNLR, "-t", scrub_percent, "-s", "300", "-c", "jpg", "-i", full_path, "-o", hash_img_path])
-    public void generateThumbnail(final String full_path, final String hash_img_path, final String scrub_percent) {
-        try {
-            ProcessBuilder pb = new ProcessBuilder("ffmpegthumbnailer", "-t", scrub_percent, "-s", "300", "-c", "jpg", "-i", full_path, "-o", hash_img_path);
-            Process p = pb.start();
-        } catch (Exception e) {
-            log.debug("Thumbnail couldn't be generated...");
-            // Note: Need supporting logic for failed loads. Maybe return empty byte[]
-        }
-
-    }
-
 }

src/main/java/com/itdominator/api/entities/Thumbnails.java

@@ -5,6 +5,8 @@ import java.io.Serializable;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.Pattern;
@@ -24,6 +26,7 @@ public class Thumbnails implements Serializable {
     @Id
     @Column(name = "id", nullable = false)
     @EqualsAndHashCode.Include
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
 
     @Column(name = "file_name", nullable = false)
@@ -35,4 +38,11 @@ public class Thumbnails implements Serializable {
 
     @Column(name = "image", columnDefinition="BLOB NOT NULL")
     private byte[] image;
+
+    public Thumbnails(String fileName, String fileHash, byte[] image) {
+        this.fileName = fileName;
+        this.fileHash = fileHash;
+        this.image    = image;
+    }
+
 }

src/main/java/com/itdominator/api/repositories/ThumbnailRepository.java

@@ -24,4 +24,5 @@ public interface ThumbnailRepository extends JpaRepository<Thumbnails, Thumbnail
 
     @Query(value = "SELECT path FROM thumbnails WHERE id = :id", nativeQuery = true)
     ThumbnailDto findThumbnailById(int id);
+
 }

src/main/java/com/itdominator/api/services/ThumbnailerService.java

@@ -8,12 +8,14 @@ import org.springframework.validation.annotation.Validated;
 
 import com.itdominator.api.dto.ThumbnailDto;
 import com.itdominator.api.dto.ThumbnailSearchCriteria;
+import com.itdominator.api.entities.Thumbnails;
 import com.itdominator.api.repositories.ThumbnailRepository;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 
+
 @RequiredArgsConstructor
 @Service
 @Validated
@@ -46,4 +48,8 @@ public class ThumbnailerService {
         return thumbnailRepository.getAllThumbnails();
     }
 
+    public void saveThumbnail(final Thumbnails thumbnail) {
+        thumbnailRepository.save(thumbnail);
+    }
+
 }

src/main/java/com/itdominator/api/util/Thumbnailer.java

@@ -0,0 +1,67 @@
+package com.itdominator.api.util;
+
+import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+
+
+
+@Component
+@RequiredArgsConstructor
+public class Thumbnailer {
+
+    @Value("${videos.filter}")
+    private final String[] videoFilter;
+
+    public Set<Path> collectVideoFilePaths(final String dir) throws IOException {
+        Set<Path> paths = new HashSet<>();
+
+        DirectoryStream<Path> stream = Files.newDirectoryStream( Paths.get(dir) );
+        for (Path path : stream) {
+            if ( !Files.isDirectory(path) ) {
+                String target = path.getFileName().toString();
+                for (String filterItem : videoFilter) {
+                    if ( target.endsWith(filterItem) ) {
+                        paths.add(path);
+                    }
+                }
+            }
+        }
+
+        return paths;
+    }
+
+    public void generateThumbnails(Set<Path> paths) throws IOException {
+        for (Path path : paths) {
+            String fileName = path.getFileName().toString();
+            String fileHash = DigestUtils.sha256Hex(fileName);
+            generateThumbnail(path.toString(), "/tmp/" + fileHash + ".jpg","65%");
+        }
+    }
+
+    // proc = subprocess.Popen([self.FFMPG_THUMBNLR, "-t", scrub_percent, "-s", "300", "-c", "jpg", "-i", full_path, "-o", hash_img_path])
+    private void generateThumbnail(final String full_path, final String hash_img_path, final String scrub_percent) throws IOException {
+        ProcessBuilder pb = new ProcessBuilder("ffmpegthumbnailer", "-t", scrub_percent, "-s", "300", "-c", "jpg", "-i", full_path, "-o", hash_img_path);
+        Process p = pb.start();
+        while (p.isAlive()) {
+            try {
+                TimeUnit.SECONDS.sleep(1);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+    }
+
+}