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

diff --git a/src/be/nikiroo/jvcard/parsers/Vcard21Parser.java b/src/be/nikiroo/jvcard/parsers/Vcard21Parser.java
index 225915d..5388783 100644
--- a/src/be/nikiroo/jvcard/parsers/Vcard21Parser.java
+++ b/src/be/nikiroo/jvcard/parsers/Vcard21Parser.java
@@ -10,10 +10,20 @@ import be.nikiroo.jvcard.Data;
 import be.nikiroo.jvcard.TypeInfo;
 
 public class Vcard21Parser {
-	public static List<Contact> parse(Iterable<String> textData) {
+	/**
+	 * Load the given data from under the given {@link Format}.
+	 * 
+	 * @param lines
+	 *            the input to load from
+	 * @param format
+	 *            the {@link Format} to load as
+	 * 
+	 * @return the list of elements
+	 */
+	public static List<Contact> parseContact(Iterable<String> textData) {
 		Iterator<String> lines = textData.iterator();
 		List<Contact> contacts = new LinkedList<Contact>();
-		List<Data> datas = null;
+		List<String> datas = null;
 
 		String nextRawLine = null;
 		if (lines.hasNext()) {
@@ -43,14 +53,14 @@ public class Vcard21Parser {
 
 			String line = rawLine.toString();
 			if (line.equals("BEGIN:VCARD")) {
-				datas = new LinkedList<Data>();
+				datas = new LinkedList<String>();
 			} else if (line.equals("END:VCARD")) {
 				if (datas == null) {
 					// BAD INPUT FILE. IGNORE.
 					System.err
 							.println("VCARD Parser warning: END:VCARD seen before any VCARD:BEGIN");
 				} else {
-					contacts.add(new Contact(datas));
+					contacts.add(new Contact(parseData(datas)));
 				}
 			} else {
 				if (datas == null) {
@@ -58,46 +68,7 @@ public class Vcard21Parser {
 					System.err
 							.println("VCARD Parser warning: data seen before any VCARD:BEGIN");
 				} else {
-					List<TypeInfo> types = new LinkedList<TypeInfo>();
-					String name = "";
-					String value = "";
-					String group = "";
-
-					if (line.contains(":")) {
-						int colIndex = line.indexOf(':');
-						String rest = line.substring(0, colIndex);
-						value = line.substring(colIndex + 1);
-
-						if (rest.contains(";")) {
-							String tab[] = rest.split(";");
-							name = tab[0];
-
-							for (int i = 1; i < tab.length; i++) {
-								if (tab[i].contains("=")) {
-									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], ""));
-								}
-							}
-						} else {
-							name = rest;
-						}
-					} else {
-						name = line;
-					}
-
-					if (name.contains(".")) {
-						int dotIndex = name.indexOf('.');
-						group = name.substring(0, dotIndex);
-						name = name.substring(dotIndex + 1);
-					}
-
-					datas.add(new Data(types, name, value, group));
+					datas.add(line);
 				}
 			}
 		}
@@ -105,77 +76,192 @@ public class Vcard21Parser {
 		return contacts;
 	}
 
-	// -1 = no bkeys
-	public static String toString(Contact contact, int startingBKey) {
-		StringBuilder builder = new StringBuilder();
+	/**
+	 * Load the given data from under the given {@link Format}.
+	 * 
+	 * @param lines
+	 *            the input to load from
+	 * @param format
+	 *            the {@link Format} to load as
+	 * 
+	 * @return the list of elements
+	 */
+	public static List<Data> parseData(Iterable<String> textData) {
+		List<Data> datas = new LinkedList<Data>();
 
-		builder.append("BEGIN:VCARD");
-		builder.append("\r\n");
-		builder.append("VERSION:2.1");
-		builder.append("\r\n");
-		for (Data data : contact) {
-			StringBuilder dataBuilder = new StringBuilder();
-			if (data.getGroup() != null && !data.getGroup().trim().equals("")) {
-				dataBuilder.append(data.getGroup().trim());
-				dataBuilder.append('.');
-			}
-			dataBuilder.append(data.getName());
-			for (TypeInfo type : data) {
-				dataBuilder.append(';');
-				dataBuilder.append(type.getName());
-				if (type.getValue() != null
-						&& !type.getValue().trim().equals("")) {
-					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++;
+		for (String line : textData) {
+			List<TypeInfo> types = new LinkedList<TypeInfo>();
+			String name = "";
+			String value = "";
+			String group = "";
+
+			if (line.contains(":")) {
+				int colIndex = line.indexOf(':');
+				String rest = line.substring(0, colIndex);
+				value = line.substring(colIndex + 1);
+
+				if (rest.contains(";")) {
+					String tab[] = rest.split(";");
+					name = tab[0];
+
+					for (int i = 1; i < tab.length; i++) {
+						if (tab[i].contains("=")) {
+							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], ""));
+						}
 					}
+				} else {
+					name = rest;
 				}
+			} else {
+				name = line;
+			}
 
-				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;
+			if (name.contains(".")) {
+				int dotIndex = name.indexOf('.');
+				group = name.substring(0, dotIndex);
+				name = name.substring(dotIndex + 1);
 			}
+
+			datas.add(new Data(types, name, value, group));
 		}
-		builder.append("END:VCARD");
-		builder.append("\r\n");
 
-		return builder.toString();
+		return datas;
 	}
 
-	public static String toString(Card card) {
-		StringBuilder builder = new StringBuilder();
+	/**
+	 * Return a {@link String} representation of the given {@link Card}, line by
+	 * line.
+	 * 
+	 * @param card
+	 *            the card to convert
+	 * 
+	 * @return the {@link String} representation
+	 */
+	public static List<String> toStrings(Card card) {
+		List<String> lines = new LinkedList<String>();
 
 		for (Contact contact : card) {
-			builder.append(toString(contact, -1));
+			lines.addAll(toStrings(contact, -1));
+		}
+
+		return lines;
+	}
+
+	/**
+	 * Return a {@link String} representation of the given {@link Contact}, line
+	 * by line.
+	 * 
+	 * @param card
+	 *            the contact to convert
+	 * 
+	 * @param startingBKey
+	 *            the starting BKey number (all the other will follow) or -1 for
+	 *            no BKey
+	 * 
+	 * @return the {@link String} representation
+	 */
+	public static List<String> toStrings(Contact contact, int startingBKey) {
+		List<String> lines = new LinkedList<String>();
+
+		lines.add("BEGIN:VCARD");
+		lines.add("VERSION:2.1");
+		for (Data data : contact) {
+			lines.addAll(toStrings(data));
 		}
+		lines.add("END:VCARD");
 
-		builder.append("\r\n");
+		return lines;
+	}
 
-		return builder.toString();
+	/**
+	 * Return a {@link String} representation of the given {@link Data}, line by
+	 * line.
+	 * 
+	 * @param data
+	 *            the data to convert
+	 * 
+	 * @return the {@link String} representation
+	 */
+	public static List<String> toStrings(Data data) {
+		List<String> lines = new LinkedList<String>();
+
+		StringBuilder dataBuilder = new StringBuilder();
+		if (data.getGroup() != null && !data.getGroup().trim().equals("")) {
+			dataBuilder.append(data.getGroup().trim());
+			dataBuilder.append('.');
+		}
+		dataBuilder.append(data.getName());
+		for (TypeInfo type : data) {
+			dataBuilder.append(';');
+			dataBuilder.append(type.getName());
+			if (type.getValue() != null && !type.getValue().trim().equals("")) {
+				dataBuilder.append('=');
+				dataBuilder.append(type.getRawValue());
+			}
+		}
+		dataBuilder.append(':');
+
+		// TODO: bkey!
+		dataBuilder.append(data.getRawValue());
+
+		// 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) {
+				lines.add(' ' + dataBuilder.substring(0, stop));
+			} else {
+				lines.add(dataBuilder.substring(0, stop));
+			}
+			dataBuilder.delete(0, stop);
+
+			continuation = true;
+		}
+
+		return lines;
+	}
+
+	/**
+	 * Clone the given {@link Card} by exporting then importing it again in VCF.
+	 * 
+	 * @param c
+	 *            the {@link Card} to clone
+	 * 
+	 * @return the clone {@link Contact}
+	 */
+	public static Card clone(Card c) {
+		return new Card(parseContact(toStrings(c)));
+	}
+
+	/**
+	 * Clone the given {@link Contact} by exporting then importing it again in
+	 * VCF.
+	 * 
+	 * @param c
+	 *            the {@link Contact} to clone
+	 * 
+	 * @return the clone {@link Contact}
+	 */
+	public static Contact clone(Contact c) {
+		return parseContact(toStrings(c, -1)).get(0);
 	}
 
 	/**