inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-10-08 14:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

ATS-728: Add optional Windows parameters for ImageMagickCommandExecutor (#229)

Browse Source 
* ATS-728: Add optional Windows parameters for ImageMagickCommandExecutor

* ATS-728: Split logic

* ATS-728: Fix newly implemented AIOImageMagick tests
This commit is contained in:
Kristian Dimitrov
2020-04-22 11:32:23 +01:00
committed by GitHub
parent e2ba7676a6
commit 88116fc4af
8 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java
View File

@@ -55,6 +55,12 @@ public class AIOCustomConfig
@Value("${transform.core.imagemagick.root}")
private String imageMagickRootPath;
@Value("${transform.core.imagemagick.coders}")
private String imageMagickCodersPath;
@Value("${transform.core.imagemagick.config}")
private String imageMagickConfigPath;
/**
*
* @return Override the TransformRegistryImpl used in {@link AbstractTransformerController}
@@ -66,7 +72,7 @@ public class AIOCustomConfig
AIOTransformRegistry aioTransformRegistry = new AIOTransformRegistry();
aioTransformRegistry.registerTransformer(new MiscAdapter());
aioTransformRegistry.registerTransformer(new TikaAdapter());
aioTransformRegistry.registerTransformer(new ImageMagickAdapter(imageMagickExePath, imageMagickDynPath, imageMagickRootPath));
aioTransformRegistry.registerTransformer(new ImageMagickAdapter(imageMagickExePath, imageMagickDynPath, imageMagickRootPath, imageMagickCodersPath, imageMagickConfigPath));
aioTransformRegistry.registerTransformer(new LibreOfficeAdapter(libreofficePath));
aioTransformRegistry.registerTransformer(new PdfRendererAdapter(pdfRendererPath));
return aioTransformRegistry;

4
alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/resources/application-default.yaml
View File

@@ -9,4 +9,6 @@ transform:
imagemagick:
root: ${IMAGEMAGICK_ROOT:/usr/lib64/ImageMagick-7.0.7}
dyn: ${IMAGEMAGICK_DYN:/usr/lib64/ImageMagick-7.0.7/lib}
exe: ${IMAGEMAGICK_EXE:/usr/bin/convert}
exe: ${IMAGEMAGICK_EXE:/usr/bin/convert}
coders: ${IMAGEMAGICK_CODERS:}
config: ${IMAGEMAGICK_CONFIG:}

2
alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java
View File

@@ -63,7 +63,7 @@ public class AIOControllerImageMagickTest extends ImageMagickControllerTest
@PostConstruct
private void init() throws Exception
{
adapter = new ImageMagickAdapter(EXE, DYN, ROOT);
adapter = new ImageMagickAdapter(EXE, DYN, ROOT, CODERS, CONFIG);
}
@Before @Override

4
alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/ImageMagickAdapter.java
View File

@@ -59,9 +59,9 @@ public class ImageMagickAdapter implements Transformer
private static String ID = "imagemagick";
private ImageMagickCommandExecutor commandExecutor;
public ImageMagickAdapter(String exe, String dyn, String root) throws Exception
public ImageMagickAdapter(String exe, String dyn, String root, String coder, String config) throws Exception
{
commandExecutor = new ImageMagickCommandExecutor(exe, dyn, root);
commandExecutor = new ImageMagickCommandExecutor(exe, dyn, root, coder, config);
}
@Override