hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2582 from aynsix/PHRAS-2031-porting-Add-xmpmm-documentId

Browse Source 
PHRAS-2031 Port to 4.1 - Add XmpMM:DocumentID source
This commit is contained in:
Nicolas Maillat
2018-05-10 11:01:33 +02:00
committed by GitHub
parent 7b4104413f cf41426095
commit 39d86ef260
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Alchemy/Phrasea/Border/File.php
View File

@@ -49,6 +49,7 @@ class File
protected $originalName; protected $originalName;
protected $md5; protected $md5;
protected $attributes; protected $attributes;
public static $xmpTag = ['XMP-xmpMM:DocumentID'];
/** /**
* Constructor * Constructor
@@ -102,6 +103,7 @@ class File
'IPTC:UniqueDocumentID', 'IPTC:UniqueDocumentID',
'ExifIFD:ImageUniqueID', 'ExifIFD:ImageUniqueID',
'Canon:ImageUniqueID', 'Canon:ImageUniqueID',
'XMP-xmpMM:DocumentID',
]; ];
if (!$this->uuid) { if (!$this->uuid) {
@@ -112,6 +114,9 @@ class File
foreach ($availableUUIDs as $meta) { foreach ($availableUUIDs as $meta) {
if ($metadatas->containsKey($meta)) { if ($metadatas->containsKey($meta)) {
$candidate = $metadatas->get($meta)->getValue()->asString(); $candidate = $metadatas->get($meta)->getValue()->asString();
if(in_array($meta, self::$xmpTag)){
$candidate = self::sanitizeXmpUuid($candidate);
}
if (Uuid::isValid($candidate)) { if (Uuid::isValid($candidate)) {
$uuid = $candidate; $uuid = $candidate;
break; break;
@@ -287,4 +292,13 @@ class File
return new File($app, $media, $collection, $originalName); return new File($app, $media, $collection, $originalName);
} }
/**
* Sanitize XMP UUID
* @param $uuid
* @return mixed
*/
public static function sanitizeXmpUuid($uuid){
return str_replace('xmp.did:', '', $uuid);
}
} }

8
lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataSetter.php
View File

@@ -11,6 +11,7 @@
namespace Alchemy\Phrasea\Metadata; namespace Alchemy\Phrasea\Metadata;
use Alchemy\Phrasea\Border\File;
use Alchemy\Phrasea\Databox\DataboxRepository; use Alchemy\Phrasea\Databox\DataboxRepository;
use Alchemy\Phrasea\Metadata\Tag\NoSource; use Alchemy\Phrasea\Metadata\Tag\NoSource;
use PHPExiftool\Driver\Metadata\Metadata; use PHPExiftool\Driver\Metadata\Metadata;
@@ -119,8 +120,11 @@ class PhraseanetMetadataSetter
if (!isset($metadataPerField[$fieldName])) { if (!isset($metadataPerField[$fieldName])) {
$metadataPerField[$fieldName] = []; $metadataPerField[$fieldName] = [];
} }
if(in_array($tagName, File::$xmpTag)){
$metadataPerField[$fieldName] = array_merge($metadataPerField[$fieldName], $metadata->getValue()->asArray()); $metadataPerField[$fieldName] = array_merge($metadataPerField[$fieldName], (array) File::sanitizeXmpUuid($metadata->getValue()->asString()));
}else{
$metadataPerField[$fieldName] = array_merge($metadataPerField[$fieldName], $metadata->getValue()->asArray());
}
} }
} }