X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FLibrary.java;h=f1f7121385faeab1bae5ba686dbdcf2fce993ae5;hp=69b497fd84f1730feda48aae6fab96b02a76d74c;hb=70c9b112926f1cf95b2fddd0bb504ab37d6ddd1e;hpb=4f661b2bb0f64ed54c3e849c0c2c5b6bcfe844df

diff --git a/src/be/nikiroo/fanfix/Library.java b/src/be/nikiroo/fanfix/Library.java
index 69b497f..f1f7121 100644
--- a/src/be/nikiroo/fanfix/Library.java
+++ b/src/be/nikiroo/fanfix/Library.java
@@ -1,5 +1,6 @@
 package be.nikiroo.fanfix;
 
+import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
@@ -16,6 +17,7 @@ import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.output.BasicOutput;
 import be.nikiroo.fanfix.output.BasicOutput.OutputType;
+import be.nikiroo.fanfix.output.InfoCover;
 import be.nikiroo.fanfix.supported.BasicSupport;
 import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
 import be.nikiroo.fanfix.supported.InfoReader;
@@ -27,6 +29,9 @@ import be.nikiroo.utils.Progress;
  * <p>
  * Each {@link Story} object will be associated with a (local to the library)
  * unique ID, the LUID, which will be used to identify the {@link Story}.
+ * <p>
+ * Most of the {@link Library} functions work on either the LUID or a partial
+ * (cover not included) {@link MetaData} object.
  * 
  * @author niki
  */
@@ -68,7 +73,7 @@ public class Library {
 	}
 
 	/**
-	 * List all the known types of stories.
+	 * List all the known types (sources) of stories.
 	 * 
 	 * @return the types
 	 */
