From 5c2c7f3477f2affd4cca1e57b2c74e7c82919e3c Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Fri, 6 May 2022 21:34:50 +0200 Subject: [PATCH] Fix loading of thumbnails for Stripchat --- .../stripchat/StripchatUpdateService.java | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatUpdateService.java b/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatUpdateService.java index f216f32c..1fbeb7f6 100644 --- a/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatUpdateService.java @@ -1,17 +1,5 @@ package ctbrec.ui.sites.stripchat; -import static ctbrec.io.HttpConstants.*; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Locale; - -import org.json.JSONObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import ctbrec.Config; import ctbrec.Model; import ctbrec.io.HttpException; @@ -21,14 +9,25 @@ import ctbrec.ui.SiteUiFactory; import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; +import org.json.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; + +import static ctbrec.io.HttpConstants.*; public class StripchatUpdateService extends PaginatedScheduledService { private static final Logger LOG = LoggerFactory.getLogger(StripchatUpdateService.class); - private String url; - private boolean loginRequired; - private Stripchat stripchat; + private final String url; + private final boolean loginRequired; + private final Stripchat stripchat; int modelsPerPage = 60; public StripchatUpdateService(String url, boolean loginRequired, Stripchat stripchat) { @@ -39,7 +38,7 @@ public class StripchatUpdateService extends PaginatedScheduledService { @Override protected Task> createTask() { - return new Task>() { + return new Task<>() { @Override public List call() throws IOException { if (loginRequired && !stripchat.credentialsAvailable()) { @@ -75,14 +74,14 @@ public class StripchatUpdateService extends PaginatedScheduledService { private List parseModels(String body) { List models = new ArrayList<>(); var json = new JSONObject(body); - if(json.has("models")) { + if (json.has("models")) { var jsonModels = json.getJSONArray("models"); for (var i = 0; i < jsonModels.length(); i++) { var jsonModel = jsonModels.getJSONObject(i); try { StripchatModel model = stripchat.createModel(jsonModel.getString("username")); model.setDescription(""); - model.setPreview(jsonModel.optString("snapshotUrl")); + model.setPreview(jsonModel.optString("previewUrlThumbBig")); model.setDisplayName(model.getName()); model.setOnlineState(Model.State.ONLINE); models.add(model);