-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BXC-4630 derivative MP3 from WAV (#1789)
* generate mp3 derivatives from wav files * generate mp3 derivatives from wav files * fix destroy derivative and enhancement tests * fix javadoc, unique startuporder value and route id, add log statements/test/assertions, use FcrepoJmsConstants, update context file * remove constructor, rename bean to addAudioAccessCopyProcessor, add test, update context files * rename bean addAudioAccessCopyProcessor in context file * add audio/wave and audio/x-wave to mimetypes * switch mp3 to m4a * add audioDerivativeProcessor to service-context * change audio temp path from -access to -audio
- Loading branch information
Showing
17 changed files
with
476 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
...mel-app/src/main/java/edu/unc/lib/boxc/services/camel/audio/AudioDerivativeProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package edu.unc.lib.boxc.services.camel.audio; | ||
|
|
||
| import edu.unc.lib.boxc.services.camel.util.CdrFcrepoHeaders; | ||
| import org.apache.camel.Exchange; | ||
| import org.apache.camel.Message; | ||
| import org.apache.camel.Processor; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.util.regex.Pattern; | ||
|
|
||
| /** | ||
| * Processor which validates and prepares audio objects for producing derivatives | ||
| * @author krwong | ||
| */ | ||
| public class AudioDerivativeProcessor implements Processor { | ||
| private static final Logger log = LoggerFactory.getLogger(AudioDerivativeProcessor.class); | ||
|
|
||
| private static final Pattern MIMETYPE_PATTERN = Pattern.compile("^(audio.(wav|wave|x-wave))$"); | ||
|
|
||
| /** | ||
| * Returns true if the subject of the exchange is a binary which | ||
| * is eligible for having audio derivatives generated from it. | ||
| * @param exchange | ||
| * @return | ||
| */ | ||
| public static boolean allowedAudioType(Exchange exchange) { | ||
| Message in = exchange.getIn(); | ||
| String mimetype = (String) in.getHeader(CdrFcrepoHeaders.CdrBinaryMimeType); | ||
| String binPath = (String) in.getHeader(CdrFcrepoHeaders.CdrBinaryPath); | ||
|
|
||
| if (!MIMETYPE_PATTERN.matcher(mimetype).matches()) { | ||
| log.debug("File type {} on object {} is not applicable for audio derivatives", mimetype, binPath); | ||
| return false; | ||
| } | ||
|
|
||
| log.debug("Object {} with type {} is permitted for audio derivatives", binPath, mimetype); | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void process(Exchange exchange) throws Exception { | ||
| Message in = exchange.getIn(); | ||
| String mimetype = (String) in.getHeader(CdrFcrepoHeaders.CdrBinaryMimeType); | ||
|
|
||
| String binPath = (String) in.getHeader(CdrFcrepoHeaders.CdrBinaryPath); | ||
| log.debug("Keeping existing audio path as {} for type {}", binPath, mimetype); | ||
| in.setHeader(CdrFcrepoHeaders.CdrAudioPath, binPath); | ||
| } | ||
| } |
62 changes: 62 additions & 0 deletions
62
...amel-app/src/main/java/edu/unc/lib/boxc/services/camel/audio/AudioEnhancementsRouter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| package edu.unc.lib.boxc.services.camel.audio; | ||
|
|
||
| import edu.unc.lib.boxc.model.api.exceptions.RepositoryException; | ||
| import edu.unc.lib.boxc.services.camel.images.AddDerivativeProcessor; | ||
| import edu.unc.lib.boxc.services.camel.util.CdrFcrepoHeaders; | ||
| import org.apache.camel.BeanInject; | ||
| import org.apache.camel.LoggingLevel; | ||
| import org.apache.camel.builder.RouteBuilder; | ||
| import org.apache.camel.spi.UuidGenerator; | ||
| import org.apache.camel.support.DefaultUuidGenerator; | ||
| import org.slf4j.Logger; | ||
|
|
||
| import static org.slf4j.LoggerFactory.getLogger; | ||
|
|
||
| /** | ||
| * Router which triggers the creation of audio derivatives | ||
| * @author krwong | ||
| */ | ||
| public class AudioEnhancementsRouter extends RouteBuilder { | ||
| private static final Logger log = getLogger(AudioEnhancementsRouter.class); | ||
|
|
||
| @BeanInject(value = "addAudioAccessCopyProcessor") | ||
| private AddDerivativeProcessor addAudioAccessCopyProcessor; | ||
|
|
||
| private UuidGenerator uuidGenerator; | ||
|
|
||
| /** | ||
| * Configure the audio enhancement route workflow. | ||
| */ | ||
| @Override | ||
| public void configure() throws Exception { | ||
| AudioDerivativeProcessor audioDerivProcessor = new AudioDerivativeProcessor(); | ||
|
|
||
| uuidGenerator = new DefaultUuidGenerator(); | ||
|
|
||
| onException(RepositoryException.class) | ||
| .redeliveryDelay("{{error.retryDelay}}") | ||
| .maximumRedeliveries("{{error.maxRedeliveries}}") | ||
| .backOffMultiplier("{{error.backOffMultiplier}}") | ||
| .retryAttemptedLogLevel(LoggingLevel.WARN); | ||
|
|
||
| from("direct:process.enhancement.audioAccessCopy") | ||
| .routeId("AudioAccessCopy") | ||
| .startupOrder(25) | ||
| .log(LoggingLevel.DEBUG, log, "Access copy triggered") | ||
| .filter().method(addAudioAccessCopyProcessor, "needsRun") | ||
| .filter().method(audioDerivProcessor, "allowedAudioType") | ||
| .bean(audioDerivProcessor) | ||
| .log(LoggingLevel.INFO, log, "Creating/Updating AAC access copy for ${headers[CdrAudioPath]}") | ||
| // Generate an random identifier to avoid derivative collisions | ||
| .setBody(exchange -> uuidGenerator.generateUuid()) | ||
| .setHeader(CdrFcrepoHeaders.CdrTempPath, simple("${properties:services.tempDirectory}/${body}-audio")) | ||
| .doTry() | ||
| .recipientList(simple("exec:/bin/sh?args=${properties:cdr.enhancement.bin}/convertWav.sh " | ||
| + "${headers[CdrAudioPath]} ${headers[CdrTempPath]}")) | ||
| .bean(addAudioAccessCopyProcessor) | ||
| .endDoTry() | ||
| .doFinally() | ||
| .bean(addAudioAccessCopyProcessor, "cleanupTempFile") | ||
| .end(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.