Revision 3baaf1b2
Added by Andreas Müller over 2 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/media/MediaInfoFactory.java | ||
|---|---|---|
| 42 | 42 |
* the image metadata from the file itself. |
| 43 | 43 |
*/ |
| 44 | 44 |
@Override |
| 45 |
public CdmImageInfo cdmImageInfoWithMetaData(URI imageUri) throws IOException, HttpException {
|
|
| 45 |
public CdmImageInfo cdmImageInfo(URI imageUri, boolean forceMetaData) throws IOException, HttpException {
|
|
| 46 | 46 |
|
| 47 | 47 |
List<URI> metadataServiceURIs = applyURITransformations(imageUri); |
| 48 | 48 |
if(!metadataServiceURIs.isEmpty()) {
|
| ... | ... | |
| 52 | 52 |
.getCdmImageInfo(); |
| 53 | 53 |
} else {
|
| 54 | 54 |
// :-( need to use the files reader |
| 55 |
return new MediaInfoFileReader(imageUri)
|
|
| 56 |
.readBaseInfo() |
|
| 57 |
.readMetaData()
|
|
| 58 |
.getCdmImageInfo();
|
|
| 55 |
MediaInfoFileReader mediaReader = new MediaInfoFileReader(imageUri)
|
|
| 56 |
.readBaseInfo();
|
|
| 57 |
AbstactMediaMetadataReader reader = forceMetaData ? mediaReader.readMetaData() : mediaReader;
|
|
| 58 |
return reader.getCdmImageInfo();
|
|
| 59 | 59 |
} |
| 60 | 60 |
} |
| 61 | 61 |
|
| ... | ... | |
| 65 | 65 |
List<URI> metadataServiceURIs = processor.applyTo(imageUri); |
| 66 | 66 |
return metadataServiceURIs; |
| 67 | 67 |
} |
| 68 |
|
|
| 69 |
@Override |
|
| 70 |
public CdmImageInfo cdmImageInfo(URI imageUri) throws IOException, HttpException {
|
|
| 71 |
|
|
| 72 |
List<URI> metadataServiceURIs = applyURITransformations(imageUri); |
|
| 73 |
// :-) Hooray, we can get the metadata from the web service, this is going to be snappy |
|
| 74 |
if(!metadataServiceURIs.isEmpty()) {
|
|
| 75 |
return new MediaInfoServiceReader(imageUri, metadataServiceURIs.get(0)) |
|
| 76 |
.read() |
|
| 77 |
.getCdmImageInfo(); |
|
| 78 |
} else {
|
|
| 79 |
// :-( need to use the files reader |
|
| 80 |
return new MediaInfoFileReader(imageUri) |
|
| 81 |
.readBaseInfo() |
|
| 82 |
.getCdmImageInfo(); |
|
| 83 |
} |
|
| 84 |
} |
|
| 85 | 68 |
} |
Also available in: Unified diff
ref #9607 remove redundant method in IMediaInfoFactory