X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FBasicOutput.java;h=62a008c001b8b3697671079ab34b839fef74bf31;hp=03218bcdf8f22f80404261f41998c3a19dd36722;hb=HEAD;hpb=925298fd058a953144058f8b70d939c2a3e7ea5b

diff --git a/src/be/nikiroo/fanfix/output/BasicOutput.java b/src/be/nikiroo/fanfix/output/BasicOutput.java
index 03218bc..62a008c 100644
--- a/src/be/nikiroo/fanfix/output/BasicOutput.java
+++ b/src/be/nikiroo/fanfix/output/BasicOutput.java
@@ -12,6 +12,7 @@ import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.Version;
 
 /**
  * This class is the base class used by the other output classes. It can be used
@@ -62,13 +63,13 @@ public abstract class BasicOutput {
 			StringId id = longDesc ? StringId.OUTPUT_DESC
 					: StringId.OUTPUT_DESC_SHORT;
 
-			String desc = Instance.getTrans().getStringX(id, this.name());
+			String desc = Instance.getInstance().getTrans().getStringX(id, this.name());
 
 			if (desc == null) {
-				desc = Instance.getTrans().getString(id, this);
+				desc = Instance.getInstance().getTrans().getString(id, this.toString());
 			}
 
-			if (desc == null) {
+			if (desc == null || desc.isEmpty()) {
 				desc = this.toString();
 			}
 
@@ -79,9 +80,10 @@ public abstract class BasicOutput {
 		 * The default extension to add to the output files.
 		 * 
 		 * @param readerTarget
-		 *            the target to point to to read the {@link Story} (for
-		 *            instance, the main entry point if this {@link Story} is in
-		 *            a directory bundle)
+		 *            TRUE to point to the main {@link Story} entry point for a
+		 *            reader (for instance, the main entry point if this
+		 *            {@link Story} is in a directory bundle), FALSE to point to
+		 *            the main file even if it is a directory for instance
 		 * 
 		 * @return the extension
 		 */
@@ -149,7 +151,8 @@ public abstract class BasicOutput {
 	}
 
 	/** The creator name (this program, by me!) */
-	static final String EPUB_CREATOR = "Fanfix (by Niki)";
+	static protected final String EPUB_CREATOR = "Fanfix "
+			+ Version.getCurrentVersion() + " (by Niki)";
 
 	/** The current best name for an image */
 	private String imageName;
@@ -284,9 +287,10 @@ public abstract class BasicOutput {
 	 * The default extension to add to the output files.
 	 * 
 	 * @param readerTarget
-	 *            the target to point to to read the {@link Story} (for
-	 *            instance, the main entry point if this {@link Story} is in a
-	 *            directory bundle)
+	 *            TRUE to point to the main {@link Story} entry point for a
+	 *            reader (for instance, the main entry point if this
+	 *            {@link Story} is in a directory bundle), FALSE to point to the
+	 *            main file even if it is a directory for instance
 	 * 
 	 * @return the extension
 	 */
@@ -295,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 {
 	}
 
@@ -328,20 +326,16 @@ public abstract class BasicOutput {
 
 		String chapterNameNum = String.format("%03d", 0);
 		String paragraphNumber = String.format("%04d", 0);
-		imageName = paragraphNumber + "_" + chapterNameNum + ".png";
+		imageName = paragraphNumber + "_" + chapterNameNum;
 
 		if (story.getMeta() != null) {
 			story.getMeta().setType("" + getType());
 		}
 
-		System.out.println(story.getMeta().getTitle() + " -> write cover: "
-				+ writeCover);
-		new Exception().printStackTrace();
-
-		if (writeCover) {
+		if (isWriteCover()) {
 			InfoCover.writeCover(targetDir, targetName, story.getMeta());
 		}
-		if (writeInfo) {
+		if (isWriteInfo()) {
 			InfoCover.writeInfo(targetDir, targetName, story.getMeta());
 		}
 
@@ -380,13 +374,13 @@ public abstract class BasicOutput {
 
 		int num = 0;
 		String paragraphNumber = String.format("%04d", num++);
-		imageName = chapterNameNum + "_" + paragraphNumber + ".png";
+		imageName = chapterNameNum + "_" + paragraphNumber;
 
 		writeChapterHeader(chap);
 		int i = 1;
 		for (Paragraph para : chap) {
 			paragraphNumber = String.format("%04d", num++);
-			imageName = chapterNameNum + "_" + paragraphNumber + ".png";
+			imageName = chapterNameNum + "_" + paragraphNumber;
 			writeParagraph(para);
 			if (chapPg != null) {
 				chapPg.setProgress(i++);