You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/08/11 10:43:43 UTC
svn commit: r1755932 [2/2] - in /openmeetings/application:
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/
branches/3.2.x/open...
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java?rev=1755932&r1=1755931&r2=1755932&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java Thu Aug 11 10:43:43 2016
@@ -18,9 +18,7 @@
*/
package org.apache.openmeetings.web.user.record;
-import static org.apache.openmeetings.util.OmFileHelper.MP4_EXTENSION;
import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE;
-import static org.apache.openmeetings.util.OmFileHelper.getMp4Recording;
import java.io.File;
@@ -40,11 +38,11 @@ public class Mp4RecordingResourceReferen
@Override
protected String getFileName(Recording r) {
- return r.getHash() + MP4_EXTENSION;
+ return r.getFile().getName();
}
@Override
protected File getFile(Recording r) {
- return getMp4Recording(r.getHash());
+ return r.getFile();
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1755932&r1=1755931&r2=1755932&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java Thu Aug 11 10:43:43 2016
@@ -18,18 +18,20 @@
*/
package org.apache.openmeetings.web.user.record;
-import static org.apache.openmeetings.util.OmFileHelper.getRecording;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
import static org.apache.openmeetings.util.OmFileHelper.getRecordingMetaData;
-import static org.apache.openmeetings.util.OmFileHelper.isRecordingExists;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import org.apache.openmeetings.core.converter.IRecordingConverter;
import org.apache.openmeetings.core.converter.InterviewConverter;
import org.apache.openmeetings.core.converter.RecordingConverter;
-import org.apache.openmeetings.core.converter.IRecordingConverter;
import org.apache.openmeetings.db.dao.record.RecordingMetaDataDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.entity.record.Recording;
@@ -126,7 +128,7 @@ public class VideoInfo extends Panel {
}
}
reConvert.setEnabled(reConvEnabled);
- downloadBtn.setEnabled(isRecordingExists(r.getAlternateDownload()) || isRecordingExists(r.getHash()));
+ downloadBtn.setEnabled(r.exists() || r.exists(EXTENSION_AVI));
if (target != null) {
target.add(form);
}
@@ -150,6 +152,24 @@ public class VideoInfo extends Panel {
private List<IMenuItem> newDownloadMenuList() {
List<IMenuItem> list = new ArrayList<>();
+ //mp4
+ list.add(new MenuItem(EXTENSION_MP4, JQueryIcon.ARROWTHICKSTOP_1_S) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isEnabled() {
+ Recording r = VideoInfo.this.rm.getObject();
+ return r != null && r.exists(EXTENSION_MP4);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ File f = rm.getObject().getFile(EXTENSION_MP4);
+ download.setFileName(f.getName());
+ download.setResourceStream(new FileResourceStream(f));
+ download.initiate(target);
+ }
+ });
//avi
list.add(new MenuItem(getString("884"), JQueryIcon.ARROWTHICKSTOP_1_S) {
private static final long serialVersionUID = 1L;
@@ -157,13 +177,14 @@ public class VideoInfo extends Panel {
@Override
public boolean isEnabled() {
Recording r = VideoInfo.this.rm.getObject();
- return r != null && isRecordingExists(r.getAlternateDownload());
+ return r != null && r.exists(EXTENSION_AVI);
}
@Override
public void onClick(AjaxRequestTarget target) {
- download.setFileName(rm.getObject().getAlternateDownload());
- download.setResourceStream(new FileResourceStream(getRecording(rm.getObject().getAlternateDownload())));
+ File f = rm.getObject().getFile(EXTENSION_AVI);
+ download.setFileName(f.getName());
+ download.setResourceStream(new FileResourceStream(f));
download.initiate(target);
}
});
@@ -174,13 +195,14 @@ public class VideoInfo extends Panel {
@Override
public boolean isEnabled() {
Recording r = VideoInfo.this.rm.getObject();
- return r != null && isRecordingExists(r.getAlternateDownload());
+ return r != null && r.exists(EXTENSION_FLV);
}
@Override
public void onClick(AjaxRequestTarget target) {
- download.setFileName(rm.getObject().getHash());
- download.setResourceStream(new FileResourceStream(getRecording(rm.getObject().getHash())));
+ File f = rm.getObject().getFile(EXTENSION_FLV);
+ download.setFileName(f.getName());
+ download.setResourceStream(new FileResourceStream(f));
download.initiate(target);
}
});
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java?rev=1755932&r1=1755931&r2=1755932&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java Thu Aug 11 10:43:43 2016
@@ -19,7 +19,6 @@
package org.apache.openmeetings.web.user.record;
import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE;
-import static org.apache.openmeetings.util.OmFileHelper.getMp4Recording;
import org.apache.openmeetings.db.entity.record.Recording;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -59,7 +58,7 @@ public class VideoPlayer extends Panel {
}
public VideoPlayer update(AjaxRequestTarget target, Recording r) {
- boolean videoExists = r != null && getMp4Recording(r.getHash()).exists();
+ boolean videoExists = r != null && r.exists();
if (videoExists) {
PageParameters pp = new PageParameters().add("id", r.getId());
mp4.setPageParameters(pp);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1755932&r1=1755931&r2=1755932&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Thu Aug 11 10:43:43 2016
@@ -240,7 +240,6 @@
<bean id="smsHandler" class="org.apache.openmeetings.core.mail.SMSHandler" />
<bean id="importInitvalues" class="org.apache.openmeetings.installation.ImportInitvalues" />
<bean id="generateSWF" class="org.apache.openmeetings.core.converter.GenerateSWF" />
- <bean id="fileUtils" class="org.apache.openmeetings.core.data.file.FileUtils" />
<bean id="ldapLoginManagement" class="org.apache.openmeetings.core.ldap.LdapLoginManagement" />
<bean id="timezoneUtil" class="org.apache.openmeetings.db.util.TimezoneUtil" />
<bean id="whiteboardManagement" class="org.apache.openmeetings.core.data.whiteboard.WhiteboardManager" />
Added: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/chart_pie_error.png
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/chart_pie_error.png?rev=1755932&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/chart_pie_error.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/layout.png
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/layout.png?rev=1755932&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/layout.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/layout_error.png
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/layout_error.png?rev=1755932&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/layout_error.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/page.png
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/page.png?rev=1755932&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/page.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/page_error.png
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/page_error.png?rev=1755932&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/page_error.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/picture.png
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/picture.png?rev=1755932&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/picture.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/picture_error.png
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/picture_error.png?rev=1755932&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/picture_error.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css?rev=1755932&r1=1755931&r2=1755932&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css Thu Aug 11 10:43:43 2016
@@ -334,18 +334,15 @@ html, body {
background: url(images/folder_add.png);
}
.recording.om-icon {
- padding-left: 18px;
background-image: url(images/film.png);
}
-.broken-recording.om-icon {
- padding-left: 18px;
+.broken.recording.om-icon {
background-image: url(images/film_error.png);
}
-.processing-recording.om-icon {
- padding-left: 18px;
+.processing.recording.om-icon {
background-image: url(images/film_processing.png);
}
-.file.om-icon {
+.file.om-icon, .recording.om-icon {
padding-left: 18px;
}
.my.file.om-icon {
@@ -355,16 +352,28 @@ html, body {
background-image: url(images/world_link.png);
}
.image.file.om-icon {
- background-image: url(images/photo.png);
+ background-image: url(images/picture.png);
+}
+.broken.image.file.om-icon {
+ background-image: url(images/picture_error.png);
}
.chart.file.om-icon {
background-image: url(images/chart_pie.png);
}
+.broken.chart.file.om-icon {
+ background-image: url(images/chart_pie_error.png);
+}
.wml.file.om-icon {
- background-image: url(images/map.png);
+ background-image: url(images/layout.png);
+}
+.broken.wml.file.om-icon {
+ background-image: url(images/layout_error.png);
}
.doc.file.om-icon {
- background-image: url(images/report.png);
+ background-image: url(images/page.png);
+}
+.broken.doc.file.om-icon {
+ background-image: url(images/page_error.png);
}
.invite.om-icon {
background-image: url(images/connect.png);
Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java?rev=1755932&r1=1755931&r2=1755932&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java (original)
+++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java Thu Aug 11 10:43:43 2016
@@ -43,7 +43,6 @@ import javax.ws.rs.core.MediaType;
import org.apache.cxf.feature.Features;
import org.apache.cxf.jaxrs.ext.multipart.Multipart;
import org.apache.openmeetings.core.data.file.FileProcessor;
-import org.apache.openmeetings.core.data.file.FileUtils;
import org.apache.openmeetings.core.documents.LoadLibraryPresentation;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
@@ -86,8 +85,6 @@ public class FileWebService {
@Autowired
private FileExplorerItemDao fileDao;
@Autowired
- private FileUtils fileUtils;
- @Autowired
private FileProcessor fileProcessor;
/**
@@ -285,11 +282,11 @@ public class FileWebService {
// Home File List
List<FileExplorerItem> fList = fileDao.getByOwner(userId);
- fileExplorerObject.setUser(fList, fileUtils.getSize(fList));
+ fileExplorerObject.setUser(fList, fileDao.getSize(fList));
// Public File List
List<FileExplorerItem> rList = fileDao.getByRoom(roomId);
- fileExplorerObject.setRoom(rList, fileUtils.getSize(rList));
+ fileExplorerObject.setRoom(rList, fileDao.getSize(rList));
return fileExplorerObject;
} else {