Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[2541] trunk/openutils-mgnlmedia/src/main
|
From: <die...@us...> - 2010-05-24 13:18:04
|
Revision: 2541
http://openutils.svn.sourceforge.net/openutils/?rev=2541&view=rev
Author: diego_schivo
Date: 2010-05-24 13:17:54 +0000 (Mon, 24 May 2010)
Log Message:
-----------
MEDIA-142 Expose playlists in xspf format
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-05-24 12:37:50 UTC (rev 2540)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-05-24 13:17:54 UTC (rev 2541)
@@ -69,7 +69,7 @@
private boolean success;
- private static final String VIEW_RESULTS_XML = "-xml";
+ private static final String VIEW_XSPF = "-xspf";
private static final String VIEW_EXTJS = "-extjs";
@@ -257,13 +257,13 @@
return VIEW_EXTJS;
}
- public String xmlView() throws IOException
+ public String xspf() throws IOException
{
- this.show();
+ String viewName = this.show();
if (this.getPlaylist() == null)
{
this.response.sendError(404);
- return this.show();
+ return viewName;
}
else
{
@@ -273,7 +273,8 @@
{
try
{
- mediaContentList.add(MgnlContext.getHierarchyManager("media").getContentByUUID(plb.getMedia()));
+ mediaContentList.add(MgnlContext.getHierarchyManager(MediaModule.REPO).getContentByUUID(
+ plb.getMedia()));
}
catch (RepositoryException e)
{
@@ -287,9 +288,9 @@
locale = Locale.getDefault().toString();
}
- this.response.setContentType("text/xml");
+ this.response.setContentType("application/xspf+xml");
}
- return VIEW_RESULTS_XML;
+ return VIEW_XSPF;
}
/**
Deleted: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html 2010-05-24 12:37:50 UTC (rev 2540)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xml.html 2010-05-24 13:17:54 UTC (rev 2541)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<playlist version="1" xmlns="http://xspf.org/ns/0/" xmlns:media="http://www.openmindlab.com/media">
- [#assign mgnlEl = this.getStatic("it.openutils.mgnlutils.el.MgnlUtilsElFunctions")]
- [#assign systemProperty = this.getStatic("info.magnolia.cms.core.SystemProperty")]
- [#assign dateUtils = this.getStatic("net.sourceforge.openutils.elfunctions.DateElUtils")]
- [#assign cal = this.getStatic("java.util.Calendar")]
- [#assign mediaEl = this.getStatic("net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl")]
- <title><![CDATA[${this.playlist.title}]]></title>
- <meta rel="media:locale">${this.locale}</meta>
- <meta rel="media:playlist-id">${this.playlist.uuid}</meta>
- <location><![CDATA[${mgnlEl.baseUrl()}/playlists${this.playlist.handle}.xml?locale=${this.locale}]]></location>
- <date>${dateUtils.toXsdDate(cal.getInstance())}</date>
- <trackList>
- [#list this.mediaContentList as mediaDetail]
- [#assign mediaNode = mediaEl.node(mediaDetail.@uuid)]
- <track>
- <location><![CDATA[${mgnlEl.toAbsoluteUrl(mediaEl.url(mediaNode))}]]></location>
- <identifier>media:${mediaDetail.@uuid}</identifier>
- [#if (mediaDetail['title_' + this.locale])?exists]<title><![CDATA[${mediaDetail['title_' + this.locale]}]]></title>[/#if]
- [#assign resolution = systemProperty.getProperty("thumbresolution") ]
- [#if mediaEl.type(mediaNode) == 'image']
- <image>${mgnlEl.baseUrl()}${mediaEl.urlres(mediaNode, resolution)}</image>
- [#else]
- [#if (mediaDetail.image)?exists]<image>${mgnlEl.baseUrl()}${mediaEl.urlres(mediaDetail, resolution)}</image>[/#if]
- [/#if]
- [#if (mediaDetail['description_' + this.locale])?exists]<annotation><![CDATA[${mediaDetail['description_' + this.locale]}]]></annotation>[/#if]
- [#if (mediaDetail.media_duration)?exists]<duration>${(mediaDetail.media_duration * 1000)?string.computer}</duration>[/#if]
- <extension application="http://www.openmindlab.com/media">
- <media:locale code="${this.locale}" />
- <media:type>${mediaDetail.type}</media:type>
- </extension>
- </track>
- [/#list]
- </trackList>
-</playlist>
\ No newline at end of file
Added: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html 2010-05-24 13:17:54 UTC (rev 2541)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<playlist version="1" xmlns="http://xspf.org/ns/0/" xmlns:media="http://www.openmindlab.com/media">
+ [#assign mgnlEl = this.getStatic("it.openutils.mgnlutils.el.MgnlUtilsElFunctions")]
+ [#assign systemProperty = this.getStatic("info.magnolia.cms.core.SystemProperty")]
+ [#assign dateUtils = this.getStatic("net.sourceforge.openutils.elfunctions.DateElUtils")]
+ [#assign cal = this.getStatic("java.util.Calendar")]
+ [#assign mediaEl = this.getStatic("net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl")]
+ <title><![CDATA[${this.playlist.title}]]></title>
+ <meta rel="media:locale">${this.locale}</meta>
+ <meta rel="media:playlist-id">${this.playlist.uuid}</meta>
+ <location><![CDATA[${mgnlEl.baseUrl()}/playlists${this.playlist.handle}.xml?locale=${this.locale}]]></location>
+ <date>${dateUtils.toXsdDate(cal.getInstance())}</date>
+ <trackList>
+ [#list this.mediaContentList as mediaDetail]
+ [#assign mediaNode = mediaEl.node(mediaDetail.@uuid)]
+ <track>
+ <location><![CDATA[${mgnlEl.toAbsoluteUrl(mediaEl.url(mediaNode))}]]></location>
+ <identifier>media:${mediaDetail.@uuid}</identifier>
+ [#if (mediaDetail['title_' + this.locale])?exists]<title><![CDATA[${mediaDetail['title_' + this.locale]}]]></title>[/#if]
+ [#assign resolution = systemProperty.getProperty("thumbresolution") ]
+ [#if mediaEl.type(mediaNode) == 'image']
+ <image>${mgnlEl.baseUrl()}${mediaEl.urlres(mediaNode, resolution)}</image>
+ [#else]
+ [#if (mediaDetail.image)?exists]<image>${mgnlEl.baseUrl()}${mediaEl.urlres(mediaDetail, resolution)}</image>[/#if]
+ [/#if]
+ [#if (mediaDetail['description_' + this.locale])?exists]<annotation><![CDATA[${mediaDetail['description_' + this.locale]}]]></annotation>[/#if]
+ [#if (mediaDetail.media_duration)?exists]<duration>${(mediaDetail.media_duration * 1000)?string.computer}</duration>[/#if]
+ <extension application="http://www.openmindlab.com/media">
+ <media:locale code="${this.locale}" />
+ <media:type>${mediaDetail.type}</media:type>
+ </extension>
+ </track>
+ [/#list]
+ </trackList>
+</playlist>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
