X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FBasicSupport.java;h=0a5ec3686e1be43c52a328d1a1be86e805ad21fe;hb=7949d4a5098d8554c333c9fbbda469488bc66f7e;hp=d07fbcd93cdd3aa72c1bba621c1595918beb2385;hpb=0013f760d69fd7db2b298c3da5d89bc0b102eabf;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java
index d07fbcd..0a5ec36 100644
--- a/src/be/nikiroo/fanfix/supported/BasicSupport.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java
@@ -2,14 +2,17 @@ package be.nikiroo.fanfix.supported;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Scanner;
 import java.util.Map.Entry;
 
+import org.json.JSONObject;
 import org.jsoup.helper.DataUtil;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -224,8 +227,7 @@ public abstract class BasicSupport {
 	 */
 	protected Document loadDocument(URL source) throws IOException {
 		String url = getCanonicalUrl(source).toString();
-		return DataUtil.load(Instance.getCache().open(source, this, false),
-				"UTF-8", url.toString());
+		return DataUtil.load(Instance.getInstance().getCache().open(source, this, false), "UTF-8", url.toString());
 	}
 
 	/**
@@ -270,10 +272,13 @@ public abstract class BasicSupport {
 
 		Story story = new Story();
 		MetaData meta = getMeta();
-		if (meta.getCreationDate() == null || meta.getCreationDate().isEmpty()) {
-			meta.setCreationDate(StringUtils.fromTime(new Date().getTime()));
+		if (meta.getCreationDate() == null
+				|| meta.getCreationDate().trim().isEmpty()) {
+			meta.setCreationDate(bsHelper
+					.formatDate(StringUtils.fromTime(new Date().getTime())));
 		}
 		story.setMeta(meta);
+		pg.put("meta", meta);
 
 		pg.setProgress(50);
 
@@ -284,18 +289,72 @@ public abstract class BasicSupport {
 		pg.setProgress(60);
 
 		if (getDesc) {
-			String descChapterName = Instance.getTrans().getString(
-					StringId.DESCRIPTION);
-			story.getMeta().setResume(
-					bsPara.makeChapter(this, source, 0,
-							descChapterName, //
-							getDesc(), isHtml(), null));
+			String descChapterName = Instance.getInstance().getTrans().getString(StringId.DESCRIPTION);
+			story.getMeta().setResume(bsPara.makeChapter(this, source, 0, descChapterName, //
+					getDesc(), isHtml(), null));
 		}
 
 		pg.done();
 		return story;
 	}
 
+	/**
+	 * Utility method to convert the given URL into a JSON object.
+	 * <p>
+	 * Note that this method expects small JSON files (everything is copied into
+	 * memory at least twice).
+	 * 
+	 * @param url
+	 *            the URL to parse
+	 * @param stable
+	 *            TRUE for more stable resources, FALSE when they often change
+	 * 
+	 * @return the JSON object
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
+	 */
+	protected JSONObject getJson(String url, boolean stable)
+			throws IOException {
+		try {
+			return getJson(new URL(url), stable);
+		} catch (MalformedURLException e) {
+			throw new IOException("Malformed URL: " + url, e);
+		}
+	}
+
+	/**
+	 * Utility method to convert the given URL into a JSON object.
+	 * <p>
+	 * Note that this method expects small JSON files (everything is copied into
+	 * memory at least twice).
+	 * 
+	 * @param url
+	 *            the URL to parse
+	 * @param stable
+	 *            TRUE for more stable resources, FALSE when they often change
+	 * 
+	 * @return the JSON object
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
+	 */
+	protected JSONObject getJson(URL url, boolean stable) throws IOException {
+		InputStream in = Instance.getInstance().getCache().open(url, null,
+				stable);
+		try {
+			Scanner scan = new Scanner(in);
+			scan.useDelimiter("\0");
+			try {
+				return new JSONObject(scan.next());
+			} finally {
+				scan.close();
+			}
+		} finally {
+			in.close();
+		}
+	}
+
 	/**
 	 * Process the given story resource into a fully filled {@link Story}
 	 * object.
@@ -340,14 +399,15 @@ public abstract class BasicSupport {
 		} else {
 			pg.setMinMax(0, 100);
 		}
+		
+		pg.setName("Initialising");
 
 		pg.setProgress(1);
 		Progress pgMeta = new Progress();
 		pg.addProgress(pgMeta, 10);
 		Story story = processMeta(true, pgMeta);
 		pgMeta.done(); // 10%
-
-		pg.setName("Retrieving " + story.getMeta().getTitle());
+		pg.put("meta", story.getMeta());
 
 		Progress pgGetChapters = new Progress();
 		pg.addProgress(pgGetChapters, 10);