X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fdata%2FMetaData.java;h=2e34ef98ad27bda10ff34a009fa3d3d314aaf6b2;hp=67fedbd35627a5da59968fe92e13b21533cae869;hb=074a83257de30c3cd7409b0840ab6f27ed0e93b5;hpb=8b152e7b4b89b6bda319c96a1371e766b8a51adc

diff --git a/src/be/nikiroo/fanfix/data/MetaData.java b/src/be/nikiroo/fanfix/data/MetaData.java
index 67fedbd..2e34ef9 100644
--- a/src/be/nikiroo/fanfix/data/MetaData.java
+++ b/src/be/nikiroo/fanfix/data/MetaData.java
@@ -5,9 +5,16 @@ 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.
+ * <p>
+ * Note that some earlier version of the program did not save the resume as an
+ * external file; for those stories, the resume is not fetched until the story
+ * is.
+ * <p>
+ * The cover is never fetched until the story is.
  * 
  * @author niki
  */
@@ -33,6 +40,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.
 	 * 
@@ -111,6 +124,12 @@ 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}.
+	 * <p>
+	 * Note that some earlier version of the program did not save the resume as
+	 * an external file; for those stories, the resume is not fetched until the
+	 * story is.
 	 * 
 	 * @return the resume
 	 */
@@ -120,6 +139,10 @@ public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
 
 	/**
 	 * The story resume (a.k.a. description).
+	 * <p>
+	 * Note that some earlier version of the program did not save the resume as
+	 * an external file; for those stories, the resume is not fetched until the
+	 * story is.
 	 * 
 	 * @param resume
 	 *            the resume to set
@@ -130,6 +153,8 @@ public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
 
 	/**
 	 * The cover image of the story if any (can be NULL).
+	 * <p>
+	 * The cover is not fetched until the story is.
 	 * 
 	 * @return the cover
 	 */
@@ -139,6 +164,8 @@ public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
 
 	/**
 	 * The cover image of the story if any (can be NULL).
+	 * <p>
+	 * The cover is not fetched until the story is.
 	 * 
 	 * @param cover
 	 *            the cover to set
@@ -387,12 +414,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
@@ -469,24 +498,14 @@ public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
 
 		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);
 	}
 }