From 81b848f38dda3acd29fae14c9d6b60339f2ff7c6 Mon Sep 17 00:00:00 2001 From: hstr0100 Date: Thu, 21 Nov 2024 12:51:15 -0300 Subject: [PATCH] Hotfix: remove misbehaving check --- build.gradle | 2 +- core/src/main/java/net/brlns/gdownloader/GDownloader.java | 1 + .../net/brlns/gdownloader/downloader/DownloadManager.java | 7 +------ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index eb1f26b..4fdd657 100755 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -rootProject.version = '1.2.0' +rootProject.version = '1.2.1' subprojects { repositories { diff --git a/core/src/main/java/net/brlns/gdownloader/GDownloader.java b/core/src/main/java/net/brlns/gdownloader/GDownloader.java index d8a645a..10e1fbb 100644 --- a/core/src/main/java/net/brlns/gdownloader/GDownloader.java +++ b/core/src/main/java/net/brlns/gdownloader/GDownloader.java @@ -115,6 +115,7 @@ // TODO Crawl for valid links that can be consumed by direct-http // TODO Toolbar button to toggle different downloaders // TODO Two column layout when in full screen +// TODO Fix notification line wrapping /** * GDownloader - GUI wrapper for yt-dlp * diff --git a/core/src/main/java/net/brlns/gdownloader/downloader/DownloadManager.java b/core/src/main/java/net/brlns/gdownloader/downloader/DownloadManager.java index 69b3db5..03469eb 100644 --- a/core/src/main/java/net/brlns/gdownloader/downloader/DownloadManager.java +++ b/core/src/main/java/net/brlns/gdownloader/downloader/DownloadManager.java @@ -47,7 +47,6 @@ import net.brlns.gdownloader.ui.menu.IMenuEntry; import net.brlns.gdownloader.util.Nullable; import net.brlns.gdownloader.util.collection.ConcurrentRearrangeableDeque; -import net.brlns.gdownloader.util.collection.ExpiringSet; import net.brlns.gdownloader.util.collection.LinkedIterableBlockingQueue; import static net.brlns.gdownloader.downloader.enums.DownloadFlagsEnum.*; @@ -93,8 +92,6 @@ public class DownloadManager implements IEvent { private final AtomicReference suggestedDownloaderId = new AtomicReference<>(null); - private final ExpiringSet urlIgnoreSet = new ExpiringSet<>(TimeUnit.SECONDS, 5); - private final ExecutorService forcefulExecutor = Executors.newCachedThreadPool();// No limits, power to ya private final String _forceStartKey = l10n("gui.force_download_start"); private final String _restartKey = l10n("gui.restart_download"); @@ -193,7 +190,7 @@ public CompletableFuture captureUrl(@Nullable String inputUrl, boolean List compatibleDownloaders = getCompatibleDownloaders(inputUrl); - if (downloadsBlocked.get() || inputUrl == null || urlIgnoreSet.contains(inputUrl) && !force + if (downloadsBlocked.get() || inputUrl == null || compatibleDownloaders.isEmpty() || capturedLinks.contains(inputUrl)) { future.complete(false); return future; @@ -219,8 +216,6 @@ public CompletableFuture captureUrl(@Nullable String inputUrl, boolean return future; } - urlIgnoreSet.add(inputUrl); - String filteredUrl; // TODO: move these to the appropriate classes. if (filter instanceof YoutubePlaylistFilter) {