From: Niki Roo Date: Tue, 12 May 2020 10:06:45 +0000 (+0200) Subject: JsonIO: fix missing fields from MetaData X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=2a5c763d4d754c23bd65ed61fb47e35b62bdd3aa;p=fanfix.git JsonIO: fix missing fields from MetaData --- diff --git a/data/JsonIO.java b/data/JsonIO.java index 1f70f0a..5157dca 100644 --- a/data/JsonIO.java +++ b/data/JsonIO.java @@ -31,6 +31,8 @@ public class JsonIO { put(json, "subject", meta.getSubject()); put(json, "type", meta.getType()); put(json, "uuid", meta.getUuid()); + put(json, "fake_cover", meta.isFakeCover()); + put(json, "image_document", meta.isImageDocument()); put(json, "resume", toJson(meta.getResume())); put(json, "tags", new JSONArray(meta.getTags())); @@ -68,6 +70,8 @@ public class JsonIO { meta.setSubject(getString(json, "subject")); meta.setType(getString(json, "type")); meta.setUuid(getString(json, "uuid")); + meta.setFakeCover(getBoolean(json, "fake_cover", false)); + meta.setImageDocument(getBoolean(json, "image_document", false)); meta.setResume(toChapter(getJson(json, "resume"))); meta.setTags(toListString(getJsonArr(json, "tags"))); @@ -260,6 +264,17 @@ public class JsonIO { return def; } + static boolean getBoolean(JSONObject json, String key, boolean def) { + if (json.has(key)) { + Object o = json.get(key); + if (o instanceof Boolean) { + return (Boolean) o; + } + } + + return def; + } + static int getInt(JSONObject json, String key, int def) { if (json.has(key)) { Object o = json.get(key);