Skip to content

Commit 2fb82f1

Browse files
committed
Implement Updater for Deno JS Runtime, fixes latest YouTube downloading issues.
1 parent 3b3828e commit 2fb82f1

File tree

15 files changed

+210
-27
lines changed

15 files changed

+210
-27
lines changed

core/src/main/java/net/brlns/gdownloader/downloader/DownloadManager.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
import net.brlns.gdownloader.downloader.structs.DownloadResult;
4040
import net.brlns.gdownloader.event.EventDispatcher;
4141
import net.brlns.gdownloader.event.IEvent;
42+
import net.brlns.gdownloader.filters.AbstractUrlFilter;
43+
import net.brlns.gdownloader.filters.GenericFilter;
44+
import net.brlns.gdownloader.filters.YoutubeFilter;
45+
import net.brlns.gdownloader.filters.YoutubePlaylistFilter;
4246
import net.brlns.gdownloader.persistence.PersistenceManager;
4347
import net.brlns.gdownloader.persistence.entity.CounterTypeEnum;
4448
import net.brlns.gdownloader.persistence.entity.QueueEntryEntity;
4549
import net.brlns.gdownloader.process.ProcessMonitor;
4650
import net.brlns.gdownloader.settings.enums.PlayListOptionEnum;
47-
import net.brlns.gdownloader.filters.AbstractUrlFilter;
48-
import net.brlns.gdownloader.filters.GenericFilter;
49-
import net.brlns.gdownloader.filters.YoutubeFilter;
50-
import net.brlns.gdownloader.filters.YoutubePlaylistFilter;
5151
import net.brlns.gdownloader.system.ShutdownRegistry.CloseBefore;
5252
import net.brlns.gdownloader.system.taskbar.ITaskbarManager.TaskbarState;
5353
import net.brlns.gdownloader.system.taskbar.TaskbarManager;

core/src/main/java/net/brlns/gdownloader/downloader/GalleryDlDownloader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
import net.brlns.gdownloader.downloader.enums.DownloaderIdEnum;
3737
import net.brlns.gdownloader.downloader.structs.DownloadResult;
3838
import net.brlns.gdownloader.downloader.structs.MediaInfo;
39+
import net.brlns.gdownloader.filters.AbstractUrlFilter;
3940
import net.brlns.gdownloader.persistence.PersistenceManager;
4041
import net.brlns.gdownloader.process.ProcessArguments;
41-
import net.brlns.gdownloader.filters.AbstractUrlFilter;
4242
import net.brlns.gdownloader.util.CancelHook;
4343
import net.brlns.gdownloader.util.DirectoryDeduplicator;
4444
import net.brlns.gdownloader.util.DirectoryUtils;

core/src/main/java/net/brlns/gdownloader/downloader/QueueEntry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
import net.brlns.gdownloader.GDownloader;
5151
import net.brlns.gdownloader.downloader.enums.*;
5252
import net.brlns.gdownloader.downloader.structs.MediaInfo;
53-
import net.brlns.gdownloader.persistence.entity.QueueEntryEntity;
54-
import net.brlns.gdownloader.settings.enums.*;
5553
import net.brlns.gdownloader.filters.AbstractUrlFilter;
5654
import net.brlns.gdownloader.filters.GenericFilter;
55+
import net.brlns.gdownloader.persistence.entity.QueueEntryEntity;
56+
import net.brlns.gdownloader.settings.enums.*;
5757
import net.brlns.gdownloader.ui.MediaCard;
5858
import net.brlns.gdownloader.ui.menu.*;
5959
import net.brlns.gdownloader.ui.message.Message;

