X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FBasicLibrary.java;h=6a2b95a642b0c6c21349d076c9b4c08f3af8a7e0;hb=27694a1373c09fa3f2634dfaec4cc944dff3ea5f;hp=d324008f0b4c2294e503d907a25b0edc226ed944;hpb=085a2f9a3a811a910de7c3011eb6f5ef2ab18aa0;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/BasicLibrary.java b/src/be/nikiroo/fanfix/library/BasicLibrary.java
index d324008..6a2b95a 100644
--- a/src/be/nikiroo/fanfix/library/BasicLibrary.java
+++ b/src/be/nikiroo/fanfix/library/BasicLibrary.java
@@ -1,9 +1,9 @@
 package be.nikiroo.fanfix.library;
 
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -14,7 +14,8 @@ import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.output.BasicOutput;
 import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.fanfix.supported.BasicSupport;
-import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
+import be.nikiroo.fanfix.supported.SupportType;
+import be.nikiroo.utils.Image;
 import be.nikiroo.utils.Progress;
 
 /**
@@ -29,6 +30,22 @@ import be.nikiroo.utils.Progress;
  * @author niki
  */
 abstract public class BasicLibrary {
+	/**
+	 * A {@link BasicLibrary} status.
+	 * 
+	 * @author niki
+	 */
+	public enum Status {
+		/** The library is ready. */
+		READY,
+		/** The library is invalid (not correctly set up). */
+		INVALID,
+		/** You are not allowed to access this library. */
+		UNAUTORIZED,
+		/** The library is currently out of commission. */
+		UNAVAILABLE,
+	}
+
 	/**
 	 * Return a name for this library (the UI may display this).
 	 * <p>
@@ -40,6 +57,15 @@ abstract public class BasicLibrary {
 		return "";
 	}
 
+	/**
+	 * The library status.
+	 * 
+	 * @return the current status
+	 */
+	public Status getStatus() {
+		return Status.READY;
+	}
+
 	/**
 	 * Retrieve the main {@link File} corresponding to the given {@link Story},
 	 * which can be passed to an external reader or instance.
@@ -63,7 +89,7 @@ abstract public class BasicLibrary {
 	 * 
 	 * @return the cover image
 	 */
-	public abstract BufferedImage getCover(String luid);
+	public abstract Image getCover(String luid);
 
 	/**
 	 * Return the cover image associated to this source.
@@ -75,7 +101,7 @@ abstract public class BasicLibrary {
 	 * 
 	 * @return the cover image or NULL
 	 */
-	public BufferedImage getSourceCover(String source) {
+	public Image getSourceCover(String source) {
 		List<MetaData> metas = getListBySource(source);
 		if (metas.size() > 0) {
 			return getCover(metas.get(0).getLuid());
@@ -109,7 +135,29 @@ abstract public class BasicLibrary {
 	 * Invalidate the {@link Story} cache (when the content should be re-read
 	 * because it was changed).
 	 */
-	protected abstract void clearCache();
+	protected void deleteInfo() {
+		deleteInfo(null);
+	}
+
+	/**
+	 * Invalidate the {@link Story} cache (when the content is removed).
+	 * <p>
+	 * All the cache can be deleted if NULL is passed as meta.
+	 * 
+	 * @param luid
+	 *            the LUID of the {@link Story} to clear from the cache, or NULL
+	 *            for all stories
+	 */
+	protected abstract void deleteInfo(String luid);
+
+	/**
+	 * Invalidate the {@link Story} cache (when the content has changed, but we
+	 * already have it) with the new given meta.
+	 * 
+	 * @param meta
+	 *            the {@link Story} to clear from the cache
+	 */
+	protected abstract void updateInfo(MetaData meta);
 
 	/**
 	 * Return the next LUID that can be used.
@@ -147,26 +195,14 @@ abstract public class BasicLibrary {
 			throws IOException;
 
 	/**
-	 * Refresh the {@link BasicLibrary}, that is, make sure all stories are
+	 * Refresh the {@link BasicLibrary}, that is, make sure all metas are
 	 * loaded.
 	 * 
-	 * @param full
-	 *            force the full content of the stories to be loaded, not just
-	 *            the {@link MetaData}
-	 * 
 	 * @param pg
 	 *            the optional progress reporter
 	 */
-	public void refresh(boolean full, Progress pg) {
-		if (full) {
-			// TODO: progress
-			List<MetaData> metas = getMetas(pg);
-			for (MetaData meta : metas) {
-				getStory(meta.getLuid(), null);
-			}
-		} else {
-			getMetas(pg);
-		}
+	public void refresh(Progress pg) {
+		getMetas(pg);
 	}
 
 	/**
@@ -317,17 +353,22 @@ abstract public class BasicLibrary {
 							.getType());
 					URL url = file.toURI().toURL();
 					if (type != null) {
-						story = BasicSupport.getSupport(type).process(url,
-								pgProcess);
+						story = BasicSupport.getSupport(type, url) //
+								.process(pgProcess);
+System.out.println("after process: "+story);
+						// Because we do not want to clear the meta cache:
+						meta.setCover(story.getMeta().getCover());
 						story.setMeta(meta);
+						//
 					} else {
 						throw new IOException("Unknown type: " + meta.getType());
 					}
 				} catch (IOException e) {
 					// We should not have not-supported files in the
 					// library
-					Instance.syserr(new IOException(
-							"Cannot load file from library: " + file, e));
+					Instance.getTraceHandler().error(
+							new IOException("Cannot load file from library: "
+									+ file, e));
 				} finally {
 					pgProcess.done();
 					pg.done();
@@ -351,16 +392,18 @@ abstract public class BasicLibrary {
 	 * 
 	 * @return the imported {@link Story}
 	 * 
+	 * @throws UnknownHostException
+	 *             if the host is not supported
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
 	public Story imprt(URL url, Progress pg) throws IOException {
 		BasicSupport support = BasicSupport.getSupport(url);
 		if (support == null) {
-			throw new IOException("URL not supported: " + url.toString());
+			throw new UnknownHostException("" + url);
 		}
 
-		return save(support.process(url, pg), null);
+		return save(support.process(pg), null);
 	}
 
 	/**
@@ -425,7 +468,7 @@ abstract public class BasicLibrary {
 			pg.addProgress(pgOut, 1);
 		}
 
-		BasicOutput out = BasicOutput.getOutput(type, false);
+		BasicOutput out = BasicOutput.getOutput(type, false, false);
 		if (out == null) {
 			throw new IOException("Output type not supported: " + type);
 		}
@@ -475,6 +518,7 @@ abstract public class BasicLibrary {
 	 */
 	public synchronized Story save(Story story, String luid, Progress pg)
 			throws IOException {
+
 		// Do not change the original metadata, but change the original story
 		MetaData meta = story.getMeta().clone();
 		story.setMeta(meta);
@@ -485,13 +529,13 @@ abstract public class BasicLibrary {
 			meta.setLuid(luid);
 		}
 
-		if (getInfo(luid) != null) {
+		if (luid != null && getInfo(luid) != null) {
 			delete(luid);
 		}
 
-		doSave(story, pg);
+		story = doSave(story, pg);
 
-		clearCache();
+		updateInfo(story.getMeta());
 
 		return story;
 	}
@@ -507,7 +551,7 @@ abstract public class BasicLibrary {
 	 */
 	public synchronized void delete(String luid) throws IOException {
 		doDelete(luid);
-		clearCache();
+		deleteInfo(luid);
 	}
 
 	/**