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

Remove exiftool gitmodule dependency

Browse Source
This commit is contained in:
Romain Neutron
2012-05-04 01:26:21 +02:00
parent 7fb78bf281
commit fcd3e42737
11 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/classes/task/period/upgradetov31.class.php
View File

@@ -45,10 +45,11 @@ class task_period_upgradetov31 extends task_abstract
// task can't be stopped here
$appbox = appbox::get_instance(\bootstrap::getCore());
$conn = $appbox->get_connection();
$registry = $appbox->get_registry();
$running = true;
if ( ! is_executable($registry->get('GV_exiftool'))) {
$binary = __DIR__ . '/../../../../vendor/phpexiftool/exiftool/exiftool';
if ( ! is_executable($binary)) {
printf("Exiftool is not executable, script can not process\n");
return 'stopped';

8
lib/classes/task/period/writemeta.class.php
View File

@@ -330,9 +330,15 @@ class task_period_writemeta extends task_databoxAbstract
foreach ($tsub as $name => $file) {
$cmd = '';
if ($this->system == 'WINDOWS')
{
$cmd = 'start /B /LOW ';
$cmd .= ( $registry->get('GV_exiftool') . ' -m -overwrite_original ');
}
$cmd .= __DIR__ . '/../../../../vendor/phpexiftool/exiftool/exiftool'
. ' -m -overwrite_original ';
if ($name != 'document' || $this->clear_doc)
$cmd .= ' -all:all= ';