core/src/main/java/net/brlns/gdownloader/downloader/SpotDLDownloader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
import net.brlns.gdownloader.downloader.enums.DownloaderIdEnum;
3838
import net.brlns.gdownloader.downloader.structs.DownloadResult;
3939
import net.brlns.gdownloader.downloader.structs.MediaInfo;
40+
import net.brlns.gdownloader.filters.AbstractUrlFilter;
4041
import net.brlns.gdownloader.persistence.PersistenceManager;
4142
import net.brlns.gdownloader.process.ProcessArguments;
42-
import net.brlns.gdownloader.filters.AbstractUrlFilter;
4343
import net.brlns.gdownloader.util.CancelHook;
4444
import net.brlns.gdownloader.util.DirectoryUtils;
4545
import net.brlns.gdownloader.util.FileUtils;

core/src/main/java/net/brlns/gdownloader/downloader/YtDlpDownloader.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
import net.brlns.gdownloader.downloader.structs.DownloadResult;
4040
import net.brlns.gdownloader.downloader.structs.MediaInfo;
4141
import net.brlns.gdownloader.ffmpeg.enums.AudioBitrateEnum;
42+
import net.brlns.gdownloader.filters.AbstractUrlFilter;
4243
import net.brlns.gdownloader.persistence.PersistenceManager;
4344
import net.brlns.gdownloader.process.ProcessArguments;
4445
import net.brlns.gdownloader.settings.QualitySettings;
4546
import net.brlns.gdownloader.settings.enums.AudioContainerEnum;
47+
import net.brlns.gdownloader.settings.enums.DescriptionContainerEnum;
4648
import net.brlns.gdownloader.settings.enums.SubtitleContainerEnum;
4749
import net.brlns.gdownloader.settings.enums.ThumbnailContainerEnum;
4850
import net.brlns.gdownloader.settings.enums.VideoContainerEnum;
49-
import net.brlns.gdownloader.settings.enums.DescriptionContainerEnum;
50-
import net.brlns.gdownloader.filters.AbstractUrlFilter;
5151
import net.brlns.gdownloader.util.CancelHook;
5252
import net.brlns.gdownloader.util.DirectoryUtils;
5353
import net.brlns.gdownloader.util.FileUtils;
@@ -68,6 +68,10 @@ public class YtDlpDownloader extends AbstractDownloader {
6868
@Setter
6969
private Optional<File> executablePath = Optional.empty();
7070

71+
@Getter
72+
@Setter
73+
private Optional<File> denoPath = Optional.empty();
74+
7175
public YtDlpDownloader(DownloadManager managerIn) {
7276
super(managerIn);
7377
}

core/src/main/java/net/brlns/gdownloader/filters/GenericFilter.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@
1919
import com.fasterxml.jackson.annotation.JsonIgnore;
2020
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2121
import java.io.File;
22+
import java.util.Optional;
2223
import lombok.Data;
2324
import lombok.EqualsAndHashCode;
2425
import lombok.extern.slf4j.Slf4j;
2526
import net.brlns.gdownloader.GDownloader;
2627
import net.brlns.gdownloader.downloader.AbstractDownloader;
2728
import net.brlns.gdownloader.downloader.DownloadManager;
29+
import net.brlns.gdownloader.downloader.YtDlpDownloader;
2830
import net.brlns.gdownloader.downloader.enums.DownloadTypeEnum;
2931
import net.brlns.gdownloader.ffmpeg.enums.AudioBitrateEnum;
3032
import net.brlns.gdownloader.process.ProcessArguments;
@@ -91,6 +93,16 @@ protected ProcessArguments buildArguments(AbstractDownloader downloader, Downloa
9193
);
9294
}
9395

