"); - desc.append(story.getMeta().getTitle()); - desc.append("

\n"); - desc.append("\t\n"); - desc.append("\t\t

\n"); - desc.append("\t\n"); - desc.append("\t\n"); + StringBuilder desclines = new StringBuilder(); Map details = BasicLibrary .getMetaDesc(story.getMeta()); for (String key : details.keySet()) { - appendTableRow(desc, 2, key, details.get(key)); + desclines.append(getTemplate("viewer.descline") // + .replace("${key}", key) // + .replace("${value}", details.get(key)) // + ); } - desc.append("\t

\n"); - desc.append("

Description

\n"); - content.append(desc); - String description = new TextOutput(false).convert(chap, - chapter > 0); - content.append(chap.getParagraphs().size() <= 0 - ? "No content provided." - : description); - content.append("

" - + "

\n" // - + "\t<<\n"// - + "\t<\n" // - + "\t

\n" // - + "\t\t

\n", // - disabledLeft, first, // - disabledLeft, previous, // - paragraph > 0 ? paragraph : chapter // - )); - // List of chap/para links - - appendItemA(builder, 3, WebLibraryUrls.getViewUrl(luid, 0, null), - "Description", paragraph == 0 && chapter == 0); + StringBuilder links = new StringBuilder(); + links.append(getTemplate("viewer.link") // + .replace("${link}", + WebLibraryUrls.getViewUrl(luid, 0, null)) // + .replace("${class}", + paragraph == 0 && chapter == 0 ? "selected" : "") // + .replace("${name}", "Description") // + ); if (paragraph > 0) { for (int i = 1; i <= chap.getParagraphs().size(); i++) { - appendItemA(builder, 3, - WebLibraryUrls.getViewUrl(luid, chapter, i), - "Image " + i, paragraph == i); + links.append(getTemplate("viewer.link") // + .replace("${link}", + WebLibraryUrls.getViewUrl(luid, chapter, i)) // + .replace("${class}", + paragraph == i ? "selected" : "") // + .replace("${name}", "Image " + i) // + ); } } else { int i = 1; @@ -736,51 +734,79 @@ abstract class WebLibraryServerHtml implements Runnable { chapName += ": " + c.getName(); } - appendItemA(builder, 3, - WebLibraryUrls.getViewUrl(luid, i, null), chapName, - chapter == i); + links.append(getTemplate("viewer.link") // + .replace("${link}", + WebLibraryUrls.getViewUrl(luid, i, null)) // + .replace("${class}", chapter == i ? "selected" : "") // + .replace("${name}", chapName) // + ); i++; } } - builder.append(String.format("" // - + "\t\t

\n" // - + "\t

\n" // - + "\t>\n" // - + "\t>>\n"// - + "

\n"); - builder.append(" BACK\n"); - if (paragraph > 0) { - builder.append(String.format("" // - + "\tREAL\n"// - + "\tWIDTH\n"// - + "\tHEIGHT\n"// - + "

"); - builder.append(name); - builder.append("

Fanfix

${title}

