X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fdata%2FMetaData.java;h=bcebf754b7dc2b6ee71204d9aaf8a1efe2c20dbf;hp=1781d869f263c559d6e7f5240399db5e498a4fd5;hb=83001824bb702296a45cdf400312e34f69951e91;hpb=c289a297c0e819c9c944732e52e30a35db7a1796

diff --git a/src/be/nikiroo/fanfix/data/MetaData.java b/src/be/nikiroo/fanfix/data/MetaData.java
index 1781d86..bcebf75 100644
--- a/src/be/nikiroo/fanfix/data/MetaData.java
+++ b/src/be/nikiroo/fanfix/data/MetaData.java
@@ -34,6 +34,12 @@ public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
 	private String creationDate;
 	private boolean fakeCover;
 
+	/**
+	 * Create an empty {@link MetaData}.
+	 */
+	public MetaData() {
+	}
+	
 	/**
 	 * The title of the story.
 	 * 
@@ -112,6 +118,8 @@ public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
 
 	/**
 	 * The story resume (a.k.a. description).
+	 * <p>
+	 * This can be NULL if we don't have a resume for this {@link Story}.
 	 * 
 	 * @return the resume
 	 */
@@ -388,12 +396,14 @@ public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
 			return 1;
 		}
 
-		String id = (getUuid() == null ? "" : getUuid())
+		String id = (getTitle() == null ? "" : getTitle())
+				+ (getUuid() == null ? "" : getUuid())
 				+ (getLuid() == null ? "" : getLuid());
-		String oId = (getUuid() == null ? "" : o.getUuid())
+		String oId = (getTitle() == null ? "" : o.getTitle())
+				+ (getUuid() == null ? "" : o.getUuid())
 				+ (o.getLuid() == null ? "" : o.getLuid());
 
-		return id.compareTo(oId);
+		return id.compareToIgnoreCase(oId);
 	}
 
 	@Override
@@ -470,13 +480,14 @@ public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
 
 		String cover = "none";
 		if (getCover() != null) {
-			cover = StringUtils.formatNumber(getCover().getData().length)
+			cover = StringUtils.formatNumber(getCover().getSize())
 					+ "bytes";
 		}
 
 		return String.format(
-				"Meta %s:\n\tTitle: [%s]\n\tAuthor: [%s]\n\tDate: [%s]\n\tTags: [%s]"
-						+ "\n\tResume: [%s]\n\tCover: [%s]", luid, title,
-				getAuthor(), getDate(), tags.toString(), resume, cover);
+				"Meta %s:\n\tTitle: [%s]\n\tAuthor: [%s]\n\tDate: [%s]\n\tTags: [%s]\n\tWord count: [%s]"
+						+ "\n\tResume: [%s]\n\tCover: [%s]",
+				luid, title, getAuthor(), getDate(), tags.toString(),
+				"" + words, resume, cover);
 	}
 }