jafea7
/
jafea7-ctbrec-v5.3.0-based
mirror of https://github.com/Jafea7/0xb00bface-ctbrec.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: jafea7:5731d80f7feff09b6837520fa1aaff9a479f0666
Branches Tags
jafea7:master
jafea7:experimental
jafea7:v25.9.13
jafea7:v25.9.10
jafea7:v25.8.31
jafea7:v25.05.29
..
compare: jafea7:64ddf4977e776002c550ef7329d4f39522ca8e20
Branches Tags
jafea7:experimental
jafea7:v25.9.13
jafea7:v25.9.10
jafea7:v25.8.31
jafea7:v25.05.29
jafea7:master

No commits in common. "5731d80f7feff09b6837520fa1aaff9a479f0666" and "64ddf4977e776002c550ef7329d4f39522ca8e20" have entirely different histories.
5731d80f7f ... 64ddf4977e

9 changed files with 108 additions and 122 deletions
Show Stats Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -11,12 +11,6 @@ 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)

2
client/pom.xml
View File

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

63
client/src/main/java/ctbrec/ui/Player.java
View File

@ -75,6 +75,46 @@ 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)) {
@ -199,9 +239,14 @@ 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);
@ -269,6 +314,24 @@ 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);

60
client/src/main/java/ctbrec/ui/action/CheckModelAccountAction.java
View File

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

85
client/src/main/java/ctbrec/ui/controls/Dialogs.java
View File

@ -1,12 +1,6 @@
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;
@ -15,7 +9,6 @@ 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;
@ -36,68 +29,26 @@ public class Dialogs {
}
public static void showError(String header, String text, Throwable 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) {
Runnable r = () -> {
AutosizeAlert alert = new AutosizeAlert(Alert.AlertType.ERROR, parent);
alert.setTitle("Error");
alert.setHeaderText(header);
alert.setContentText(text);
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 {
Platform.runLater(r);
}
showError(scene, header, text, t);
}
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 alert = new AutosizeAlert(Alert.AlertType.ERROR, parent);
alert.setTitle("Error");
alert.setHeaderText(header);
String content = text + "\n" + t.getLocalizedMessage();
String content = text;
if (t != null) {
content += " " + 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());
var stage = (Stage) alert.getDialogPane().getScene().getWindow();
stage.getScene().getStylesheets().addAll(parent.getStylesheets());
}
alert.showAndWait();
};
if (Platform.isFxApplicationThread()) {
r.run();
} else {
@ -170,24 +121,6 @@ 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);

8
client/src/main/java/ctbrec/ui/tabs/HelpTab.java
View File

@ -52,12 +52,8 @@ 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);
@ -78,7 +74,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, openDiscord);
vbox.getChildren().addAll(wanLabelBox, openHelp, configLabelBox, openCfg, logLabelBox, openLog);
// Set up the BorderPane layout
BorderPane layout = new BorderPane();
@ -138,8 +134,6 @@ 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() {

2
common/pom.xml
View File

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

2
master/pom.xml
View File

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

2
server/pom.xml
View File

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