Ensure thread-safety of right-click menu and download log

Move collections from util to util.collection Assorted bug fixes
hstr0100 · Nov 20, 2024 · f651cdd · f651cdd
1 parent 919f95b
commit f651cdd
Show file tree

Hide file tree

Showing 21 changed files with 497 additions and 211 deletions.
diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java
@@ -53,6 +53,7 @@
     exports net.brlns.gdownloader.ui.themes;
     exports net.brlns.gdownloader.updater;
     exports net.brlns.gdownloader.util;
+    exports net.brlns.gdownloader.util.collection;
 
     uses javax.imageio.spi.ImageInputStreamSpi;
     uses javax.imageio.spi.ImageOutputStreamSpi;

diff --git a/core/src/main/java/net/brlns/gdownloader/GDownloader.java b/core/src/main/java/net/brlns/gdownloader/GDownloader.java
@@ -111,6 +111,7 @@
 // TODO Tabs in settings for the different downloaders
 // 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
 /**
  * GDownloader - GUI wrapper for yt-dlp
  *

diff --git a/core/src/main/java/net/brlns/gdownloader/clipboard/ClipboardManager.java b/core/src/main/java/net/brlns/gdownloader/clipboard/ClipboardManager.java
@@ -104,41 +104,33 @@ public void tickClipboard() {
         }
     }
 
+    public void copyTextToClipboard(@NonNull String text) {
+        copyTextToClipboard(List.of(text));
+    }
+
     public void copyTextToClipboard(@NonNull List<String> texts) {
         if (texts.isEmpty()) {
             return;
         }
 
-        invalidateClipboard();
+        clipboardLock.lock();
+        try {
+            clipboard.setContents(new StringSelection(String.join(System.lineSeparator(), texts)), null);
 
-        clipboard.setContents(new StringSelection(String.join(System.lineSeparator(), texts)), null);
+            invalidateClipboard();
 
-        String lastText = texts.get(texts.size() - 1);
-        main.getGuiManager().showMessage(
-            l10n("gui.copied_to_clipboard.notification_title"),
-            lastText,
-            2000,
-            GUIManager.MessageType.INFO,
-            false
-        );
-    }
+            String displayText = texts.size() == 1 ? texts.get(texts.size() - 1)
+                : l10n("gui.copied_to_clipboard.lines", texts.size());
 
-    public void copyTextToClipboard(@NonNull String text) {
-        if (text.isEmpty()) {
-            return;
+            main.getGuiManager().showMessage(
+                l10n("gui.copied_to_clipboard.notification_title"),
+                displayText,
+                2000,
+                GUIManager.MessageType.INFO,
+                false);
+        } finally {
+            clipboardLock.unlock();
         }
-
-        invalidateClipboard();
-
-        clipboard.setContents(new StringSelection(text), null);
-
-        main.getGuiManager().showMessage(
-            l10n("gui.copied_to_clipboard.notification_title"),
-            text,
-            2000,
-            GUIManager.MessageType.INFO,
-            false
-        );
     }
 
     public boolean tryHandleDnD(@Nullable Transferable transferable) {

diff --git a/core/src/main/java/net/brlns/gdownloader/downloader/DirectHttpDownloader.java b/core/src/main/java/net/brlns/gdownloader/downloader/DirectHttpDownloader.java
@@ -96,7 +96,8 @@ public boolean isMainDownloader() {
 
     @Override
     protected boolean canConsumeUrl(String inputUrl) {
-        return !(inputUrl.contains("ytimg")
+        return main.getConfig().isDirectHttpEnabled()
+            && !(inputUrl.contains("ytimg")
             || inputUrl.contains("ggpht")
             || inputUrl.endsWith("youtube.com/"));
     }