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

Merge with 3.5

Browse Source
This commit is contained in:
Romain Neutron
2012-03-26 14:12:52 +02:00
parent c7632846bb 85f32e4e23
commit 5acfdf0f3c
5 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/console
View File

@@ -27,6 +27,8 @@ $Core = require_once dirname(__FILE__) . '/../lib/bootstrap.php';
$result_code = 1; $result_code = 1;
$result_code = 1;
try try
{ {
\bootstrap::register_autoloads(); \bootstrap::register_autoloads();
@@ -81,11 +83,11 @@ try
$app->add(new module_console_fieldsMerge('fields:merge')); $app->add(new module_console_fieldsMerge('fields:merge'));
$result_code = $app->run(); $result_code = $app->run() === 0 ? : 1;
} }
catch (Exception $e) catch (Exception $e)
{ {
echo "an error occured";var_dump($e->getMessage()); echo sprintf("an error occured : %s", $e->getMessage());
} }
exit($result_code); exit($result_code);

10
lib/classes/binaryAdapter/video/toimage/ffmpeg.class.php
View File

@@ -88,8 +88,12 @@ class binaryAdapter_video_toimage_ffmpeg extends binaryAdapter_video_processorAb
$this->log("Commande executee : $cmd \n"); $this->log("Commande executee : $cmd \n");
if ( ! file_exists($tmpFile)) if ( ! file_exists($tmpFile))
{
throw new Exception('Unable to extract image'); throw new Exception('Unable to extract image');
}
if (file_exists($this->registry->get('GV_RootPath') . 'www/skins/icons/play.png'))
{
$cmd = $this->registry->get('GV_pathcomposite') $cmd = $this->registry->get('GV_pathcomposite')
. ' -gravity SouthEast -quiet -compose over "' . ' -gravity SouthEast -quiet -compose over "'
. $this->registry->get('GV_RootPath') . 'www/skins/icons/play.png"' . $this->registry->get('GV_RootPath') . 'www/skins/icons/play.png"'
@@ -98,6 +102,12 @@ class binaryAdapter_video_toimage_ffmpeg extends binaryAdapter_video_processorAb
$this->shell_cmd($cmd); $this->shell_cmd($cmd);
unlink($tmpFile); unlink($tmpFile);
}
else
{
rename($tmpFile, $dest);
}
rmdir($tmpDir); rmdir($tmpDir);
return $this; return $this;

2
lib/classes/module/console/schedulerState.class.php
View File

@@ -70,7 +70,7 @@ class module_console_schedulerState extends Command
return 1; return 1;
} }
return; return 0;
} }
} }

2
lib/classes/module/console/schedulerStop.class.php
View File

@@ -58,7 +58,7 @@ class module_console_schedulerStop extends Command
return 1; return 1;
} }
return; return 0;
} }
} }

2
lib/classes/module/console/systemUpgrade.class.php
View File

@@ -111,7 +111,7 @@ class module_console_systemUpgrade extends Command
} }
$output->write('Finished !', true); $output->write('Finished !', true);
return; return 0;
} }
} }