mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-20 05:21:29 +02:00
Code Issues Releases Wiki Activity

reworked the getDebugInfo method,

Browse Source 
trying to make the code more readable.
But the main goal for me is, that the output is best readable! :)
This commit is contained in:
horst-n
2019-04-27 23:15:44 +02:00
parent d062bc4345
commit 53c414aa60
1 changed files with 67 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
wire/core/Pageimage.php
View File

@@ -637,7 +637,7 @@ class Pageimage extends Pagefile {
* - Or you may specify type `int` containing "quality" value. * - Or you may specify type `int` containing "quality" value.
* - Or you may specify type `bool` containing "upscaling" value. * - Or you may specify type `bool` containing "upscaling" value.
* @return Pageimage Returns a new Pageimage object that is a variation of the original. * @return Pageimage Returns a new Pageimage object that is a variation of the original.
* If the specified dimensions/options are the same as the original, then the original then the original will be returned. * If the specified dimensions/options are the same as the original, then the original will be returned.
* *
*/ */
public function size($width, $height, $options = array()) { public function size($width, $height, $options = array()) {
@@ -1902,61 +1902,67 @@ class Pageimage extends Pagefile {
* Get verbose DebugInfo, optionally with individual options array, @horst * Get verbose DebugInfo, optionally with individual options array, @horst
* (without invoking the magic debug) * (without invoking the magic debug)
* *
* @return mixed: array | string * @param array $options The individual options you also passes with your image variation creation
* @param bool $returnAsString default is true and returns markup or plain text, false returns multidim array
* @return array|string
* *
*/ */
public function getDebugInfo($options = array(), $returnAsString = true) { public function getDebugInfo($options = array(), $returnAsString = true) {
static $depth = 0; static $depth = 0;
$depth++; $depth++;
$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='' />"; // fetch imagesizer, some infos and some options
$info = $this->original ? array('original' => $this->original->basename, 'basename' => $this->basename) : array('original' => $this->basename, 'basename' => $this->basename);
$info = array_merge(array('thumb' => $thumb), $info, parent::__debugInfo());
unset($info['filesize']);
if(!isset($_SERVER['HTTP_HOST'])) unset($info['thumb']);
$oSizer = new ImageSizer($this->filename, $options); $oSizer = new ImageSizer($this->filename, $options);
$osInfo = $oSizer->getImageInfo(true); $osInfo = $oSizer->getImageInfo(true);
$finalOptions = $oSizer->getOptions(); $finalOptions = $oSizer->getOptions();
$info['suffix'] = $finalOptions['suffix']; // build some info parts and fetch some from parent (pagefile)
$info['extension'] = $osInfo['extension']; $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='' />");
$info['imageType'] = $osInfo['info']['imageType']; $original = $this->original ? array('original' => $this->original->basename, 'basename' => $this->basename) : array('original' => '{SELF}', 'basename' => $this->basename);
$info['mime'] = $osInfo['info']['mime']; $parent = parent::__debugInfo();
unset($osInfo['info']['mime'], $osInfo['info']['imageType']); unset($parent['filesize']);
$info['width'] = $this->width();
$info['height'] = $this->height(); // start collecting the $info
$info['filesize'] = filesize($this->filename); $info = array_merge($thumb, $original, $parent, array(
$info['focus'] = $this->hasFocus ? $this->focusStr : NULL; 'suffix' => $finalOptions['suffix'],
'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,
));
// beautify the output, remove unnecessary items
if(isset($info['filedata']) && isset($info['filedata']['focus'])) unset($info['filedata']['focus']); if(isset($info['filedata']) && isset($info['filedata']['focus'])) unset($info['filedata']['focus']);
if(empty($info['filedata'])) unset($info['filedata']); 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; foreach($osInfo['info'] as $k => $v) $info[$k] = $v;
$info['iptcRaw'] = $osInfo['iptcRaw']; $info['iptcRaw'] = $osInfo['iptcRaw'];
unset($osInfo, $thumb, $original, $parent);
// WEBP // WEBP
$info['WEBP COPY'] = array(); $webp = array('WEBP COPY' => (!$this->hasWebp() ? array('hasWebp' => false) : array(
if($this->hasWebp()) { 'hasWebp' => true,
$info['WEBP COPY']['hasWebp'] = true; 'webpUrl' => $this->webpUrl,
$info['WEBP COPY']['webpUrl'] = $this->webpUrl; 'webpQuality' => isset($finalOptions['webpQuality']) ? $finalOptions['webpQuality'] : NULL,
if(isset($finalOptions['webpQuality'])) $info['WEBP COPY']['webpQuality'] = $finalOptions['webpQuality']; 'filesize' => filesize($this->webpFilename()),
$info['WEBP COPY']['filesize'] = filesize($this->webpFilename()); 'savings in percent' => 100 - intval(filesize($this->webpFilename()) / ($info['filesize'] / 100))
$info['WEBP COPY']['savings in percent'] = 100 - intval($info['WEBP COPY']['filesize'] / ($info['filesize'] / 100)); )));
} else {
$info['WEBP COPY']['hasWebp'] = false;
}
// VARIATIONS // VARIATIONS
if($depth < 2) { if($depth < 2) {
$info['VARIATIONS'] = array(); $variationArray = array();
$variations = $this->getVariations(array('info' => true, 'verbose' => false)); $variations = $this->getVariations(array('info' => true, 'verbose' => false));
foreach($variations as $name) { foreach($variations as $name) $variationArray[] = $name;
$info['VARIATIONS'][] = $name;
}
#if(empty($info['VARIATIONS'])) unset($info['variations']);
} }
$depth--; $depth--;
unset($variations, $name);
// ENGINES // ENGINES
$info['ENGINE(S)'] = array();
$info['ENGINE(S)']['neededEngineSupport'] = strtoupper($oSizer->getImageInfo());
$a = []; $a = [];
$modules = $this->wire('modules'); $modules = $this->wire('modules');
$engines = array_merge($oSizer->getEngines(), array('ImageSizerEngineGD')); $engines = array_merge($oSizer->getEngines(), array('ImageSizerEngineGD'));
@@ -1966,17 +1972,33 @@ class Pageimage extends Pagefile {
$a[$moduleName] = "priority {$priority}"; $a[$moduleName] = "priority {$priority}";
} }
asort($a, SORT_STRING); asort($a, SORT_STRING);
$info['ENGINE(S)']['installedEngines'] = $a; $enginesArray = array(
unset($a, $moduleName, $configData, $engines, $priority, $engines, $modules); 'neededEngineSupport' => strtoupper($oSizer->getImageInfo()),
$info['ENGINE(S)']['selectedEngine'] = $oSizer->getEngine()->className; 'installedEngines' => $a,
// OPTIONS 'selectedEngine' => $oSizer->getEngine()->className
$info['OPTIONS HIERARCHY'] = array(); );
$info['OPTIONS HIERARCHY']['imageSizerOptions'] = $this->wire('config')->imageSizerOptions; unset($a, $moduleName, $configData, $engines, $priority, $modules, $oSizer);
$info['OPTIONS HIERARCHY']['individualOptions'] = $options;
$info['OPTIONS HIERARCHY']['finalOptions'] = $finalOptions;
// merge all into $info
$info = array_merge($info, $webp,
array('VARIATIONS' => $variationArray),
array('ENGINE(S)' => $enginesArray),
// OPTIONS
array('OPTIONS HIERARCHY' => array(
'imageSizerOptions' => $this->wire('config')->imageSizerOptions,
'individualOptions' => $options,
'finalOptions' => $finalOptions
)
)
);
unset($variationArray, $webp, $enginesArray, $options, $finalOptions);
// If not in browser environment, remove the thumb image
if(!isset($_SERVER['HTTP_HOST'])) unset($info['thumb']);
// return as array
if(!$returnAsString) { if(!$returnAsString) {
return $info; // return as array return $info;
} }
// make a beautyfied var_dump // make a beautyfied var_dump
@@ -2000,7 +2022,7 @@ class Pageimage extends Pagefile {
$content = str_replace(array('<pre>', '</pre>'), '', $content); $content = str_replace(array('<pre>', '</pre>'), '', $content);
if(isset($_SERVER['HTTP_HOST'])) { if(isset($_SERVER['HTTP_HOST'])) {
// build output for HTML // build output for HTML
$return = "<pre style=\"margin:10px 10px 10px; padding:10px 10px 10px 10px; background-color:#F2F2F2; color:#000; border:1px solid #333; font-family:'Hack', 'Source Code Pro', 'Lucida Console', 'Courier', monospace; font-size:12px; line-height:15px; overflow:auto;\">{$content}</pre>"; $return = "<pre style=\"margin:10px; padding:10px; background-color:#F2F2F2; color:#000; border:1px solid #333; font-family:'Hack', 'Source Code Pro', 'Lucida Console', 'Courier', monospace; font-size:12px; line-height:15px; overflow:auto;\">{$content}</pre>";
} else { } else {
// output for Console // output for Console
$return = $content; $return = $content;