mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-19 13:01:26 +02:00
Code Issues Releases Wiki Activity

rearanged and grouped the output of getDebugInfo

Browse Source
This commit is contained in:
horst-n
2019-04-29 16:51:57 +02:00
parent 53c414aa60
commit 540ae4f2d9
1 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
wire/core/Pageimage.php
View File

@@ -1917,41 +1917,19 @@ class Pageimage extends Pagefile {
$finalOptions = $oSizer->getOptions(); $finalOptions = $oSizer->getOptions();
// build some info parts and fetch some from parent (pagefile) // build some info parts and fetch some from parent (pagefile)
$thumb = array('thumb' => "<img src='{$this->url}' style='max-width:120px; max-height:120px; ".($this->width() >= $this->height() ? 'width:100px; height:auto;' : 'height:100px; width:auto;')."' alt='' />"); $thumb = array('THUMB' => "<img src='{$this->url}' style='max-width:120px; max-height:120px; ".($this->width() >= $this->height() ? 'width:100px; height:auto;' : 'height:100px; width:auto;')."' alt='' />");
$original = $this->original ? array('original' => $this->original->basename, 'basename' => $this->basename) : array('original' => '{SELF}', 'basename' => $this->basename); $original = $this->original ? array('original' => $this->original->basename, 'basename' => $this->basename) : array('original' => '{SELF}', 'basename' => $this->basename);
$parent = parent::__debugInfo(); $parent = array('FILES' => array_merge(
unset($parent['filesize']); $original,
parent::__debugInfo(),
// start collecting the $info array(
$info = array_merge($thumb, $original, $parent, array( 'suffix' => $finalOptions['suffix'],
'suffix' => $finalOptions['suffix'], 'extension' => $osInfo['extension']
'extension' => $osInfo['extension'], )
'imageType' => $osInfo['info']['imageType'],
'mime' => $osInfo['info']['mime'],
'width' => $this->width(),
'height' => $this->height(),
'filesize' => filesize($this->filename),
'focus' => $this->hasFocus ? $this->focusStr : NULL,
)); ));
// rearange parts
// beautify the output, remove unnecessary items unset($parent['FILES']['filesize']);
if(isset($info['filedata']) && isset($info['filedata']['focus'])) unset($info['filedata']['focus']); $parent['FILES']['filesize'] = filesize($this->filename);
if(empty($info['filedata'])) unset($info['filedata']);
unset($osInfo['info']['mime'], $osInfo['info']['imageType']);
// add the rest from osInfo to the final $info array
foreach($osInfo['info'] as $k => $v) $info[$k] = $v;
$info['iptcRaw'] = $osInfo['iptcRaw'];
unset($osInfo, $thumb, $original, $parent);
// WEBP
$webp = array('WEBP COPY' => (!$this->hasWebp() ? array('hasWebp' => false) : array(
'hasWebp' => true,
'webpUrl' => $this->webpUrl,
'webpQuality' => isset($finalOptions['webpQuality']) ? $finalOptions['webpQuality'] : NULL,
'filesize' => filesize($this->webpFilename()),
'savings in percent' => 100 - intval(filesize($this->webpFilename()) / ($info['filesize'] / 100))
)));
// VARIATIONS // VARIATIONS
if($depth < 2) { if($depth < 2) {
@@ -1962,6 +1940,40 @@ class Pageimage extends Pagefile {
$depth--; $depth--;
unset($variations, $name); unset($variations, $name);
// start collecting the $info
$info = array_merge($thumb, $parent,
array('VARIATIONS' => $variationArray),
array('IMAGEINFO' => array(
'imageType' => $osInfo['info']['imageType'],
'mime' => $osInfo['info']['mime'],
'width' => $this->width(),
'height' => $this->height(),
'focus' => $this->hasFocus ? $this->focusStr : NULL,
'description' => $parent['FILES']['description'],
'tags' => $parent['FILES']['tags'],
))
);
unset($info['FILES']['tags'], $info['FILES']['description']);
// beautify the output, remove unnecessary items
if(isset($info['FILES']['filedata']) && isset($info['FILES']['filedata']['focus'])) unset($info['FILES']['filedata']['focus']);
if(empty($info['FILES']['filedata'])) unset($info['FILES']['filedata']);
unset($osInfo['info']['mime'], $osInfo['info']['imageType']);
// add the rest from osInfo to the final $info array
foreach($osInfo['info'] as $k => $v) $info['IMAGEINFO'][$k] = $v;
$info['IMAGEINFO']['iptcRaw'] = $osInfo['iptcRaw'];
unset($osInfo, $thumb, $original, $parent);
// WEBP
$webp = array('WEBP COPY' => (!$this->hasWebp() ? array('hasWebp' => false) : array(
'hasWebp' => true,
'webpUrl' => $this->webpUrl,
'webpQuality' => isset($finalOptions['webpQuality']) ? $finalOptions['webpQuality'] : NULL,
'filesize' => filesize($this->webpFilename()),
'savings in percent' => 100 - intval(filesize($this->webpFilename()) / ($info['FILES']['filesize'] / 100))
)));
// ENGINES // ENGINES
$a = []; $a = [];
$modules = $this->wire('modules'); $modules = $this->wire('modules');
@@ -1981,7 +1993,6 @@ class Pageimage extends Pagefile {
// merge all into $info // merge all into $info
$info = array_merge($info, $webp, $info = array_merge($info, $webp,
array('VARIATIONS' => $variationArray),
array('ENGINE(S)' => $enginesArray), array('ENGINE(S)' => $enginesArray),
// OPTIONS // OPTIONS
array('OPTIONS HIERARCHY' => array( array('OPTIONS HIERARCHY' => array(
@@ -1994,7 +2005,7 @@ class Pageimage extends Pagefile {
unset($variationArray, $webp, $enginesArray, $options, $finalOptions); unset($variationArray, $webp, $enginesArray, $options, $finalOptions);
// If not in browser environment, remove the thumb image // If not in browser environment, remove the thumb image
if(!isset($_SERVER['HTTP_HOST'])) unset($info['thumb']); if(!isset($_SERVER['HTTP_HOST'])) unset($info['THUMB']);
// return as array // return as array
if(!$returnAsString) { if(!$returnAsString) {