Merge pull request #53 from MarcWeberFS:11-frontend-integration-for-u…

…ser-input 11-frontend-integration-for-user-input
MarcWeberFS · Nov 16, 2024 · dbbebf9 · dbbebf9
2 parents f2181ea + d452318
commit dbbebf9
Show file tree

Hide file tree

Showing 9 changed files with 438 additions and 57 deletions.
diff --git a/video-downloader-backend/src/main/java/ch/marc/controller/VideoDownloadController.java b/video-downloader-backend/src/main/java/ch/marc/controller/VideoDownloadController.java
@@ -26,12 +26,18 @@ public class VideoDownloadController {
     private RuntimeService runtimeService;
 
     @PostMapping("/start-download")
-    public ResponseEntity<Map<String, String>> startDownloadProcess(@RequestParam("url") String url) {
+    public ResponseEntity<Map<String, String>> startDownloadProcess(
+            @RequestParam("url") String url,
+            @RequestParam("advanced") boolean advanced,
+            @RequestParam("sourceLanguage") String sourceLanguage,
+            @RequestParam("targetLanguage") String targetLanguage) {
         Map<String, Object> variables = new HashMap<>();
         variables.put("url", url);
-        variables.put("advanced", true);
-        variables.put("sourceLanguage", "en");
-        variables.put("targetLanguage", "de");
+        variables.put("advanced", advanced);
+        variables.put("sourceLanguage", sourceLanguage);
+        variables.put("targetLanguage", targetLanguage);
+
+        System.out.println("URL: " + url + " Advanced: " + advanced + " Source Language: " + sourceLanguage + " Target Language: " + targetLanguage);
 
         ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("Process_1ua4l8j", variables);
         Map<String, String> response = new HashMap<>();
@@ -40,6 +46,7 @@ public ResponseEntity<Map<String, String>> startDownloadProcess(@RequestParam("u
         return ResponseEntity.ok(response);
     }
 
+
     @Autowired
     private HistoryService historyService;
 

diff --git a/video-downloader-backend/src/main/java/ch/marc/delegates/TranslateVideoDelegate.java b/video-downloader-backend/src/main/java/ch/marc/delegates/TranslateVideoDelegate.java
@@ -2,6 +2,7 @@
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.stream.Collectors;
 
 import org.camunda.bpm.engine.delegate.DelegateExecution;
@@ -37,25 +38,27 @@ public void execute(DelegateExecution execution) throws Exception {
                 .build();
 
         try (ResponseInputStream s3ObjectStream = s3Client.getObject(getObjectRequest);
-             BufferedReader reader = new BufferedReader(new InputStreamReader(s3ObjectStream))) {
+              BufferedReader reader = new BufferedReader(new InputStreamReader(s3ObjectStream, StandardCharsets.UTF_8))) {
+
 
             String srtContent = reader.lines().collect(Collectors.joining("\n"));
-            //System.out.println("Original SRT content:" + srtContent);
+            System.out.println("Original SRT content:" + srtContent);
 
-            TranslateTextRequest translateTextRequest = TranslateTextRequest.builder()
+            TranslateTextRequest translateTextRequest = TranslateTextRequest.builder()        
                     .sourceLanguageCode(sourceLanguage)
                     .targetLanguageCode(targetLanguage)
                     .text(srtContent)
                     .build();
 
             TranslateTextResponse translateTextResponse = translateClient.translateText(translateTextRequest);
+            System.out.println("Translated Response Object: " + translateTextResponse);
             String translatedText = translateTextResponse.translatedText();
 
             //System.out.println("Translated SRT content:\n" + translatedText);
 
             Translate translate = new Translate();
             // Text fields inside of h2 database are limitted to 4000 characters. Store the object (blob) instead.
-            translate.setText(translatedText);
+            translate.setText(translatedText.toString());
 
             execution.setVariable("translatedText", translate);
 

diff --git a/video-downloader-frontend/package-lock.json b/video-downloader-frontend/package-lock.json
diff --git a/video-downloader-frontend/package.json b/video-downloader-frontend/package.json
@@ -3,6 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@headlessui/react": "^2.2.0",
+    "@heroicons/react": "^2.1.5",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",

diff --git a/video-downloader-frontend/public/index.html b/video-downloader-frontend/public/index.html
@@ -9,6 +9,7 @@
       name="description"
       content="Web site created using create-react-app"
     />
+    <script src="https://cdn.tailwindcss.com"></script>
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a