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/09/25 14:43:50 UTC
svn commit: r1762210 - in /openmeetings/application:
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/
branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/
branches/3.2.x/openmeetings-ut...
Author: solomax
Date: Sun Sep 25 14:43:50 2016
New Revision: 1762210
URL: http://svn.apache.org/viewvc?rev=1762210&view=rev
Log:
[OPENMEETINGS-1457] initial work on file import
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.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/RoomFileResourceReference.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.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/RoomFileResourceReference.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1762210&r1=1762209&r2=1762210&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java Sun Sep 25 14:43:50 2016
@@ -18,18 +18,13 @@
*/
package org.apache.openmeetings.core.data.file;
+import static org.apache.openmeetings.util.OmFileHelper.getFileExt;
import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import java.util.UUID;
import org.apache.commons.transaction.util.FileHelper;
@@ -62,11 +57,6 @@ public class FileProcessor {
@Autowired
private GeneratePDF generatePDF;
- public static String getExt(FileExplorerItem f) {
- int dotidx = f.getName().lastIndexOf('.');
- return dotidx < 0 ? "" : f.getName().substring(dotidx + 1).toLowerCase();
- }
-
//FIXME TODO this method need to be refactored to throw exceptions
public ConverterProcessResultList processFile(Long userId, FileExplorerItem f, InputStream is) throws Exception {
ConverterProcessResultList returnError = new ConverterProcessResultList();
@@ -75,7 +65,7 @@ public class FileProcessor {
// foreign characters and duplicates
String hash = UUID.randomUUID().toString();
- String ext = getExt(f);
+ String ext = getFileExt(f.getName());
log.debug("file extension: " + ext);
StoredFile storedFile = new StoredFile(hash, ext);
Modified: openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1762210&r1=1762209&r2=1762210&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Sun Sep 25 14:43:50 2016
@@ -23,11 +23,18 @@ import static org.apache.openmeetings.db
import static org.apache.openmeetings.db.entity.user.PrivateMessage.SENT_FOLDER_ID;
import static org.apache.openmeetings.db.entity.user.PrivateMessage.TRASH_FOLDER_ID;
import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG;
+import static org.apache.openmeetings.util.OmFileHelper.getFileName;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
import static org.apache.openmeetings.util.OmFileHelper.getUploadDir;
import static org.apache.openmeetings.util.OmFileHelper.getUploadProfilesUserDir;
import static org.apache.openmeetings.util.OmFileHelper.getUploadRoomDir;
import static org.apache.openmeetings.util.OmFileHelper.profilesPrefix;
+import static org.apache.openmeetings.util.OmFileHelper.recordingFileName;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LDAP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -163,13 +170,14 @@ public class BackupImport {
@Autowired
private RoomGroupDao roomGroupDao;
- private final Map<Long, Long> usersMap = new HashMap<Long, Long>();
- private final Map<Long, Long> groupMap = new HashMap<Long, Long>();
- private final Map<Long, Long> appointmentsMap = new HashMap<Long, Long>();
- private final Map<Long, Long> roomsMap = new HashMap<Long, Long>();
- private final Map<Long, Long> messageFoldersMap = new HashMap<Long, Long>();
- private final Map<Long, Long> userContactsMap = new HashMap<Long, Long>();
- private final Map<String, Integer> userEmailMap = new HashMap<String, Integer>();
+ private final Map<Long, Long> usersMap = new HashMap<>();
+ private final Map<Long, Long> groupMap = new HashMap<>();
+ private final Map<Long, Long> appointmentsMap = new HashMap<>();
+ private final Map<Long, Long> roomsMap = new HashMap<>();
+ private final Map<Long, Long> messageFoldersMap = new HashMap<>();
+ private final Map<Long, Long> userContactsMap = new HashMap<>();
+ private final Map<String, Integer> userEmailMap = new HashMap<>();
+ private final Map<String, String> fileMap = new HashMap<>();
private enum Maps {
USERS, ORGANISATIONS, APPOINTMENTS, ROOMS, MESSAGEFOLDERS, USERCONTACTS
@@ -223,6 +231,7 @@ public class BackupImport {
messageFoldersMap.clear();
userContactsMap.clear();
userEmailMap.clear();
+ fileMap.clear();
messageFoldersMap.put(INBOX_FOLDER_ID, INBOX_FOLDER_ID);
messageFoldersMap.put(SENT_FOLDER_ID, SENT_FOLDER_ID);
messageFoldersMap.put(TRASH_FOLDER_ID, TRASH_FOLDER_ID);
@@ -495,21 +504,30 @@ public class BackupImport {
*/
{
List<Recording> list = readRecordingList(f, "flvRecordings.xml", "flvrecordings");
- for (Recording fr : list) {
- fr.setId(null);
- if (fr.getRoomId() != null) {
- fr.setRoomId(roomsMap.get(fr.getRoomId()));
+ for (Recording r : list) {
+ r.setId(null);
+ if (r.getRoomId() != null) {
+ r.setRoomId(roomsMap.get(r.getRoomId()));
}
- if (fr.getOwnerId() != null) {
- fr.setOwnerId(usersMap.get(fr.getOwnerId()));
+ if (r.getOwnerId() != null) {
+ r.setOwnerId(usersMap.get(r.getOwnerId()));
}
- if (fr.getMetaData() != null) {
- for (RecordingMetaData meta : fr.getMetaData()) {
+ if (r.getMetaData() != null) {
+ for (RecordingMetaData meta : r.getMetaData()) {
meta.setId(null);
- meta.setRecording(fr);
+ meta.setRecording(r);
}
}
- recordingDao.update(fr);
+ if (!Strings.isEmpty(r.getHash()) && r.getHash().startsWith(recordingFileName)) {
+ String name = getFileName(r.getHash());
+ r.setHash(UUID.randomUUID().toString());
+ fileMap.put(String.format("%s.%s", name, EXTENSION_FLV), String.format("%s.%s", r.getHash(), EXTENSION_FLV));
+ fileMap.put(String.format("%s.%s", name, EXTENSION_AVI), String.format("%s.%s", r.getHash(), EXTENSION_AVI));
+ fileMap.put(String.format("%s.%s", name, EXTENSION_JPG), String.format("%s.%s", r.getHash(), EXTENSION_JPG));
+ fileMap.put(String.format("%s.%s.%s", name, EXTENSION_FLV, EXTENSION_MP4), String.format("%s.%s", r.getHash(), EXTENSION_MP4));
+ fileMap.put(String.format("%s.%s.%s", name, EXTENSION_FLV, EXTENSION_OGG), String.format("%s.%s", r.getHash(), EXTENSION_OGG));
+ }
+ recordingDao.update(r);
}
}
@@ -775,7 +793,11 @@ public class BackupImport {
//Some hashes were stored with file extension
int idx = f.getHash() == null ? -1 : f.getHash().indexOf('.');
if (idx > -1) {
- f.setHash(f.getHash().substring(0, idx));
+ String hash = f.getHash().substring(0, idx);
+ if (FileItem.Type.Image == f.getType()) {
+ fileMap.put(f.getHash(), String.format("%s/%s", hash, f.getHash()));
+ }
+ f.setHash(hash);
}
list.add(f);
item = listNode.getNext();
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=1762210&r1=1762209&r2=1762210&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 Sun Sep 25 14:43:50 2016
@@ -316,4 +316,14 @@ public class OmFileHelper {
log.error("[copyfile(File, File)]", e);
}
}
+
+ public static String getFileName(String name) {
+ int dotidx = name.lastIndexOf('.');
+ return dotidx < 0 ? "" : name.substring(0, dotidx);
+ }
+
+ public static String getFileExt(String name) {
+ int dotidx = name.lastIndexOf('.');
+ return dotidx < 0 ? "" : name.substring(dotidx + 1).toLowerCase();
+ }
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomFileResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomFileResourceReference.java?rev=1762210&r1=1762209&r2=1762210&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomFileResourceReference.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomFileResourceReference.java Sun Sep 25 14:43:50 2016
@@ -18,9 +18,10 @@
*/
package org.apache.openmeetings.web.room;
+import static org.apache.openmeetings.util.OmFileHelper.getFileExt;
+
import java.io.File;
-import org.apache.openmeetings.core.data.file.FileProcessor;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
public class RoomFileResourceReference extends RoomResourceReference {
@@ -42,6 +43,6 @@ public class RoomFileResourceReference e
@Override
protected File getFile(FileExplorerItem r) {
- return getFile(r, FileProcessor.getExt(r));
+ return getFile(r, getFileExt(r.getName()));
}
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1762210&r1=1762209&r2=1762210&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java Sun Sep 25 14:43:50 2016
@@ -18,18 +18,13 @@
*/
package org.apache.openmeetings.core.data.file;
+import static org.apache.openmeetings.util.OmFileHelper.getFileExt;
import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import java.util.UUID;
import org.apache.commons.transaction.util.FileHelper;
@@ -62,11 +57,6 @@ public class FileProcessor {
@Autowired
private GeneratePDF generatePDF;
- public static String getExt(FileExplorerItem f) {
- int dotidx = f.getName().lastIndexOf('.');
- return dotidx < 0 ? "" : f.getName().substring(dotidx + 1).toLowerCase();
- }
-
//FIXME TODO this method need to be refactored to throw exceptions
public ConverterProcessResultList processFile(Long userId, FileExplorerItem f, InputStream is) throws Exception {
ConverterProcessResultList returnError = new ConverterProcessResultList();
@@ -75,7 +65,7 @@ public class FileProcessor {
// foreign characters and duplicates
String hash = UUID.randomUUID().toString();
- String ext = getExt(f);
+ String ext = getFileExt(f.getName());
log.debug("file extension: " + ext);
StoredFile storedFile = new StoredFile(hash, ext);
Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1762210&r1=1762209&r2=1762210&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Sun Sep 25 14:43:50 2016
@@ -23,11 +23,18 @@ import static org.apache.openmeetings.db
import static org.apache.openmeetings.db.entity.user.PrivateMessage.SENT_FOLDER_ID;
import static org.apache.openmeetings.db.entity.user.PrivateMessage.TRASH_FOLDER_ID;
import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG;
+import static org.apache.openmeetings.util.OmFileHelper.getFileName;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
import static org.apache.openmeetings.util.OmFileHelper.getUploadDir;
import static org.apache.openmeetings.util.OmFileHelper.getUploadProfilesUserDir;
import static org.apache.openmeetings.util.OmFileHelper.getUploadRoomDir;
import static org.apache.openmeetings.util.OmFileHelper.profilesPrefix;
+import static org.apache.openmeetings.util.OmFileHelper.recordingFileName;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LDAP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -163,13 +170,14 @@ public class BackupImport {
@Autowired
private RoomGroupDao roomGroupDao;
- private final Map<Long, Long> usersMap = new HashMap<Long, Long>();
- private final Map<Long, Long> groupMap = new HashMap<Long, Long>();
- private final Map<Long, Long> appointmentsMap = new HashMap<Long, Long>();
- private final Map<Long, Long> roomsMap = new HashMap<Long, Long>();
- private final Map<Long, Long> messageFoldersMap = new HashMap<Long, Long>();
- private final Map<Long, Long> userContactsMap = new HashMap<Long, Long>();
- private final Map<String, Integer> userEmailMap = new HashMap<String, Integer>();
+ private final Map<Long, Long> usersMap = new HashMap<>();
+ private final Map<Long, Long> groupMap = new HashMap<>();
+ private final Map<Long, Long> appointmentsMap = new HashMap<>();
+ private final Map<Long, Long> roomsMap = new HashMap<>();
+ private final Map<Long, Long> messageFoldersMap = new HashMap<>();
+ private final Map<Long, Long> userContactsMap = new HashMap<>();
+ private final Map<String, Integer> userEmailMap = new HashMap<>();
+ private final Map<String, String> fileMap = new HashMap<>();
private enum Maps {
USERS, ORGANISATIONS, APPOINTMENTS, ROOMS, MESSAGEFOLDERS, USERCONTACTS
@@ -223,6 +231,7 @@ public class BackupImport {
messageFoldersMap.clear();
userContactsMap.clear();
userEmailMap.clear();
+ fileMap.clear();
messageFoldersMap.put(INBOX_FOLDER_ID, INBOX_FOLDER_ID);
messageFoldersMap.put(SENT_FOLDER_ID, SENT_FOLDER_ID);
messageFoldersMap.put(TRASH_FOLDER_ID, TRASH_FOLDER_ID);
@@ -495,21 +504,30 @@ public class BackupImport {
*/
{
List<Recording> list = readRecordingList(f, "flvRecordings.xml", "flvrecordings");
- for (Recording fr : list) {
- fr.setId(null);
- if (fr.getRoomId() != null) {
- fr.setRoomId(roomsMap.get(fr.getRoomId()));
+ for (Recording r : list) {
+ r.setId(null);
+ if (r.getRoomId() != null) {
+ r.setRoomId(roomsMap.get(r.getRoomId()));
}
- if (fr.getOwnerId() != null) {
- fr.setOwnerId(usersMap.get(fr.getOwnerId()));
+ if (r.getOwnerId() != null) {
+ r.setOwnerId(usersMap.get(r.getOwnerId()));
}
- if (fr.getMetaData() != null) {
- for (RecordingMetaData meta : fr.getMetaData()) {
+ if (r.getMetaData() != null) {
+ for (RecordingMetaData meta : r.getMetaData()) {
meta.setId(null);
- meta.setRecording(fr);
+ meta.setRecording(r);
}
}
- recordingDao.update(fr);
+ if (!Strings.isEmpty(r.getHash()) && r.getHash().startsWith(recordingFileName)) {
+ String name = getFileName(r.getHash());
+ r.setHash(UUID.randomUUID().toString());
+ fileMap.put(String.format("%s.%s", name, EXTENSION_FLV), String.format("%s.%s", r.getHash(), EXTENSION_FLV));
+ fileMap.put(String.format("%s.%s", name, EXTENSION_AVI), String.format("%s.%s", r.getHash(), EXTENSION_AVI));
+ fileMap.put(String.format("%s.%s", name, EXTENSION_JPG), String.format("%s.%s", r.getHash(), EXTENSION_JPG));
+ fileMap.put(String.format("%s.%s.%s", name, EXTENSION_FLV, EXTENSION_MP4), String.format("%s.%s", r.getHash(), EXTENSION_MP4));
+ fileMap.put(String.format("%s.%s.%s", name, EXTENSION_FLV, EXTENSION_OGG), String.format("%s.%s", r.getHash(), EXTENSION_OGG));
+ }
+ recordingDao.update(r);
}
}
@@ -775,7 +793,11 @@ public class BackupImport {
//Some hashes were stored with file extension
int idx = f.getHash() == null ? -1 : f.getHash().indexOf('.');
if (idx > -1) {
- f.setHash(f.getHash().substring(0, idx));
+ String hash = f.getHash().substring(0, idx);
+ if (FileItem.Type.Image == f.getType()) {
+ fileMap.put(f.getHash(), String.format("%s/%s", hash, f.getHash()));
+ }
+ f.setHash(hash);
}
list.add(f);
item = listNode.getNext();
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=1762210&r1=1762209&r2=1762210&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 Sun Sep 25 14:43:50 2016
@@ -316,4 +316,14 @@ public class OmFileHelper {
log.error("[copyfile(File, File)]", e);
}
}
+
+ public static String getFileName(String name) {
+ int dotidx = name.lastIndexOf('.');
+ return dotidx < 0 ? "" : name.substring(0, dotidx);
+ }
+
+ public static String getFileExt(String name) {
+ int dotidx = name.lastIndexOf('.');
+ return dotidx < 0 ? "" : name.substring(dotidx + 1).toLowerCase();
+ }
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomFileResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomFileResourceReference.java?rev=1762210&r1=1762209&r2=1762210&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomFileResourceReference.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomFileResourceReference.java Sun Sep 25 14:43:50 2016
@@ -18,9 +18,10 @@
*/
package org.apache.openmeetings.web.room;
+import static org.apache.openmeetings.util.OmFileHelper.getFileExt;
+
import java.io.File;
-import org.apache.openmeetings.core.data.file.FileProcessor;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
public class RoomFileResourceReference extends RoomResourceReference {
@@ -42,6 +43,6 @@ public class RoomFileResourceReference e
@Override
protected File getFile(FileExplorerItem r) {
- return getFile(r, FileProcessor.getExt(r));
+ return getFile(r, getFileExt(r.getName()));
}
}