|
|
@@ -46,7 +46,7 @@ public class AudioFileProcessor {
|
|
|
|
|
|
public UploadFileRet process(ObjectResult objectResult) {
|
|
|
String originalObjectName = objectResult.getObjectName();
|
|
|
- String originalObjectId = objectResult.getObjectId();
|
|
|
+ String audioFileId = objectResult.getObjectId();
|
|
|
boolean duplicate = objectResult.isDuplicate();
|
|
|
if (duplicate) {
|
|
|
ObjectResult objectResult1 = putObjectService.copyObject(originalObjectName);
|
|
|
@@ -56,7 +56,7 @@ public class AudioFileProcessor {
|
|
|
String dupObjectId = objectResult.getDupObjectId();
|
|
|
AudioFile audioFile = mediaRepository.findAudioFile(dupObjectId);
|
|
|
String audioCodec = audioFile.getCodec();
|
|
|
- AudioFile audioFile1 = new AudioFile(originalObjectId, objectId1, audioCodec, url1);
|
|
|
+ AudioFile audioFile1 = new AudioFile(audioFileId, objectId1, audioCodec, url1);
|
|
|
mediaRepository.saveAudioFile(audioFile1);
|
|
|
return new UploadFileRet(objectId1, url1);
|
|
|
}
|
|
|
@@ -73,14 +73,13 @@ public class AudioFileProcessor {
|
|
|
if (!audioCodecs.contains(audioCodec)) {
|
|
|
log.info("将 {} 对象的音频转换为 aac 编码", originalObjectName);
|
|
|
File file = new File(objectResult.getAbsolutePath());
|
|
|
- UploadFileRet uploadFileRet = getConvertedAudioFile(originalObjectId, file, originalObjectName, ".m4a");
|
|
|
- return uploadFileRet;
|
|
|
+ return getConvertedAudioFile(audioFileId, file, originalObjectName, ".m4a");
|
|
|
}
|
|
|
|
|
|
ObjectResult objectResult1 = putObjectService.copyObject(originalObjectName);
|
|
|
String objectId1 = objectResult1.getObjectId();
|
|
|
String url1 = objectNameService.getObjectUrl(objectResult1.getObjectName());
|
|
|
- AudioFile audioFile = new AudioFile(originalObjectId, objectId1, audioCodec, url1);
|
|
|
+ AudioFile audioFile = new AudioFile(audioFileId, objectId1, audioCodec, url1);
|
|
|
mediaRepository.saveAudioFile(audioFile);
|
|
|
return new UploadFileRet(objectId1, url1);
|
|
|
}
|