ctbrecuser
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Fix Stripchat followed tab

This commit is contained in:
0xb00bface 2020-07-29 20:20:45 +02:00
parent e2fdda32db
commit 48964cc85f
2 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/src/main/java/ctbrec/ui/sites/stripchat/StripchatFollowedTab.java
View File

@ -4,14 +4,10 @@ import ctbrec.sites.stripchat.Stripchat;
import ctbrec.ui.tabs.FollowedTab; import ctbrec.ui.tabs.FollowedTab;
import ctbrec.ui.tabs.ThumbOverviewTab; import ctbrec.ui.tabs.ThumbOverviewTab;
import javafx.concurrent.WorkerStateEvent; import javafx.concurrent.WorkerStateEvent;
import javafx.geometry.Insets;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.RadioButton;
import javafx.scene.control.ToggleGroup;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent; import javafx.scene.input.KeyEvent;
import javafx.scene.layout.HBox;
public class StripchatFollowedTab extends ThumbOverviewTab implements FollowedTab { public class StripchatFollowedTab extends ThumbOverviewTab implements FollowedTab {
private Label status; private Label status;
@ -26,25 +22,6 @@ public class StripchatFollowedTab extends ThumbOverviewTab implements FollowedTa
@Override @Override
protected void createGui() { protected void createGui() {
super.createGui(); super.createGui();
addOnlineOfflineSelector();
}
private void addOnlineOfflineSelector() {
ToggleGroup group = new ToggleGroup();
RadioButton online = new RadioButton("online");
online.setToggleGroup(group);
RadioButton offline = new RadioButton("offline");
offline.setToggleGroup(group);
pagination.getChildren().add(online);
pagination.getChildren().add(offline);
HBox.setMargin(online, new Insets(5, 5, 5, 40));
HBox.setMargin(offline, new Insets(5, 5, 5, 5));
online.setSelected(true);
group.selectedToggleProperty().addListener(e -> {
queue.clear();
((StripchatFollowedUpdateService)updateService).showOnline(online.isSelected());
updateService.restart();
});
} }
@Override @Override

36
client/src/main/java/ctbrec/ui/sites/stripchat/StripchatFollowedUpdateService.java
View File

@ -4,8 +4,8 @@ import static ctbrec.io.HttpConstants.*;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
@ -24,8 +24,8 @@ import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
public class StripchatFollowedUpdateService extends PaginatedScheduledService { public class StripchatFollowedUpdateService extends PaginatedScheduledService {
private static final int PAGE_SIZE = 30;
private Stripchat stripchat; private Stripchat stripchat;
private boolean showOnline = true;
public StripchatFollowedUpdateService(Stripchat stripchat) { public StripchatFollowedUpdateService(Stripchat stripchat) {
this.stripchat = stripchat; this.stripchat = stripchat;
@ -36,16 +36,27 @@ public class StripchatFollowedUpdateService extends PaginatedScheduledService {
return new Task<List<Model>>() { return new Task<List<Model>>() {
@Override @Override
public List<Model> call() throws IOException { public List<Model> call() throws IOException {
int startIndex = (getPage() - 1) * PAGE_SIZE;
JSONArray favoriteModelIds = loadFavoriteModelIds(); JSONArray favoriteModelIds = loadFavoriteModelIds();
List<Model> models = loadModels(favoriteModelIds); List<Integer> modelIdsToLoad = new ArrayList<>(PAGE_SIZE);
List<Model> models;
if (startIndex < favoriteModelIds.length()) {
int modelsOnPage = Math.min(PAGE_SIZE, favoriteModelIds.length() - startIndex - 1);
for (int i = 0; i < modelsOnPage; i++) {
modelIdsToLoad.add(favoriteModelIds.getInt(startIndex + i));
}
models = loadModels(modelIdsToLoad);
} else {
models = Collections.emptyList();
}
return models; return models;
} }
private List<Model> loadModels(JSONArray favoriteModelIds) throws IOException { private List<Model> loadModels(List<Integer> modelIdsToLoad) throws IOException {
List<Model> models = new ArrayList<>(); List<Model> models = new ArrayList<>();
HttpUrl.Builder urlBuilder = HttpUrl.parse(stripchat.getBaseUrl() + "/api/front/models/list").newBuilder(); HttpUrl.Builder urlBuilder = HttpUrl.parse(stripchat.getBaseUrl() + "/api/front/models/list").newBuilder();
for (int i = 0; i < favoriteModelIds.length(); i++) { for (int i = 0; i < modelIdsToLoad.size(); i++) {
urlBuilder.addQueryParameter("modelIds["+i+"]", Integer.toString(favoriteModelIds.getInt(i))); urlBuilder.addQueryParameter("modelIds["+i+"]", modelIdsToLoad.get(i).toString());
} }
Request request = new Request.Builder() Request request = new Request.Builder()
.url(urlBuilder.build()) .url(urlBuilder.build())
@ -64,10 +75,7 @@ public class StripchatFollowedUpdateService extends PaginatedScheduledService {
StripchatModel model = stripchat.createModel(user.optString("username")); StripchatModel model = stripchat.createModel(user.optString("username"));
model.setDescription(user.optString("description")); model.setDescription(user.optString("description"));
model.setPreview(user.optString("previewUrlThumbBig")); model.setPreview(user.optString("previewUrlThumbBig"));
boolean online = Objects.equals(user.optString("status"), "public"); models.add(model);
if (showOnline == online) {
models.add(model);
}
} }
} }
} else { } else {
@ -93,8 +101,8 @@ public class StripchatFollowedUpdateService extends PaginatedScheduledService {
try (Response response = stripchat.getHttpClient().execute(request)) { try (Response response = stripchat.getHttpClient().execute(request)) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
JSONObject json = new JSONObject(response.body().string()); JSONObject json = new JSONObject(response.body().string());
if(json.has("userIds")) { if (json.has("modelIds")) {
JSONArray userIds = json.getJSONArray("userIds"); JSONArray userIds = json.getJSONArray("modelIds");
return userIds; return userIds;
} else { } else {
return new JSONArray(); return new JSONArray();
@ -106,8 +114,4 @@ public class StripchatFollowedUpdateService extends PaginatedScheduledService {
} }
}; };
} }
void showOnline(boolean online) {
this.showOnline = online;
}
} }