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

Fix LiveJasmin Followed tab

This commit is contained in:
0xb00bface 2022-02-19 15:21:55 +01:00
parent 83d6fd526e
commit 26bf338807
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminFollowedUpdateService.java
View File

@ -1,19 +1,5 @@
package ctbrec.ui.sites.jasmin; package ctbrec.ui.sites.jasmin;
import static ctbrec.io.HttpConstants.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.Future;
import org.json.JSONArray;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ctbrec.Config; import ctbrec.Config;
import ctbrec.GlobalThreadPool; import ctbrec.GlobalThreadPool;
import ctbrec.Model; import ctbrec.Model;
@ -26,12 +12,25 @@ import javafx.concurrent.Task;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import org.json.JSONArray;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.Future;
import static ctbrec.io.HttpConstants.*;
public class LiveJasminFollowedUpdateService extends PaginatedScheduledService { public class LiveJasminFollowedUpdateService extends PaginatedScheduledService {
private static final Logger LOG = LoggerFactory.getLogger(LiveJasminFollowedUpdateService.class); private static final Logger LOG = LoggerFactory.getLogger(LiveJasminFollowedUpdateService.class);
private LiveJasmin liveJasmin; private final LiveJasmin liveJasmin;
private String url; private final String url;
private boolean showOnline = true; private boolean showOnline = true;
public LiveJasminFollowedUpdateService(LiveJasmin liveJasmin) { public LiveJasminFollowedUpdateService(LiveJasmin liveJasmin) {
@ -41,15 +40,15 @@ public class LiveJasminFollowedUpdateService extends PaginatedScheduledService {
@Override @Override
protected Task<List<Model>> createTask() { protected Task<List<Model>> createTask() {
return new Task<List<Model>>() { return new Task<>() {
@Override @Override
public List<Model> call() throws IOException { public List<Model> call() throws IOException {
if(!liveJasmin.credentialsAvailable()) { if (!liveJasmin.credentialsAvailable()) {
throw new RuntimeException("Credentials missing"); throw new RuntimeException("Credentials missing");
} }
boolean loggedIn = SiteUiFactory.getUi(liveJasmin).login(); boolean loggedIn = SiteUiFactory.getUi(liveJasmin).login();
if(!loggedIn) { if (!loggedIn) {
throw new RuntimeException("Couldn't login to livejasmin"); throw new RuntimeException("Couldn't login to livejasmin");
} }
Request request = new Request.Builder() Request request = new Request.Builder()
@ -77,7 +76,7 @@ public class LiveJasminFollowedUpdateService extends PaginatedScheduledService {
} }
LiveJasminModel model = (LiveJasminModel) liveJasmin.createModel(name); LiveJasminModel model = (LiveJasminModel) liveJasmin.createModel(name);
model.setId(m.getString("id")); model.setId(String.valueOf(m.get("id")));
model.setDisplayName(m.getString("display_name")); model.setDisplayName(m.getString("display_name"));
Model.State onlineState = LiveJasminModel.mapStatus(m.getInt("status")); Model.State onlineState = LiveJasminModel.mapStatus(m.getInt("status"));
boolean online = onlineState == Model.State.ONLINE; boolean online = onlineState == Model.State.ONLINE;
@ -85,9 +84,7 @@ public class LiveJasminFollowedUpdateService extends PaginatedScheduledService {
if (online == showOnline) { if (online == showOnline) {
models.add(model); models.add(model);
} }
loadDetailsFutures.add(GlobalThreadPool.submit(() -> { loadDetailsFutures.add(GlobalThreadPool.submit(() -> loadModelDetails(model)));
loadModelDetails(model);
}));
} }
for (Future<?> future : loadDetailsFutures) { for (Future<?> future : loadDetailsFutures) {
try { try {
@ -130,7 +127,7 @@ public class LiveJasminFollowedUpdateService extends PaginatedScheduledService {
} }
} }
} }
} catch(IOException e) { } catch (IOException e) {
// details couldn't be loaded, but that doesn't matter // details couldn't be loaded, but that doesn't matter
} }
} }