jafea7
/
ctbrec-5.3.2-experimental
mirror of https://github.com/Jafea7/ctbrec-5.3.2-original.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If loading site specific fails, print out the model name

This commit is contained in:
0xboobface 2018-12-17 17:13:54 +01:00
parent 9958e04ef8
commit 8a8327a2a5
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/ctbrec/io/ModelJsonAdapter.java
View File

@ -5,6 +5,9 @@ import java.lang.reflect.InvocationTargetException;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.JsonAdapter;
import com.squareup.moshi.JsonReader; import com.squareup.moshi.JsonReader;
import com.squareup.moshi.JsonReader.Token; import com.squareup.moshi.JsonReader.Token;
@ -16,6 +19,8 @@ import ctbrec.sites.chaturbate.ChaturbateModel;
public class ModelJsonAdapter extends JsonAdapter<Model> { public class ModelJsonAdapter extends JsonAdapter<Model> {
private static final transient Logger LOG = LoggerFactory.getLogger(ModelJsonAdapter.class);
private List<Site> sites; private List<Site> sites;
public ModelJsonAdapter() { public ModelJsonAdapter() {
@ -62,7 +67,12 @@ public class ModelJsonAdapter extends JsonAdapter<Model> {
model.setSuspended(suspended); model.setSuspended(suspended);
} else if(key.equals("siteSpecific")) { } else if(key.equals("siteSpecific")) {
reader.beginObject(); reader.beginObject();
try {
model.readSiteSpecificData(reader); model.readSiteSpecificData(reader);
} catch(Exception e) {
LOG.error("Couldn't read site specific data for model {}", model.getName());
throw e;
}
reader.endObject(); reader.endObject();
} }
} else { } else {