Compare commits

..

No commits in common. "9b0c911169a15480b4f402caf7ce4af3b52d2b04" and "af7c556283aec85172666b73901aec240978a2dc" have entirely different histories.

14 changed files with 12 additions and 91 deletions

View File

@ -11,13 +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.26
========================
* Added BongaCams URL entry warning
* Added model online detection for CGF search, sends name instead of image URL if offline
Note: Sending name for FC2 will fail to find matches (Japanese), DC cannot send URL to preview image (wrong mimetype).
* Implement PAC (Proxy Auto Configuration)
25.09.15
========================
* Add missing UserAgent parameter to minimal-browser call for some sites

View File

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

View File

@ -26,12 +26,6 @@
<filtered>true</filtered>
<destName>ctbrec-no-splash.sh</destName>
</file>
<file>
<source>${project.basedir}/src/assembly/pac.js</source>
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
<destName>pac.js</destName>
</file>
<file>
<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
<outputDirectory>ctbrec</outputDirectory>

View File

@ -26,12 +26,6 @@
<filtered>true</filtered>
<destName>ctbrec-no-splash.sh</destName>
</file>
<file>
<source>${project.basedir}/src/assembly/pac.js</source>
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
<destName>pac.js</destName>
</file>
<file>
<source>${project.build.directory}/${project.artifactId}-${project.version}.jar
</source>

View File

@ -1,9 +0,0 @@
function FindProxyForURL(url, host) {
if (shExpMatch(host, "*stripchat.com")) {
return "SOCKS 127.0.0.1:1080";
} else if (shExpMatch(host, "*chaturbate.com")) {
return "PROXY 127.0.0.1:8080";
} else {
return "DIRECT";
}
}

View File

@ -22,12 +22,6 @@
<source>${project.build.directory}/ctbrec-no-splash.exe</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.basedir}/src/assembly/pac.js</source>
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
<destName>pac.js</destName>
</file>
<file>
<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
<outputDirectory>ctbrec</outputDirectory>

View File

