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

Fix Border File API

Browse Source
This commit is contained in:
Romain Neutron
2012-05-14 09:44:53 +02:00
parent f67bd7aa3f
commit 3e48096db7
7 changed files with 62 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@
namespace Alchemy\Phrasea\Border;
use MediaVorus\Media\Media;
use MediaVorus\MediaVorus;
use PHPExiftool\Reader;
use PHPExiftool\Writer;
@@ -44,18 +45,18 @@ class File
/**
* Constructor
*
* @param type $pathfile The path to the file
* @param Media $media The media
* @param \collection $collection The destination collection
* @param type $originalName The original name of the file
* @param string $originalName The original name of the file
* (if not provided, original name is
* extracted from the pathfile)
*/
public function __construct($pathfile, \collection $collection, $originalName = null)
public function __construct(Media $media, \collection $collection, $originalName = null)
{
$this->media = MediaVorus::guess(new \SplFileInfo($pathfile));
$this->media = $media;
$this->collection = $collection;
$this->attributes = array();
$this->originalName = $originalName ? : pathinfo($pathfile, PATHINFO_BASENAME);
$this->originalName = $originalName ? : pathinfo($this->getPathfile(), PATHINFO_BASENAME);
$this->ensureUUID();
}
@@ -227,4 +228,26 @@ class File
return $this;
}
/**
* Build the File package object
*
* @param string $pathfile The path to the file
* @param \collection $collection The destination collection
* @param string $originalName An optionnal original name (if
* different from the $pathfile filename)
* @throws \RuntimeException
*
* @return \Alchemy\Phrasea\Border\File
*/
public function buildFromPathfile($pathfile, \collection $collection, $originalName = null)
{
try {
$media = MediaVorus::guess(new \SplFileInfo($pathfile));
} catch (\MediaVorus\Exception\FileNotFoundException $e) {
throw new \RuntimeException(sprintf('Unable to build media file from non existant %s', $pathfile));
}
return new File($media, $collection, $originalName);
}
}

9
tests/Alchemy/Phrasea/Border/Checker/FilenameTest.php
View File

