Merge branch 'experimental' of https://github.com/Jafea7/0xb00bface-ctbrec into experimental

CHANGELOG.md

@@ -11,6 +11,12 @@ If this version doesn't do what you want, don't use it ... simple.
 
 Changes from 0xb00bface's v5.3.0 version.
 
+25.09.13
+========================
+* Sort entries in site tabs: Tracked->Bookmarked
+* Add Discord button to Settings->Help
+* Implemnt CheckURL dialog from WinkRU v5.0.24
+
 25.09.10 (fix stream playback)
 ========================
 * SC encrypted stream fix (credit @Gabi_uy)

client/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>ctbrec</groupId>
         <artifactId>master</artifactId>
-        <version>25.9.10</version>
+        <version>25.9.13</version>
         <relativePath>../master</relativePath>
     </parent>
 

client/src/main/java/ctbrec/ui/Player.java

@@ -75,46 +75,6 @@ public class Player {
         return play(model, true);
     }
 
-    // Precompile VR suffix regex
-//    private static final Pattern VR_SUFFIX = Pattern.compile("(_vr)$");
-
-    // Map of host replacements for non-VR streams
-/*     private static final Map<String, String> HOST_REPLACEMENTS = Map.of(
-        "media-hls.doppiocdn.com", "media-hls.saawsedge.com"
-    ); */
-
-    /**
-     * Rewrites non-VR doppiocdn.com URLs:
-     *  - swaps host
-     *  - strips _vr from directory if present
-     *  - forces _480p resolution
-     */
-/*     private static String rewriteNonVrStripchatUrl(String url) {
-        try {
-            URI u = URI.create(url);
-            String host = u.getHost();
-
-            if (host != null && host.contains("doppiocdn.com")) {
-                String newHost = HOST_REPLACEMENTS.getOrDefault(host, host);
-
-                // Split the path: /b-hls-02/89673378/89673378_720p60.m3u8
-                String[] parts = u.getPath().split("/");
-                if (parts.length >= 4) {
-                    String dir1 = parts[1]; // e.g., b-hls-02
-                    String dir2 = VR_SUFFIX.matcher(parts[2]).replaceAll(""); // strip _vr if present
-                    String newFile = dir2 + "_480p.m3u8"; // force 480p
-
-                    String rewritten = String.format("https://%s/%s/%s/%s", newHost, dir1, dir2, newFile);
-                    log.trace("Rewrote non-VR Stripchat URL: {} -> {}", url, rewritten);
-                    return rewritten;
-                }
-            }
-        } catch (Exception ex) {
-            log.warn("Failed to rewrite Stripchat URL {}: {}", url, ex.toString());
-        }
-        return url;
-    } */
-
     public static boolean play(Model model, boolean async) {
         try {
             if (model.isOnline(true)) {
@@ -239,14 +199,9 @@ public class Player {
 
                     String mediaUrlForPlayer = upstreamUrl;
                     if (looksLikeStripchatM3u8(upstreamUrl)) {
-//                    if (isVrStripchatStream(upstreamUrl)) {
-                        // VR stream -> use proxy
                         proxy = new LocalHlsProxy(model, upstreamUrl);
                         proxy.start();
                         mediaUrlForPlayer = proxy.localUrl();
-//                    } else if (upstreamUrl.contains("doppiocdn.com")) {
-                        // Non-VR -> rewrite host + resolution
-//                        mediaUrlForPlayer = rewriteNonVrStripchatUrl(upstreamUrl);
                     }
 
                     Object[] cmdline = createCmdline(mediaUrlForPlayer, model);
@@ -314,24 +269,6 @@ public class Player {
             }
         }
 
-        /**
-         * Returns true if the URL is a VR doppiocdn.com stream (.m3u8 + _vr)
-         */
-        private boolean isVrStripchatStream(String url) {
-            try {
-                URI u = URI.create(url);
-                String host = u.getHost();
-                String path = u.getPath().toLowerCase(Locale.ROOT);
-
-                return host != null
-                    && host.contains("doppiocdn.com")
-                    && path.endsWith(".m3u8")
-                    && path.contains("_vr");
-            } catch (Throwable ignore) {
-                return false;
-            }
-        }
-
         private boolean looksLikeStripchatM3u8(String url) {
             try {
                 URL u = new URL(url);

client/src/main/java/ctbrec/ui/action/CheckModelAccountAction.java

@@ -1,15 +1,15 @@
 package ctbrec.ui.action;
 
+import ctbrec.GlobalThreadPool;
+import ctbrec.Model;
+import ctbrec.recorder.Recorder;
+import ctbrec.ui.action.StopRecordingAction;
+import ctbrec.ui.controls.Dialogs;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
-import ctbrec.GlobalThreadPool;
-import ctbrec.Model;
-import ctbrec.recorder.Recorder;
-import ctbrec.ui.controls.Dialogs;
 import javafx.application.Platform;
 import javafx.scene.control.Button;
 import lombok.extern.slf4j.Slf4j;
@@ -17,9 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class CheckModelAccountAction {
     private Button b;
-
     private Recorder recorder;
-
     private String buttonText;
 
     public CheckModelAccountAction(Button b, Recorder recorder) {
@@ -30,30 +28,30 @@ public class CheckModelAccountAction {
 
     public void execute(Predicate<Model> filter) {
         b.setDisable(true);
-        Runnable checker = (() -> {
+        Runnable checker = () -> {
-            List<Model> deletedAccounts = new ArrayList<>();
+            ArrayList<Model> deletedAccounts = new ArrayList<Model>();
             try {
                 checkModelAccounts(filter, deletedAccounts);
-            } finally {
+            }
+            finally {
                 showResult(deletedAccounts);
             }
-        });
+        };
-        GlobalThreadPool.submit(checker);
+        GlobalThreadPool.submit((Runnable)checker);
     }
 
     private void showResult(List<Model> deletedAccounts) {
         Platform.runLater(() -> {
             b.setDisable(false);
-            b.setText(buttonText);
+            b.setText(this.buttonText);
             if (!deletedAccounts.isEmpty()) {
-                var sb = new StringBuilder();
+                StringBuilder sb = new StringBuilder();
                 for (Model deletedModel : deletedAccounts) {
-                    String name = deletedModel.getDisplayName() + " ".repeat(30);
+                    Object name = deletedModel.getDisplayName() + " ".repeat(30);
-                    name = name.substring(0, 30);
+                    name = ((String)name).substring(0, 30);
-                    sb.append(name).append(' ').append('(').append(deletedModel.getUrl()).append(')').append('\n');
+                    sb.append((String)name).append(' ').append('(').append(deletedModel.getUrl()).append(')').append('\n');
                 }
-                boolean remove = Dialogs.showConfirmDialog("Deleted Accounts", sb.toString(),
+                boolean remove = Dialogs.showExpandedConfirmDialog("Deleted Accounts", "Accounts list:", sb.toString(), "The following accounts seem to have been deleted. Do you want to remove them?", b.getScene());
-                        "The following accounts seem to have been deleted. Do you want to remove them?", b.getScene());
                 if (remove) {
                     new StopRecordingAction(b, deletedAccounts, recorder).execute();
                 }
@@ -62,21 +60,21 @@ public class CheckModelAccountAction {
     }
 
     private void checkModelAccounts(Predicate<Model> filter, List<Model> deletedAccounts) {
-        List<Model> models = recorder.getModels().stream() //
+        List models = recorder.getModels().stream().filter(filter).collect(Collectors.toList());
-                .filter(filter) //
-                .collect(Collectors.toList());
         int total = models.size();
-        for (var i = 0; i < total; i++) {
+        for (int i = 0; i < total; ++i) {
-            final int counter = i+1;
+            int counter = i + 1;
-            Platform.runLater(() -> b.setText(buttonText + ' ' + counter + '/' + total));
+            Platform.runLater(() -> b.setText(buttonText + " " + counter + "/" + total));
-            var modelToCheck = models.get(i);
+            Model modelToCheck = (Model)models.get(i);
             try {
-                if (!modelToCheck.exists()) {
+                if (modelToCheck.exists()) continue;
                 deletedAccounts.add(modelToCheck);
+                continue;
             }
-            } catch (IOException e) {
+            catch (IOException e) {
-                log.warn("Couldn't check, if model account still exists", e);
+                log.warn("Couldn't check, if model account still exists", (Throwable)e);
             }
         }
     }
 }
+

client/src/main/java/ctbrec/ui/controls/Dialogs.java

@@ -1,6 +1,12 @@
 package ctbrec.ui.controls;
 
 import ctbrec.ui.AutosizeAlert;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Optional;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.geometry.Insets;
@@ -9,6 +15,7 @@ import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.image.Image;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Priority;
 import javafx.scene.layout.Region;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
@@ -29,26 +36,68 @@ public class Dialogs {
     }
 
     public static void showError(String header, String text, Throwable t) {
-        showError(scene, header, text, t);
+        if (Objects.nonNull(t)) {
+            Dialogs.showError(scene, header, text, t);
+        } else {
+            Dialogs.showError(scene, header, text);
+        }
     }
 
-    public static void showError(Scene parent, String header, String text, Throwable t) {
+    public static void showError(Scene parent, String header, String text) {
         Runnable r = () -> {
-            Alert alert = new AutosizeAlert(Alert.AlertType.ERROR, parent);
+            AutosizeAlert alert = new AutosizeAlert(Alert.AlertType.ERROR, parent);
             alert.setTitle("Error");
             alert.setHeaderText(header);
-            String content = text;
+            alert.setContentText(text);
-            if (t != null) {
-                content += " " + t.getLocalizedMessage();
-            }
-            alert.setContentText(content);
             if (parent != null) {
-                var stage = (Stage) alert.getDialogPane().getScene().getWindow();
+                Stage stage = (Stage)alert.getDialogPane().getScene().getWindow();
-                stage.getScene().getStylesheets().addAll(parent.getStylesheets());
+                stage.getScene().getStylesheets().addAll((Collection<String>)parent.getStylesheets());
             }
             alert.showAndWait();
         };
+        if (Platform.isFxApplicationThread()) {
+            r.run();
+        } else {
+            Platform.runLater(r);
+        }
+    }
 
+    public static void showError(Scene parent, String header, String text, Throwable t) {
+        if (Objects.isNull(t)) {
+            Dialogs.showError(parent, header, text);
+            return;
+        }
+        Runnable r = () -> {
+            AutosizeAlert alert = new AutosizeAlert(Alert.AlertType.ERROR, parent);
+            alert.setTitle("Error");
+            alert.setHeaderText(header);
+            String content = text + "\n" + t.getLocalizedMessage();
+            alert.setContentText(content);
+            StringWriter sw = new StringWriter();
+            PrintWriter pw = new PrintWriter(sw);
+            t.printStackTrace(pw);
+            String exceptionText = sw.toString();
+            Label label = new Label("The exception stacktrace was:");
+            TextArea textArea = new TextArea(exceptionText);
+            textArea.setEditable(false);
+            textArea.setWrapText(true);
+            textArea.setMaxWidth(Double.MAX_VALUE);
+            textArea.setMaxHeight(Double.MAX_VALUE);
+            GridPane.setVgrow(textArea, Priority.ALWAYS);
+            GridPane.setHgrow(textArea, Priority.ALWAYS);
+            GridPane expContent = new GridPane();
+            expContent.setMaxWidth(Double.MAX_VALUE);
+            expContent.add(label, 0, 0);
+            expContent.add(textArea, 0, 1);
+            alert.getDialogPane().setExpandableContent(expContent);
+            alert.getDialogPane().setMinHeight(Double.NEGATIVE_INFINITY);
+            alert.getDialogPane().setMinWidth(Double.NEGATIVE_INFINITY);
+            if (parent != null) {
+                Stage stage = (Stage)alert.getDialogPane().getScene().getWindow();
+                stage.getScene().getStylesheets().addAll((Collection<String>)parent.getStylesheets());
+            }
+            alert.showAndWait();
+        };
         if (Platform.isFxApplicationThread()) {
             r.run();
         } else {
@@ -121,6 +170,24 @@ public class Dialogs {
         return confirm.getResult() == YES;
     }
 
+    public static boolean showExpandedConfirmDialog(String title, String message, String expandedText, String header, Scene parent) {
+        AutosizeAlert confirm = new AutosizeAlert(Alert.AlertType.CONFIRMATION, message, parent, ButtonType.YES, ButtonType.NO);
+        confirm.setTitle(title);
+        confirm.setHeaderText(header);
+        TextArea textArea = new TextArea(expandedText);
+        textArea.setEditable(false);
+        textArea.setWrapText(true);
+        textArea.setMaxWidth(Double.MAX_VALUE);
+        textArea.setMaxHeight(Double.MAX_VALUE);
+        GridPane.setVgrow(textArea, Priority.ALWAYS);
+        GridPane.setHgrow(textArea, Priority.ALWAYS);
+        confirm.getDialogPane().setExpandableContent(textArea);
+        confirm.getDialogPane().setExpanded(true);
+        confirm.getDialogPane().setMinHeight(Double.NEGATIVE_INFINITY);
+        confirm.showAndWait();
+        return confirm.getResult() == ButtonType.YES;
+    }
+
     public static ButtonType showShutdownDialog(Scene parent) {
         var message = "There are recordings in progress";
         var confirm = new AutosizeAlert(AlertType.CONFIRMATION, "", parent, YES, FINISH, NO);

client/src/main/java/ctbrec/ui/tabs/HelpTab.java

@@ -52,8 +52,12 @@ public class HelpTab extends Tab {
         Button openCfg = new Button("Open Config Dir");
         openCfg.setStyle("-fx-font-family: 'Arial'; -fx-font-size: 16px; -fx-font-weight: bold; -fx-text-fill: #ffffff; -fx-background-color: #FF9800; -fx-padding: 15 30; -fx-border-radius: 5; -fx-background-radius: 5;");
 
+        Button openDiscord = new Button("Discord");
+        openDiscord.setStyle("-fx-font-family: 'Arial'; -fx-font-size: 16px; -fx-font-weight: bold; -fx-text-fill: #ffffff; -fx-background-color: #ff0022; -fx-padding: 15 30; -fx-border-radius: 5; -fx-background-radius: 5;");
+
         File cfgDir = Config.getInstance().getConfigDir();
         String path = (cfgDir != null) ? cfgDir.getAbsolutePath() : "Unknown";
+        
         Label configStaticLabel = new Label("Config Dir:");
         configStaticLabel.setStyle("-fx-font-family: 'Arial'; -fx-font-size: 14px; -fx-font-weight: bold; -fx-alignment: center;");
         Label configValueLabel = new Label(path);
@@ -74,7 +78,7 @@ public class HelpTab extends Tab {
         VBox vbox = new VBox();
         vbox.setAlignment(Pos.CENTER);
         vbox.setSpacing(20);
-        vbox.getChildren().addAll(wanLabelBox, openHelp, configLabelBox, openCfg, logLabelBox, openLog);
+        vbox.getChildren().addAll(wanLabelBox, openHelp, configLabelBox, openCfg, logLabelBox, openLog, openDiscord);
 
         // Set up the BorderPane layout
         BorderPane layout = new BorderPane();
@@ -134,6 +138,8 @@ public class HelpTab extends Tab {
                 log.warn("Config dir doesn't exist: {}", configDir.getAbsolutePath());
             }
         });
+
+        openDiscord.setOnAction(e -> DesktopIntegration.open("https://discord.gg/8jCXgVHzgf"));
     }
 
     private void startDocumentationServer() {

common/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>ctbrec</groupId>
         <artifactId>master</artifactId>
-        <version>25.9.10</version>
+        <version>25.9.13</version>
         <relativePath>../master</relativePath>
     </parent>
 

master/pom.xml

@@ -11,7 +11,7 @@
     <groupId>ctbrec</groupId>
     <artifactId>master</artifactId>
     <packaging>pom</packaging>
-    <version>25.9.10</version>
+    <version>25.9.13</version>
 
     <modules>
         <module>../common</module>

server/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>ctbrec</groupId>
         <artifactId>master</artifactId>
-        <version>25.9.10</version>
+        <version>25.9.13</version>
         <relativePath>../master</relativePath>
     </parent>