ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: recording url fix

pull/375/head
pabloFuente 2019-08-09 13:56:26 +02:00
parent 1b2b10afde
commit 1a67cdd425
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java
View File

@ -420,16 +420,19 @@ public class RecordingManager {
Recording recording = new Recording(json); Recording recording = new Recording(json);
if (io.openvidu.java.client.Recording.Status.ready.equals(recording.getStatus()) if (io.openvidu.java.client.Recording.Status.ready.equals(recording.getStatus())
|| io.openvidu.java.client.Recording.Status.failed.equals(recording.getStatus())) { || io.openvidu.java.client.Recording.Status.failed.equals(recording.getStatus())) {
String recordingUrl = openviduConfig.getFinalUrl() + "recordings/" + recording.getId() + "/" recording.setUrl(getRecordingUrl(recording));
+ recording.getName() + "." + this.getExtensionFromRecording(recording);
recording.setUrl(recordingUrl);
} }
return recording; return recording;
} }
return null; return null;
} }
public String getExtensionFromRecording(Recording recording) { public String getRecordingUrl(Recording recording) {
return openviduConfig.getFinalUrl() + "recordings/" + recording.getId() + "/"
+ recording.getName() + "." + this.getExtensionFromRecording(recording);
}
private String getExtensionFromRecording(Recording recording) {
if (io.openvidu.java.client.Recording.OutputMode.INDIVIDUAL.equals(recording.getOutputMode())) { if (io.openvidu.java.client.Recording.OutputMode.INDIVIDUAL.equals(recording.getOutputMode())) {
return "zip"; return "zip";
} else if (recording.hasVideo()) { } else if (recording.hasVideo()) {

3
openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingService.java
View File

@ -104,6 +104,9 @@ public abstract class RecordingService {
io.openvidu.java.client.Recording.Status status = io.openvidu.java.client.Recording.Status.failed io.openvidu.java.client.Recording.Status status = io.openvidu.java.client.Recording.Status.failed
.equals(recording.getStatus()) ? io.openvidu.java.client.Recording.Status.failed .equals(recording.getStatus()) ? io.openvidu.java.client.Recording.Status.failed
: io.openvidu.java.client.Recording.Status.ready; : io.openvidu.java.client.Recording.Status.ready;
// Status is now failed or ready. Url property must be defined
recording.setUrl(recordingManager.getRecordingUrl(recording));
final String entityFile = this.openviduConfig.getOpenViduRecordingPath() + recording.getId() + "/" final String entityFile = this.openviduConfig.getOpenViduRecordingPath() + recording.getId() + "/"
+ RecordingManager.RECORDING_ENTITY_FILE + recording.getId(); + RecordingManager.RECORDING_ENTITY_FILE + recording.getId();