include 2.0.3 patch

[nikiroo-utils.git] / src / be / nikiroo / fanfix / data / MetaData.java

diff --git a/src/be/nikiroo/fanfix/data/MetaData.java b/src/be/nikiroo/fanfix/data/MetaData.java
index 4b8e65d7e8f674f8b6a99529d91fcce20ba25c9e..1781d869f263c559d6e7f5240399db5e498a4fd5 100644 (file)
--- 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;
@@ -466,24 +470,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().getData().length)
+                                       + "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);
        }
 }