From 5f0c90afdd30f97a2f941053e62527c362babd60 Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Wed, 15 Oct 2025 17:02:17 -0700 Subject: fix: regular full video download (youtube block), added cookie extraction from browser --- src/main/java/Main.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src/main/java/Main.java') diff --git a/src/main/java/Main.java b/src/main/java/Main.java index aa41b31..229d752 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -12,6 +12,7 @@ import com.formdev.flatlaf.FlatIntelliJLaf; import javax.swing.*; import javax.swing.text.DefaultCaret; +import static UI.Modal.chooseBrowserType; import static UI.Modal.showTextFileChooser; @@ -74,6 +75,7 @@ public class Main extends JFrame { public void downloadAndTag(){ ArrayList songs = FileUtility.txtToList(textPath); + String browser = configuration.get("browser"); int totalSongs = songs.size(); int songsProcessed = 0; for(String line: songs){ @@ -84,7 +86,7 @@ public class Main extends JFrame { String stamp = parts[1]; Downloader downloader = new Downloader(completedDir, outputArea); try{ - if(!downloader.download(url, stamp)){ + if(!downloader.download(url, stamp, browser)){ UI.Modal.showError("Error downloading song: " + url + " at timestamp: " + stamp); } } @@ -95,9 +97,10 @@ public class Main extends JFrame { } else{ + Downloader downloader = new Downloader(completedDir, outputArea); try{ - if(!downloader.download(line)){ + if(!downloader.download(line, browser)){ UI.Modal.showError("Error downloading song: " + line); } } @@ -264,6 +267,15 @@ public class Main extends JFrame { } } else { + if(!configuration.containsKey("browser") || configuration.get("browser").isEmpty()){ + System.out.println("Browser not set, this is needed to read cookies"); + String browser = chooseBrowserType(); + if(browser.isEmpty()){ + return; + } + config.modifyConfigurationValue("browser", browser); + configuration = config.readConfigurationData(); + } outputArea.setText(outputArea.getText() + "\n\n" + "Files will be saved to: " + completedDir); Runnable runnable = () -> { outputArea.setText(""); -- cgit v1.2.3