X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FLibrary.java;h=4db3868b5928701ecda2a53e6f522294aee00cc9;hb=2284842831ea46e89b97dd22b6e294caad361f30;hp=88228497d8e1b6722e42ca35490006d331fadc9b;hpb=3b2b638f7e1395702f843b5b19d7959327f604b2;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/Library.java b/src/be/nikiroo/fanfix/Library.java
index 8822849..4db3868 100644
--- a/src/be/nikiroo/fanfix/Library.java
+++ b/src/be/nikiroo/fanfix/Library.java
@@ -4,11 +4,13 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.output.BasicOutput;
@@ -16,6 +18,7 @@ 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.InfoReader;
+import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.Progress;
 
 /**
@@ -58,7 +61,7 @@ public class Library {
 	 * 
 	 * @return the types
 	 */
-	public List<String> getTypes() {
+	public synchronized List<String> getTypes() {
 		List<String> list = new ArrayList<String>();
 		for (Entry<MetaData, File> entry : getStories().entrySet()) {
 			String storyType = entry.getValue().getParentFile().getName();
@@ -79,7 +82,7 @@ public class Library {
 	 * 
 	 * @return the stories
 	 */
-	public List<MetaData> getList(String type) {
+	public synchronized List<MetaData> getList(String type) {
 		List<MetaData> list = new ArrayList<MetaData>();
 		for (Entry<MetaData, File> entry : getStories().entrySet()) {
 			String storyType = entry.getValue().getParentFile().getName();
@@ -88,6 +91,7 @@ public class Library {
 			}
 		}
 
+		Collections.sort(list);
 		return list;
 	}
 
@@ -99,7 +103,7 @@ public class Library {
 	 * 
 	 * @return the corresponding {@link Story}
 	 */
-	public MetaData getInfo(String luid) {
+	public synchronized MetaData getInfo(String luid) {
 		if (luid != null) {
 			for (Entry<MetaData, File> entry : getStories().entrySet()) {
 				if (luid.equals(entry.getKey().getLuid())) {
@@ -119,7 +123,7 @@ public class Library {
 	 * 
 	 * @return the corresponding {@link Story}
 	 */
-	public File getFile(String luid) {
+	public synchronized File getFile(String luid) {
 		if (luid != null) {
 			for (Entry<MetaData, File> entry : getStories().entrySet()) {
 				if (luid.equals(entry.getKey().getLuid())) {
@@ -141,7 +145,7 @@ public class Library {
 	 * 
 	 * @return the corresponding {@link Story} or NULL if not found
 	 */
-	public Story getStory(String luid, Progress pg) {
+	public synchronized Story getStory(String luid, Progress pg) {
 		if (luid != null) {
 			for (Entry<MetaData, File> entry : getStories().entrySet()) {
 				if (luid.equals(entry.getKey().getLuid())) {
@@ -271,7 +275,8 @@ public class Library {
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
-	public Story save(Story story, String luid, Progress pg) throws IOException {
+	public synchronized Story save(Story story, String luid, Progress pg)
+			throws IOException {
 		// Do not change the original metadata, but change the original story
 		MetaData key = story.getMeta().clone();
 		story.setMeta(key);
@@ -296,12 +301,71 @@ public class Library {
 		}
 
 		BasicOutput it = BasicOutput.getOutput(out, true);
-		File file = it.process(story, getFile(key).getPath(), pg);
-		getStories().put(story.getMeta(), file);
+		it.process(story, getFile(key).getPath(), pg);
+
+		// empty cache
+		stories.clear();
 
 		return story;
 	}
 
+	/**
+	 * Delete the given {@link Story} from this {@link Library}.
+	 * 
+	 * @param luid
+	 *            the LUID of the target {@link Story}
+	 * 
+	 * @return TRUE if it was deleted
+	 */
+	public synchronized boolean delete(String luid) {
+		boolean ok = false;
+
+		MetaData meta = getInfo(luid);
+		File file = getStories().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);
+				}
+
+				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()));
+				}
+				coverFile.delete();
+
+				ok = true;
+			}
+
+			// clear cache
+			stories.clear();
+		}
+
+		return ok;
+	}
+
 	/**
 	 * The directory (full path) where the {@link Story} related to this
 	 * {@link MetaData} should be located on disk.
@@ -335,7 +399,7 @@ public class Library {
 	 * 
 	 * @return the stories
 	 */
-	private Map<MetaData, File> getStories() {
+	private synchronized Map<MetaData, File> getStories() {
 		if (stories.isEmpty()) {
 			lastId = 0;
 
@@ -358,7 +422,7 @@ public class Library {
 											- ext.length());
 
 									String newExt = getOutputType(meta)
-											.getDefaultExtension();
+											.getDefaultExtension(true);
 
 									file = new File(path + newExt);
 									//