X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Flauncher%2FMain.java;h=f193be1b493ae81c09178c1f446ca5563f4ce917;hb=47d06cf312c7f7a86b5861bb9a762c8856c4f58e;hp=66625f7e37d892f9585c4a21a041191dd1f7e945;hpb=6435013a3d3feabc7b5a4536ca766ffede0c4d5b;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/launcher/Main.java b/src/be/nikiroo/jvcard/launcher/Main.java
index 66625f7..f193be1 100644
--- a/src/be/nikiroo/jvcard/launcher/Main.java
+++ b/src/be/nikiroo/jvcard/launcher/Main.java
@@ -63,7 +63,7 @@ public class Main {
 	 * @return the translated text with the given value where required
 	 */
 	static public String trans(StringId id, Object... values) {
-		return transService.getString(id, (Object[]) values);
+		return transService.getString(id, values);
 	}
 
 	/**
@@ -278,6 +278,7 @@ public class Main {
 				new RemoteBundle().updateFile(dir);
 			} catch (IOException e) {
 				e.printStackTrace();
+				System.err.flush();
 				System.exit(ERR_INTERNAL);
 			}
 			break;
@@ -316,9 +317,17 @@ public class Main {
 						File f = new File(dir, filename);
 
 						if (f.exists()) {
+							System.out.println("Loading " + f);
 							try {
-								String b64 = StringUtils.fromImage(ImageIO
-										.read(f));
+								String type = "jpeg";
+								int dotIndex = filename.indexOf('.');
+								if (dotIndex >= 0
+										&& (dotIndex + 1) < filename.length()) {
+									type = filename.substring(dotIndex + 1)
+											.toLowerCase();
+								}
+
+								String b64 = StringUtils.fromImage(f);
 
 								// remove previous photos:
 								for (Data photo = contact
@@ -330,7 +339,7 @@ public class Main {
 
 								List<TypeInfo> types = new LinkedList<TypeInfo>();
 								types.add(new TypeInfo("ENCODING", "b"));
-								types.add(new TypeInfo("TYPE", "png"));
+								types.add(new TypeInfo("TYPE", type));
 								Data photo = new Data(types, "PHOTO", b64, null);
 								contact.add(photo);
 							} catch (IOException e) {
@@ -356,6 +365,7 @@ public class Main {
 						if (photo != null) {
 							String filename = contact.toString(format, "");
 							File f = new File(dir, filename + ".png");
+							System.out.println("Saving " + f);
 							try {
 								ImageIO.write(
 										StringUtils.toImage(photo.getValue()),
@@ -419,7 +429,7 @@ public class Main {
 					+ trans(StringId.CLI_HELP_LANG));
 			System.out.println("\t--tui : " + trans(StringId.CLI_HELP_TUI));
 			System.out.println("\t--gui : " + trans(StringId.CLI_HELP_GUI));
-			System.out.println("\t--noutf : " + trans(StringId.CLI_HELP_NOUTF));
+			System.out.println("\t--noutf : " + trans(StringId.CLI_HELP_NOUTF_OPTION));
 			System.out.println("\t--config : "
 					+ trans(StringId.CLI_HELP_CONFIG));
 			System.out.println();
@@ -630,6 +640,7 @@ public class Main {
 		else
 			System.err.println(trans(err, trans(suberr, subvalues)));
 
+		System.err.flush();
 		System.exit(CODE);
 	}
 }