JsonIO: fix longs

[nikiroo-utils.git] / data / JsonIO.java

diff --git a/data/JsonIO.java b/data/JsonIO.java
index fee60ce23a57b2b754fae7a1d01159af5eafb7d5..524f99a7da2de6a56c0d5ad8bc8de027efbaacdc 100644 (file)
--- a/data/JsonIO.java
+++ b/data/JsonIO.java
@@ -8,6 +8,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
+import be.nikiroo.utils.Progress;
 
 public class JsonIO {
        static public JSONObject toJson(MetaData meta) {
@@ -16,6 +17,7 @@ public class JsonIO {
                }
 
                JSONObject json = new JSONObject();
+
                put(json, "", MetaData.class.getName());
                put(json, "luid", meta.getLuid());
                put(json, "title", meta.getTitle());
@@ -30,6 +32,9 @@ 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()));
 
@@ -52,6 +57,7 @@ public class JsonIO {
                }
 
                MetaData meta = new MetaData();
+
                meta.setLuid(getString(json, "luid"));
                meta.setTitle(getString(json, "title"));
                meta.setAuthor(getString(json, "author"));
@@ -65,6 +71,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")));
@@ -105,7 +113,7 @@ public class JsonIO {
                }
 
                Story story = new Story();
-               story.setMeta(toMetaData(getJson(json,"meta")));
+               story.setMeta(toMetaData(getJson(json, "meta")));
                story.setChapters(toListChapter(getJsonArr(json, "chapters")));
 
                return story;
@@ -148,6 +156,7 @@ public class JsonIO {
                Chapter chap = new Chapter(getInt(json, "number", 0),
                                getString(json, "name"));
                chap.setWords(getLong(json, "words", 0));
+
                chap.setParagraphs(toListParagraph(getJsonArr(json, "paragraphs")));
 
                return chap;
@@ -160,11 +169,13 @@ public class JsonIO {
                }
 
                JSONObject json = new JSONObject();
+
                put(json, "", Paragraph.class.getName());
-               put(json, "type", para.getType());
                put(json, "content", para.getContent());
                put(json, "words", para.getWords());
 
+               put(json, "type", para.getType().toString());
+
                return json;
        }
 
@@ -190,11 +201,41 @@ public class JsonIO {
                return para;
        }
 
+       // no children included
+       static public JSONObject toJson(Progress pg) {
+               if (pg == null) {
+                       return null;
+               }
+
+               JSONObject json = new JSONObject();
+
+               put(json, "", Progress.class.getName());
+               put(json, "name", pg.getName());
+               put(json, "min", pg.getMin());
+               put(json, "max", pg.getMax());
+               put(json, "progress", pg.getProgress());
+
+               return json;
+       }
+
+       // no children included
+       static public Progress toProgress(JSONObject json) {
+               if (json == null) {
+                       return null;
+               }
+
+               Progress pg = new Progress(getString(json, "name"),
+                               getInt(json, "min", 0), getInt(json, "max", 100));
+               pg.setProgress(getInt(json, "progress", 0));
+
+               return pg;
+       }
+
        static public List<String> toListString(JSONArray array) {
                if (array != null) {
                        List<String> values = new ArrayList<String>();
-                       for (Object value : array.toList()) {
-                               values.add(value == null ? null : value.toString());
+                       for (int i = 0; i < array.length(); i++) {
+                               values.add(array.getString(i));
                        }
                        return values;
                }
@@ -205,9 +246,9 @@ public class JsonIO {
        static public List<Paragraph> toListParagraph(JSONArray array) {
                if (array != null) {
                        List<Paragraph> values = new ArrayList<Paragraph>();
-                       for (Object value : array.toList()) {
-                               values.add(
-                                               value instanceof Paragraph ? (Paragraph) value : null);
+                       for (int i = 0; i < array.length(); i++) {
+                               JSONObject value = array.getJSONObject(i);
+                               values.add(toParagraph(value));
                        }
                        return values;
                }
@@ -218,8 +259,9 @@ public class JsonIO {
        private static List<Chapter> toListChapter(JSONArray array) {
                if (array != null) {
                        List<Chapter> values = new ArrayList<Chapter>();
-                       for (Object value : array.toList()) {
-                               values.add(value instanceof Chapter ? (Chapter) value : null);
+                       for (int i = 0; i < array.length(); i++) {
+                               JSONObject value = array.getJSONObject(i);
+                               values.add(toChapter(value));
                        }
                        return values;
                }
@@ -245,8 +287,24 @@ public class JsonIO {
        static long getLong(JSONObject json, String key, long def) {
                if (json.has(key)) {
                        Object o = json.get(key);
-                       if (o instanceof Long) {
+                       if (o instanceof Byte)
+                               return (Byte) o;
+                       if (o instanceof Short)
+                               return (Short) o;
+                       if (o instanceof Integer)
+                               return (Integer) o;
+                       if (o instanceof Long)
                                return (Long) o;
+               }
+
+               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;
                        }
                }
 
@@ -256,8 +314,17 @@ public class JsonIO {
        static int getInt(JSONObject json, String key, int def) {
                if (json.has(key)) {
                        Object o = json.get(key);
-                       if (o instanceof Integer) {
+                       if (o instanceof Byte)
+                               return (Byte) o;
+                       if (o instanceof Short)
+                               return (Short) o;
+                       if (o instanceof Integer)
                                return (Integer) o;
+                       if (o instanceof Long) {
+                               try {
+                                       return (int) (long) ((Long) o);
+                               } catch (Exception e) {
+                               }
                        }
                }