@@ -6,13 +6,14 @@ require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
use Alchemy\Phrasea\Border\File;
class FilenameTest extends \PhraseanetPHPUnitAbstract
class FilenameTest extends \PHPUnit_Framework_TestCase
{
/**
* @var Filename
*/
protected $object;
protected $filename;
protected $media;
public function setUp()
{
@@ -20,10 +21,12 @@ class FilenameTest extends \PhraseanetPHPUnitAbstract
$this->object = new Filename;
$this->filename = __DIR__ . '/../../../../../tmp/test001.CR2';
copy(__DIR__ . '/../../../../testfiles/test001.CR2', $this->filename);
$this->media = \MediaVorus\MediaVorus::guess(new \SplFileInfo($this->filename));
}
public function tearDown()
{
$this->media = null;
if (file_exists($this->filename)) {
unlink($this->filename);
}
@@ -35,7 +38,7 @@ class FilenameTest extends \PhraseanetPHPUnitAbstract
*/
public function testCheck()
{
$response = $this->object->check(self::$core['EM'], new File($this->filename, self::$collection));
$response = $this->object->check(self::$core['EM'], new File($this->media, self::$collection));
$this->assertInstanceOf('\\Alchemy\\Phrasea\\Border\\Checker\\Response', $response);
@@ -47,7 +50,7 @@ class FilenameTest extends \PhraseanetPHPUnitAbstract
*/
public function testCheckNoFile()
{
$mock = $this->getMock('\\Alchemy\\Phrasea\\Border\\File', array('getOriginalName'), array($this->filename, self::$collection));
$mock = $this->getMock('\\Alchemy\\Phrasea\\Border\\File', array('getOriginalName'), array($this->media, self::$collection));
$mock
->expects($this->once())

2
tests/Alchemy/Phrasea/Border/Checker/ResponseTest.php
View File

@@ -40,7 +40,7 @@ class ResponseTest extends \PHPUnit_Framework_TestCase
/**
* @covers Alchemy\Phrasea\Border\Checker\Checker
* @covers Alchemy\Phrasea\Border\Checker\Response::getCheck
* @covers Alchemy\Phrasea\Border\Checker\Response::getChecker
*/
public function testGetCheck()
{

7
tests/Alchemy/Phrasea/Border/Checker/Sha256Test.php
View File

@@ -13,6 +13,7 @@ class Sha256Test extends \PhraseanetPHPUnitAbstract
*/
protected $object;
protected $filename;
protected $media;
public function setUp()
{
@@ -20,10 +21,12 @@ class Sha256Test extends \PhraseanetPHPUnitAbstract
$this->object = new Sha256;
$this->filename = __DIR__ . '/../../../../../tmp/test001.CR2';
copy(__DIR__ . '/../../../../testfiles/test001.CR2', $this->filename);
$this->media = \MediaVorus\MediaVorus::guess(new \SplFileInfo($this->filename));
}
public function tearDown()
{
$this->media = null;
if (file_exists($this->filename)) {
unlink($this->filename);
}
@@ -35,7 +38,7 @@ class Sha256Test extends \PhraseanetPHPUnitAbstract
*/
public function testCheck()
{
$mock = $this->getMock('\\Alchemy\\Phrasea\\Border\\File', array('getSha256'), array($this->filename, self::$collection));
$mock = $this->getMock('\\Alchemy\\Phrasea\\Border\\File', array('getSha256'), array($this->media, self::$collection));
$mock
->expects($this->once())
@@ -55,7 +58,7 @@ class Sha256Test extends \PhraseanetPHPUnitAbstract
*/
public function testCheckNoFile()
{
$mock = $this->getMock('\\Alchemy\\Phrasea\\Border\\File', array('getSha256'), array($this->filename, self::$collection));
$mock = $this->getMock('\\Alchemy\\Phrasea\\Border\\File', array('getSha256'), array($this->media, self::$collection));
$mock
->expects($this->once())

7
tests/Alchemy/Phrasea/Border/Checker/UUIDTest.php
View File

@@ -13,6 +13,7 @@ class UUIDTest extends \PhraseanetPHPUnitAbstract
*/
protected $object;
protected $filename;
protected $media;
public function setUp()
{
@@ -20,10 +21,12 @@ class UUIDTest extends \PhraseanetPHPUnitAbstract
$this->object = new UUID;
$this->filename = __DIR__ . '/../../../../../tmp/test001.CR2';
copy(__DIR__ . '/../../../../testfiles/test001.CR2', $this->filename);
$this->media = \MediaVorus\MediaVorus::guess(new \SplFileInfo($this->filename));
}
public function tearDown()
{
$this->media = null;
if (file_exists($this->filename)) {
unlink($this->filename);
}
@@ -35,7 +38,7 @@ class UUIDTest extends \PhraseanetPHPUnitAbstract
*/
public function testCheck()
{
$response = $this->object->check(self::$core['EM'], new File($this->filename, self::$collection));
$response = $this->object->check(self::$core['EM'], new File($this->media, self::$collection));
$this->assertInstanceOf('\\Alchemy\\Phrasea\\Border\\Checker\\Response', $response);
@@ -47,7 +50,7 @@ class UUIDTest extends \PhraseanetPHPUnitAbstract
*/
public function testCheckNoFile()
{
$mock = $this->getMock('\\Alchemy\\Phrasea\\Border\\File', array('getUUID'), array($this->filename, self::$collection));
$mock = $this->getMock('\\Alchemy\\Phrasea\\Border\\File', array('getUUID'), array($this->media, self::$collection));
$mock
->expects($this->once())

10
tests/Alchemy/Phrasea/Border/FileTest.php
View File

@@ -11,6 +11,7 @@ class FileTest extends \PhraseanetPHPUnitAbstract
*/
protected $object;
protected $filename;
protected $media;
/**
* @covers Alchemy\Phrasea\Border\File::__construct
@@ -20,7 +21,10 @@ class FileTest extends \PhraseanetPHPUnitAbstract
parent::setUp();
$this->filename = __DIR__ . '/../../../../tmp/iphone_pic.jpg';
copy(__DIR__ . '/../../../testfiles/iphone_pic.jpg', $this->filename);
$this->object = new File($this->filename, self::$collection, 'originalName.txt');
$this->media = \MediaVorus\MediaVorus::guess(new \SplFileInfo($this->filename));
$this->object = new File($this->media, self::$collection, 'originalName.txt');
}
/**
@@ -58,7 +62,7 @@ class FileTest extends \PhraseanetPHPUnitAbstract
copy(__DIR__ . '/../../../testfiles/p4logo.jpg', $file);
$borderFile = new File($file, self::$collection);
$borderFile = new File(\MediaVorus\MediaVorus::guess(new \SplFileInfo($file)), self::$collection);
$uuid = $borderFile->getUUID();
$this->assertTrue(\uuid::is_valid($uuid));
@@ -122,7 +126,7 @@ class FileTest extends \PhraseanetPHPUnitAbstract
*/
public function testOriginalNameAuto()
{
$object = new File($this->filename, self::$collection);
$object = new File(\MediaVorus\MediaVorus::guess(new \SplFileInfo($this->filename)), self::$collection);
$this->assertSame('iphone_pic.jpg', $object->getOriginalName());
}

20
tests/Alchemy/Phrasea/Border/ManagerTest.php
View File

@@ -69,7 +69,7 @@ class ManagerTest extends \PhraseanetPHPUnitAbstract
$records[] = $record;
};
$this->assertEquals(Manager::RECORD_CREATED, $this->object->process($this->session, new File(self::$file1, self::$collection), $postProcessRecord));
$this->assertEquals(Manager::RECORD_CREATED, $this->object->process($this->session, File::buildFromPathfile(self::$file1, self::$collection), $postProcessRecord));
$shaChecker = new Checker\Sha256();
$this->object->registerChecker($shaChecker);
@@ -82,7 +82,7 @@ class ManagerTest extends \PhraseanetPHPUnitAbstract
$records[] = $element;
};
$this->assertEquals(Manager::LAZARET_CREATED, $this->object->process($this->session, new File(self::$file1, self::$collection), $postProcess));
$this->assertEquals(Manager::LAZARET_CREATED, $this->object->process($this->session, File::buildFromPathfile(self::$file1, self::$collection), $postProcess));
$postProcess = function($element, $visa, $code) use ($phpunit, &$records) {
$phpunit->assertInstanceOf('\\record_adapter', $element);
@@ -91,7 +91,7 @@ class ManagerTest extends \PhraseanetPHPUnitAbstract
$records[] = $element;
};
$this->assertEquals(Manager::RECORD_CREATED, $this->object->process($this->session, new File(self::$file1, self::$collection), $postProcess, Manager::FORCE_RECORD));
$this->assertEquals(Manager::RECORD_CREATED, $this->object->process($this->session, File::buildFromPathfile(self::$file1, self::$collection), $postProcess, Manager::FORCE_RECORD));
foreach ($records as $record) {
if ($record instanceof \record_adapter) {
@@ -110,8 +110,8 @@ class ManagerTest extends \PhraseanetPHPUnitAbstract
$postProcessRecord = function($record) use(&$records) {
$records[] = $record;
};
$this->assertEquals(Manager::LAZARET_CREATED, $this->object->process($this->session, new File(self::$file1, self::$collection), NULL, Manager::FORCE_LAZARET));
$this->assertEquals(Manager::RECORD_CREATED, $this->object->process($this->session, new File(self::$file1, self::$collection), $postProcessRecord));
$this->assertEquals(Manager::LAZARET_CREATED, $this->object->process($this->session, File::buildFromPathfile(self::$file1, self::$collection), NULL, Manager::FORCE_LAZARET));
$this->assertEquals(Manager::RECORD_CREATED, $this->object->process($this->session, File::buildFromPathfile(self::$file1, self::$collection), $postProcessRecord));
foreach ($records as $record) {
if ($record instanceof \record_adapter) {
@@ -125,7 +125,7 @@ class ManagerTest extends \PhraseanetPHPUnitAbstract
*/
public function testLazaretAttributes()
{
$file = new File(self::$file1, self::$collection);
$file = File::buildFromPathfile(self::$file1, self::$collection);
$objectNameTag = new \PHPExiftool\Driver\Tag\IPTC\ObjectName();
$monoValue = new \PHPExiftool\Driver\Value\Mono('title');
@@ -165,16 +165,16 @@ class ManagerTest extends \PhraseanetPHPUnitAbstract
$records[] = $record;
};
$visa = $this->object->getVisa(new File(self::$file1, self::$collection));
$visa = $this->object->getVisa(File::buildFromPathfile(self::$file1, self::$collection));
$this->assertInstanceOf('\\Alchemy\\Phrasea\\Border\\Visa', $visa);
$this->assertTrue($visa->isValid());
$this->object->process($this->session, new File(self::$file1, self::$collection), $postProcessRecord);
$this->object->process($this->session, File::buildFromPathfile(self::$file1, self::$collection), $postProcessRecord);
$visa = $this->object->getVisa(new File(self::$file1, self::$collection));
$visa = $this->object->getVisa(File::buildFromPathfile(self::$file1, self::$collection));
$this->assertInstanceOf('\\Alchemy\\Phrasea\\Border\\Visa', $visa);
@@ -182,7 +182,7 @@ class ManagerTest extends \PhraseanetPHPUnitAbstract
$this->object->registerChecker(new Checker\Sha256());
$visa = $this->object->getVisa(new File(self::$file1, self::$collection));
$visa = $this->object->getVisa(File::buildFromPathfile(self::$file1, self::$collection));
$this->assertInstanceOf('\\Alchemy\\Phrasea\\Border\\Visa', $visa);