X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=db4316e8c499d22fad8417bddde2fe2cb41f9c9e;hp=1c1bc545d59a88e7aeda74dbe79dfa871437581a;hb=68e370a441d8e6b10bfaa904ecacb29e7d6160d8;hpb=333f0e7b5e333e8f6222881ce35398f403fc4121

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 1c1bc54..db4316e 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -14,6 +14,8 @@ import be.nikiroo.fanfix.reader.BasicReader;
 import be.nikiroo.fanfix.reader.BasicReader.ReaderType;
 import be.nikiroo.fanfix.supported.BasicSupport;
 import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
+import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.ui.UIUtils;
 
 /**
  * Main program entry point.
@@ -160,17 +162,40 @@ public class Main {
 			}
 		}
 
+		final Progress mainProgress = new Progress(0, 80);
+		mainProgress.addProgressListener(new Progress.ProgressListener() {
+			private int current = mainProgress.getMin();
+
+			public void progress(Progress progress, String name) {
+				int diff = progress.getProgress() - current;
+				current += diff;
+
+				StringBuilder builder = new StringBuilder();
+				for (int i = 0; i < diff; i++) {
+					builder.append('.');
+				}
+
+				System.err.print(builder.toString());
+
+				if (progress.isDone()) {
+					System.err.println("");
+				}
+			}
+		});
+		Progress pg = new Progress();
+		mainProgress.addProgress(pg, mainProgress.getMax());
+
 		if (exitCode != 255) {
 			switch (action) {
 			case IMPORT:
-				exitCode = imprt(urlString);
+				exitCode = imprt(urlString, pg);
 				break;
 			case EXPORT:
-				exitCode = export(luid, typeString, target);
+				exitCode = export(luid, typeString, target, pg);
 				break;
 			case CONVERT:
 				exitCode = convert(urlString, typeString, target,
-						plusInfo == null ? false : plusInfo);
+						plusInfo == null ? false : plusInfo, pg);
 				break;
 			case LIST:
 				exitCode = list(typeString);
@@ -188,6 +213,7 @@ public class Main {
 			case SET_READER:
 				break;
 			case START:
+				UIUtils.setLookAndFeel();
 				BasicReader.setDefaultReaderType(ReaderType.LOCAL);
 				BasicReader.getReader().start(null);
 				break;
@@ -203,45 +229,20 @@ public class Main {
 		}
 	}
 
-	/**
-	 * Return an {@link URL} from this {@link String}, be it a file path or an
-	 * actual {@link URL}.
-	 * 
-	 * @param sourceString
-	 *            the source
-	 * 
-	 * @return the corresponding {@link URL}
-	 * 
-	 * @throws MalformedURLException
-	 *             if this is neither a file nor a conventional {@link URL}
-	 */
-	private static URL getUrl(String sourceString) throws MalformedURLException {
-		if (sourceString == null || sourceString.isEmpty()) {
-			throw new MalformedURLException("Empty url");
-		}
-
-		URL source = null;
-		try {
-			source = new URL(sourceString);
-		} catch (MalformedURLException e) {
-			File sourceFile = new File(sourceString);
-			source = sourceFile.toURI().toURL();
-		}
-
-		return source;
-	}
-
 	/**
 	 * Import the given resource into the {@link Library}.
 	 * 
 	 * @param urlString
 	 *            the resource to import
+	 * @param pg
+	 *            the optional progress reporter
 	 * 
 	 * @return the exit return code (0 = success)
 	 */
-	public static int imprt(String urlString) {
+	public static int imprt(String urlString, Progress pg) {
 		try {
-			Story story = Instance.getLibrary().imprt(getUrl(urlString));
+			Story story = Instance.getLibrary().imprt(
+					BasicReader.getUrl(urlString), pg);
 			System.out.println(story.getMeta().getLuid() + ": \""
 					+ story.getMeta().getTitle() + "\" imported.");
 		} catch (IOException e) {
@@ -261,10 +262,13 @@ public class Main {
 	 *            the {@link OutputType} to use
 	 * @param target
 	 *            the target
+	 * @param pg
+	 *            the optional progress reporter
 	 * 
 	 * @return the exit return code (0 = success)
 	 */
-	public static int export(String luid, String typeString, String target) {
+	public static int export(String luid, String typeString, String target,
+			Progress pg) {
 		OutputType type = OutputType.valueOfNullOkUC(typeString);
 		if (type == null) {
 			Instance.syserr(new Exception(trans(StringId.OUTPUT_DESC,
@@ -273,7 +277,7 @@ public class Main {
 		}
 
 		try {
-			Instance.getLibrary().export(luid, type, target);
+			Instance.getLibrary().export(luid, type, target, pg);
 		} catch (IOException e) {
 			Instance.syserr(e);
 			return 4;
@@ -316,9 +320,9 @@ public class Main {
 		try {
 			BasicReader reader = BasicReader.getReader();
 			if (library) {
-				reader.setStory(story);
+				reader.setStory(story, null);
 			} else {
-				reader.setStory(getUrl(story));
+				reader.setStory(BasicReader.getUrl(story), null);
 			}
 
 			if (chapString != null) {
@@ -352,16 +356,18 @@ public class Main {
 	 * @param infoCover
 	 *            TRUE to also export the cover and info file, even if the given
 	 *            {@link OutputType} does not usually save them
+	 * @param pg
+	 *            the optional progress reporter
 	 * 
 	 * @return the exit return code (0 = success)
 	 */
 	private static int convert(String urlString, String typeString,
-			String target, boolean infoCover) {
+			String target, boolean infoCover, Progress pg) {
 		int exitCode = 0;
 
 		String sourceName = urlString;
 		try {
-			URL source = getUrl(urlString);
+			URL source = BasicReader.getUrl(urlString);
 			sourceName = source.toString();
 			if (source.toString().startsWith("file://")) {
 				sourceName = sourceName.substring("file://".length());
@@ -378,12 +384,19 @@ public class Main {
 					BasicSupport support = BasicSupport.getSupport(source);
 
 					if (support != null) {
-						Story story = support.process(source);
+						Progress pgIn = new Progress();
+						Progress pgOut = new Progress();
+						if (pg != null) {
+							pg.setMax(2);
+							pg.addProgress(pgIn, 1);
+							pg.addProgress(pgOut, 1);
+						}
 
+						Story story = support.process(source, pgIn);
 						try {
 							target = new File(target).getAbsolutePath();
 							BasicOutput.getOutput(type, infoCover).process(
-									story, target);
+									story, target, pgOut);
 						} catch (IOException e) {
 							Instance.syserr(new IOException(trans(
 									StringId.ERR_SAVING, target), e));