X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fdata%2FMetaData.java;h=586196a663fea88aa39fe45111445d76df0d5651;hb=7345d22206e6ff1571dfaef6795aff7007e50bcb;hp=4b8e65d7e8f674f8b6a99529d91fcce20ba25c9e;hpb=b5e9855b962842b306c17688c1c793dc1378ea62;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/data/MetaData.java b/src/be/nikiroo/fanfix/data/MetaData.java
index 4b8e65d..586196a 100644
--- a/src/be/nikiroo/fanfix/data/MetaData.java
+++ b/src/be/nikiroo/fanfix/data/MetaData.java
@@ -1,16 +1,20 @@
 package be.nikiroo.fanfix.data;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 import be.nikiroo.utils.Image;
+import be.nikiroo.utils.StringUtils;
 
 /**
  * The meta data associated to a {@link Story} object.
  * 
  * @author niki
  */
-public class MetaData implements Cloneable, Comparable<MetaData> {
+public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private String title;
 	private String author;
 	private String date;
@@ -108,6 +112,8 @@ public class MetaData implements Cloneable, Comparable<MetaData> {
 
 	/**
 	 * 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
 	 */
@@ -384,12 +390,14 @@ public class MetaData implements Cloneable, Comparable<MetaData> {
 			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
@@ -466,24 +474,13 @@ public class MetaData implements Cloneable, Comparable<MetaData> {
 
 		String cover = "none";
 		if (getCover() != null) {
-			cover = " bytes";
-
-			int size = getCover().getData().length;
-			if (size > 1000) {
-				size /= 1000;
-				cover = " kb";
-				if (size > 1000) {
-					size /= 1000;
-					cover = " mb";
-				}
-			}
-
-			cover = size + cover;
+			cover = StringUtils.formatNumber(getCover().getSize())
+					+ "bytes";
 		}
 
 		return String.format(
-				"Title: [%s]\nAuthor: [%s]\nDate: [%s]\nTags: [%s]\n"
-						+ "Resume: [%s]\nCover: [%s]", title, getAuthor(),
-				getDate(), tags.toString(), resume, cover);
+				"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);
 	}
 }