From 62602b552f76cc293ac8cd41b3ce825af597bd85 Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Fri, 1 Jan 2021 17:23:53 +0100 Subject: [PATCH] Remove a few code smells --- client/src/main/java/ctbrec/ui/settings/SettingsTab.java | 4 +--- .../java/ctbrec/ui/sites/fc2live/Fc2UpdateService.java | 2 +- common/src/main/java/ctbrec/recorder/RemoteRecorder.java | 9 +++------ .../ctbrec/recorder/download/hls/FFmpegDownload.java | 8 +++----- .../java/ctbrec/sites/streamate/StreamateHttpClient.java | 1 - .../main/java/ctbrec/sites/streamate/StreamateModel.java | 1 - .../java/ctbrec/sites/stripchat/StripchatHttpClient.java | 2 +- 7 files changed, 9 insertions(+), 18 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/settings/SettingsTab.java b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java index f12e525a..b3cebec2 100644 --- a/client/src/main/java/ctbrec/ui/settings/SettingsTab.java +++ b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java @@ -562,9 +562,7 @@ public class SettingsTab extends Tab implements TabSelectionListener { if (getClass() != obj.getClass()) return false; SplitBiggerThanOption other = (SplitBiggerThanOption) obj; - if (value != other.value) - return false; - return true; + return value != other.value; } public static ValueConverter converter() { diff --git a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2UpdateService.java b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2UpdateService.java index 0de1728b..6fc40fa4 100644 --- a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2UpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2UpdateService.java @@ -76,7 +76,7 @@ public class Fc2UpdateService extends PaginatedScheduledService { } return models.stream() .sorted((m1, m2) -> m2.getViewerCount() - m1.getViewerCount()) - .skip( (page - 1) * modelsPerPage) + .skip( (long)(page - 1) * modelsPerPage) .limit(modelsPerPage) .collect(Collectors.toList()); } else { diff --git a/common/src/main/java/ctbrec/recorder/RemoteRecorder.java b/common/src/main/java/ctbrec/recorder/RemoteRecorder.java index a7b7ea0a..388828d1 100644 --- a/common/src/main/java/ctbrec/recorder/RemoteRecorder.java +++ b/common/src/main/java/ctbrec/recorder/RemoteRecorder.java @@ -211,7 +211,7 @@ public class RemoteRecorder implements Recorder { private static final String COULDNT_SYNCHRONIZE_WITH_SERVER = "Couldn't synchronize with server"; private static final String COULDNT_SYNCHRONIZE_WITH_SERVER_HTTP_STATUS = "Couldn't synchronize with server. HTTP status: {} - {}"; private volatile boolean running = false; - private static final long ONE_HUNDRED_MIB = 100 * 1024 * 1024; + private static final long ONE_HUNDRED_MIB = 100 * 1024 * 1024L; public SyncThread() { setName("RemoteRecorder SyncThread"); @@ -375,11 +375,8 @@ public class RemoteRecorder implements Recorder { for (Site site : sites) { for (Recording recording : recordings) { Model m = recording.getModel(); - if (m.getSite() == null) { - if (site.isSiteForModel(m)) { - m.setSite(site); - continue; - } + if (m.getSite() == null && site.isSiteForModel(m)) { + m.setSite(site); } } } diff --git a/common/src/main/java/ctbrec/recorder/download/hls/FFmpegDownload.java b/common/src/main/java/ctbrec/recorder/download/hls/FFmpegDownload.java index cdad907d..0ad3ee11 100644 --- a/common/src/main/java/ctbrec/recorder/download/hls/FFmpegDownload.java +++ b/common/src/main/java/ctbrec/recorder/download/hls/FFmpegDownload.java @@ -35,7 +35,6 @@ import ctbrec.recorder.download.ProcessExitedUncleanException; public class FFmpegDownload extends AbstractHlsDownload { private static final transient Logger LOG = LoggerFactory.getLogger(FFmpegDownload.class); - private transient Config config; private transient Process ffmpeg; private File targetFile; @@ -44,10 +43,8 @@ public class FFmpegDownload extends AbstractHlsDownload { } @Override - public void init(Config config, Model model, Instant startTime, ExecutorService executorService) { - this.config = config; - this.model = model; - this.startTime = startTime; + public void init(Config config, Model model, Instant startTime, ExecutorService executorService) throws IOException { + super.init(config, model, startTime, executorService); String suffix = config.getSettings().ffmpegFileSuffix; targetFile = config.getFileForRecording(model, suffix, startTime); } @@ -122,6 +119,7 @@ public class FFmpegDownload extends AbstractHlsDownload { @Override public void postprocess(Recording recording) { + // nothing to here for now } @Override diff --git a/common/src/main/java/ctbrec/sites/streamate/StreamateHttpClient.java b/common/src/main/java/ctbrec/sites/streamate/StreamateHttpClient.java index 08c5425c..55ed1ca0 100644 --- a/common/src/main/java/ctbrec/sites/streamate/StreamateHttpClient.java +++ b/common/src/main/java/ctbrec/sites/streamate/StreamateHttpClient.java @@ -116,7 +116,6 @@ public class StreamateHttpClient extends HttpClient { String content = response.body().string(); if(response.isSuccessful()) { JSONObject json = new JSONObject(content); - //LOG.debug(json.toString(2)); loggedIn = json.has(SAKEY_KEY); saKey = json.optString(SAKEY_KEY); JSONObject account = json.getJSONObject("account"); diff --git a/common/src/main/java/ctbrec/sites/streamate/StreamateModel.java b/common/src/main/java/ctbrec/sites/streamate/StreamateModel.java index 43fe8ade..a2a8a477 100644 --- a/common/src/main/java/ctbrec/sites/streamate/StreamateModel.java +++ b/common/src/main/java/ctbrec/sites/streamate/StreamateModel.java @@ -93,7 +93,6 @@ public class StreamateModel extends AbstractModel { try (Response response = site.getHttpClient().execute(req)) { if (response.isSuccessful()) { JSONObject json = new JSONObject(response.body().string()); - //LOG.debug(json.toString(2)); JSONObject formats = json.getJSONObject("formats"); JSONObject hls = formats.getJSONObject("mp4-hls"); diff --git a/common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java b/common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java index 2b3fd2fe..11945c6e 100644 --- a/common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java +++ b/common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java @@ -117,7 +117,7 @@ public class StripchatHttpClient extends HttpClient { * @throws IOException */ public boolean checkLoginSuccess() throws IOException { - long userId = getUserId(); + userId = getUserId(); String url = Stripchat.baseUri + "/api/front/users/" + userId + "/favorites"; Request request = new Request.Builder() .url(url)