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/11/17 16:32:06 UTC
svn commit: r1770238 - in /openmeetings/application:
branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/
branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/
trunk/openmeetings-install/src/main/java...
Author: solomax
Date: Thu Nov 17 16:32:06 2016
New Revision: 1770238
URL: http://svn.apache.org/viewvc?rev=1770238&view=rev
Log:
[OPENMEETINGS-1457] import should be fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.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/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.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
Modified: openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1770238&r1=1770237&r2=1770238&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java Thu Nov 17 16:32:06 2016
@@ -20,6 +20,7 @@ package org.apache.openmeetings.backup;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.openmeetings.util.OmFileHelper.BACKUP_DIR;
+import static org.apache.openmeetings.util.OmFileHelper.BCKP_RECORD_FILES;
import static org.apache.openmeetings.util.OmFileHelper.BCKP_ROOM_FILES;
import static org.apache.openmeetings.util.OmFileHelper.IMPORT_DIR;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -417,7 +418,7 @@ public class BackupExport {
/*
* ##################### Backup Recording Files
*/
- File targetDirRec = new File(backup_dir, "recordingFiles");
+ File targetDirRec = new File(backup_dir, BCKP_RECORD_FILES);
if (!targetDirRec.exists()) {
targetDirRec.mkdir();
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=1770238&r1=1770237&r2=1770238&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 Thu Nov 17 16:32:06 2016
@@ -22,6 +22,7 @@ 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.BCKP_RECORD_FILES;
import static org.apache.openmeetings.util.OmFileHelper.BCKP_ROOM_FILES;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
@@ -555,6 +556,7 @@ public class BackupImport {
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.meta", name, EXTENSION_FLV), String.format("%s.%s.meta", 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));
@@ -1181,7 +1183,7 @@ public class BackupImport {
list.add(r);
item = listNode.getNext();
}
- }
+ }
}
}
return list;
@@ -1241,12 +1243,17 @@ public class BackupImport {
}
// Now check the recordings and import them
-
- File sourceDirRec = new File(importBaseDir, "recordingFiles");
-
- log.debug("sourceDirRec PATH " + sourceDirRec.getCanonicalPath());
- if (sourceDirRec.exists()) {
- FileUtils.copyDirectory(sourceDirRec, getStreamsHibernateDir());
+ File recDir = new File(importBaseDir, BCKP_RECORD_FILES);
+ log.debug("sourceDirRec PATH " + recDir.getCanonicalPath());
+ if (recDir.exists()) {
+ for (File r : recDir.listFiles()) {
+ String n = fileMap.get(r.getName());
+ if (n != null) {
+ FileUtils.copyFile(r, new File(getStreamsHibernateDir(), n));
+ } else {
+ FileUtils.copyFileToDirectory(r, getStreamsHibernateDir());
+ }
+ }
}
}
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=1770238&r1=1770237&r2=1770238&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 Thu Nov 17 16:32:06 2016
@@ -74,6 +74,7 @@ public class OmFileHelper {
public static final String JPG_MIME_TYPE = "image/jpeg";
public static final String PNG_MIME_TYPE = "image/png";
public static final String BCKP_ROOM_FILES = "roomFiles";
+ public static final String BCKP_RECORD_FILES = "recordingFiles";
public static void setOmHome(File omHome) {
OmFileHelper.OM_HOME = omHome;
Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1770238&r1=1770237&r2=1770238&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java (original)
+++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java Thu Nov 17 16:32:06 2016
@@ -20,6 +20,7 @@ package org.apache.openmeetings.backup;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.openmeetings.util.OmFileHelper.BACKUP_DIR;
+import static org.apache.openmeetings.util.OmFileHelper.BCKP_RECORD_FILES;
import static org.apache.openmeetings.util.OmFileHelper.BCKP_ROOM_FILES;
import static org.apache.openmeetings.util.OmFileHelper.IMPORT_DIR;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -417,7 +418,7 @@ public class BackupExport {
/*
* ##################### Backup Recording Files
*/
- File targetDirRec = new File(backup_dir, "recordingFiles");
+ File targetDirRec = new File(backup_dir, BCKP_RECORD_FILES);
if (!targetDirRec.exists()) {
targetDirRec.mkdir();
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=1770238&r1=1770237&r2=1770238&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 Thu Nov 17 16:32:06 2016
@@ -22,6 +22,7 @@ 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.BCKP_RECORD_FILES;
import static org.apache.openmeetings.util.OmFileHelper.BCKP_ROOM_FILES;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
@@ -555,6 +556,7 @@ public class BackupImport {
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.meta", name, EXTENSION_FLV), String.format("%s.%s.meta", 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));
@@ -1241,12 +1243,17 @@ public class BackupImport {
}
// Now check the recordings and import them
-
- File sourceDirRec = new File(importBaseDir, "recordingFiles");
-
- log.debug("sourceDirRec PATH " + sourceDirRec.getCanonicalPath());
- if (sourceDirRec.exists()) {
- FileUtils.copyDirectory(sourceDirRec, getStreamsHibernateDir());
+ File recDir = new File(importBaseDir, BCKP_RECORD_FILES);
+ log.debug("sourceDirRec PATH " + recDir.getCanonicalPath());
+ if (recDir.exists()) {
+ for (File r : recDir.listFiles()) {
+ String n = fileMap.get(r.getName());
+ if (n != null) {
+ FileUtils.copyFile(r, new File(getStreamsHibernateDir(), n));
+ } else {
+ FileUtils.copyFileToDirectory(r, getStreamsHibernateDir());
+ }
+ }
}
}
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=1770238&r1=1770237&r2=1770238&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 Thu Nov 17 16:32:06 2016
@@ -74,6 +74,7 @@ public class OmFileHelper {
public static final String JPG_MIME_TYPE = "image/jpeg";
public static final String PNG_MIME_TYPE = "image/png";
public static final String BCKP_ROOM_FILES = "roomFiles";
+ public static final String BCKP_RECORD_FILES = "recordingFiles";
public static void setOmHome(File omHome) {
OmFileHelper.OM_HOME = omHome;