X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FBasicOutput.java;h=5109cce61637a067bb6fc2bfaf38272f54c37c33;hb=16a81ef7656c5c692fb831927e75edde25dd77a0;hp=036a1564d0a594eae2e4d758f0dd16f40a3fcd44;hpb=e604986c4208da0091d26bc0e1c4feb4ff3c588f;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/output/BasicOutput.java b/src/be/nikiroo/fanfix/output/BasicOutput.java
index 036a156..5109cce 100644
--- a/src/be/nikiroo/fanfix/output/BasicOutput.java
+++ b/src/be/nikiroo/fanfix/output/BasicOutput.java
@@ -86,7 +86,7 @@ public abstract class BasicOutput {
 		 * @return the extension
 		 */
 		public String getDefaultExtension(boolean readerTarget) {
-			BasicOutput output = BasicOutput.getOutput(this, false);
+			BasicOutput output = BasicOutput.getOutput(this, false, false);
 			if (output != null) {
 				return output.getDefaultExtension(readerTarget);
 			}
@@ -240,23 +240,42 @@ public abstract class BasicOutput {
 		return type;
 	}
 
+	/**
+	 * Enable the creation of a .info file next to the resulting processed file.
+	 * 
+	 * @return TRUE to enable it
+	 */
+	protected boolean isWriteInfo() {
+		return writeInfo;
+	}
+
+	/**
+	 * Enable the creation of a cover file next to the resulting processed file
+	 * if possible.
+	 * 
+	 * @return TRUE to enable it
+	 */
+	protected boolean isWriteCover() {
+		return writeCover;
+	}
+
 	/**
 	 * The output type.
 	 * 
 	 * @param type
 	 *            the new type
-	 * @param writeInfo
-	 *            TRUE to enable the creation of a .info file
 	 * @param writeCover
 	 *            TRUE to enable the creation of a cover if possible
+	 * @param writeInfo
+	 *            TRUE to enable the creation of a .info file
 	 * 
 	 * @return this
 	 */
-	protected BasicOutput setType(OutputType type, boolean writeCover,
-			boolean writeInfo) {
+	protected BasicOutput setType(OutputType type, boolean writeInfo,
+			boolean writeCover) {
 		this.type = type;
-		this.writeCover = writeCover;
 		this.writeInfo = writeInfo;
+		this.writeCover = writeCover;
 
 		return this;
 	}
@@ -357,13 +376,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++);
@@ -495,29 +514,33 @@ public abstract class BasicOutput {
 	 * 
 	 * @param type
 	 *            the type
-	 * @param infoCover
-	 *            force the <tt>.info</tt> file and the cover to be saved next
+	 * @param writeCover
+	 *            TRUE to enable the creation of a cover if possible to be saved
+	 *            next to the main target file
+	 * @param writeInfo
+	 *            TRUE to enable the creation of a .info file to be saved next
 	 *            to the main target file
 	 * 
 	 * @return the {@link BasicOutput}
 	 */
-	public static BasicOutput getOutput(OutputType type, boolean infoCover) {
+	public static BasicOutput getOutput(OutputType type, boolean writeInfo,
+			boolean writeCover) {
 		if (type != null) {
 			switch (type) {
 			case EPUB:
-				return new Epub().setType(type, infoCover, infoCover);
+				return new Epub().setType(type, writeInfo, writeCover);
 			case TEXT:
-				return new Text().setType(type, true, infoCover);
+				return new Text().setType(type, writeInfo, true);
 			case INFO_TEXT:
 				return new InfoText().setType(type, true, true);
 			case SYSOUT:
 				return new Sysout().setType(type, false, false);
 			case CBZ:
-				return new Cbz().setType(type, infoCover, infoCover);
+				return new Cbz().setType(type, writeInfo, writeCover);
 			case LATEX:
-				return new LaTeX().setType(type, infoCover, infoCover);
+				return new LaTeX().setType(type, writeInfo, writeCover);
 			case HTML:
-				return new Html().setType(type, infoCover, infoCover);
+				return new Html().setType(type, writeInfo, writeCover);
 			}
 		}