X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Fparsers%2FVcard21Parser.java;h=225915d7ca131a8a974a10ef7f1b9741d4b8cb2f;hb=1c03abafc3987d93fa682e7b8758e51bed8a4faf;hp=6cb4635b27fe1aba3394618d1b493170dfd637b0;hpb=a3b510ab4bf89a7a2a05f3851ffe0f030b8a78f4;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/parsers/Vcard21Parser.java b/src/be/nikiroo/jvcard/parsers/Vcard21Parser.java
index 6cb4635..225915d 100644
--- a/src/be/nikiroo/jvcard/parsers/Vcard21Parser.java
+++ b/src/be/nikiroo/jvcard/parsers/Vcard21Parser.java
@@ -1,5 +1,6 @@
 package be.nikiroo.jvcard.parsers;
 
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -9,12 +10,38 @@ import be.nikiroo.jvcard.Data;
 import be.nikiroo.jvcard.TypeInfo;
 
 public class Vcard21Parser {
-	public static List<Contact> parse(List<String> lines) {
+	public static List<Contact> parse(Iterable<String> textData) {
+		Iterator<String> lines = textData.iterator();
 		List<Contact> contacts = new LinkedList<Contact>();
 		List<Data> datas = null;
 
-		for (String l : lines) {
-			String line = l.trim();
+		String nextRawLine = null;
+		if (lines.hasNext()) {
+			nextRawLine = lines.next();
+			while (lines.hasNext() && isContinuation(nextRawLine)) {
+				// BAD INPUT FILE. IGNORE.
+				System.err
+						.println("VCARD Parser warning: CONTINUATION line seen before any data line");
+				nextRawLine = lines.next();
+			}
+		}
+
+		while (nextRawLine != null) {
+			StringBuilder rawLine = new StringBuilder(nextRawLine.trim());
+			if (lines.hasNext())
+				nextRawLine = lines.next();
+			else
+				nextRawLine = null;
+
+			while (isContinuation(nextRawLine)) {
+				rawLine.append(nextRawLine.trim());
+				if (lines.hasNext())
+					nextRawLine = lines.next();
+				else
+					nextRawLine = null;
+			}
+
+			String line = rawLine.toString();
 			if (line.equals("BEGIN:VCARD")) {
 				datas = new LinkedList<Data>();
 			} else if (line.equals("END:VCARD")) {
@@ -37,8 +64,9 @@ public class Vcard21Parser {
 					String group = "";
 
 					if (line.contains(":")) {
-						String rest = line.split(":")[0];
-						value = line.substring(rest.length() + 1);
+						int colIndex = line.indexOf(':');
+						String rest = line.substring(0, colIndex);
+						value = line.substring(colIndex + 1);
 
 						if (rest.contains(";")) {
 							String tab[] = rest.split(";");
@@ -46,9 +74,11 @@ public class Vcard21Parser {
 
 							for (int i = 1; i < tab.length; i++) {
 								if (tab[i].contains("=")) {
-									String tname = tab[i].split("=")[0];
-									String tvalue = tab[i].substring(tname
-											.length() + 1);
+									int equIndex = tab[i].indexOf('=');
+									String tname = tab[i]
+											.substring(0, equIndex);
+									String tvalue = tab[i]
+											.substring(equIndex + 1);
 									types.add(new TypeInfo(tname, tvalue));
 								} else {
 									types.add(new TypeInfo(tab[i], ""));
@@ -62,8 +92,9 @@ public class Vcard21Parser {
 					}
 
 					if (name.contains(".")) {
-						group = name.split("\\.")[0];
-						name = name.substring(group.length() + 1);
+						int dotIndex = name.indexOf('.');
+						group = name.substring(0, dotIndex);
+						name = name.substring(dotIndex + 1);
 					}
 
 					datas.add(new Data(types, name, value, group));
@@ -82,26 +113,52 @@ public class Vcard21Parser {
 		builder.append("\r\n");
 		builder.append("VERSION:2.1");
 		builder.append("\r\n");
-		for (Data data : contact.getContent()) {
+		for (Data data : contact) {
+			StringBuilder dataBuilder = new StringBuilder();
 			if (data.getGroup() != null && !data.getGroup().trim().equals("")) {
-				builder.append(data.getGroup().trim());
-				builder.append('.');
+				dataBuilder.append(data.getGroup().trim());
+				dataBuilder.append('.');
 			}
-			builder.append(data.getName());
-			for (TypeInfo type : data.getTypes()) {
-				builder.append(';');
-				builder.append(type.getName());
+			dataBuilder.append(data.getName());
+			for (TypeInfo type : data) {
+				dataBuilder.append(';');
+				dataBuilder.append(type.getName());
 				if (type.getValue() != null
 						&& !type.getValue().trim().equals("")) {
-					builder.append('=');
-					builder.append(type.getValue());
+					dataBuilder.append('=');
+					dataBuilder.append(type.getValue());
+				}
+			}
+			dataBuilder.append(':');
+
+			// TODO: bkey!
+			dataBuilder.append(data.getValue());
+
+			// RFC says: Content lines SHOULD be folded to a maximum width of 75
+			// octets -> since it is SHOULD, we will just cut it as 74/75 chars
+			// depending if the last one fits in one char (note: chars != octet)
+			boolean continuation = false;
+			while (dataBuilder.length() > 0) {
+				int stop = 74;
+				if (continuation)
+					stop--; // the space takes 1
+				if (dataBuilder.length() > stop) {
+					char car = dataBuilder.charAt(stop - 1);
+					// RFC forbids cutting a character in 2
+					if (Character.isHighSurrogate(car)) {
+						stop++;
+					}
 				}
+
+				stop = Math.min(stop, dataBuilder.length());
+				if (continuation)
+					builder.append(' ');
+				builder.append(dataBuilder, 0, stop);
+				builder.append("\r\n");
+				dataBuilder.delete(0, stop);
+
+				continuation = true;
 			}
-			builder.append(':');
-			
-			//TODO: bkey!
-			builder.append(data.getValue());
-			builder.append("\r\n");
 		}
 		builder.append("END:VCARD");
 		builder.append("\r\n");
@@ -112,10 +169,26 @@ public class Vcard21Parser {
 	public static String toString(Card card) {
 		StringBuilder builder = new StringBuilder();
 
-		for (Contact contact : card.getContacts()) {
+		for (Contact contact : card) {
 			builder.append(toString(contact, -1));
 		}
 
+		builder.append("\r\n");
+
 		return builder.toString();
 	}
+
+	/**
+	 * Check if the given line is a continuation line or not.
+	 * 
+	 * @param line
+	 *            the line to check
+	 * 
+	 * @return TRUE if the line is a continuation line
+	 */
+	private static boolean isContinuation(String line) {
+		if (line != null && line.length() > 0)
+			return (line.charAt(0) == ' ' || line.charAt(0) == '\t');
+		return false;
+	}
 }