Created JSP Home and Scan pages; moved to use war

pom.xml

@@ -13,6 +13,7 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<name>ITDominator Thumbnailer</name>
     <description>A thumbnailer api for files.</description>
+	<packaging>war</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -51,6 +52,10 @@
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-jasper</artifactId>
+		</dependency>
 
 
 		<dependency>

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

@@ -2,6 +2,8 @@ package com.itdominator.api;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
@@ -9,10 +11,15 @@ import org.springframework.context.annotation.Configuration;
 @SpringBootApplication
 @ComponentScan("com.itdominator.api")
 @Configuration
-public class ThumbnailApiApplication {
+public class ThumbnailApiApplication extends SpringBootServletInitializer {
 
-	public static void main(String[] args) {
-		SpringApplication.run(ThumbnailApiApplication.class, args);
-	}
+	@Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(ThumbnailApiApplication.class);
+    }
+
+    public static void main(String[] args) {
+        SpringApplication.run(ThumbnailApiApplication.class, args);
+    }
 
 }

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

@@ -1,30 +1,39 @@
 package com.itdominator.api.controller;
 
 
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
-import org.springframework.validation.annotation.Validated;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
 
-import lombok.RequiredArgsConstructor;
+import com.itdominator.api.dto.ScanQuery;
+import com.itdominator.api.dto.User;
+
 import lombok.extern.slf4j.Slf4j;
 
 
 
-@RestController
-@EnableMethodSecurity(securedEnabled = true, prePostEnabled = true)
-@RequiredArgsConstructor
+
+@Controller
 @Slf4j
-@Validated
 public class BaseController {
 
-
-    @PreAuthorize("hasRole('User')")
-    // @PreAuthorize("hashPermission('User')")
-    @GetMapping("/")
-    public String root() {
-        return "<h1>Hello, World!</h1>";
+    @GetMapping({"/", "home"})
+    public String index() {
+        return "index";
     }
 
+    @GetMapping("/register")
+    public String register(Model model) {
+        model.addAttribute("user", new User());
+
+        return "register";
+    }
+
+
+    @GetMapping("/submit-for-scan")
+    public String submitForScan(Model model) {
+        model.addAttribute("scan_query", new ScanQuery());
+
+        return "submit-for-scan";
+    }
 }

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

@@ -13,11 +13,13 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.itdominator.api.dto.ScanQuery;
 import com.itdominator.api.dto.ThumbnailDto;
 import com.itdominator.api.dto.ThumbnailSearchCriteria;
 import com.itdominator.api.entities.Thumbnails;
@@ -72,6 +74,7 @@ public class ThumbnailerApiController {
         return thumbnailerService.getThumbnailByIdOrHashQuery(criteria);
     }
 
+    // @PreAuthorize("hashPermission('User')")
     @PreAuthorize("hasRole('Admin')")
     @GetMapping("/get-all-thumbnails")
     public List<ThumbnailDto> getAllThumbnails() {
@@ -79,9 +82,11 @@ public class ThumbnailerApiController {
     }
 
     @PreAuthorize("hasRole('User')")
-    @GetMapping("/temp-videos-list-test")
-    public Set<String> getAllVideoFiles() throws IOException {
-        Set<Path> paths   = thumbnailer.collectVideoFilePaths("/home/abaddon/Downloads");
+    @PostMapping("/scan-target")
+    public Set<String> scanTarget(
+        @ModelAttribute("scan_query") ScanQuery query
+    ) throws IOException {
+        Set<Path> paths   = thumbnailer.collectVideoFilePaths(query.getPath());
         Set<String> files = new HashSet<>();
 
         thumbnailer.generateThumbnails(paths);

src/main/java/com/itdominator/api/dto/ScanQuery.java

@@ -0,0 +1,10 @@
+package com.itdominator.api.dto;
+
+
+import lombok.Data;
+
+
+@Data
+public class ScanQuery {
+    private String path;
+}

src/main/java/com/itdominator/api/dto/User.java

@@ -0,0 +1,11 @@
+package com.itdominator.api.dto;
+
+
+import lombok.Data;
+
+
+@Data
+public class User {
+    private String email;
+    private String password;
+}

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

@@ -36,7 +36,7 @@ public class Thumbnails implements Serializable {
     @Pattern(regexp = "[a-zA-Z0-9]*$")
     private String fileHash;
 
-    @Column(name = "image", columnDefinition="BLOB NOT NULL")
+    @Column(name = "image", columnDefinition = "BLOB NOT NULL")
     private byte[] image;
 
     public Thumbnails(String fileName, String fileHash, byte[] image) {

src/main/resources/application.properties

@@ -1,5 +1,8 @@
 server.port=8999
 
+spring.mvc.view.prefix:/WEB-INF/jsp/
+spring.mvc.view.suffix:.jsp
+
 spring.security.user.name=root
 spring.security.user.password=toor
 spring.security.user.roles=User,Admin

src/main/webapp/WEB-INF/jsp/index.jsp

@@ -0,0 +1,15 @@
+<html>
+    <head>
+        <meta http-equiv="Content-Type" 
+          content="text/html; charset=UTF-8">
+        <title>Thumbnailer</title>
+    </head>
+    <body>
+        <ul>
+            <li>
+                <a href="/submit-for-scan">Manual Scanner</a>
+                <a href="/register">Register</a>
+            </li>
+        </ul>
+    </body>
+</html>

src/main/webapp/WEB-INF/jsp/register.jsp

@@ -0,0 +1,17 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" 
+          content="text/html; charset=ISO-8859-1">
+        <title>User Registration</title>
+    </head>
+    <body>
+        <form:form method="POST" modelAttribute="user">
+            <form:label path="email">Email: </form:label>
+            <form:input path="email" type="text"/>
+            <form:label path="password">Password: </form:label>
+            <form:input path="password" type="password" />
+            <input type="submit" value="Submit" />
+        </form:form>
+    </body>
+</html>

src/main/webapp/WEB-INF/jsp/submit-for-scan.jsp

@@ -0,0 +1,15 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" 
+          content="text/html; charset=ISO-8859-1">
+        <title>Manual Scan</title>
+    </head>
+    <body>
+        <form:form method="POST" action="scan-target" modelAttribute="scan_query">
+            <form:label path="path">Scan Path: </form:label>
+            <form:input path="path" type="text"/>
+            <input type="submit" value="Scan" />
+        </form:form>
+    </body>
+</html>

start-app.sh

@@ -12,6 +12,7 @@ function main() {
     echo "Working Dir: " $(pwd)
 
     export JAVA_HOME="/usr/lib/jvm/java-17-openjdk/"
-    /usr/lib/jvm/java-17-openjdk/bin/java -jar ./target/thumbnailer-api-0.0.1-SNAPSHOT.jar
+    # /usr/lib/jvm/java-17-openjdk/bin/java -jar ./target/thumbnailer-api-0.0.1-SNAPSHOT.jar
+    /usr/lib/jvm/java-17-openjdk/bin/java -jar ./target/thumbnailer-api-0.0.1-SNAPSHOT.war
 }
 main "$@";