96+
if (downloader instanceof YtDlpDownloader ytDlpDownloader) {
97+
Optional<File> denoPath = ytDlpDownloader.getDenoPath();
98+
if (denoPath.isPresent()) {
99+
arguments.add(
100+
"--js-runtimes",
101+
"deno:" + denoPath.get().getAbsolutePath()
102+
);
103+
}
104+
}
105+
94106
switch (typeEnum) {
95107
case ALL -> {
96108
if (config.isEnableExtraArguments()) {

core/src/main/java/net/brlns/gdownloader/persistence/entity/QueueEntryEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
*/
1717
package net.brlns.gdownloader.persistence.entity;
1818

19-
import net.brlns.gdownloader.filters.AbstractUrlFilter;
2019
import jakarta.persistence.*;
2120
import java.io.Serializable;
2221
import java.util.ArrayList;
2322
import lombok.AllArgsConstructor;
2423
import lombok.Data;
2524
import lombok.NoArgsConstructor;
2625
import net.brlns.gdownloader.downloader.enums.*;
26+
import net.brlns.gdownloader.filters.AbstractUrlFilter;
2727
import net.brlns.gdownloader.persistence.converter.*;
2828

2929
/**

core/src/main/java/net/brlns/gdownloader/settings/Settings.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
import net.brlns.gdownloader.GDownloader;
3030
import net.brlns.gdownloader.ffmpeg.enums.AudioCodecEnum;
3131
import net.brlns.gdownloader.ffmpeg.structs.FFmpegConfig;
32+
import net.brlns.gdownloader.filters.AbstractUrlFilter;
33+
import net.brlns.gdownloader.filters.GenericFilter;
3234
import net.brlns.gdownloader.settings.enums.BrowserEnum;
3335
import net.brlns.gdownloader.settings.enums.LanguageEnum;
3436
import net.brlns.gdownloader.settings.enums.PlayListOptionEnum;
3537
import net.brlns.gdownloader.settings.enums.ThemeEnum;
3638
import net.brlns.gdownloader.settings.enums.WebFilterEnum;
37-
import net.brlns.gdownloader.filters.AbstractUrlFilter;
38-
import net.brlns.gdownloader.filters.GenericFilter;
3939

4040
/**
4141
* @author Gabriel / hstr0100 / vertx010

core/src/main/java/net/brlns/gdownloader/settings/enums/WebFilterEnum.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
*/
1717
package net.brlns.gdownloader.settings.enums;
1818

19-
import net.brlns.gdownloader.filters.YoutubeFilter;
19+
import lombok.Getter;
2020
import net.brlns.gdownloader.filters.CrunchyrollFilter;
21-
import net.brlns.gdownloader.filters.XFilter;
22-
import net.brlns.gdownloader.filters.YoutubePlaylistFilter;
21+
import net.brlns.gdownloader.filters.DropoutFilter;
22+
import net.brlns.gdownloader.filters.FacebookFilter;
23+
import net.brlns.gdownloader.filters.GenericFilter;
2324
import net.brlns.gdownloader.filters.RedditFilter;
2425
import net.brlns.gdownloader.filters.TwitchFilter;
25-
import net.brlns.gdownloader.filters.GenericFilter;
26-
import net.brlns.gdownloader.filters.FacebookFilter;
27-
import net.brlns.gdownloader.filters.DropoutFilter;
28-
import lombok.Getter;
26+
import net.brlns.gdownloader.filters.XFilter;
27+
import net.brlns.gdownloader.filters.YoutubeFilter;
28+
import net.brlns.gdownloader.filters.YoutubePlaylistFilter;
2929

3030
/**
3131
* The sole purpose of this enum as of 2024-10-20 is for config migration.

core/src/main/java/net/brlns/gdownloader/ui/SettingsPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
import net.brlns.gdownloader.GDownloader;
4242
import net.brlns.gdownloader.ffmpeg.enums.AudioBitrateEnum;
4343
import net.brlns.gdownloader.ffmpeg.structs.FFmpegConfig;
44+
import net.brlns.gdownloader.filters.AbstractUrlFilter;
4445
import net.brlns.gdownloader.lang.ITranslatable;
4546
import net.brlns.gdownloader.settings.QualitySettings;
4647
import net.brlns.gdownloader.settings.Settings;
4748
import net.brlns.gdownloader.settings.enums.*;
48-
import net.brlns.gdownloader.filters.AbstractUrlFilter;
4949
import net.brlns.gdownloader.system.StartupManager;
5050
import net.brlns.gdownloader.ui.builder.CheckBoxBuilder;
5151
import net.brlns.gdownloader.ui.builder.ComboBoxBuilder;

0 commit comments

Comments
 (0)