Author: solomax
Date: Wed Jul 27 06:06:54 2016
New Revision: 1754220
URL: http://svn.apache.org/viewvc?rev=1754220&view=rev
Log:
[OPENMEETINGS-1030] more work of files section: files drop
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1754220&r1=1754219&r2=1754220&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
Wed Jul 27 06:06:54 2016
@@ -19,6 +19,8 @@
package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OmFileHelper.FLV_EXTENSION;
+import static org.apache.openmeetings.util.OmFileHelper.JPG_EXTENTION;
+import static org.apache.openmeetings.util.OmFileHelper.WB_VIDEO_FILE_PREFIX;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -77,7 +79,7 @@ public class FlvExplorerConverter extend
private List<ConverterProcessResult> convertToFLV(FileExplorerItem
fileExplorerItem, String moviePath) {
List<ConverterProcessResult> returnLog = new
ArrayList<ConverterProcessResult>();
try {
- String name = "UPLOADFLV_" + fileExplorerItem.getId();
+ String name = WB_VIDEO_FILE_PREFIX +
fileExplorerItem.getId();
File outputFullFlv = new File(getStreamsHibernateDir(),
name + FLV_EXTENSION);
fileExplorerItem.setType(Type.Video);
@@ -102,8 +104,8 @@ public class FlvExplorerConverter extend
returnLog.add(returnMapConvertFLV);
- String hashFileFullNameJPEG = "UPLOADFLV_" +
fileExplorerItem.getId() + ".jpg";
- File outPutJpeg = new File(getStreamsHibernateDir(),
name + ".jpg");
+ String hashFileFullNameJPEG = WB_VIDEO_FILE_PREFIX +
fileExplorerItem.getId() + JPG_EXTENTION;
+ File outPutJpeg = new File(getStreamsHibernateDir(),
name + JPG_EXTENTION);
fileExplorerItem.setPreviewImage(hashFileFullNameJPEG);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1754220&r1=1754219&r2=1754220&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Wed Jul 27 06:06:54 2016
@@ -1377,6 +1377,9 @@ public class ScopeApplicationAdapter ext
case Presentation:
type = "swf";
break;
+ case Video:
+ type = "flv";
+ break;
default:
}
sendToWhiteboard(client, Arrays.asList(
Modified:
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1754220&r1=1754219&r2=1754220&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
Wed Jul 27 06:06:54 2016
@@ -75,6 +75,9 @@ public class OmFileHelper {
public static final String MP4_EXTENSION = ".mp4";
public static final String OGG_EXTENSION = ".ogg";
public static final String JPG_EXTENTION = ".jpg";
+ public static final String WB_VIDEO_FILE_PREFIX = "UPLOADFLV_";
+ public static final String FLV_MIME_TYPE = "video/flv";
+ public static final String JPG_MIME_TYPE = "image/jpeg";
public static void setOmHome(File omHome) {
OmFileHelper.OM_HOME = omHome;
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java?rev=1754220&r1=1754219&r2=1754220&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
Wed Jul 27 06:06:54 2016
@@ -18,6 +18,10 @@
*/
package org.apache.openmeetings.web.room;
+import static org.apache.openmeetings.util.OmFileHelper.FLV_MIME_TYPE;
+import static org.apache.openmeetings.util.OmFileHelper.JPG_EXTENTION;
+import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE;
+import static org.apache.openmeetings.util.OmFileHelper.WB_VIDEO_FILE_PREFIX;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getOnlineClient;
@@ -36,6 +40,7 @@ import org.apache.wicket.util.string.Str
public class RoomResourceReference extends
FileItemResourceReference<FileExplorerItem> {
private static final long serialVersionUID = 1L;
public static final String DEFAULT_NAME = "wb-room-file";
+ private boolean preview = false;
public RoomResourceReference() {
super(DEFAULT_NAME);
@@ -53,11 +58,14 @@ public class RoomResourceReference exten
mime = "application/xml";
break;
case Image:
- mime = "image/jpeg";
+ mime = JPG_MIME_TYPE;
break;
case Presentation:
mime = "application/x-shockwave-flash";
break;
+ case Video:
+ mime = preview ? JPG_MIME_TYPE : FLV_MIME_TYPE;
+ break;
default:
throw new RuntimeException("Not supported");
}
@@ -68,6 +76,8 @@ public class RoomResourceReference exten
protected FileExplorerItem getFileItem(Attributes attributes) {
PageParameters params = attributes.getParameters();
StringValue _id = params.get("id");
+ StringValue _preview = params.get("preview");
+ preview = _preview.toBoolean(false);
String uid = params.get("uid").toString();
Long id = null;
try {
@@ -94,6 +104,10 @@ public class RoomResourceReference exten
result = new
File(OmFileHelper.getUploadFilesDir(), String.format("%s.%s", r.getHash(), ext
== null ? "jpg" : ext));
}
break;
+ case Video: {
+ result = new
File(OmFileHelper.getStreamsHibernateDir(), String.format("%s%s%s",
WB_VIDEO_FILE_PREFIX, r.getId(), preview ? FLV_MIME_TYPE : JPG_EXTENTION));
+ break;
+ }
case Presentation: {
File d = new
File(OmFileHelper.getUploadFilesDir(), r.getHash());
result = new File(d, String.format("%s.%s",
r.getHash(), ext == null ? "swf" : ext));
@@ -112,7 +126,6 @@ public class RoomResourceReference exten
@Override
protected String getFileName(FileExplorerItem r) {
- // TODO Auto-generated method stub
- return null;
+ return preview ? r.getPreviewImage() : r.getName();
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java?rev=1754220&r1=1754219&r2=1754220&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java
Wed Jul 27 06:06:54 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.user.record;
+import static org.apache.openmeetings.util.OmFileHelper.FLV_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.getRecording;
import java.io.File;
@@ -33,7 +34,7 @@ public class FlvRecordingResourceReferen
@Override
public String getMimeType() {
- return "video/flv";
+ return FLV_MIME_TYPE;
}
@Override
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java?rev=1754220&r1=1754219&r2=1754220&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java
Wed Jul 27 06:06:54 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.user.record;
+import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.getRecording;
import java.io.File;
@@ -33,7 +34,7 @@ public class JpgRecordingResourceReferen
@Override
public String getMimeType() {
- return "image/jpeg";
+ return JPG_MIME_TYPE;
}
@Override
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1754220&r1=1754219&r2=1754220&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
Wed Jul 27 06:06:54 2016
@@ -19,6 +19,8 @@
package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OmFileHelper.FLV_EXTENSION;
+import static org.apache.openmeetings.util.OmFileHelper.JPG_EXTENTION;
+import static org.apache.openmeetings.util.OmFileHelper.WB_VIDEO_FILE_PREFIX;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -77,7 +79,7 @@ public class FlvExplorerConverter extend
private List<ConverterProcessResult> convertToFLV(FileExplorerItem
fileExplorerItem, String moviePath) {
List<ConverterProcessResult> returnLog = new
ArrayList<ConverterProcessResult>();
try {
- String name = "UPLOADFLV_" + fileExplorerItem.getId();
+ String name = WB_VIDEO_FILE_PREFIX +
fileExplorerItem.getId();
File outputFullFlv = new File(getStreamsHibernateDir(),
name + FLV_EXTENSION);
fileExplorerItem.setType(Type.Video);
@@ -102,8 +104,8 @@ public class FlvExplorerConverter extend
returnLog.add(returnMapConvertFLV);
- String hashFileFullNameJPEG = "UPLOADFLV_" +
fileExplorerItem.getId() + ".jpg";
- File outPutJpeg = new File(getStreamsHibernateDir(),
name + ".jpg");
+ String hashFileFullNameJPEG = WB_VIDEO_FILE_PREFIX +
fileExplorerItem.getId() + JPG_EXTENTION;
+ File outPutJpeg = new File(getStreamsHibernateDir(),
name + JPG_EXTENTION);
fileExplorerItem.setPreviewImage(hashFileFullNameJPEG);
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1754220&r1=1754219&r2=1754220&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Wed Jul 27 06:06:54 2016
@@ -1377,6 +1377,9 @@ public class ScopeApplicationAdapter ext
case Presentation:
type = "swf";
break;
+ case Video:
+ type = "flv";
+ break;
default:
}
sendToWhiteboard(client, Arrays.asList(
Modified:
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1754220&r1=1754219&r2=1754220&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
(original)
+++
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
Wed Jul 27 06:06:54 2016
@@ -75,6 +75,9 @@ public class OmFileHelper {
public static final String MP4_EXTENSION = ".mp4";
public static final String OGG_EXTENSION = ".ogg";
public static final String JPG_EXTENTION = ".jpg";
+ public static final String WB_VIDEO_FILE_PREFIX = "UPLOADFLV_";
+ public static final String FLV_MIME_TYPE = "video/flv";
+ public static final String JPG_MIME_TYPE = "image/jpeg";
public static void setOmHome(File omHome) {
OmFileHelper.OM_HOME = omHome;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java?rev=1754220&r1=1754219&r2=1754220&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
Wed Jul 27 06:06:54 2016
@@ -18,6 +18,10 @@
*/
package org.apache.openmeetings.web.room;
+import static org.apache.openmeetings.util.OmFileHelper.FLV_MIME_TYPE;
+import static org.apache.openmeetings.util.OmFileHelper.JPG_EXTENTION;
+import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE;
+import static org.apache.openmeetings.util.OmFileHelper.WB_VIDEO_FILE_PREFIX;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getOnlineClient;
@@ -36,6 +40,7 @@ import org.apache.wicket.util.string.Str
public class RoomResourceReference extends
FileItemResourceReference<FileExplorerItem> {
private static final long serialVersionUID = 1L;
public static final String DEFAULT_NAME = "wb-room-file";
+ private boolean preview = false;
public RoomResourceReference() {
super(DEFAULT_NAME);
@@ -53,11 +58,14 @@ public class RoomResourceReference exten
mime = "application/xml";
break;
case Image:
- mime = "image/jpeg";
+ mime = JPG_MIME_TYPE;
break;
case Presentation:
mime = "application/x-shockwave-flash";
break;
+ case Video:
+ mime = preview ? JPG_MIME_TYPE : FLV_MIME_TYPE;
+ break;
default:
throw new RuntimeException("Not supported");
}
@@ -68,6 +76,8 @@ public class RoomResourceReference exten
protected FileExplorerItem getFileItem(Attributes attributes) {
PageParameters params = attributes.getParameters();
StringValue _id = params.get("id");
+ StringValue _preview = params.get("preview");
+ preview = _preview.toBoolean(false);
String uid = params.get("uid").toString();
Long id = null;
try {
@@ -94,6 +104,10 @@ public class RoomResourceReference exten
result = new
File(OmFileHelper.getUploadFilesDir(), String.format("%s.%s", r.getHash(), ext
== null ? "jpg" : ext));
}
break;
+ case Video: {
+ result = new
File(OmFileHelper.getStreamsHibernateDir(), String.format("%s%s%s",
WB_VIDEO_FILE_PREFIX, r.getId(), preview ? FLV_MIME_TYPE : JPG_EXTENTION));
+ break;
+ }
case Presentation: {
File d = new
File(OmFileHelper.getUploadFilesDir(), r.getHash());
result = new File(d, String.format("%s.%s",
r.getHash(), ext == null ? "swf" : ext));
@@ -112,7 +126,6 @@ public class RoomResourceReference exten
@Override
protected String getFileName(FileExplorerItem r) {
- // TODO Auto-generated method stub
- return null;
+ return preview ? r.getPreviewImage() : r.getName();
}
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java?rev=1754220&r1=1754219&r2=1754220&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java
Wed Jul 27 06:06:54 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.user.record;
+import static org.apache.openmeetings.util.OmFileHelper.FLV_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.getRecording;
import java.io.File;
@@ -33,7 +34,7 @@ public class FlvRecordingResourceReferen
@Override
public String getMimeType() {
- return "video/flv";
+ return FLV_MIME_TYPE;
}
@Override
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java?rev=1754220&r1=1754219&r2=1754220&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java
Wed Jul 27 06:06:54 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.user.record;
+import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.getRecording;
import java.io.File;
@@ -33,7 +34,7 @@ public class JpgRecordingResourceReferen
@Override
public String getMimeType() {
- return "image/jpeg";
+ return JPG_MIME_TYPE;
}
@Override
