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

Subsitution cleanup && test enhancement

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-03-21 17:10:46 +01:00
committed by Romain Neutron
parent 93aa9be0fa
commit 02e5e2c216
4 changed files with 70 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
lib/Alchemy/Phrasea/Controller/Prod/Tools.php
View File

@@ -127,30 +127,29 @@ class Tools implements ControllerProviderInterface
$controllers->post('/hddoc/', function(Application $app, Request $request) { $controllers->post('/hddoc/', function(Application $app, Request $request) {
$success = false; $success = false;
$errorMessage = ""; $message = _('An error occured');
$fileName = null;
if ($file = $request->files->get('newHD')) { if ($file = $request->files->get('newHD')) {
if ($file->isValid()) {
$fileName = $file->getClientOriginalName(); $fileName = $file->getClientOriginalName();
$size = $file->getClientSize();
$tempoFile = tempnam(sys_get_temp_dir(), 'substit');
unlink($tempoFile);
mkdir($tempoFile);
$tempoFile = $tempoFile . DIRECTORY_SEPARATOR . $fileName;
copy($file->getPathname(), $tempoFile);
if ($file->getClientSize() && $fileName && $file->isValid()) {
try { try {
$record = new \record_adapter( $tmpFile = sprintf(
$request->get('sbas_id') '%stmp/%s',
, $request->get('record_id') $app['Core']->getRegistry()->get('GV_RootPath'),
$fileName
); );
$media = $app['Core']['mediavorus']->guess(new \SplFileInfo($tempoFile)); if (false === rename($file->getPathname(), $tmpFile)) {
throw new \Exception();
}
$record = new \record_adapter(
$request->get('sbas_id'),
$request->get('record_id')
);
$media = $app['Core']['mediavorus']->guess(new \SplFileInfo($tmpFile));
$record->substitute_subdef('document', $media); $record->substitute_subdef('document', $media);
@@ -159,50 +158,44 @@ class Tools implements ControllerProviderInterface
} }
$success = true; $success = true;
$message = _('Record document has been successfully substitued');
unlink($tmpFile);
} catch (\Exception $e) { } catch (\Exception $e) {
$errorMessage = $e->getMessage();
}
unlink($tempoFile); }
rmdir(dirname($tempoFile));
unlink($file->getPathname());
} else { } else {
$errorMessage = _('file is not valid'); $message = _('file is not valid');
} }
} }
$template = 'prod/actions/Tools/iframeUpload.html.twig'; return new Response($app['Core']->getTwig()->render('prod/actions/Tools/iframeUpload.html.twig', array(
$var = array( 'success' => $success,
'success' => $success 'message' => $message,
, 'fileName' => $fileName )));
, 'errorMessage' => $errorMessage
);
return new Response($app['Core']->getTwig()->render($template, $var));
/**
*
*/
}); });
$controllers->post('/chgthumb/', function(Application $app, Request $request) { $controllers->post('/chgthumb/', function(Application $app, Request $request) {
$success = false; $success = false;
$errorMessage = ""; $message = _('An error occured');
if ($file = $request->files->get('newThumb')) { if ($file = $request->files->get('newThumb')) {
$size = $file->getClientSize();
$fileName = $file->getClientOriginalName(); $fileName = $file->getClientOriginalName();
if ($size && $fileName && $file->isValid()) { if ($file->getClientSize() && $fileName && $file->isValid()) {
try { try {
$rootPath = $app['Core']->getRegistry()->get('GV_RootPath'); $tmpFile = sprintf(
$tmpFile = $rootPath . 'tmp/' . $fileName; '%stmp/%s',
rename($file->getPathname(), $tmpFile); $app['Core']->getRegistry()->get('GV_RootPath'),
$fileName
);
if (false === rename($file->getPathname(), $tmpFile)) {
throw new \Exception();
}
$record = new \record_adapter( $record = new \record_adapter(
$request->get('sbas_id') $request->get('sbas_id'),
, $request->get('record_id') $request->get('record_id')
); );
$media = $app['Core']['mediavorus']->guess(new \SplFileInfo($tmpFile)); $media = $app['Core']['mediavorus']->guess(new \SplFileInfo($tmpFile));
@@ -210,21 +203,19 @@ class Tools implements ControllerProviderInterface
$record->substitute_subdef('thumbnail', $media); $record->substitute_subdef('thumbnail', $media);
$success = true; $success = true;
$message = _('Record thumbnail has been successfully substitued');
unlink($tmpFile);
} catch (\Exception $e) { } catch (\Exception $e) {
$errorMessage = _('An error occured');
} }
} else { } else {
$errorMessage = _('file is not valid'); $message = _('file is not valid');
} }
$template = 'prod/actions/Tools/iframeUpload.html.twig'; return new Response($app['Core']->getTwig()->render('prod/actions/Tools/iframeUpload.html.twig', array(
$var = array( 'success' => $success,
'success' => $success 'message' => $message,
, 'fileName' => $fileName )));
, 'errorMessage' => $errorMessage
);
return new Response($app['Core']->getTwig()->render($template, $var));
} }
}); });

