X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FLocalLibrary.java;h=ffcd8af99d0a482b27e939435fbbd6548f32550d;hb=13fdb89adc017452a7a72f552b933f8e7b869413;hp=50f9ac01fe902f272255e96da1facbd117a85178;hpb=d5a3b60634af7e3cbd0b698e6369072751ee1518;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/LocalLibrary.java b/src/be/nikiroo/fanfix/library/LocalLibrary.java index 50f9ac0..ffcd8af 100644 --- a/src/be/nikiroo/fanfix/library/LocalLibrary.java +++ b/src/be/nikiroo/fanfix/library/LocalLibrary.java @@ -22,6 +22,7 @@ import be.nikiroo.fanfix.supported.InfoReader; import be.nikiroo.utils.IOUtils; import be.nikiroo.utils.Image; import be.nikiroo.utils.Progress; +import be.nikiroo.utils.StringUtils; /** * This {@link BasicLibrary} will store the stories locally on disk. @@ -32,6 +33,7 @@ public class LocalLibrary extends BasicLibrary { private int lastId; private Map stories; // Files: [ infoFile, TargetFile ] private Map sourceCovers; + private Map authorCovers; private File baseDir; private OutputType text; @@ -45,8 +47,8 @@ public class LocalLibrary extends BasicLibrary { */ public LocalLibrary(File baseDir) { this(baseDir, Instance.getConfig().getString( - Config.NON_IMAGES_DOCUMENT_TYPE), Instance.getConfig() - .getString(Config.IMAGES_DOCUMENT_TYPE), false); + Config.FILE_FORMAT_NON_IMAGES_DOCUMENT_TYPE), Instance.getConfig() + .getString(Config.FILE_FORMAT_IMAGES_DOCUMENT_TYPE), false); } /** @@ -98,7 +100,7 @@ public class LocalLibrary extends BasicLibrary { } @Override - public File getFile(String luid, Progress pg) { + public File getFile(String luid, Progress pg) throws IOException { Instance.getTraceHandler().trace( this.getClass().getSimpleName() + ": get file for " + luid); @@ -120,9 +122,13 @@ public class LocalLibrary extends BasicLibrary { } @Override - public Image getCover(String luid) { + public Image getCover(String luid) throws IOException { MetaData meta = getInfo(luid); if (meta != null) { + if (meta.getCover() != null) { + return meta.getCover(); + } + File[] files = getStories(null).get(meta); if (files != null) { File infoFile = files[0]; @@ -141,11 +147,11 @@ public class LocalLibrary extends BasicLibrary { @Override protected synchronized void updateInfo(MetaData meta) { - deleteInfo(); + invalidateInfo(); } @Override - protected void deleteInfo(String luid) { + protected void invalidateInfo(String luid) { stories = null; sourceCovers = null; } @@ -183,7 +189,7 @@ public class LocalLibrary extends BasicLibrary { throws IOException { File newDir = getExpectedDir(meta.getSource()); if (!newDir.exists()) { - newDir.mkdir(); + newDir.mkdirs(); } List relatedFiles = getRelatedFiles(meta.getLuid()); @@ -195,8 +201,8 @@ public class LocalLibrary extends BasicLibrary { try { String name = relatedFile.getName().replaceFirst( "\\.info$", ""); - InfoCover.writeInfo(newDir, name, meta); relatedFile.delete(); + InfoCover.writeInfo(newDir, name, meta); relatedFile.getParentFile().delete(); } catch (IOException e) { Instance.getTraceHandler().error(e); @@ -207,7 +213,7 @@ public class LocalLibrary extends BasicLibrary { } } - deleteInfo(); + invalidateInfo(); } @Override @@ -221,7 +227,7 @@ public class LocalLibrary extends BasicLibrary { return img; } - File coverDir = new File(baseDir, source); + File coverDir = getExpectedDir(source); if (coverDir.isDirectory()) { File cover = new File(coverDir, ".cover.png"); if (cover.exists()) { @@ -248,12 +254,51 @@ public class LocalLibrary extends BasicLibrary { } @Override - public void setSourceCover(String source, String luid) { + public synchronized Image getCustomAuthorCover(String author) { + if (authorCovers == null) { + authorCovers = new HashMap(); + } + + Image img = authorCovers.get(author); + if (img != null) { + return img; + } + + File cover = getAuthorCoverFile(author); + if (cover.exists()) { + InputStream in; + try { + in = new FileInputStream(cover); + try { + authorCovers.put(author, new Image(in)); + } finally { + in.close(); + } + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + Instance.getTraceHandler().error( + new IOException( + "Cannot load the existing custom author cover: " + + cover, e)); + } + } + + return authorCovers.get(author); + } + + @Override + public void setSourceCover(String source, String luid) throws IOException { setSourceCover(source, getCover(luid)); } + @Override + public void setAuthorCover(String author, String luid) throws IOException { + setAuthorCover(author, getCover(luid)); + } + /** - * Fix the source cover to the given story cover. + * Set the source cover to the given story cover. * * @param source * the source to change @@ -261,7 +306,9 @@ public class LocalLibrary extends BasicLibrary { * the cover image */ synchronized void setSourceCover(String source, Image coverImage) { - File cover = new File(getExpectedDir(source), ".cover"); + File dir = getExpectedDir(source); + dir.mkdirs(); + File cover = new File(dir, ".cover"); try { Instance.getCache().saveAsImage(coverImage, cover, true); if (sourceCovers != null) { @@ -272,6 +319,27 @@ public class LocalLibrary extends BasicLibrary { } } + /** + * Set the author cover to the given story cover. + * + * @param author + * the author to change + * @param coverImage + * the cover image + */ + synchronized void setAuthorCover(String author, Image coverImage) { + File cover = getAuthorCoverFile(author); + cover.getParentFile().mkdirs(); + try { + Instance.getCache().saveAsImage(coverImage, cover, true); + if (authorCovers != null) { + authorCovers.put(author, coverImage); + } + } catch (IOException e) { + Instance.getTraceHandler().error(e); + } + } + @Override public void imprt(BasicLibrary other, String luid, Progress pg) throws IOException { @@ -289,19 +357,21 @@ public class LocalLibrary extends BasicLibrary { if (meta != null && meta.getType().equals(expectedType)) { File from = otherLocalLibrary.getExpectedDir(meta.getSource()); File to = this.getExpectedDir(meta.getSource()); - List sources = otherLocalLibrary.getRelatedFiles(luid); - if (!sources.isEmpty()) { - pg.setMinMax(0, sources.size()); + List relatedFiles = otherLocalLibrary + .getRelatedFiles(luid); + if (!relatedFiles.isEmpty()) { + pg.setMinMax(0, relatedFiles.size()); } - for (File source : sources) { - File target = new File(source.getAbsolutePath().replace( - from.getAbsolutePath(), to.getAbsolutePath())); - if (!source.equals(target)) { + for (File relatedFile : relatedFiles) { + File target = new File(relatedFile.getAbsolutePath() + .replace(from.getAbsolutePath(), + to.getAbsolutePath())); + if (!relatedFile.equals(target)) { target.getParentFile().mkdirs(); InputStream in = null; try { - in = new FileInputStream(source); + in = new FileInputStream(relatedFile); IOUtils.write(in, target); } catch (IOException e) { if (in != null) { @@ -319,7 +389,7 @@ public class LocalLibrary extends BasicLibrary { pg.add(1); } - deleteInfo(); + invalidateInfo(); pg.done(); return; } @@ -344,6 +414,22 @@ public class LocalLibrary extends BasicLibrary { return text; } + /** + * Return the default {@link OutputType} for this kind of {@link Story}. + * + * @param imageDocument + * TRUE for images document, FALSE for text documents + * + * @return the type + */ + public String getOutputType(boolean imageDocument) { + if (imageDocument) { + return image.toString(); + } + + return text.toString(); + } + /** * Get the target {@link File} related to the given .info * {@link File} and {@link MetaData}. @@ -379,6 +465,9 @@ public class LocalLibrary extends BasicLibrary { title = ""; } title = title.replaceAll("[^a-zA-Z0-9._+-]", "_"); + if (title.length() > 40) { + title = title.substring(0, 40); + } return new File(getExpectedDir(key.getSource()), key.getLuid() + "_" + title); } @@ -393,10 +482,44 @@ public class LocalLibrary extends BasicLibrary { * @return the target directory */ private File getExpectedDir(String source) { - String sanitizedSource = source.replaceAll("[^a-zA-Z0-9._+-]", "_"); + String sanitizedSource = source.replaceAll("[^a-zA-Z0-9._+/-]", "_"); + + while (sanitizedSource.startsWith("/") + || sanitizedSource.startsWith("_")) { + if (sanitizedSource.length() > 1) { + sanitizedSource = sanitizedSource.substring(1); + } else { + sanitizedSource = ""; + } + } + + sanitizedSource = sanitizedSource.replace("/", File.separator); + + if (sanitizedSource.isEmpty()) { + sanitizedSource = "_EMPTY"; + } + return new File(baseDir, sanitizedSource); } + /** + * Return the full path to the file to use for the custom cover of this + * author. + *

+ * One or more of the parent directories MAY not exist. + * + * @param author + * the author + * + * @return the custom cover file + */ + private File getAuthorCoverFile(String author) { + File aDir = new File(baseDir, "_AUTHORS"); + String hash = StringUtils.getMd5Hash(author); + String ext = Instance.getConfig().getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER); + return new File(aDir, hash + "." + ext.toLowerCase()); + } + /** * Return the list of files/directories on disk for this {@link Story}. *

@@ -439,7 +562,7 @@ public class LocalLibrary extends BasicLibrary { } String coverExt = "." - + Instance.getConfig().getString(Config.IMAGE_FORMAT_COVER) + + Instance.getConfig().getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER) .toLowerCase(); File coverFile = new File(path + coverExt); if (!coverFile.exists()) { @@ -460,7 +583,7 @@ public class LocalLibrary extends BasicLibrary { * {@link LocalLibrary#baseDir}. *

* Will use a cached list when possible (see - * {@link BasicLibrary#deleteInfo()}). + * {@link BasicLibrary#invalidateInfo()}). * * @param pg * the optional {@link Progress} @@ -492,49 +615,11 @@ public class LocalLibrary extends BasicLibrary { pg.addProgress(pgDirs, 100); for (File dir : dirs) { - File[] infoFiles = dir.listFiles(new FileFilter() { - @Override - public boolean accept(File file) { - return file != null - && file.getPath().toLowerCase() - .endsWith(".info"); - } - }); - - Progress pgFiles = new Progress(0, infoFiles.length); + Progress pgFiles = new Progress(); pgDirs.addProgress(pgFiles, 100); pgDirs.setName("Loading from: " + dir.getName()); - for (File infoFile : infoFiles) { - pgFiles.setName(infoFile.getName()); - try { - MetaData meta = InfoReader - .readMeta(infoFile, false); - try { - int id = Integer.parseInt(meta.getLuid()); - if (id > lastId) { - lastId = id; - } - - stories.put(meta, new File[] { infoFile, - getTargetFile(meta, infoFile) }); - } catch (Exception e) { - // not normal!! - throw new IOException( - "Cannot understand the LUID of " - + infoFile + ": " - + meta.getLuid(), e); - } - } catch (IOException e) { - // We should not have not-supported files in the - // library - Instance.getTraceHandler().error( - new IOException( - "Cannot load file from library: " - + infoFile, e)); - } - pgFiles.add(1); - } + addToStories(pgFiles, dir); pgFiles.setName(null); } @@ -546,4 +631,59 @@ public class LocalLibrary extends BasicLibrary { pg.done(); return stories; } + + private void addToStories(Progress pgFiles, File dir) { + File[] infoFilesAndSubdirs = dir.listFiles(new FileFilter() { + @Override + public boolean accept(File file) { + boolean info = file != null && file.isFile() + && file.getPath().toLowerCase().endsWith(".info"); + boolean dir = file != null && file.isDirectory(); + boolean isExpandedHtml = new File(file, "index.html").isFile(); + return info || (dir && !isExpandedHtml); + } + }); + + if (pgFiles != null) { + pgFiles.setMinMax(0, infoFilesAndSubdirs.length); + } + + for (File infoFileOrSubdir : infoFilesAndSubdirs) { + if (pgFiles != null) { + pgFiles.setName(infoFileOrSubdir.getName()); + } + + if (infoFileOrSubdir.isDirectory()) { + addToStories(null, infoFileOrSubdir); + } else { + try { + MetaData meta = InfoReader + .readMeta(infoFileOrSubdir, false); + try { + int id = Integer.parseInt(meta.getLuid()); + if (id > lastId) { + lastId = id; + } + + stories.put(meta, new File[] { infoFileOrSubdir, + getTargetFile(meta, infoFileOrSubdir) }); + } catch (Exception e) { + // not normal!! + throw new IOException("Cannot understand the LUID of " + + infoFileOrSubdir + ": " + meta.getLuid(), e); + } + } catch (IOException e) { + // We should not have not-supported files in the + // library + Instance.getTraceHandler().error( + new IOException("Cannot load file from library: " + + infoFileOrSubdir, e)); + } + } + + if (pgFiles != null) { + pgFiles.add(1); + } + } + } }