diff --git a/library/web/package-info.java b/library/web/package-info.java new file mode 100644 index 0000000..69bff54 --- /dev/null +++ b/library/web/package-info.java @@ -0,0 +1 @@ +package be.nikiroo.fanfix.library.web; \ No newline at end of file diff --git a/library/web/style.css b/library/web/style.css index 4196aeb..b12a24f 100644 --- a/library/web/style.css +++ b/library/web/style.css @@ -310,13 +310,13 @@ a.viewer.link:hover { display: block; } -.desc .details .col1 { +.desc .details .col.key { font-weight: bold; padding-left: 5px; padding-right: 5px; } -.desc .details .col2 { +.desc .details .col.value { color: #AAA391; } diff --git a/library/web/templates/WebLibraryServerTemplates.java b/library/web/templates/WebLibraryServerTemplates.java new file mode 100644 index 0000000..482a1b8 --- /dev/null +++ b/library/web/templates/WebLibraryServerTemplates.java @@ -0,0 +1,4 @@ +package be.nikiroo.fanfix.library.web.templates; + +public class WebLibraryServerTemplates { +} diff --git a/library/web/templates/bookline.html b/library/web/templates/bookline.html new file mode 100644 index 0000000..9b1a6b7 --- /dev/null +++ b/library/web/templates/bookline.html @@ -0,0 +1 @@ +

${cached}${luid}${title}${author}

diff --git a/library/web/templates/browser.html b/library/web/templates/browser.html new file mode 100644 index 0000000..f3f3047 --- /dev/null +++ b/library/web/templates/browser.html @@ -0,0 +1,18 @@ + diff --git a/library/web/templates/browser.option.html b/library/web/templates/browser.option.html new file mode 100644 index 0000000..49f7b5b --- /dev/null +++ b/library/web/templates/browser.option.html @@ -0,0 +1 @@ + diff --git a/library/web/templates/browser.select.html b/library/web/templates/browser.select.html new file mode 100644 index 0000000..447d845 --- /dev/null +++ b/library/web/templates/browser.select.html @@ -0,0 +1,3 @@ + diff --git a/library/web/templates/index.banner.html b/library/web/templates/index.banner.html new file mode 100644 index 0000000..c2cd1e7 --- /dev/null +++ b/library/web/templates/index.banner.html @@ -0,0 +1,5 @@ + diff --git a/library/web/templates/index.post.html b/library/web/templates/index.post.html new file mode 100644 index 0000000..52ba19e --- /dev/null +++ b/library/web/templates/index.post.html @@ -0,0 +1,2 @@ +

+ \ No newline at end of file diff --git a/library/web/templates/package-info.java b/library/web/templates/package-info.java new file mode 100644 index 0000000..5d4f3b2 --- /dev/null +++ b/library/web/templates/package-info.java @@ -0,0 +1 @@ +package be.nikiroo.fanfix.library.web.templates; \ No newline at end of file diff --git a/library/web/templates/viewer.desc.html b/library/web/templates/viewer.desc.html new file mode 100644 index 0000000..21cddc4 --- /dev/null +++ b/library/web/templates/viewer.desc.html @@ -0,0 +1,9 @@ +

${title}

+ +

+ + +${details}

Description

diff --git a/library/web/templates/viewer.descline.html b/library/web/templates/viewer.descline.html new file mode 100644 index 0000000..9d61987 --- /dev/null +++ b/library/web/templates/viewer.descline.html @@ -0,0 +1 @@ + ${key}${value} diff --git a/library/web/templates/viewer.image.html b/library/web/templates/viewer.image.html new file mode 100644 index 0000000..2416516 --- /dev/null +++ b/library/web/templates/viewer.image.html @@ -0,0 +1,6 @@ + +

+ diff --git a/library/web/templates/viewer.link.html b/library/web/templates/viewer.link.html new file mode 100644 index 0000000..5812c80 --- /dev/null +++ b/library/web/templates/viewer.link.html @@ -0,0 +1 @@ + ${name} diff --git a/library/web/templates/viewer.navbar.html b/library/web/templates/viewer.navbar.html new file mode 100644 index 0000000..59f35be --- /dev/null +++ b/library/web/templates/viewer.navbar.html @@ -0,0 +1,11 @@ + diff --git a/library/web/templates/viewer.optionbar.button.html b/library/web/templates/viewer.optionbar.button.html new file mode 100644 index 0000000..b85f9a9 --- /dev/null +++ b/library/web/templates/viewer.optionbar.button.html @@ -0,0 +1 @@ + ${value} diff --git a/library/web/templates/viewer.optionbar.html b/library/web/templates/viewer.optionbar.html new file mode 100644 index 0000000..1d1eaec --- /dev/null +++ b/library/web/templates/viewer.optionbar.html @@ -0,0 +1,2 @@ +

+${buttons}

diff --git a/library/web/templates/viewer.text.html b/library/web/templates/viewer.text.html new file mode 100644 index 0000000..4562ea4 --- /dev/null +++ b/library/web/templates/viewer.text.html @@ -0,0 +1,4 @@ +

+${desc} + ${content} +

diff --git a/output/BasicOutput.java b/output/BasicOutput.java index 41634fa..62a008c 100644 --- a/output/BasicOutput.java +++ b/output/BasicOutput.java @@ -299,27 +299,21 @@ public abstract class BasicOutput { return ""; } - @SuppressWarnings("unused") protected void writeStoryHeader(Story story) throws IOException { } - @SuppressWarnings("unused") protected void writeChapterHeader(Chapter chap) throws IOException { } - @SuppressWarnings("unused") protected void writeParagraphHeader(Paragraph para) throws IOException { } - @SuppressWarnings("unused") protected void writeStoryFooter(Story story) throws IOException { } - @SuppressWarnings("unused") protected void writeChapterFooter(Chapter chap) throws IOException { } - @SuppressWarnings("unused") protected void writeParagraphFooter(Paragraph para) throws IOException { } diff --git a/output/InfoCover.java b/output/InfoCover.java index d8ca49a..fe530a8 100644 --- a/output/InfoCover.java +++ b/output/InfoCover.java @@ -5,22 +5,45 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; +import java.util.Arrays; import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.bundles.Config; +import be.nikiroo.fanfix.data.Chapter; import be.nikiroo.fanfix.data.MetaData; +import be.nikiroo.fanfix.data.Story; +/** + * Helper class to write info, cover and summary (resume) files. + * + * @author niki + */ public class InfoCover { + /** + * Write both the .info and the .summary files by taking + * the information from the {@link MetaData}. + * + * @param targetDir + * the directory where to write the 2 files + * @param targetName + * the target name (no extension) to use (so you will get + * targetName.info and targetName.summary) + * @param meta + * the {@link MetaData} to get the data out of + * + * @throws IOException + * in case of I/O error + */ public static void writeInfo(File targetDir, String targetName, MetaData meta) throws IOException { File info = new File(targetDir, targetName + ".info"); - BufferedWriter infoWriter = null; - try { - infoWriter = new BufferedWriter(new OutputStreamWriter( - new FileOutputStream(info), "UTF-8")); + if (meta != null) { + BufferedWriter infoWriter = null; + try { + infoWriter = new BufferedWriter(new OutputStreamWriter( + new FileOutputStream(info), "UTF-8")); - if (meta != null) { String tags = ""; if (meta.getTags() != null) { for (String tag : meta.getTags()) { @@ -47,7 +70,8 @@ public class InfoCover { writeMeta(infoWriter, "TYPE", meta.getType()); if (meta.getCover() != null) { String format = Instance.getInstance().getConfig() - .getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER).toLowerCase(); + .getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER) + .toLowerCase(); writeMeta(infoWriter, "COVER", targetName + "." + format); } else { writeMeta(infoWriter, "COVER", ""); @@ -59,14 +83,69 @@ public class InfoCover { writeMeta(infoWriter, "CREATION_DATE", meta.getCreationDate()); writeMeta(infoWriter, "FAKE_COVER", Boolean.toString(meta.isFakeCover())); + } finally { + if (infoWriter != null) { + infoWriter.close(); + } } - } finally { - if (infoWriter != null) { - infoWriter.close(); + + if (meta.getResume() != null) { + Story fakeStory = new Story(); + fakeStory.setMeta(meta); + fakeStory.setChapters(Arrays.asList(meta.getResume())); + + Text summaryText = new Text() { + @Override + protected boolean isWriteCover() { + return false; + } + + @Override + protected boolean isWriteInfo() { + return false; // infinite loop if not! + } + + @Override + public String getDefaultExtension(boolean readerTarget) { + return ".summary"; + } + + @Override + protected void writeStoryHeader(Story story) + throws IOException { + } + + @Override + protected void writeStoryFooter(Story story) + throws IOException { + } + + @Override + protected void writeChapterHeader(Chapter chap) + throws IOException { + } + + @Override + protected void writeChapterFooter(Chapter chap) + throws IOException { + } + }; + + summaryText.process(fakeStory, targetDir, targetName); } } } + /** + * Write the cover file. + * + * @param targetDir + * the target directory + * @param targetName + * the target name for the cover (the extension will be added) + * @param meta + * the meta to get the information out of + */ public static void writeCover(File targetDir, String targetName, MetaData meta) { if (meta != null && meta.getCover() != null) { diff --git a/reader/TextOutput.java b/reader/TextOutput.java index 60b3a7f..732fced 100644 --- a/reader/TextOutput.java +++ b/reader/TextOutput.java @@ -145,4 +145,18 @@ public class TextOutput { } return builder.toString(); } + + /** + * Convert the paragraph into HTML3 code. + * + * @param para + * the {@link Paragraph} to convert + * + * @return HTML3 code tested with Java Swing + */ + public String convert(Paragraph para) { + Chapter fakeChapter = new Chapter(0, ""); + fakeChapter.setParagraphs(Arrays.asList(para)); + return convert(fakeChapter, false); + } } diff --git a/supported/BasicSupportPara.java b/supported/BasicSupportPara.java index 1dbedc9..e550d82 100644 --- a/supported/BasicSupportPara.java +++ b/supported/BasicSupportPara.java @@ -35,6 +35,17 @@ public class BasicSupportPara { BasicSupportHelper bsHelper; BasicSupportImages bsImages; + /** + * Create a new {@link BasicSupportPara}. + * + * Note that you need an instance of both {@link BasicSupportHelper} and + * {@link BasicSupportImages} for it to work. + * + * @param bsHelper + * the required {@link BasicSupportHelper} + * @param bsImages + * the required {@link BasicSupportImages} + */ public BasicSupportPara(BasicSupportHelper bsHelper, BasicSupportImages bsImages) { this.bsHelper = bsHelper; this.bsImages = bsImages; @@ -45,7 +56,7 @@ public class BasicSupportPara { * the content as it should be. * * @param support - * the linked {@link BasicSupport} + * the linked {@link BasicSupport} (can be NULL) * @param source * the source of the story (for image lookup in the same path if * the source is a file, can be NULL) diff --git a/supported/InfoReader.java b/supported/InfoReader.java index d5eeeb1..22afc92 100644 --- a/supported/InfoReader.java +++ b/supported/InfoReader.java @@ -11,27 +11,30 @@ import java.util.Scanner; import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.bundles.Config; +import be.nikiroo.fanfix.data.Chapter; import be.nikiroo.fanfix.data.MetaData; +import be.nikiroo.utils.IOUtils; import be.nikiroo.utils.Image; import be.nikiroo.utils.streams.MarkableFileInputStream; -// not complete: no "description" tag public class InfoReader { static protected BasicSupportHelper bsHelper = new BasicSupportHelper(); - // static protected BasicSupportImages bsImages = new BasicSupportImages(); - // static protected BasicSupportPara bsPara = new BasicSupportPara(new - // BasicSupportHelper(), new BasicSupportImages()); + static protected BasicSupportImages bsImages = new BasicSupportImages(); + static protected BasicSupportPara bsPara = new BasicSupportPara( + new BasicSupportHelper(), new BasicSupportImages()); public static MetaData readMeta(File infoFile, boolean withCover) throws IOException { if (infoFile == null) { throw new IOException("File is null"); } + + MetaData meta = null; if (infoFile.exists()) { InputStream in = new MarkableFileInputStream(infoFile); try { - MetaData meta = createMeta(infoFile.toURI().toURL(), in, + meta = createMeta(infoFile.toURI().toURL(), in, withCover); // Some old .info files were using UUID for URL... @@ -46,8 +49,6 @@ public class InfoReader { // formats have a copy of the original text file) if (!hasIt(meta.getTitle(), meta.getAuthor(), meta.getDate(), meta.getUrl())) { - - // TODO: not nice, would be better to do it properly... String base = infoFile.getPath(); if (base.endsWith(".info")) { base = base.substring(0, @@ -62,15 +63,34 @@ public class InfoReader { } completeMeta(textFile, meta); - // } - return meta; + } finally { in.close(); } } + if (meta != null) { + try { + File summaryFile = new File(infoFile.getAbsolutePath() + .replaceFirst("\\.info$", ".summary")); + InputStream in = new MarkableFileInputStream(summaryFile); + try { + String content = IOUtils.readSmallStream(in); + Chapter desc = bsPara.makeChapter(null, null, 0, + "Description", content, false, null); + meta.setResume(desc); + } finally { + in.close(); + } + } catch (IOException e) { + // ignore absent or bad summary + } + + return meta; + } + throw new FileNotFoundException( "File given as argument does not exists: " + infoFile.getAbsolutePath()); @@ -90,6 +110,7 @@ public class InfoReader { */ static public void completeMeta(File textFile, MetaData meta) throws IOException { + // TODO: not nice, would be better to do it properly... if (textFile != null && textFile.exists()) { final URL source = textFile.toURI().toURL(); final MetaData[] superMetaA = new MetaData[1]; diff --git a/supported/Text.java b/supported/Text.java index 232eab6..71e30c3 100644 --- a/supported/Text.java +++ b/supported/Text.java @@ -15,9 +15,7 @@ import org.jsoup.nodes.Document; import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.bundles.Config; -import be.nikiroo.fanfix.data.Chapter; import be.nikiroo.fanfix.data.MetaData; -import be.nikiroo.fanfix.data.Paragraph; import be.nikiroo.utils.Image; import be.nikiroo.utils.ImageUtils; import be.nikiroo.utils.Progress; @@ -172,20 +170,7 @@ class Text extends BasicSupport { @Override protected String getDesc() throws IOException { - String content = getChapterContent(null, 0, null).trim(); - if (!content.isEmpty()) { - Chapter desc = bsPara.makeChapter(this, null, 0, "Description", - content, isHtml(), null); - StringBuilder builder = new StringBuilder(); - for (Paragraph para : desc) { - if (builder.length() > 0) { - builder.append("\n"); - } - builder.append(para.getContent()); - } - } - - return content; + return getChapterContent(null, 0, null).trim(); } protected Image getCover(File sourceFile) {

"); - desc.append(story.getMeta().getTitle()); - desc.append("

Description

Fanfix

") // - .append(Version.getCurrentVersion()) // - .append("

Fanfix

${version}

${title}

Description