From e7aae593ccbf53a19bcd7fc3a04a5a5a4f9de67f Mon Sep 17 00:00:00 2001 From: J62 Date: Sat, 15 Mar 2025 17:04:25 -0700 Subject: [PATCH] d7 --- .../java/ctbrec/ui/settings/SettingsTab.java | 18 ++++++++---------- .../chaturbate/ChaturbateTabProvider.java | 9 ++++++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/settings/SettingsTab.java b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java index 7a73b57f..27b886c4 100644 --- a/client/src/main/java/ctbrec/ui/settings/SettingsTab.java +++ b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java @@ -219,6 +219,7 @@ public class SettingsTab extends Tab implements TabSelectionListener { saveConfig(); refreshChaturbateTabs(); // Refresh tabs when the setting changes }); + useHlsdl = new SimpleBooleanProperty(null, "useHlsdl", settings.useHlsdl); hlsdlExecutable = new SimpleFileProperty(null, "hlsdlExecutable", settings.hlsdlExecutable); recentlyWatched = new SimpleBooleanProperty(null, "recentlyWatched", settings.recentlyWatched); @@ -242,16 +243,13 @@ public class SettingsTab extends Tab implements TabSelectionListener { httpClientMaxRequestsPerHost = new SimpleIntegerProperty(null, "httpClientMaxRequestsPerHost", settings.httpClientMaxRequestsPerHost); } - private void refreshChaturbateTabs() { - getTabPane().getTabs().forEach(tab -> { - if (tab instanceof ThumbOverviewTab overviewTab) { - if (overviewTab.getUpdateService() != null) { - overviewTab.getUpdateService().reset(); - overviewTab.getUpdateService().restart(); - } - } - }); - } +private void refreshChaturbateTabs() { + getTabPane().getTabs().removeIf(tab -> tab instanceof ThumbOverviewTab); // Remove all Chaturbate tabs + + var newTabs = SiteUiFactory.getUi(new Chaturbate()).getTabProvider().getSiteTabs(getTabPane().getScene()); // Get updated tabs + getTabPane().getTabs().addAll(newTabs); // Add them back with new URLs +} + private void createGui() { diff --git a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateTabProvider.java b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateTabProvider.java index 23e00dea..c7a1ff34 100644 --- a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateTabProvider.java +++ b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateTabProvider.java @@ -79,9 +79,12 @@ public class ChaturbateTabProvider extends AbstractTabProvider { return createTab(title, updateService); } - private String buildUrl(String endpoint) { - return apiUrl + endpoint + (Config.getInstance().getSettings().filterNAcamsOnly ? "®ions=NA" : ""); - } +private String buildUrl(String endpoint) { + boolean filterNA = Config.getInstance().getSettings().filterNAcamsOnly; // Always check latest setting + String url = apiUrl + endpoint + (filterNA ? "®ions=NA" : ""); + System.out.println("Building URL: " + url); // Debugging line + return url; +}