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:acbcd6eef355363883c6b7abbcc5fa1ef31fed22
Branches Tags
jafea7:master
jafea7:experimental
jafea7:v25.9.13
jafea7:v25.9.10
jafea7:v25.8.31
jafea7:v25.05.29
..
compare: jafea7:5731d80f7feff09b6837520fa1aaff9a479f0666
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. "acbcd6eef355363883c6b7abbcc5fa1ef31fed22" and "5731d80f7feff09b6837520fa1aaff9a479f0666" have entirely different histories.
acbcd6eef3 ... 5731d80f7f

15 changed files with 16 additions and 31 deletions
Show Stats Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -11,18 +11,11 @@ If this version doesn't do what you want, don't use it ... simple.
Changes from 0xb00bface's v5.3.0 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
* Implement CheckURL dialog from WinkRU v5.0.24
* Implemnt CheckURL dialog from WinkRU v5.0.24
25.09.10 (fix stream playback)
========================

2
client/pom.xml
View File

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

4
client/src/main/java/ctbrec/ui/settings/CreateContactSheetPaneFactory.java
View File

@ -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, "2"));
var padding = new SimpleStringProperty(null, PADDING, pp.getConfig().getOrDefault(PADDING, "4"));
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, "$sanitize${modelName}_$format(${localDateTime},yyyyMMdd-HHmmss).jpg"));
var filename = new SimpleStringProperty(null, FILENAME, pp.getConfig().getOrDefault(FILENAME, "contactsheet.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())));

2
client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsElectronLoginDialog.java
View File

@ -13,6 +13,7 @@ import org.json.JSONObject;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
// import java.net.URL;
import java.net.URISyntaxException;
import java.util.Collections;
import java.util.Objects;
@ -34,7 +35,6 @@ public class BongaCamsElectronLoginDialog {
config.put("url", site.getBaseUrl() + "/login");
config.put("w", 640);
config.put("h", 480);
config.put("userAgent", Config.getInstance().getSettings().httpUserAgent);
var msg = new JSONObject();
msg.put("config", config);
browser.run(msg, msgHandler);

5
client/src/main/java/ctbrec/ui/sites/cam4/Cam4ElectronLoginDialog.java
View File

@ -21,7 +21,6 @@ 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;
@ -29,8 +28,7 @@ public class Cam4ElectronLoginDialog {
private boolean loginDialogOpened = false;
private Thread loginChecker;
public Cam4ElectronLoginDialog(Cam4 site, CookieJar cookieJar) throws IOException {
this.site = site;
public Cam4ElectronLoginDialog(CookieJar cookieJar) throws IOException {
this.cookieJar = cookieJar;
browser = ExternalBrowser.getInstance();
try {
@ -38,7 +36,6 @@ public class Cam4ElectronLoginDialog {
config.put("url", URL);
config.put("w", 480);
config.put("h", 640);
config.put("userAgent", Config.getInstance().getSettings().httpUserAgent);
var msg = new JSONObject();
msg.put("config", config);
browser.run(msg, msgHandler);

2
client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java
View File

@ -44,7 +44,7 @@ public class Cam4SiteUi extends AbstractSiteUi {
} else {
// login with external browser
try {
new Cam4ElectronLoginDialog(cam4, cam4.getHttpClient().getCookieJar());
new Cam4ElectronLoginDialog(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);

4
client/src/main/java/ctbrec/ui/sites/showup/ShowupElectronLoginDialog.java
View File

@ -20,13 +20,11 @@ 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(Showup site, CookieJar cookieJar) throws IOException {
this.site = site;
public ShowupElectronLoginDialog(CookieJar cookieJar) throws IOException {
this.cookieJar = cookieJar;
browser = ExternalBrowser.getInstance();
try {

2
client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java
View File

@ -45,7 +45,7 @@ public class ShowupSiteUi extends AbstractSiteUi {
} else {
// login with external browser window
try {
new ShowupElectronLoginDialog(site, site.getHttpClient().getCookieJar());
new ShowupElectronLoginDialog(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);

4
client/src/main/java/ctbrec/ui/sites/streamray/StreamrayElectronLoginDialog.java
View File

@ -18,12 +18,10 @@ import java.util.function.Consumer;
public class StreamrayElectronLoginDialog {
public static final String DOMAIN = "streamray.com";
private Streamray site;
private CookieJar cookieJar;
public StreamrayElectronLoginDialog(Streamray site, CookieJar cookieJar) throws IOException {
this.site = site;
public StreamrayElectronLoginDialog(CookieJar cookieJar) throws IOException {
this.cookieJar = cookieJar;
try (ExternalBrowser browser = ExternalBrowser.getInstance()) {
var config = new JSONObject();

2
client/src/main/java/ctbrec/ui/sites/streamray/StreamrayFavoritesTab.java
View File

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

3
client/src/main/java/ctbrec/ui/sites/stripchat/StripchatElectronLoginDialog.java
View File

@ -21,7 +21,7 @@ public class StripchatElectronLoginDialog {
private CookieJar cookieJar;
private ExternalBrowser browser;
public StripchatElectronLoginDialog(Stripchat site, CookieJar cookieJar) throws IOException {
public StripchatElectronLoginDialog(CookieJar cookieJar) throws IOException {
this.cookieJar = cookieJar;
browser = ExternalBrowser.getInstance();
try {
@ -29,7 +29,6 @@ public class StripchatElectronLoginDialog {
config.put("url", URL);
config.put("w", 640);
config.put("h", 640);
config.put("userAgent", Config.getInstance().getSettings().httpUserAgent);
var msg = new JSONObject();
msg.put("config", config);
browser.run(msg, msgHandler);

2
client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java
View File

@ -45,7 +45,7 @@ public class StripchatSiteUi extends AbstractSiteUi {
} else {
// login with external browser
try {
new StripchatElectronLoginDialog(site, site.getHttpClient().getCookieJar());
new StripchatElectronLoginDialog(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);

2
common/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>ctbrec</groupId>
<artifactId>master</artifactId>
<version>25.9.15</version>
<version>25.9.13</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.15</version>
<version>25.9.13</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.15</version>
<version>25.9.13</version>
<relativePath>../master</relativePath>
</parent>