Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1774] trunk/openutils-mgnlmedia/src/main
|
From: <die...@us...> - 2010-02-02 17:57:08
|
Revision: 1774
http://openutils.svn.sourceforge.net/openutils/?rev=1774&view=rev
Author: diego_schivo
Date: 2010-02-02 17:57:01 +0000 (Tue, 02 Feb 2010)
Log Message:
-----------
MEDIA-64 mediaInfo as a map
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2010-02-02 17:28:50 UTC (rev 1773)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2010-02-02 17:57:01 UTC (rev 1774)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
@@ -56,7 +57,7 @@
private boolean writable;
- private String formatInfo;
+ private Map<String, String> mediaInfo;
/**
* Returns the metaData.
@@ -257,21 +258,21 @@
}
/**
- * Returns the formatInfo.
- * @return the formatInfo
+ * Returns the mediaInfo
+ * @return the mediaInfo
*/
- public String getFormatInfo()
+ public Map<String, String> getMediaInfo()
{
- return formatInfo;
+ return mediaInfo;
}
/**
- * Sets the formatInfo.
- * @param formatInfo the formatInfo to set
+ * Sets the mediaInfo.
+ * @param mediaInfo the mediaInfo to set
*/
- public void setFormatInfo(String formatInfo)
+ public void setMediaInfo(Map<String, String> mediaInfo)
{
- this.formatInfo = formatInfo;
+ this.mediaInfo = mediaInfo;
}
}
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-02-02 17:28:50 UTC (rev 1773)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-02-02 17:57:01 UTC (rev 1774)
@@ -268,7 +268,7 @@
log.error("Exception caught", ex);
}
- mb.setFormatInfo(mtc.getHandler().getMediaInfo(media));
+ mb.setMediaInfo(mtc.getHandler().getMediaInfo(media));
medias.add(mb);
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2010-02-02 17:28:50 UTC (rev 1773)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2010-02-02 17:57:01 UTC (rev 1774)
@@ -133,7 +133,7 @@
* @param media media
* @return a formatted string for media info
*/
- String getMediaInfo(Content media);
+ Map<String, String> getMediaInfo(Content media);
/**
* Called from dialog when saving a media
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-02-02 17:28:50 UTC (rev 1773)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-02-02 17:57:01 UTC (rev 1774)
@@ -31,6 +31,7 @@
import java.io.File;
import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
@@ -305,7 +306,7 @@
/**
* {@inheritDoc}
*/
- public String getMediaInfo(Content media)
+ public Map<String, String> getMediaInfo(Content media)
{
FileProperties fp = new FileProperties(media, ORGINAL_NODEDATA_NAME);
@@ -324,6 +325,13 @@
int width = NumberUtils.toInt(fp.getProperty(FileProperties.PROPERTY_WIDTH));
int height = NumberUtils.toInt(fp.getProperty(FileProperties.PROPERTY_HEIGHT));
- return extension + (width > 0 ? (" " + width + "x" + height) : "") + " " + size;
+ // return extension + (width > 0 ? (" " + width + "x" + height) : "") + " " + size;
+
+ Map<String, String> info = new LinkedHashMap<String, String>();
+ info.put("extension", extension);
+ info.put("width", String.valueOf(width));
+ info.put("height", String.valueOf(height));
+ info.put("size", size);
+ return info;
}
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java 2010-02-02 17:28:50 UTC (rev 1773)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java 2010-02-02 17:57:01 UTC (rev 1774)
@@ -19,6 +19,9 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
@@ -92,7 +95,7 @@
* {@inheritDoc}
*/
@Override
- public String getMediaInfo(Content media)
+ public Map<String, String> getMediaInfo(Content media)
{
Content originalAsNode = ContentUtil.getContent(media, BaseTypeHandler.ORGINAL_NODEDATA_NAME);
@@ -104,12 +107,20 @@
long duration = flvMetaDataNode.getNodeData(DURATION_ATTRIBUTE).getLong();
long size = flvMetaDataNode.getNodeData(FileProperties.PROPERTY_SIZE).getLong();
- return ext
- + (width > 0 ? (" " + width + "x" + height) : "")
- + " length: "
- + DurationFormatUtils.formatDuration(duration * 1000, "m:ss ")
- + "size: "
- + toSizeString(size);
+// return ext
+// + (width > 0 ? (" " + width + "x" + height) : "")
+// + " length: "
+// + DurationFormatUtils.formatDuration(duration * 1000, "m:ss ")
+// + "size: "
+// + toSizeString(size);
+
+ Map<String, String> info = new LinkedHashMap<String, String>();
+ info.put("extension", ext);
+ info.put("width", String.valueOf(width));
+ info.put("height", String.valueOf(height));
+ info.put("duration", String.valueOf(duration));
+ info.put("size", String.valueOf(size));
+ return info;
}
/*
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2010-02-02 17:28:50 UTC (rev 1773)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2010-02-02 17:57:01 UTC (rev 1774)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
-import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
@@ -31,7 +30,6 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
import org.devlib.schmidt.imageinfo.ImageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -82,38 +80,7 @@
+ ImageUtils.getExtension(media, "preview");
}
- /**
- * {@inheritDoc}
- */
@Override
- public String getMediaInfo(Content media)
- {
- FileProperties fp = new FileProperties(media, ORGINAL_NODEDATA_NAME);
-
- String extension = fp.getProperty(FileProperties.PROPERTY_EXTENSION);
- String size = StringUtils.EMPTY;
-
- try
- {
- size = fp.getProperty(FileProperties.PROPERTY_SIZE);
- }
- catch (NumberFormatException nfe)
- {
- // just ignore, no file size info
- }
-
- int width = NumberUtils.toInt(fp.getProperty(FileProperties.PROPERTY_WIDTH));
- int height = NumberUtils.toInt(fp.getProperty(FileProperties.PROPERTY_HEIGHT));
-
- if (width <= 0 || height <= 0)
- {
- return "broken file";
- }
-
- return extension + (width > 0 ? (" " + width + "x" + height) : "") + " " + size;
- }
-
- @Override
public boolean onPostSave(Content media)
{
InputStream stream = null;
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-02 17:28:50 UTC (rev 1773)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-02 17:57:01 UTC (rev 1774)
@@ -248,8 +248,13 @@
</a>
</div>
</div>
- <#if media.formatInfo??>
- <div class="mediainfo">${media.formatInfo}</div>
+ <#if media.mediaInfo??>
+ <div class="mediainfo">
+ ${media.mediaInfo['extension']}
+ <#if media.mediaInfo['width']?? && media.mediaInfo['height']??>
+ ${media.mediaInfo['width']}x${media.mediaInfo['height']}
+ </#if>
+ </div>
</#if>
<#if this.selectMedia>
<div class="selectMediaLine">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
