X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FLocalLibrary.java;h=c99a0fbebefc1a2fef30d6f83d8c0d080303b5ef;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=e9c67f3866d41bca6487b36b2e5db20be163dc97;hpb=3a0605e6a05e6d9dee6b596d5f9b193408470164;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/library/LocalLibrary.java b/src/be/nikiroo/fanfix/library/LocalLibrary.java index e9c67f3..c99a0fb 100644 --- a/src/be/nikiroo/fanfix/library/LocalLibrary.java +++ b/src/be/nikiroo/fanfix/library/LocalLibrary.java @@ -13,6 +13,8 @@ import java.util.Map; import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.bundles.Config; +import be.nikiroo.fanfix.bundles.ConfigBundle; +import be.nikiroo.fanfix.bundles.UiConfigBundle; import be.nikiroo.fanfix.data.MetaData; import be.nikiroo.fanfix.data.Story; import be.nikiroo.fanfix.output.BasicOutput; @@ -22,6 +24,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 +35,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; @@ -40,13 +44,14 @@ public class LocalLibrary extends BasicLibrary { /** * Create a new {@link LocalLibrary} with the given back-end directory. * - * @param baseDir - * the directory where to find the {@link Story} objects + * @param baseDir the directory where to find the {@link Story} objects + * @param config the configuration used to know which kind of default + * {@link OutputType} to use for images and non-images stories */ - public LocalLibrary(File baseDir) { - this(baseDir, Instance.getConfig().getString( - Config.NON_IMAGES_DOCUMENT_TYPE), Instance.getConfig() - .getString(Config.IMAGES_DOCUMENT_TYPE), false); + public LocalLibrary(File baseDir, ConfigBundle config) { + this(baseDir, // + config.getString(Config.FILE_FORMAT_NON_IMAGES_DOCUMENT_TYPE), + config.getString(Config.FILE_FORMAT_IMAGES_DOCUMENT_TYPE), false); } /** @@ -98,9 +103,8 @@ public class LocalLibrary extends BasicLibrary { } @Override - public File getFile(String luid, Progress pg) { - Instance.getTraceHandler().trace( - this.getClass().getSimpleName() + ": get file for " + luid); + public File getFile(String luid, Progress pg) throws IOException { + Instance.getInstance().getTraceHandler().trace(this.getClass().getSimpleName() + ": get file for " + luid); File file = null; String mess = "no file found for "; @@ -112,15 +116,14 @@ public class LocalLibrary extends BasicLibrary { file = files[1]; } - Instance.getTraceHandler().trace( - this.getClass().getSimpleName() + ": " + mess + luid + " (" - + meta.getTitle() + ")"); + Instance.getInstance().getTraceHandler() + .trace(this.getClass().getSimpleName() + ": " + mess + luid + " (" + meta.getTitle() + ")"); return file; } @Override - public Image getCover(String luid) { + public Image getCover(String luid) throws IOException { MetaData meta = getInfo(luid); if (meta != null) { if (meta.getCover() != null) { @@ -135,7 +138,7 @@ public class LocalLibrary extends BasicLibrary { meta = InfoReader.readMeta(infoFile, true); return meta.getCover(); } catch (IOException e) { - Instance.getTraceHandler().error(e); + Instance.getInstance().getTraceHandler().error(e); } } } @@ -203,7 +206,7 @@ public class LocalLibrary extends BasicLibrary { InfoCover.writeInfo(newDir, name, meta); relatedFile.getParentFile().delete(); } catch (IOException e) { - Instance.getTraceHandler().error(e); + Instance.getInstance().getTraceHandler().error(e); } } else { relatedFile.renameTo(new File(newDir, relatedFile.getName())); @@ -240,10 +243,8 @@ public class LocalLibrary extends BasicLibrary { } catch (FileNotFoundException e) { e.printStackTrace(); } catch (IOException e) { - Instance.getTraceHandler().error( - new IOException( - "Cannot load the existing custom source cover: " - + cover, e)); + Instance.getInstance().getTraceHandler() + .error(new IOException("Cannot load the existing custom source cover: " + cover, e)); } } } @@ -252,12 +253,49 @@ 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.getInstance().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 @@ -269,12 +307,33 @@ public class LocalLibrary extends BasicLibrary { dir.mkdirs(); File cover = new File(dir, ".cover"); try { - Instance.getCache().saveAsImage(coverImage, cover, true); + Instance.getInstance().getCache().saveAsImage(coverImage, cover, true); if (sourceCovers != null) { sourceCovers.put(source, coverImage); } } catch (IOException e) { - Instance.getTraceHandler().error(e); + Instance.getInstance().getTraceHandler().error(e); + } + } + + /** + * 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.getInstance().getCache().saveAsImage(coverImage, cover, true); + if (authorCovers != null) { + authorCovers.put(author, coverImage); + } + } catch (IOException e) { + Instance.getInstance().getTraceHandler().error(e); } } @@ -352,6 +411,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}. @@ -387,6 +462,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); } @@ -403,7 +481,8 @@ public class LocalLibrary extends BasicLibrary { private File getExpectedDir(String source) { String sanitizedSource = source.replaceAll("[^a-zA-Z0-9._+/-]", "_"); - while (sanitizedSource.startsWith("/")) { + while (sanitizedSource.startsWith("/") + || sanitizedSource.startsWith("_")) { if (sanitizedSource.length() > 1) { sanitizedSource = sanitizedSource.substring(1); } else { @@ -414,12 +493,30 @@ public class LocalLibrary extends BasicLibrary { sanitizedSource = sanitizedSource.replace("/", File.separator); if (sanitizedSource.isEmpty()) { - sanitizedSource = "EMPTY"; + 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.getInstance().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}. *

@@ -462,8 +559,7 @@ public class LocalLibrary extends BasicLibrary { } String coverExt = "." - + Instance.getConfig().getString(Config.IMAGE_FORMAT_COVER) - .toLowerCase(); + + Instance.getInstance().getConfig().getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER).toLowerCase(); File coverFile = new File(path + coverExt); if (!coverFile.exists()) { coverFile = new File(path.substring(0, @@ -539,7 +635,8 @@ public class LocalLibrary extends BasicLibrary { boolean info = file != null && file.isFile() && file.getPath().toLowerCase().endsWith(".info"); boolean dir = file != null && file.isDirectory(); - return info || dir; + boolean isExpandedHtml = new File(file, "index.html").isFile(); + return info || (dir && !isExpandedHtml); } }); @@ -574,9 +671,8 @@ public class LocalLibrary extends BasicLibrary { } 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)); + Instance.getInstance().getTraceHandler() + .error(new IOException("Cannot load file from library: " + infoFileOrSubdir, e)); } }