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=cbaf84e3c75def8646332cb7975a650dfe703013;hb=83001824bb702296a45cdf400312e34f69951e91;hpb=3f9f9d63efef45f1b94bf37ece957cead9c29518

diff --git a/src/be/nikiroo/fanfix/data/MetaData.java b/src/be/nikiroo/fanfix/data/MetaData.java
index cbaf84e..bcebf75 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;
@@ -30,6 +34,12 @@ public class MetaData implements Cloneable, Comparable<MetaData> {
 	private String creationDate;
 	private boolean fakeCover;
 
+	/**
+	 * Create an empty {@link MetaData}.
+	 */
+	public MetaData() {
+	}
+	
 	/**
 	 * The title of the story.
 	 * 
@@ -108,6 +118,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 +396,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 +480,14 @@ 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(
-				"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);
 	}
 }