git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '8a1cae77d279cc246a68109f6178b2bb05e7471f'
[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 67fedbd35627a5da59968fe92e13b21533cae869..2c40beb1758b36f5b1415b3adf4b7ef86bd42fe6 100644
(file)
--- a/
src/be/nikiroo/fanfix/data/MetaData.java
+++ b/
src/be/nikiroo/fanfix/data/MetaData.java
@@
-5,6
+5,7
@@
import java.util.ArrayList;
import java.util.List;
import be.nikiroo.utils.Image;
import java.util.List;
import be.nikiroo.utils.Image;
+import be.nikiroo.utils.StringUtils;
/**
* The meta data associated to a {@link Story} object.
/**
* The meta data associated to a {@link Story} object.
@@
-111,6
+112,8
@@
public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
/**
* The story resume (a.k.a. description).
/**
* 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
*/
*
* @return the resume
*/
@@
-469,19
+472,8
@@
public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
String cover = "none";
if (getCover() != null) {
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(
}
return String.format(