@ -83,7 +83,6 @@ public class SettingsTab extends Tab implements TabSelectionListener {
private SimpleStringProperty proxyPort;
private SimpleStringProperty proxyUser;
private SimpleStringProperty proxyPassword;
private SimpleStringProperty pacUrl;
private SimpleDirectoryProperty recordingsDir;
private SimpleListProperty<DirectoryStructure> directoryStructure;
private SimpleListProperty<SplitAfterOption> splitAfter;
@ -161,12 +160,11 @@ public class SettingsTab extends Tab implements TabSelectionListener {
maximumResolutionPlayer = new SimpleIntegerProperty(null, "maximumResolutionPlayer", settings.maximumResolutionPlayer);
showPlayerStarting = new SimpleBooleanProperty(null, "showPlayerStarting", settings.showPlayerStarting);
singlePlayer = new SimpleBooleanProperty(null, "singlePlayer", settings.singlePlayer);
proxyType = new SimpleListProperty<>(null, "proxyType", FXCollections.observableList(List.of(DIRECT, HTTP, SOCKS4, SOCKS5, PAC)));
proxyType = new SimpleListProperty<>(null, "proxyType", FXCollections.observableList(List.of(DIRECT, HTTP, SOCKS4, SOCKS5)));
proxyHost = new SimpleStringProperty(null, "proxyHost", settings.proxyHost);
proxyPort = new SimpleStringProperty(null, "proxyPort", settings.proxyPort);
proxyUser = new SimpleStringProperty(null, "proxyUser", settings.proxyUser);
proxyPassword = new SimpleStringProperty(null, "proxyPassword", settings.proxyPassword);
pacUrl = new SimpleStringProperty(null, "pacUrl", settings.pacUrl);
recordingsDir = new SimpleDirectoryProperty(null, "recordingsDir", settings.recordingsDir);
directoryStructure = new SimpleListProperty<>(null, "recordingsDirStructure",
FXCollections.observableList(List.of(FLAT, ONE_PER_MODEL, ONE_PER_GROUP, ONE_PER_RECORDING)));
@ -322,8 +320,7 @@ public class SettingsTab extends Tab implements TabSelectionListener {
Setting.of("Host", proxyHost).needsRestart(),
Setting.of("Port", proxyPort).needsRestart(),
Setting.of("Username", proxyUser).needsRestart(),
Setting.of("Password", proxyPassword).needsRestart(),
Setting.of("PAC URL", pacUrl, "URL to your Proxy Auto-Config (PAC) file (e.g. http://example.com/pac.js or file:///G:/path/to/pac.js)").needsRestart())),
Setting.of("Password", proxyPassword).needsRestart())),
Category.of("Advanced / Devtools",
Group.of("Networking",
Setting.of("Playlist request timeout (ms)", playlistRequestTimeout, "Timeout in ms for playlist requests")),

View File

@ -8,7 +8,7 @@
<parent>
<groupId>ctbrec</groupId>
<artifactId>master</artifactId>
<version>25.9.26</version>
<version>25.9.15</version>
<relativePath>../master</relativePath>
</parent>
@ -41,11 +41,6 @@
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<dependency>
<groupId>org.bidib.com.github.markusbernhardt</groupId>
<artifactId>proxy-vole</artifactId>
<version>1.1.6</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>

View File

@ -32,8 +32,7 @@ public class Settings {
DIRECT,
HTTP,
SOCKS4,
SOCKS5,
PAC
SOCKS5
}
public enum SplitStrategy {
@ -140,7 +139,6 @@ public class Settings {
public String proxyPort;
public ProxyType proxyType = ProxyType.DIRECT;
public String proxyUser;
public String pacUrl;
public boolean recentlyWatched = true;
public List<String> recordLaterTableColumnOrder = new ArrayList<>();
public Map<String, Boolean> recordLaterTableColumnVisibility = new HashMap<>();

View File

@ -1,8 +1,5 @@
package ctbrec.io;
import com.github.markusbernhardt.proxy.selector.pac.PacProxySelector;
import com.github.markusbernhardt.proxy.selector.pac.UrlPacScriptSource;
import com.fasterxml.jackson.core.type.TypeReference;
import ctbrec.Config;
import ctbrec.LoggingInterceptor;
@ -23,7 +20,6 @@ import java.io.File;
import java.io.IOException;
import java.net.Authenticator;
import java.net.PasswordAuthentication;
import java.net.ProxySelector;
import java.nio.file.Files;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
@ -94,18 +90,6 @@ public abstract class HttpClient {
Authenticator.setDefault(new SocksProxyAuth(username, password));
}
break;
case PAC:
String pacUrl = config.getSettings().pacUrl;
if (pacUrl != null && !pacUrl.isEmpty()) {
try {
UrlPacScriptSource pacSource = new UrlPacScriptSource(pacUrl);
ProxySelector pacSelector = new PacProxySelector(pacSource);
ProxySelector.setDefault(pacSelector);
} catch (Exception e) {
log.warn("Failed to load PAC file: {}", e.getMessage());
}
}
break;
case DIRECT:
default:
System.clearProperty(ProxyConstants.HTTP_PROXY_HOST);
@ -158,11 +142,11 @@ public abstract class HttpClient {
cacheSize = (long) config.getSettings().thumbCacheSize * 1024 * 1024;
Builder builder = new OkHttpClient.Builder()
.cookieJar(cookieJar)
.connectionPool(GLOBAL_HTTP_CONN_POOL)
.connectTimeout(config.getSettings().httpTimeout, TimeUnit.MILLISECONDS)
.readTimeout(config.getSettings().httpTimeout, TimeUnit.MILLISECONDS)
.addNetworkInterceptor(new LoggingInterceptor());
.cookieJar(cookieJar)
.connectionPool(GLOBAL_HTTP_CONN_POOL)
.connectTimeout(config.getSettings().httpTimeout, TimeUnit.MILLISECONDS)
.readTimeout(config.getSettings().httpTimeout, TimeUnit.MILLISECONDS)
.addNetworkInterceptor(new LoggingInterceptor());
if (cacheSize > 0) {
cache = HttpClientCacheProvider.getCache(config);
@ -171,10 +155,6 @@ public abstract class HttpClient {
}
}
if (config.getSettings().proxyType == ProxyType.PAC) {
builder.proxySelector(ProxySelector.getDefault());
}
ProxyType proxyType = config.getSettings().proxyType;
if (proxyType == ProxyType.HTTP) {
String username = config.getSettings().proxyUser;

View File

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

View File

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

View File

@ -1,9 +0,0 @@
function FindProxyForURL(url, host) {
if (shExpMatch(host, "*stripchat.com")) {
return "SOCKS 127.0.0.1:1080";
} else if (shExpMatch(host, "*chaturbate.com")) {
return "PROXY 127.0.0.1:8080";
} else {
return "DIRECT";
}
}

View File

@ -26,12 +26,6 @@
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>${project.basedir}/src/assembly/pac.js</source>
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
<destName>pac.js</destName>
</file>
<file>
<source>${project.basedir}/../CHANGELOG.md</source>
<outputDirectory>ctbrec</outputDirectory>