From: Niki Roo <niki@nikiroo.be>
Date: Tue, 12 May 2020 10:07:16 +0000 (+0200)
Subject: Merge branch 'subtree'
X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=commitdiff_plain;h=c5e988207e92ec4ec39212012e4c31f0e02f06ec;hp=-c

Merge branch 'subtree'
---

c5e988207e92ec4ec39212012e4c31f0e02f06ec
diff --combined src/be/nikiroo/fanfix/data/JsonIO.java
index 1f70f0a,5157dca..5157dca
--- a/src/be/nikiroo/fanfix/data/JsonIO.java
+++ b/src/be/nikiroo/fanfix/data/JsonIO.java
@@@ -31,6 -31,8 +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 +70,8 @@@
  		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 +264,17 @@@
  		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);