From 8b66dce61af02abe70c7c10afd630df49d220a2c Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Sat, 5 Dec 2020 16:13:56 +0100 Subject: [PATCH] Rename chaturbate username and password setting --- .../ui/sites/chaturbate/ChaturbateConfigUi.java | 12 ++++++------ .../ui/sites/chaturbate/ChaturbateUpdateService.java | 3 +-- common/src/main/java/ctbrec/Config.java | 11 +++++++++++ common/src/main/java/ctbrec/Settings.java | 9 +++++++-- .../java/ctbrec/sites/chaturbate/Chaturbate.java | 4 ++-- .../sites/chaturbate/ChaturbateHttpClient.java | 6 +++--- 6 files changed, 30 insertions(+), 15 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateConfigUi.java b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateConfigUi.java index 791b1fd1..445d3a77 100644 --- a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateConfigUi.java +++ b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateConfigUi.java @@ -45,10 +45,10 @@ public class ChaturbateConfigUi extends AbstractConfigUI { layout.add(enabled, 1, row++); layout.add(new Label("Chaturbate User"), 0, row); - TextField username = new TextField(Config.getInstance().getSettings().username); + TextField username = new TextField(Config.getInstance().getSettings().chaturbateUsername); username.textProperty().addListener((ob, o, n) -> { - if(!n.equals(Config.getInstance().getSettings().username)) { - Config.getInstance().getSettings().username = n; + if(!n.equals(Config.getInstance().getSettings().chaturbateUsername)) { + Config.getInstance().getSettings().chaturbateUsername = n; chaturbate.getHttpClient().logout(); save(); } @@ -60,10 +60,10 @@ public class ChaturbateConfigUi extends AbstractConfigUI { layout.add(new Label("Chaturbate Password"), 0, row); PasswordField password = new PasswordField(); - password.setText(Config.getInstance().getSettings().password); + password.setText(Config.getInstance().getSettings().chaturbatePassword); password.textProperty().addListener((ob, o, n) -> { - if(!n.equals(Config.getInstance().getSettings().password)) { - Config.getInstance().getSettings().password = n; + if(!n.equals(Config.getInstance().getSettings().chaturbatePassword)) { + Config.getInstance().getSettings().chaturbatePassword = n; chaturbate.getHttpClient().logout(); save(); } diff --git a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateUpdateService.java b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateUpdateService.java index cddd8d17..5fbcd63f 100644 --- a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateUpdateService.java @@ -11,7 +11,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ctbrec.Model; -import ctbrec.StringUtil; import ctbrec.sites.chaturbate.Chaturbate; import ctbrec.sites.chaturbate.ChaturbateModelParser; import ctbrec.ui.SiteUiFactory; @@ -49,7 +48,7 @@ public class ChaturbateUpdateService extends PaginatedScheduledService { return new Task>() { @Override public List call() throws IOException { - if(loginRequired && StringUtil.isBlank(ctbrec.Config.getInstance().getSettings().username)) { + if(loginRequired && !chaturbate.credentialsAvailable()) { return Collections.emptyList(); } else { String url = ChaturbateUpdateService.this.url + "?page="+page+"&keywords=&_=" + System.currentTimeMillis(); diff --git a/common/src/main/java/ctbrec/Config.java b/common/src/main/java/ctbrec/Config.java index 2cbc8ce5..d4709ded 100644 --- a/common/src/main/java/ctbrec/Config.java +++ b/common/src/main/java/ctbrec/Config.java @@ -102,6 +102,7 @@ public class Config { migrateOldSettings(); } + @SuppressWarnings("deprecation") private void migrateOldSettings() { // 3.8.0 from maxResolution only to resolution range if(settings.minimumResolution == settings.maximumResolution && settings.minimumResolution == 0) { @@ -128,6 +129,16 @@ public class Config { settings.postProcessors.add(removeKeepFile); settings.removeRecordingAfterPostProcessing = false; } + + // 3.10.7 + if (StringUtil.isNotBlank(settings.username)) { + settings.chaturbateUsername = settings.username; + settings.username = null; + } + if (StringUtil.isNotBlank(settings.password)) { + settings.chaturbatePassword = settings.password; + settings.password = null; + } } private void makeBackup(File source) { diff --git a/common/src/main/java/ctbrec/Settings.java b/common/src/main/java/ctbrec/Settings.java index fc67ce73..355a75c5 100644 --- a/common/src/main/java/ctbrec/Settings.java +++ b/common/src/main/java/ctbrec/Settings.java @@ -41,6 +41,8 @@ public class Settings { public String cam4Username = ""; public String camsodaPassword = ""; public String camsodaUsername = ""; + public String chaturbatePassword = ""; + public String chaturbateUsername = ""; public String chaturbateBaseUrl = "https://chaturbate.com"; public boolean chooseStreamQuality = false; public String colorAccent = "#FFFFFF"; @@ -93,7 +95,9 @@ public class Settings { public int onlineCheckIntervalInSecs = 60; public boolean onlineCheckSkipsPausedModels = false; public int overviewUpdateIntervalInSecs = 10; - public String password = ""; // chaturbate password TODO maybe rename this onetime + @Deprecated + public String password = ""; + @Deprecated public String postProcessing = ""; public int postProcessingThreads = 2; public List postProcessors = new ArrayList<>(); @@ -130,7 +134,8 @@ public class Settings { public boolean transportLayerSecurity = true; public int thumbWidth = 180; public boolean updateThumbnails = true; - public String username = ""; // chaturbate username TODO maybe rename this onetime + @Deprecated + public String username = ""; public int windowHeight = 800; public boolean windowMaximized = false; public int windowWidth = 1340; diff --git a/common/src/main/java/ctbrec/sites/chaturbate/Chaturbate.java b/common/src/main/java/ctbrec/sites/chaturbate/Chaturbate.java index 8b2f087a..197c03a8 100644 --- a/common/src/main/java/ctbrec/sites/chaturbate/Chaturbate.java +++ b/common/src/main/java/ctbrec/sites/chaturbate/Chaturbate.java @@ -56,7 +56,7 @@ public class Chaturbate extends AbstractSite { @Override public Double getTokenBalance() throws IOException { - String username = Config.getInstance().getSettings().username; + String username = Config.getInstance().getSettings().chaturbateUsername; if (username == null || username.trim().isEmpty()) { throw new IOException("Not logged in"); } @@ -157,7 +157,7 @@ public class Chaturbate extends AbstractSite { @Override public boolean credentialsAvailable() { - String username = Config.getInstance().getSettings().username; + String username = Config.getInstance().getSettings().chaturbateUsername; return username != null && !username.trim().isEmpty(); } diff --git a/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateHttpClient.java b/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateHttpClient.java index e48671f1..9084018a 100644 --- a/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateHttpClient.java +++ b/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateHttpClient.java @@ -67,8 +67,8 @@ public class ChaturbateHttpClient extends HttpClient { LOG.debug("csrf token is {}", token); RequestBody body = new FormBody.Builder() - .add("username", Config.getInstance().getSettings().username) - .add("password", Config.getInstance().getSettings().password) + .add("username", Config.getInstance().getSettings().chaturbateUsername) + .add("password", Config.getInstance().getSettings().chaturbatePassword) .add("next", "") .add("csrfmiddlewaretoken", token) .build(); @@ -103,7 +103,7 @@ public class ChaturbateHttpClient extends HttpClient { } private boolean checkLogin() throws IOException { - String url = "https://chaturbate.com/p/" + Config.getInstance().getSettings().username + "/"; + String url = "https://chaturbate.com/p/" + Config.getInstance().getSettings().chaturbateUsername + "/"; Request req = new Request.Builder() .url(url) .header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)