X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FLibrary.java;h=bc9a4da4532d5787ac4b29a82dcf7a07cf0edbac;hb=5ce869b82f28c4d288b266d7dee03aa4898fff21;hp=eb9c9a39f3d4ae76298fd636c0e3e6ad43a962cc;hpb=9843a5e5c44825ac404f45ddccd6f63e554567a4;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/Library.java b/src/be/nikiroo/fanfix/Library.java index eb9c9a3..bc9a4da 100644 --- a/src/be/nikiroo/fanfix/Library.java +++ b/src/be/nikiroo/fanfix/Library.java @@ -1,9 +1,11 @@ package be.nikiroo.fanfix; import java.io.File; +import java.io.FileFilter; 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; @@ -55,6 +57,16 @@ public class Library { dir.mkdirs(); } + /** + * Refresh the {@link Library}, that is, make sure all stories are loaded. + * + * @param pg + * the optional progress reporter + */ + public void refresh(Progress pg) { + getStories(pg); + } + /** * List all the known types of stories. * @@ -62,13 +74,54 @@ public class Library { */ public synchronized List getTypes() { List list = new ArrayList(); - for (Entry entry : getStories().entrySet()) { - String storyType = entry.getValue().getParentFile().getName(); + for (Entry entry : getStories(null).entrySet()) { + String storyType = entry.getKey().getSource(); if (!list.contains(storyType)) { list.add(storyType); } } + Collections.sort(list); + return list; + } + + /** + * List all the known authors of stories. + * + * @return the authors + */ + public synchronized List getAuthors() { + List list = new ArrayList(); + for (Entry entry : getStories(null).entrySet()) { + String storyAuthor = entry.getKey().getAuthor(); + if (!list.contains(storyAuthor)) { + list.add(storyAuthor); + } + } + + Collections.sort(list); + return list; + } + + /** + * List all the stories of the given author in the {@link Library}, or all + * the stories if NULL is passed as an author. + * + * @param author + * the author of the stories to retrieve, or NULL for all + * + * @return the stories + */ + public synchronized List getListByAuthor(String author) { + List list = new ArrayList(); + for (Entry entry : getStories(null).entrySet()) { + String storyAuthor = entry.getKey().getAuthor(); + if (author == null || author.equalsIgnoreCase(storyAuthor)) { + list.add(entry.getKey()); + } + } + + Collections.sort(list); return list; } @@ -81,15 +134,16 @@ public class Library { * * @return the stories */ - public synchronized List getList(String type) { + public synchronized List getListByType(String type) { List list = new ArrayList(); - for (Entry entry : getStories().entrySet()) { + for (Entry entry : getStories(null).entrySet()) { String storyType = entry.getValue().getParentFile().getName(); if (type == null || type.equalsIgnoreCase(storyType)) { list.add(entry.getKey()); } } + Collections.sort(list); return list; } @@ -103,7 +157,7 @@ public class Library { */ public synchronized MetaData getInfo(String luid) { if (luid != null) { - for (Entry entry : getStories().entrySet()) { + for (Entry entry : getStories(null).entrySet()) { if (luid.equals(entry.getKey().getLuid())) { return entry.getKey(); } @@ -123,7 +177,7 @@ public class Library { */ public synchronized File getFile(String luid) { if (luid != null) { - for (Entry entry : getStories().entrySet()) { + for (Entry entry : getStories(null).entrySet()) { if (luid.equals(entry.getKey().getLuid())) { return entry.getValue(); } @@ -145,7 +199,7 @@ public class Library { */ public synchronized Story getStory(String luid, Progress pg) { if (luid != null) { - for (Entry entry : getStories().entrySet()) { + for (Entry entry : getStories(null).entrySet()) { if (luid.equals(entry.getKey().getLuid())) { try { SupportType type = SupportType.valueOfAllOkUC(entry @@ -280,7 +334,7 @@ public class Library { story.setMeta(key); if (luid == null || luid.isEmpty()) { - getStories(); // refresh lastId if needed + getStories(null); // refresh lastId if needed key.setLuid(String.format("%03d", (++lastId))); } else { key.setLuid(luid); @@ -319,7 +373,7 @@ public class Library { boolean ok = false; MetaData meta = getInfo(luid); - File file = getStories().get(meta); + File file = getStories(null).get(meta); if (file != null) { if (file.delete()) { @@ -388,63 +442,99 @@ public class Library { * @return the target */ private File getFile(MetaData key) { - String title = key.getTitle().replaceAll("[^a-zA-Z0-9._+-]", "_"); + String title = key.getTitle(); + if (title == null) { + title = ""; + } + title = title.replaceAll("[^a-zA-Z0-9._+-]", "_"); return new File(getDir(key), key.getLuid() + "_" + title); } /** * Return all the known stories in this {@link Library} object. * + * @param pg + * the optional progress reporter + * * @return the stories */ - private synchronized Map getStories() { + private synchronized Map getStories(Progress pg) { + if (pg == null) { + pg = new Progress(); + } else { + pg.setMinMax(0, 100); + } + if (stories.isEmpty()) { lastId = 0; - String ext = ".info"; - for (File dir : baseDir.listFiles()) { - if (dir.isDirectory()) { - for (File file : dir.listFiles()) { + File[] dirs = baseDir.listFiles(new FileFilter() { + public boolean accept(File file) { + return file != null && file.isDirectory(); + } + }); + + 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); + } + }); + + Progress pgFiles = new Progress(0, files.length); + pgDirs.addProgress(pgFiles, 100); + pgDirs.setName("Loading from: " + dir.getName()); + + for (File file : files) { + try { + pgFiles.setName(file.getName()); + MetaData meta = InfoReader.readMeta(file); try { - if (file.getPath().toLowerCase().endsWith(ext)) { - MetaData meta = InfoReader.readMeta(file); - try { - int id = Integer.parseInt(meta.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); - - } catch (Exception e) { - // not normal!! - Instance.syserr(new IOException( - "Cannot understand the LUID of " - + file.getPath() + ": " - + meta.getLuid(), e)); - } + int id = Integer.parseInt(meta.getLuid()); + if (id > lastId) { + lastId = id; } - } catch (IOException e) { - // We should not have not-supported files in the - // library + + // 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); + + } catch (Exception e) { + // not normal!! Instance.syserr(new IOException( - "Cannot load file from library: " - + file.getPath(), e)); + "Cannot understand the LUID of " + + file.getPath() + ": " + + meta.getLuid(), e)); } + } catch (IOException e) { + // We should not have not-supported files in the + // library + Instance.syserr(new IOException( + "Cannot load file from library: " + + file.getPath(), e)); + } finally { + pgFiles.add(1); } } + + pgFiles.setName(null); } + + pgDirs.setName("Loading directories"); } return stories;