7
templates/web/prod/actions/Tools/iframeUpload.html.twig
View File

@@ -1,7 +1,4 @@
<div class='content'> <div class='content {% if not success %}text-error{% endif %}'>
{% if not success %} {{ message }}
{% trans 'an error occured' %}
{{errorMessage}}
{% endif %}
</div> </div>

2
templates/web/prod/actions/Tools/index.html.twig
View File

@@ -288,7 +288,6 @@
<fieldset style='border:1px solid #999;padding:20px;'> <fieldset style='border:1px solid #999;padding:20px;'>
<legend style='color:#EEE'>&nbsp;<b>{% trans "substitution HD" %}</b>&nbsp;</legend> <legend style='color:#EEE'>&nbsp;<b>{% trans "substitution HD" %}</b>&nbsp;</legend>
<div> <div>
<input type="hidden" name="MAX_FILE_SIZE" value="20000000" />
<input id='new-hd-file' name="newHD" type="file"/> <input id='new-hd-file' name="newHD" type="file"/>
<br /> <br />
<label for="CCFNALP" class="checkbox"> <label for="CCFNALP" class="checkbox">
@@ -321,7 +320,6 @@
<fieldset style='border:1px solid #999;padding:20px;'> <fieldset style='border:1px solid #999;padding:20px;'>
<legend style='color:#EEE'>&nbsp;<b>{% trans "substitution SD" %}</b>&nbsp;</legend> <legend style='color:#EEE'>&nbsp;<b>{% trans "substitution SD" %}</b>&nbsp;</legend>
<div> <div>
<input type="hidden" name="MAX_FILE_SIZE" value="20000000" />
<input id='new-sd-file' name="newThumb" type="file" /> <input id='new-sd-file' name="newThumb" type="file" />
<input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}" /> <input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}" />
<input type="hidden" name="record_id" value="{{record.get_record_id()}}" /> <input type="hidden" name="record_id" value="{{record.get_record_id()}}" />

28
tests/Alchemy/Phrasea/Controller/Prod/ToolsTest.php
View File

@@ -35,11 +35,30 @@ class ControllerToolsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
return $app; return $app;
} }
public function testRouteChangeDoc()
{
$record = static::$records['record_1'];
$crawler = $this->client->request('POST', '/tools/hddoc/', array(
'sbas_id' => $record->get_sbas_id(),
'record_id' => $record->get_record_id(),
), array(
'newHD' => new UploadedFile(
$this->tmpFile, 'KIKOO.JPG', 'image/jpg', 2000
)
));
$response = $this->client->getResponse();
$message = trim($crawler->filterXPath('//div')->text());
$this->assertEquals(200, $response->getStatusCode());
$this->assertEquals(_('Record document has been successfully substitued'), $message);
}
public function testRouteChangeThumb() public function testRouteChangeThumb()
{ {
$record = static::$records['record_1']; $record = static::$records['record_1'];
$this->client->request('POST', '/tools/chgthumb/', array( $crawler = $this->client->request('POST', '/tools/chgthumb/', array(
'sbas_id' => $record->get_sbas_id(), 'sbas_id' => $record->get_sbas_id(),
'record_id' => $record->get_record_id(), 'record_id' => $record->get_record_id(),
), array( ), array(
@@ -49,11 +68,8 @@ class ControllerToolsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
)); ));
$response = $this->client->getResponse(); $response = $this->client->getResponse();
$message = trim($crawler->filterXPath('//div')->text());
$content = $response->getContent();
$this->assertEquals(200, $response->getStatusCode()); $this->assertEquals(200, $response->getStatusCode());
$this->assertFalse(strpos(_('An error occured'), $content)); $this->assertEquals(_('Record thumbnail has been successfully substitued'), $message);
$this->assertFalse(strpos(_('file is not valid'), $content));
} }
} }