Merge branch 'experimental' of https://github.com/Jafea7/ctbrec-5.3.2-original into experimental

CHANGELOG.md

@@ -11,11 +11,18 @@ If this version doesn't do what you want, don't use it ... simple.
 
 Changes from reusedname's v5.3.2 version.
 
+25.09.15
+========================
+* Add missing UserAgent parameter to minimal-browser call for some sites
+* Update included ffmpeg to v7.1.1
+* Update minimal-browser (latest modules + default UA)
+* Change default name for Create Contact Sheet
+
 25.09.13
 ========================
 * Sort entries in site tabs: Tracked->Bookmarked
 * Add Discord button to Settings->Help
-* Implemnt CheckURL dialog from WinkRU v5.0.24
+* Implement CheckURL dialog from WinkRU v5.0.24
 
 25.9.6
 ========================

client/pom.xml

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

client/src/main/java/ctbrec/ui/settings/CreateContactSheetPaneFactory.java

@@ -19,10 +19,10 @@ public class CreateContactSheetPaneFactory extends AbstractPostProcessingPaneFac
     @Override
     public Preferences doCreatePostProcessorPane(PostProcessor pp) {
         var totalSize = new SimpleStringProperty(null, TOTAL_SIZE, pp.getConfig().getOrDefault(TOTAL_SIZE, "1920"));
-        var padding = new SimpleStringProperty(null, PADDING, pp.getConfig().getOrDefault(PADDING, "4"));
+        var padding = new SimpleStringProperty(null, PADDING, pp.getConfig().getOrDefault(PADDING, "2"));
         var cols = new SimpleStringProperty(null, COLS, pp.getConfig().getOrDefault(COLS, "8"));
         var rows = new SimpleStringProperty(null, ROWS, pp.getConfig().getOrDefault(ROWS, "7"));
-        var filename = new SimpleStringProperty(null, FILENAME, pp.getConfig().getOrDefault(FILENAME, "contactsheet.jpg"));
+        var filename = new SimpleStringProperty(null, FILENAME, pp.getConfig().getOrDefault(FILENAME, "$sanitize${modelName}_$format(${localDateTime},yyyyMMdd-HHmmss).jpg"));
         background = new SimpleStringProperty(null, BACKGROUND, pp.getConfig().getOrDefault(BACKGROUND, "0x333333"));
         var burnTimestamp = new SimpleBooleanProperty(null, BURN_IN_TIMESTAMP,
                 Boolean.valueOf(pp.getConfig().getOrDefault(BURN_IN_TIMESTAMP, TRUE.toString())));

client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsElectronLoginDialog.java

@@ -35,6 +35,7 @@ public class BongaCamsElectronLoginDialog {
             config.put("url", site.getBaseUrl() + "/login");
             config.put("w", 640);
             config.put("h", 480);
+            config.put("userAgent", site.getHttpClient().getEffectiveUserAgent());
             var msg = new JSONObject();
             msg.put("config", config);
             browser.run(msg, msgHandler);

client/src/main/java/ctbrec/ui/sites/cam4/Cam4ElectronLoginDialog.java

@@ -20,6 +20,7 @@ import okhttp3.HttpUrl;
 public class Cam4ElectronLoginDialog {
     public static final String DOMAIN = "cam4.com";
     public static final String URL = Cam4.BASE_URI;
+    private Cam4 site;
     private CookieJar cookieJar;
     private ExternalBrowser browser;
 
@@ -27,7 +28,8 @@ public class Cam4ElectronLoginDialog {
     private boolean loginDialogOpened = false;
     private Thread loginChecker;
 
-    public Cam4ElectronLoginDialog(CookieJar cookieJar) throws IOException {
+    public Cam4ElectronLoginDialog(Cam4 site, CookieJar cookieJar) throws IOException {
+        this.site = site;
         this.cookieJar = cookieJar;
         browser = ExternalBrowser.getInstance();
         try {
@@ -35,6 +37,7 @@ public class Cam4ElectronLoginDialog {
             config.put("url", URL);
             config.put("w", 480);
             config.put("h", 640);
+            config.put("userAgent", site.getHttpClient().getEffectiveUserAgent());
             var msg = new JSONObject();
             msg.put("config", config);
             browser.run(msg, msgHandler);

client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java

@@ -44,7 +44,7 @@ public class Cam4SiteUi extends AbstractSiteUi {
         } else {
             // login with external browser
             try {
-                new Cam4ElectronLoginDialog(cam4.getHttpClient().getCookieJar());
+                new Cam4ElectronLoginDialog(cam4, cam4.getHttpClient().getCookieJar());
             } catch (Exception e1) {
                 log.error("Error logging in with external browser", e1);
                 Dialogs.showError("Login error", "Couldn't login to " + cam4.getName(), e1);

client/src/main/java/ctbrec/ui/sites/showup/ShowupElectronLoginDialog.java

@@ -5,7 +5,6 @@ import lombok.extern.slf4j.Slf4j;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.function.Consumer;
-
 import org.json.JSONObject;
 import ctbrec.Config;
 import ctbrec.sites.showup.Showup;
@@ -19,11 +18,13 @@ import okhttp3.HttpUrl;
 public class ShowupElectronLoginDialog {
     public static final String DOMAIN = "showup.tv";
     public static final String URL = Showup.BASE_URL;
+    private Showup site;
     private CookieJar cookieJar;
     private ExternalBrowser browser;
     private boolean firstCall = true;
 
-    public ShowupElectronLoginDialog(CookieJar cookieJar) throws IOException {
+    public ShowupElectronLoginDialog(Showup site, CookieJar cookieJar) throws IOException {
+        this.site = site;
         this.cookieJar = cookieJar;
         browser = ExternalBrowser.getInstance();
         try {
@@ -31,7 +32,7 @@ public class ShowupElectronLoginDialog {
             config.put("url", URL);
             config.put("w", 640);
             config.put("h", 480);
-            config.put("userAgent", Config.getInstance().getSettings().httpUserAgent);
+            config.put("userAgent", site.getHttpClient().getEffectiveUserAgent());
             var msg = new JSONObject();
             msg.put("config", config);
             browser.run(msg, msgHandler);

client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java

@@ -44,7 +44,7 @@ public class ShowupSiteUi extends AbstractSiteUi {
         } else {
             // login with external browser window
             try {
-                new ShowupElectronLoginDialog(site.getHttpClient().getCookieJar());
+                new ShowupElectronLoginDialog(site, site.getHttpClient().getCookieJar());
             } catch (Exception e1) {
                 log.error("Error logging in with external browser", e1);
                 Dialogs.showError("Login error", "Couldn't login to " + site.getName(), e1);

client/src/main/java/ctbrec/ui/sites/streamray/StreamrayElectronLoginDialog.java

@@ -18,17 +18,19 @@ import java.util.function.Consumer;
 public class StreamrayElectronLoginDialog {
 
     public static final String DOMAIN = "streamray.com";
+    private Streamray site;
     private CookieJar cookieJar;
 
 
-    public StreamrayElectronLoginDialog(CookieJar cookieJar) throws IOException {
+    public StreamrayElectronLoginDialog(Streamray site, CookieJar cookieJar) throws IOException {
+        this.site = site;
         this.cookieJar = cookieJar;
         try (ExternalBrowser browser = ExternalBrowser.getInstance()) {
             var config = new JSONObject();
             config.put("url", Streamray.BASE_URI);
             config.put("w", 800);
             config.put("h", 600);
-            config.put("userAgent", Config.getInstance().getSettings().httpUserAgent);
+            config.put("userAgent", site.getHttpClient().getEffectiveUserAgent());
             var msg = new JSONObject();
             msg.put("config", config);
             browser.run(msg, msgHandler);

client/src/main/java/ctbrec/ui/sites/streamray/StreamrayFavoritesTab.java

@@ -31,7 +31,7 @@ public class StreamrayFavoritesTab extends ThumbOverviewTab implements FollowedT
         loginButton.setPadding(new Insets(20));
         loginButton.setOnAction(e -> {
             try {
-                new StreamrayElectronLoginDialog(site.getHttpClient().getCookieJar());
+                new StreamrayElectronLoginDialog(site, site.getHttpClient().getCookieJar());
                 queue.clear();
                 updateService.restart();
             } catch (Exception ex) {

client/src/main/java/ctbrec/ui/sites/stripchat/StripchatElectronLoginDialog.java

@@ -18,10 +18,12 @@ import java.util.function.Consumer;
 public class StripchatElectronLoginDialog {
     public static final String DOMAIN = Stripchat.getDomain();
     public static final String URL = Stripchat.getBaseUri();
+    private Stripchat site;
     private CookieJar cookieJar;
     private ExternalBrowser browser;
 
-    public StripchatElectronLoginDialog(CookieJar cookieJar) throws IOException {
+    public StripchatElectronLoginDialog(Stripchat site, CookieJar cookieJar) throws IOException {
+        this.site = site;
         this.cookieJar = cookieJar;
         browser = ExternalBrowser.getInstance();
         try {
@@ -29,6 +31,7 @@ public class StripchatElectronLoginDialog {
             config.put("url", URL);
             config.put("w", 640);
             config.put("h", 640);
+            config.put("userAgent", site.getHttpClient().getEffectiveUserAgent());
             var msg = new JSONObject();
             msg.put("config", config);
             browser.run(msg, msgHandler);

client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java

@@ -45,7 +45,7 @@ public class StripchatSiteUi extends AbstractSiteUi {
         } else {
             // login with external browser
             try {
-                new StripchatElectronLoginDialog(site.getHttpClient().getCookieJar());
+                new StripchatElectronLoginDialog(site, site.getHttpClient().getCookieJar());
             } catch (Exception e1) {
                 log.error("Error logging in with external browser", e1);
                 Dialogs.showError("Login error", "Couldn't login to " + site.getName(), e1);

common/pom.xml

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

master/pom.xml

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

server/pom.xml

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