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

PHRAS-4067: admin - dashboard - 500 error (#4513)

Browse Source 
* fix error 500 on dashboard : remove unused swiftools requirement

* unused

* patch on 4.1.8
This commit is contained in:
Aina Sitraka
2024-06-10 19:18:34 +03:00
committed by GitHub
parent 0c0021d001
commit b8786852e0
15 changed files with 73 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Alchemy/Phrasea/Command/Setup/Install.php
View File

@@ -429,9 +429,6 @@ class Install extends Command
{
return [
'php_binary' => $this->executableFinder->find('php'),
'pdf2swf_binary' => $this->executableFinder->find('pdf2swf'),
'swf_extract_binary' => $this->executableFinder->find('swfextract'),
'swf_render_binary' => $this->executableFinder->find('swfrender'),
'unoconv_binary' => $this->executableFinder->find('unoconv'),
'ffmpeg_binary' => $this->executableFinder->find('ffmpeg', $this->executableFinder->find('avconv')),
'ffprobe_binary' => $this->executableFinder->find('ffprobe', $this->executableFinder->find('avprobe')),

3
lib/Alchemy/Phrasea/Controller/Api/V1Controller.php
View File

@@ -379,9 +379,6 @@ class V1Controller extends Controller
'binary' => [
'phpCli' => isset($binaries['php_binary']) ? $binaries['php_binary'] : null,
'phpIni' => $conf->get(['registry', 'executables', 'php-conf-path']),
'swfExtract' => isset($binaries['swf_extract_binary']) ? $binaries['swf_extract_binary'] : null,
'pdf2swf' => isset($binaries['pdf2swf_binary']) ? $binaries['pdf2swf_binary'] : null,
'swfRender' => isset($binaries['swf_render_binary']) ? $binaries['swf_render_binary'] : null,
'unoconv' => isset($binaries['unoconv_binary']) ? $binaries['unoconv_binary'] : null,
'ffmpeg' => isset($binaries['ffmpeg_binary']) ? $binaries['ffmpeg_binary'] : null,
'ffprobe' => isset($binaries['ffprobe_binary']) ? $binaries['ffprobe_binary'] : null,

3
lib/Alchemy/Phrasea/Controller/SetupController.php
View File

@@ -184,9 +184,6 @@ class SetupController extends Controller
$binaryData = [];
foreach ([
'php_binary' => $request->request->get('binary_php'),
'swf_extract_binary' => $request->request->get('binary_swfextract'),
'pdf2swf_binary' => $request->request->get('binary_pdf2swf'),
'swf_render_binary' => $request->request->get('binary_swfrender'),
'unoconv_binary' => $request->request->get('binary_unoconv'),
'ffmpeg_binary' => $request->request->get('binary_ffmpeg'),
'mp4box_binary' => $request->request->get('binary_MP4Box'),

3
lib/Alchemy/Phrasea/Core/Provider/MediaAlchemystServiceProvider.php
View File

@@ -13,9 +13,6 @@ class MediaAlchemystServiceProvider implements ServiceProviderInterface
$app['media-alchemyst.configuration'] = $app->share(function (Application $app) {
$configuration = [];
$parameters = [
'swftools.pdf2swf.binaries' => 'pdf2swf_binary',
'swftools.swfrender.binaries' => 'swf_render_binary',
'swftools.swfextract.binaries' => 'swf_extract_binary',
'unoconv.binaries' => 'unoconv_binary',
'mp4box.binaries' => 'mp4box_binary',
'gs.binaries' => 'ghostscript_binary',

3
lib/Alchemy/Phrasea/Setup/Probe/BinariesProbe.php
View File

@@ -20,10 +20,7 @@ class BinariesProbe extends BinariesRequirements implements ProbeInterface
{
parent::__construct(array_filter([
'php_binary' => isset($binaries['php_binary']) ? $binaries['php_binary'] : null,
'pdf2swf_binary' => isset($binaries['pdf2swf_binary']) ? $binaries['pdf2swf_binary'] : null,
'unoconv_binary' => isset($binaries['unoconv_binary']) ? $binaries['unoconv_binary'] : null,
'swf_extract_binary' => isset($binaries['swf_extract_binary']) ? $binaries['swf_extract_binary'] : null,
'swf_render_binary' => isset($binaries['swf_render_binary']) ? $binaries['swf_render_binary'] : null,
'mp4box_binary' => isset($binaries['mp4box_binary']) ? $binaries['mp4box_binary'] : null,
'pdftotext_binary' => isset($binaries['pdftotext_binary']) ? $binaries['pdftotext_binary'] : null,
'ffmpeg_binary' => isset($binaries['ffmpeg_binary']) ? $binaries['ffmpeg_binary'] : null,

58
lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php
View File

@@ -19,7 +19,6 @@ class BinariesRequirements extends RequirementCollection implements RequirementI
{
const FILE_VERSION = '5.04';
const IMAGICK_VERSION = '6.2.9';
const SWFTOOLS_VERSION = '0.9.0';
const UNOCONV_VERSION = '0.5';
const MP4BOX_VERSION = '0.4.0';
const EXIFTOOL_VERSION = '9.15';
@@ -79,21 +78,6 @@ class BinariesRequirements extends RequirementCollection implements RequirementI
);
}
$pdf2swf = isset($binaries['pdf2swf_binary']) ? $binaries['pdf2swf_binary'] : $finder->find('pdf2swf');
if (null !== $pdf2swf) {
$output = null;
exec($pdf2swf . ' --version', $output);
$data = sscanf($output[0], 'pdf2swf - part of swftools %d.%d.%d');
$version = sprintf('%d.%d.%d', $data[0], $data[1], $data[2]);
$this->addRecommendation(
version_compare(static::SWFTOOLS_VERSION, $version, '<='),
sprintf('SWFTools (pdf2swf) version %s or higher is required (%s provided)', static::SWFTOOLS_VERSION, $version),
'Please update to a more recent version.'
);
}
$unoconv = isset($binaries['unoconv_binary']) ? $binaries['unoconv_binary'] : $finder->find('unoconv');
$this->addRecommendation(
@@ -115,48 +99,6 @@ class BinariesRequirements extends RequirementCollection implements RequirementI
);
}
$swfextract = isset($binaries['swf_extract_binary']) ? $binaries['swf_extract_binary'] : $finder->find('swfextract');
$this->addRecommendation(
null !== $swfextract && is_executable($swfextract),
'SWFTools (swfextract) are required for flash files support',
'Please install SWFTools (http://www.swftools.org/)'
);
if (null !== $swfextract) {
$output = null;
exec($swfextract . ' --version', $output);
$data = sscanf($output[0], 'swfextract - part of swftools %d.%d.%d');
$version = sprintf('%d.%d.%d', $data[0], $data[1], $data[2]);
$this->addRecommendation(
version_compare(static::SWFTOOLS_VERSION, $version, '<='),
sprintf('SWFTools (swfextract) version %s or higher is required (%s provided)', static::SWFTOOLS_VERSION, $version),
'Please update to a more recent version.'
);
}
$swfrender = isset($binaries['swf_render_binary']) ? $binaries['swf_render_binary'] : $finder->find('swfrender');
$this->addRecommendation(
null !== $swfrender && is_executable($swfrender),
'SWFTools (swfrender) are required for flash files support',
'Please install SWFTools (http://www.swftools.org/)'
);
if (null !== $swfrender) {
$output = null;
exec($swfrender . ' --version', $output);
$data = sscanf($output[0], 'swfrender - part of swftools %d.%d.%d');
$version = sprintf('%d.%d.%d', $data[0], $data[1], $data[2]);
$this->addRecommendation(
version_compare(static::SWFTOOLS_VERSION, $version, '<='),
sprintf('SWFTools (swfrender) version %s or higher is required (%s provided)', static::SWFTOOLS_VERSION, $version),
'Please update to a more recent version.'
);
}
$mp4box = isset($binaries['mp4box_binary']) ? $binaries['mp4box_binary'] : $finder->find('MP4Box');
$this->addRecommendation(