@@ -106,6 +111,8 @@ public class Library {
 	/**
 	 * List all the stories of the given author in the {@link Library}, or all
 	 * the stories if NULL is passed as an author.
+	 * <p>
+	 * Cover images not included.
 	 * 
 	 * @param author
 	 *            the author of the stories to retrieve, or NULL for all
@@ -128,6 +135,8 @@ public class Library {
 	/**
 	 * List all the stories of the given source type in the {@link Library}, or
 	 * all the stories if NULL is passed as a type.
+	 * <p>
+	 * Cover images not included.
 	 * 
 	 * @param type
 	 *            the type of story to retrieve, or NULL for all
@@ -135,6 +144,11 @@ public class Library {
 	 * @return the stories
 	 */
 	public synchronized List<MetaData> getListByType(String type) {
+		if (type != null) {
+			// convert the type to dir name
+			type = getDir(type).getName();
+		}
+
 		List<MetaData> list = new ArrayList<MetaData>();
 		for (Entry<MetaData, File> entry : getStories(null).entrySet()) {
 			String storyType = entry.getValue().getParentFile().getName();
@@ -148,7 +162,8 @@ public class Library {
 	}
 
 	/**
-	 * Retrieve a {@link File} corresponding to the given {@link Story}.
+	 * Retrieve a {@link File} corresponding to the given {@link Story}, cover
+	 * image not included.
 	 * 
 	 * @param luid
 	 *            the Library UID of the story
@@ -187,6 +202,29 @@ public class Library {
 		return null;
 	}
 
+	/**
+	 * Return the cover image associated to this story.
+	 * 
+	 * @param luid
+	 *            the Library UID of the story
+	 * 
+	 * @return the cover image
+	 */
+	public synchronized BufferedImage getCover(String luid) {
+		MetaData meta = getInfo(luid);
+		if (meta != null) {
+			try {
+				File infoFile = new File(getFile(meta).getPath() + ".info");
+				meta = readMeta(infoFile, true).getKey();
+				return meta.getCover();
+			} catch (IOException e) {
+				Instance.syserr(e);
+			}
+		}
+
+		return null;
+	}
+
 	/**
 	 * Retrieve a specific {@link Story}.
 	 * 
@@ -340,8 +378,8 @@ public class Library {
 			key.setLuid(luid);
 		}
 
-		getDir(key).mkdirs();
-		if (!getDir(key).exists()) {
+		getDir(key.getSource()).mkdirs();
+		if (!getDir(key.getSource()).exists()) {
 			throw new IOException("Cannot create library dir");
 		}
 
@@ -372,63 +410,137 @@ public class Library {
 	public synchronized boolean delete(String luid) {
 		boolean ok = false;
 
+		List<File> files = getFiles(luid);
+		if (!files.isEmpty()) {
+			for (File file : files) {
+				IOUtils.deltree(file);
+			}
+
+			ok = true;
+
+			// clear cache
+			stories.clear();
+		}
+
+		return ok;
+	}
+
+	/**
+	 * Change the type (source) of the given {@link Story}.
+	 * 
+	 * @param luid
+	 *            the {@link Story} LUID
+	 * @param newSourcethe
+	 *            new source
+	 * 
+	 * @return TRUE if the {@link Story} was found
+	 */
+	public synchronized boolean changeType(String luid, String newType) {
+		MetaData meta = getInfo(luid);
+		if (meta != null) {
+			meta.setSource(newType);
+			File newDir = getDir(meta.getSource());
+			if (!newDir.exists()) {
+				newDir.mkdir();
+			}
+
+			List<File> files = getFiles(luid);
+			for (File file : files) {
+				if (file.getName().endsWith(".info")) {
+					try {
+						String name = file.getName().replaceFirst("\\.info$",
+								"");
+						InfoCover.writeInfo(newDir, name, meta);
+						file.delete();
+					} catch (IOException e) {
+						Instance.syserr(e);
+					}
+				} else {
+					file.renameTo(new File(newDir, file.getName()));
+				}
+			}
+
+			// clear cache
+			stories.clear();
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Return the list of files/dirs on disk for this {@link Story}.
+	 * <p>
+	 * If the {@link Story} is not found, and empty list is returned.
+	 * 
+	 * @param luid
+	 *            the {@link Story} LUID
+	 * 
+	 * @return the list of {@link File}s
+	 */
+	private List<File> getFiles(String luid) {
+		List<File> files = new ArrayList<File>();
+
 		MetaData meta = getInfo(luid);
 		File file = getStories(null).get(meta);
 
 		if (file != null) {
-			if (file.delete()) {
-				String readerExt = getOutputType(meta)
-						.getDefaultExtension(true);
-				String fileExt = getOutputType(meta).getDefaultExtension(false);
-
-				String path = file.getAbsolutePath();
-				if (readerExt != null && !readerExt.equals(fileExt)) {
-					path = path
-							.substring(0, path.length() - readerExt.length())
-							+ fileExt;
-					file = new File(path);
-					IOUtils.deltree(file);
-				}
+			files.add(file);
 
-				File infoFile = new File(path + ".info");
-				if (!infoFile.exists()) {
-					infoFile = new File(path.substring(0, path.length()
-							- fileExt.length())
-							+ ".info");
-				}
-				infoFile.delete();
-
-				String coverExt = "."
-						+ Instance.getConfig().getString(
-								Config.IMAGE_FORMAT_COVER);
-				File coverFile = new File(path + coverExt);
-				if (!coverFile.exists()) {
-					coverFile = new File(path.substring(0, path.length()
-							- fileExt.length()));
+			String readerExt = getOutputType(meta).getDefaultExtension(true);
+			String fileExt = getOutputType(meta).getDefaultExtension(false);
+
+			String path = file.getAbsolutePath();
+			if (readerExt != null && !readerExt.equals(fileExt)) {
+				path = path.substring(0, path.length() - readerExt.length())
+						+ fileExt;
+				file = new File(path);
+
+				if (file.exists()) {
+					files.add(file);
 				}
-				coverFile.delete();
+			}
 
-				ok = true;
+			File infoFile = new File(path + ".info");
+			if (!infoFile.exists()) {
+				infoFile = new File(path.substring(0,
+						path.length() - fileExt.length())
+						+ ".info");
 			}
 
-			// clear cache
-			stories.clear();
+			if (infoFile.exists()) {
+				files.add(infoFile);
+			}
+
+			String coverExt = "."
+					+ Instance.getConfig().getString(Config.IMAGE_FORMAT_COVER);
+			File coverFile = new File(path + coverExt);
+			if (!coverFile.exists()) {
+				coverFile = new File(path.substring(0,
+						path.length() - fileExt.length())
+						+ coverExt);
+			}
+
+			if (coverFile.exists()) {
+				files.add(coverFile);
+			}
 		}
 
-		return ok;
+		return files;
 	}
 
 	/**
 	 * The directory (full path) where the {@link Story} related to this
 	 * {@link MetaData} should be located on disk.
 	 * 
-	 * @param key
-	 *            the {@link Story} {@link MetaData}
+	 * @param type
+	 *            the type (source)
 	 * 
 	 * @return the target directory
 	 */
-	private File getDir(MetaData key) {
-		String source = key.getSource().replaceAll("[^a-zA-Z0-9._+-]", "_");
+	private File getDir(String type) {
+		String source = type.replaceAll("[^a-zA-Z0-9._+-]", "_");
 		return new File(baseDir, source);
 	}
 
@@ -447,7 +559,7 @@ public class Library {
 			title = "";
 		}
 		title = title.replaceAll("[^a-zA-Z0-9._+-]", "_");
-		return new File(getDir(key), key.getLuid() + "_" + title);
+		return new File(getDir(key.getSource()), key.getLuid() + "_" + title);
 	}
 
 	/**
@@ -477,12 +589,12 @@ public class Library {
 			Progress pgDirs = new Progress(0, 100 * dirs.length);
 			pg.addProgress(pgDirs, 100);
 
-			final String ext = ".info";
 			for (File dir : dirs) {
 				File[] files = dir.listFiles(new FileFilter() {
 					public boolean accept(File file) {
 						return file != null
-								&& file.getPath().toLowerCase().endsWith(ext);
+								&& file.getPath().toLowerCase()
+										.endsWith(".info");
 					}
 				});
 
@@ -491,34 +603,22 @@ public class Library {
 				pgDirs.setName("Loading from: " + dir.getName());
 
 				for (File file : files) {
+					pgFiles.setName(file.getName());
 					try {
-						pgFiles.setName(file.getName());
-						MetaData meta = InfoReader.readMeta(file);
+						Entry<MetaData, File> entry = readMeta(file, false);
 						try {
-							int id = Integer.parseInt(meta.getLuid());
+							int id = Integer.parseInt(entry.getKey().getLuid());
 							if (id > lastId) {
 								lastId = id;
 							}
 
-							// Replace .info with whatever is needed:
-							String path = file.getPath();
-							path = path.substring(0,
-									path.length() - ext.length());
-
-							String newExt = getOutputType(meta)
-									.getDefaultExtension(true);
-
-							file = new File(path + newExt);
-							//
-
-							stories.put(meta, file);
-
+							stories.put(entry.getKey(), entry.getValue());
 						} catch (Exception e) {
 							// not normal!!
-							Instance.syserr(new IOException(
+							throw new IOException(
 									"Cannot understand the LUID of "
 											+ file.getPath() + ": "
-											+ meta.getLuid(), e));
+											+ entry.getKey().getLuid(), e);
 						}
 					} catch (IOException e) {
 						// We should not have not-supported files in the
@@ -526,14 +626,8 @@ public class Library {
 						Instance.syserr(new IOException(
 								"Cannot load file from library: "
 										+ file.getPath(), e));
-					} finally {
-						pgFiles.setProgress(pgFiles.getProgress() + 1);
-
-						System.out.println("files: " + pgFiles.getProgress()
-								+ "/" + pgFiles.getMax());
-						System.out.println("dirs : " + pgDirs.getProgress()
-								+ "/" + pgDirs.getMax());
 					}
+					pgFiles.add(1);
 				}
 
 				pgFiles.setName(null);
@@ -545,6 +639,35 @@ public class Library {
 		return stories;
 	}
 
+	private Entry<MetaData, File> readMeta(File infoFile, boolean withCover)
+			throws IOException {
+
+		final MetaData meta = InfoReader.readMeta(infoFile, withCover);
+
+		// Replace .info with whatever is needed:
+		String path = infoFile.getPath();
+		path = path.substring(0, path.length() - ".info".length());
+
+		String newExt = getOutputType(meta).getDefaultExtension(true);
+
+		File targetFile = new File(path + newExt);
+
+		final File ffile = targetFile;
+		return new Entry<MetaData, File>() {
+			public File setValue(File value) {
+				return null;
+			}
+
+			public File getValue() {
+				return ffile;
+			}
+
+			public MetaData getKey() {
+				return meta;
+			}
+		};
+	}
+
 	/**
 	 * Return the {@link OutputType} for this {@link Story}.
 	 *