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

Fix: MyFreeCams model state updates

This commit is contained in:
0xb00bface 2023-11-13 22:14:42 +01:00
parent f926f784b3
commit 3e038f7429
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java
View File

@ -1,10 +1,12 @@
package ctbrec.sites.mfc; package ctbrec.sites.mfc;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import ctbrec.Config; import ctbrec.Config;
import ctbrec.StringUtil; import ctbrec.StringUtil;
import ctbrec.io.HttpException; import ctbrec.io.HttpException;
import ctbrec.io.json.ObjectMapperFactory;
import okhttp3.*; import okhttp3.*;
import okio.ByteString; import okio.ByteString;
import org.json.JSONArray; import org.json.JSONArray;
@ -33,6 +35,8 @@ public class MyFreeCamsClient {
private static final Logger LOG = LoggerFactory.getLogger(MyFreeCamsClient.class); private static final Logger LOG = LoggerFactory.getLogger(MyFreeCamsClient.class);
private static final ObjectMapper objectMapper = ObjectMapperFactory.getMapper();
private static MyFreeCamsClient instance; private static MyFreeCamsClient instance;
private MyFreeCams mfc; private MyFreeCams mfc;
private WebSocket ws; private WebSocket ws;
@ -224,16 +228,14 @@ public class MyFreeCamsClient {
case MYWEBCAM: case MYWEBCAM:
case JOINCHAN: case JOINCHAN:
case SESSIONSTATE: case SESSIONSTATE:
// if (!message.getMessage().isEmpty()) { if (!message.getMessage().isEmpty()) {
// //LOG.debug("SessionState: {}", message.getMessage()); try {
// JsonAdapter<SessionState> adapter = moshi.adapter(SessionState.class); SessionState sessionState = objectMapper.readValue(message.getMessage(), SessionState.class);
// try { updateSessionState(sessionState);
// SessionState sessionState = adapter.fromJson(message.getMessage()); } catch (IOException e) {
// updateSessionState(sessionState); LOG.error("Couldn't parse session state message {}", message, e);
// } catch (IOException e) { }
// LOG.error("Couldn't parse session state message {}", message, e); }
// }
// }
break; break;
case USERNAMELOOKUP: case USERNAMELOOKUP:
// LOG.debug("{}", message.getType()); // LOG.debug("{}", message.getType());
@ -675,14 +677,12 @@ public class MyFreeCamsClient {
LOG.trace("Search result: {}", msg); LOG.trace("Search result: {}", msg);
if (StringUtil.isNotBlank(msg.getMessage()) && !Objects.equals(msg.getMessage(), q)) { if (StringUtil.isNotBlank(msg.getMessage()) && !Objects.equals(msg.getMessage(), q)) {
JSONObject json = new JSONObject(msg.getMessage()); JSONObject json = new JSONObject(msg.getMessage());
try {
// JsonAdapter<SessionState> adapter = moshi.adapter(SessionState.class); SessionState sessionState = Objects.requireNonNull(objectMapper.readValue(msg.getMessage(), SessionState.class));
// try { updateSessionState(sessionState);
// SessionState sessionState = Objects.requireNonNull(adapter.fromJson(msg.getMessage())); } catch (Exception e) {
// updateSessionState(sessionState); LOG.error("Couldn't parse session state message {}", msg, e);
// } catch (Exception e) { }
// LOG.error("Couldn't parse session state message {}", msg, e);
// }
String name = json.getString("nm"); String name = json.getString("nm");
MyFreeCamsModel model = mfc.createModel(name); MyFreeCamsModel model = mfc.createModel(name);