From d7b88b355664a505a36168e60e8017191a2d3665 Mon Sep 17 00:00:00 2001
From: Pinapelz <yukais@pinapelz.com>
Date: Fri, 22 Dec 2023 23:42:37 -0800
Subject: fix: ffmpeg slicing issues

---
 src/main/java/Downloader.java  | 18 +++++++++---------
 src/main/java/FileUtility.java |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/Downloader.java b/src/main/java/Downloader.java
index d6a1f13..7a97748 100644
--- a/src/main/java/Downloader.java
+++ b/src/main/java/Downloader.java
@@ -104,10 +104,10 @@ public class Downloader {
             ProcessBuilder builder = new ProcessBuilder(
                     ytDlpExecutable,
                     "-vU",
-                    "-f", "(bestaudio)",
-                    "--external-downloader", ffmpegExecutable,
+                    "-f","(bestvideo+bestaudio)",
+                    "--external-downloader", "ffmpeg",
                     "--external-downloader-args", "ffmpeg_i:-ss " + startSec + " -to " + endSec,
-                    "--output", "download/%(title)s_%(id)s.webm",
+                    "--output", "downloaded/%(title)s_%(id)s.webm",
                     "--write-info-json",
                     url
             );
@@ -119,7 +119,7 @@ public class Downloader {
             JOptionPane.showMessageDialog(null, "An error occurred while downloading using yt-dlp: " + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
             e.printStackTrace();
         }
-        File downloadedFile = fileUtil.findFileWithType(outputDirectory+"/download", "webm");
+        File downloadedFile = fileUtil.findFileWithType(outputDirectory+"/downloaded", "webm");
         try{
             ProcessBuilder ffmpegBuilder = new ProcessBuilder(
                     ffmpegExecutable,
@@ -141,7 +141,7 @@ public class Downloader {
         }
         fileUtil.deleteFile(downloadedFile.getAbsolutePath()); // Delete old webm file
 
-        String info[] = fileUtil.parseInfoJSON(fileUtil.jsonToString(fileUtil.findJsonFile(outputDirectory+"/download")));
+        String info[] = fileUtil.parseInfoJSON(fileUtil.jsonToString(fileUtil.findJsonFile(outputDirectory+"/downloaded")));
         String uploader = info[1];
         String title = info[0];
         String urlID = info[2];
@@ -155,11 +155,11 @@ public class Downloader {
             File newFile = new File(outputDirectory + "/" + newFileName);
             oldFile.renameTo(newFile);
         }
-        tagMp3InDir(uploader, title, imageUrl, outputDirectory+"/download");
-        fileUtil.deleteFile(fileUtil.findJsonFile(outputDirectory+"/download"));
-        File downloadedMp3 = fileUtil.findFileWithType(outputDirectory+"/download", "mp3");
+        tagMp3InDir(uploader, title, imageUrl, outputDirectory+"/downloaded");
+        fileUtil.deleteFile(fileUtil.findJsonFile(outputDirectory+"/downloaded"));
+        File downloadedMp3 = fileUtil.findFileWithType(outputDirectory+"/downloaded", "mp3");
         downloadedMp3.renameTo(new File(outputDirectory+"/"+downloadedMp3.getName()));
-        fileUtil.deleteFile(outputDirectory+"/download");
+        fileUtil.deleteFile(outputDirectory+"/downloaded");
         return true;
     }
 
diff --git a/src/main/java/FileUtility.java b/src/main/java/FileUtility.java
index 1a05f3c..ba0a4f2 100644
--- a/src/main/java/FileUtility.java
+++ b/src/main/java/FileUtility.java
@@ -107,6 +107,7 @@ public class FileUtility {
     }
 
     public static File findFileWithType(String directory, String fileExt){
+        System.out.println("Searching for file with extension: " + fileExt + " in directory: " + directory);
         File dir = new File(directory);
         File[] files = dir.listFiles();
         for(File file : files){
-- 
cgit v1.2.3