RENAME methods for consistency

.gitignore

@@ -32,3 +32,6 @@ build/
 
 ### VS Code ###
 .vscode/
+
+### Generated Files ###
+videos/

src/main/java/com/ddf/vodsystem/controllers/DownloadController.java

@@ -1,14 +1,11 @@
 package com.ddf.vodsystem.controllers;
 
-import com.ddf.vodsystem.exceptions.JobNotFinished;
-import com.ddf.vodsystem.exceptions.JobNotFound;
 import com.ddf.vodsystem.services.DownloadService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,7 +21,7 @@ public class DownloadController {
 
     @GetMapping("/download/{filename}")
     public ResponseEntity<Resource> downloadFile(@PathVariable String filename) {
-        Resource resource = downloadService.download(filename);
+        Resource resource = downloadService.downloadOutput(filename);
 
         if (resource == null || !resource.exists()) {
             return ResponseEntity.notFound().build();

src/main/java/com/ddf/vodsystem/controllers/EditController.java

@@ -24,7 +24,7 @@ public class EditController {
 
     @GetMapping("/process/{uuid}")
     public ResponseEntity<String> convert(@PathVariable("uuid") String uuid) {
-        editService.jobReady(uuid);
+        editService.process(uuid);
         return new ResponseEntity<>(uuid, HttpStatus.OK);
     }
 

src/main/java/com/ddf/vodsystem/services/DownloadService.java

@@ -21,7 +21,18 @@ public class DownloadService {
         this.jobService = jobService;
     }
 
-    public Resource download(String uuid) {
+    public Resource downloadInput(String uuid) {
+        Job job = jobService.get(uuid);
+
+        if (job == null) {
+            throw new JobNotFound("Job doesn't exist");
+        }
+
+        File file = job.getInputFile();
+        return new FileSystemResource(file);
+    }
+
+    public Resource downloadOutput(String uuid) {
         Job job = jobService.get(uuid);
 
         if (job == null) {

src/main/java/com/ddf/vodsystem/services/EditService.java

@@ -17,22 +17,18 @@ public class EditService {
     public void edit(String uuid, ClipConfig clipConfig) {
         Job job = jobService.get(uuid);
 
-        if (clipConfig.getStartPoint() != null) {
+        if (clipConfig.getStartPoint() != null && clipConfig.getStartPoint() < 0) {
-            if (clipConfig.getStartPoint() < 0) {
+            throw new IllegalArgumentException("Start point cannot be negative");
-                throw new IllegalArgumentException("Start point cannot be negative");
-            }
         }
 
-        if (clipConfig.getFileSize() != null) {
+        if (clipConfig.getFileSize() != null && clipConfig.getFileSize() < 100) {
-            if (clipConfig.getFileSize() < 100) {
+            throw new IllegalArgumentException("File size cannot be less than 100kb");
-                throw new IllegalArgumentException("File size cannot be less than 100kb");
-            }
         }
 
         job.setClipConfig(clipConfig);
     }
 
-    public void jobReady(String uuid) {
+    public void process(String uuid) {
         jobService.jobReady(uuid);
     }
 

src/main/java/com/ddf/vodsystem/services/JobService.java

@@ -56,6 +56,7 @@ public class JobService {
                     try {
                         compressionService.run(job);// Execute the task
                     } catch (IOException | InterruptedException e) {
+                        Thread.currentThread().interrupt();
                         logger.error("Error while running job {}", job.getUuid(), e);
                     }
                 }