X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Flauncher%2FMain.java;h=d893e101e710ede1013025beb47f424eb879becd;hb=f06c81000632cfb5f525ca458f719338f55f9f66;hp=6d552febfae8c16955cde0ad95480f32ef5bdc40;hpb=d459d7e12a3398344e021b1b12c94a8d647cb6c4;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/launcher/Main.java b/src/be/nikiroo/jvcard/launcher/Main.java
index 6d552fe..d893e10 100644
--- a/src/be/nikiroo/jvcard/launcher/Main.java
+++ b/src/be/nikiroo/jvcard/launcher/Main.java
@@ -1,7 +1,9 @@
 package be.nikiroo.jvcard.launcher;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.net.Socket;
 import java.nio.charset.Charset;
@@ -15,17 +17,19 @@ import be.nikiroo.jvcard.Contact;
 import be.nikiroo.jvcard.Data;
 import be.nikiroo.jvcard.TypeInfo;
 import be.nikiroo.jvcard.launcher.CardResult.MergeCallback;
+import be.nikiroo.jvcard.launcher.Optional.NotSupportedException;
 import be.nikiroo.jvcard.parsers.Format;
 import be.nikiroo.jvcard.remote.Command;
 import be.nikiroo.jvcard.remote.SimpleSocket;
-import be.nikiroo.jvcard.resources.Bundles;
-import be.nikiroo.jvcard.resources.StringUtils;
-import be.nikiroo.jvcard.resources.bundles.ColorBundle;
-import be.nikiroo.jvcard.resources.bundles.DisplayBundle;
-import be.nikiroo.jvcard.resources.bundles.RemoteBundle;
-import be.nikiroo.jvcard.resources.bundles.TransBundle;
-import be.nikiroo.jvcard.resources.enums.DisplayOption;
-import be.nikiroo.jvcard.resources.enums.StringId;
+import be.nikiroo.jvcard.resources.DisplayBundle;
+import be.nikiroo.jvcard.resources.DisplayOption;
+import be.nikiroo.jvcard.resources.RemoteBundle;
+import be.nikiroo.jvcard.resources.StringId;
+import be.nikiroo.jvcard.resources.TransBundle;
+import be.nikiroo.utils.ImageUtils;
+import be.nikiroo.utils.StringUtils;
+import be.nikiroo.utils.Version;
+import be.nikiroo.utils.resources.Bundles;
 
 /**
  * This class contains the runnable Main method. It will parse the user supplied
@@ -33,11 +37,10 @@ import be.nikiroo.jvcard.resources.enums.StringId;
  * a MainWindow.
  * 
  * @author niki
- *
+ * 
  */
 public class Main {
 	static public final String APPLICATION_TITLE = "jVcard";
-	static public final String APPLICATION_VERSION = "1.0-dev";
 
 	static private final int ERR_NO_FILE = 1;
 	static private final int ERR_SYNTAX = 2;
@@ -271,9 +274,12 @@ public class Main {
 					}
 				}
 
-				transService.updateFile(dir); // current lang TransBundle
-				new TransBundle().updateFile(dir);
-				new ColorBundle().updateFile(dir);
+				new TransBundle().updateFile(dir); // default locale
+				for (String lang : new TransBundle().getKnownLanguages()) {
+					new TransBundle(lang).updateFile(dir);
+				}
+
+				// new UIColors().updateFile(dir);
 				new DisplayBundle().updateFile(dir);
 				new RemoteBundle().updateFile(dir);
 			} catch (IOException e) {
@@ -286,12 +292,12 @@ public class Main {
 		case SERVER: {
 			try {
 				Optional.runServer(port);
-			} catch (Exception e) {
-				if (e instanceof IOException) {
-					ERR(StringId.CLI_ERR, StringId.CLI_ERR_CANNOT_START,
-							ERR_INTERNAL);
-					return;
-				} else if (e instanceof ClassNotFoundException) {
+			} catch (IOException e) {
+				ERR(StringId.CLI_ERR, StringId.CLI_ERR_CANNOT_START,
+						ERR_INTERNAL);
+				return;
+			} catch (NotSupportedException e) {
+				if (!e.isCompiledIn()) {
 					ERR(StringId.CLI_ERR, StringId.CLI_ERR_NO_REMOTING,
 							ERR_INTERNAL);
 					return;
@@ -332,7 +338,16 @@ public class Main {
 											.toLowerCase();
 								}
 
-								String b64 = StringUtils.fromImage(f);
+								String b64;
+								InputStream in = null;
+								try {
+									in = new FileInputStream(f);
+									b64 = ImageUtils.toBase64(in);
+								} finally {
+									if (in != null) {
+										in.close();
+									}
+								}
 
 								// remove previous photos:
 								for (Data photo = contact
@@ -373,7 +388,7 @@ public class Main {
 							System.out.println("Saving " + f);
 							try {
 								ImageIO.write(
-										StringUtils.toImage(photo.getValue()),
+										ImageUtils.fromBase64(photo.getValue()),
 										"png", f);
 							} catch (IOException e) {
 								System.err.println(trans(
@@ -392,12 +407,12 @@ public class Main {
 		case CONTACT_MANAGER: {
 			try {
 				Optional.startTui(textMode, files);
-			} catch (Exception e) {
-				if (e instanceof IOException) {
-					ERR(StringId.CLI_ERR, StringId.CLI_ERR_CANNOT_START,
-							ERR_NO_FILE);
-					return;
-				} else if (e instanceof ClassNotFoundException) {
+			} catch (IOException e) {
+				ERR(StringId.CLI_ERR, StringId.CLI_ERR_CANNOT_START,
+						ERR_NO_FILE);
+				return;
+			} catch (NotSupportedException e) {
+				if (!e.isCompiledIn()) {
 					ERR(StringId.CLI_ERR, StringId.CLI_ERR_NO_TUI, ERR_INTERNAL);
 					return;
 				} else {
@@ -409,7 +424,8 @@ public class Main {
 			break;
 		}
 		case HELP: {
-			System.out.println(APPLICATION_TITLE + " " + APPLICATION_VERSION);
+			System.out.println(APPLICATION_TITLE + " "
+					+ Version.getCurrentVersion());
 			System.out.println();
 
 			System.out.println(trans(StringId.CLI_HELP));
@@ -499,7 +515,7 @@ public class Main {
 			}
 		} catch (IOException ioe) {
 			throw ioe;
-		} catch (Exception e) {
+		} catch (NotSupportedException e) {
 			throw new IOException("Remoting support not available", e);
 		}