git://git.nikiroo.be
/
nikiroo-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f3591bd
)
JsonIO: fix missing fields from MetaData
author
Niki Roo
<niki@nikiroo.be>
Tue, 12 May 2020 10:06:45 +0000
(12:06 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Tue, 12 May 2020 10:06:45 +0000
(12:06 +0200)
data/JsonIO.java
patch
|
blob
|
blame
|
history
diff --git
a/data/JsonIO.java
b/data/JsonIO.java
index 1f70f0a89adef193e3a5b43fcd719952e49fc4fa..5157dca3156a2a88eada47cabaa080191d6bb2c1 100644
(file)
--- 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, "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()));
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.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")));
meta.setResume(toChapter(getJson(json, "resume")));
meta.setTags(toListString(getJsonArr(json, "tags")));
@@
-260,6
+264,17
@@
public class JsonIO {
return def;
}
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);
static int getInt(JSONObject json, String key, int def) {
if (json.has(key)) {
Object o = json.get(key);