X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=data%2FJsonIO.java;h=1f70f0a89adef193e3a5b43fcd719952e49fc4fa;hb=f3591bdb28c797e58990f2b878cb3466fee46479;hp=db81db65a03b93555445a7ac4254b19707aa9c1f;hpb=5f3671e17febc5b7f6abbfc62c66c4045d47ec8d;p=fanfix.git

diff --git a/data/JsonIO.java b/data/JsonIO.java
index db81db6..1f70f0a 100644
--- a/data/JsonIO.java
+++ b/data/JsonIO.java
@@ -7,6 +7,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
+
 public class JsonIO {
 	static public JSONObject toJson(MetaData meta) {
 		if (meta == null) {
@@ -14,6 +16,7 @@ public class JsonIO {
 		}
 
 		JSONObject json = new JSONObject();
+
 		put(json, "", MetaData.class.getName());
 		put(json, "luid", meta.getLuid());
 		put(json, "title", meta.getTitle());
@@ -28,6 +31,7 @@ public class JsonIO {
 		put(json, "subject", meta.getSubject());
 		put(json, "type", meta.getType());
 		put(json, "uuid", meta.getUuid());
+
 		put(json, "resume", toJson(meta.getResume()));
 		put(json, "tags", new JSONArray(meta.getTags()));
 
@@ -35,6 +39,7 @@ public class JsonIO {
 	}
 
 	/**
+	 * // no image
 	 * 
 	 * @param json
 	 * 
@@ -49,6 +54,7 @@ public class JsonIO {
 		}
 
 		MetaData meta = new MetaData();
+
 		meta.setLuid(getString(json, "luid"));
 		meta.setTitle(getString(json, "title"));
 		meta.setAuthor(getString(json, "author"));
@@ -69,14 +75,61 @@ public class JsonIO {
 		return meta;
 	}
 
+	static public JSONObject toJson(Story story) {
+		if (story == null) {
+			return null;
+		}
+
+		JSONObject json = new JSONObject();
+		put(json, "", Story.class.getName());
+		put(json, "meta", toJson(story.getMeta()));
+
+		List<JSONObject> chapters = new ArrayList<JSONObject>();
+		for (Chapter chap : story) {
+			chapters.add(toJson(chap));
+		}
+		put(json, "chapters", new JSONArray(chapters));
+
+		return json;
+	}
+
+	/**
+	 * 
+	 * @param json
+	 * 
+	 * @return
+	 * 
+	 * @throws JSONException
+	 *             when it cannot be converted
+	 */
+	static public Story toStory(JSONObject json) {
+		if (json == null) {
+			return null;
+		}
+
+		Story story = new Story();
+		story.setMeta(toMetaData(getJson(json, "meta")));
+		story.setChapters(toListChapter(getJsonArr(json, "chapters")));
+
+		return story;
+	}
+
 	static public JSONObject toJson(Chapter chap) {
 		if (chap == null) {
 			return null;
 		}
 
 		JSONObject json = new JSONObject();
+		put(json, "", Chapter.class.getName());
+		put(json, "name", chap.getName());
+		put(json, "number", chap.getNumber());
+		put(json, "words", chap.getWords());
 
-		// TODO
+		List<JSONObject> paragraphs = new ArrayList<JSONObject>();
+		for (Paragraph para : chap) {
+			paragraphs.add(toJson(para));
+		}
+		put(json, "paragraphs", new JSONArray(paragraphs));
 
 		return json;
 	}
@@ -95,18 +148,85 @@ public class JsonIO {
 			return null;
 		}
 
-		Chapter chap = new Chapter(0, "");
+		Chapter chap = new Chapter(getInt(json, "number", 0),
+				getString(json, "name"));
+		chap.setWords(getLong(json, "words", 0));
 
-		// TODO
+		chap.setParagraphs(toListParagraph(getJsonArr(json, "paragraphs")));
 
 		return chap;
 	}
 
+	// no images
+	static public JSONObject toJson(Paragraph para) {
+		if (para == null) {
+			return null;
+		}
+
+		JSONObject json = new JSONObject();
+
+		put(json, "", Paragraph.class.getName());
+		put(json, "content", para.getContent());
+		put(json, "words", para.getWords());
+
+		put(json, "type", para.getType().toString());
+
+		return json;
+	}
+
+	/**
+	 * // no images
+	 * 
+	 * @param json
+	 * 
+	 * @return
+	 * 
+	 * @throws JSONException
+	 *             when it cannot be converted
+	 */
+	static public Paragraph toParagraph(JSONObject json) {
+		if (json == null) {
+			return null;
+		}
+
+		Paragraph para = new Paragraph(
+				ParagraphType.valueOf(getString(json, "type")),
+				getString(json, "content"), getLong(json, "words", 0));
+
+		return para;
+	}
+
 	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;
+		}
+
+		return null;
+	}
+
+	static public List<Paragraph> toListParagraph(JSONArray array) {
+		if (array != null) {
+			List<Paragraph> values = new ArrayList<Paragraph>();
+			for (int i = 0; i < array.length(); i++) {
+				JSONObject value = array.getJSONObject(i);
+				values.add(toParagraph(value));
+			}
+			return values;
+		}
+
+		return null;
+	}
+
+	private static List<Chapter> toListChapter(JSONArray array) {
+		if (array != null) {
+			List<Chapter> values = new ArrayList<Chapter>();
+			for (int i = 0; i < array.length(); i++) {
+				JSONObject value = array.getJSONObject(i);
+				values.add(toChapter(value));
 			}
 			return values;
 		}
@@ -140,6 +260,17 @@ public class JsonIO {
 		return def;
 	}
 
+	static int getInt(JSONObject json, String key, int def) {
+		if (json.has(key)) {
+			Object o = json.get(key);
+			if (o instanceof Integer) {
+				return (Integer) o;
+			}
+		}
+
+		return def;
+	}
+
 	static JSONObject getJson(JSONObject json, String key) {
 		if (json.has(key)) {
 			Object o = json.get(key);