rik/blog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add option to skip generation of thumbnails

Browse Source
This commit is contained in:
Rik Veenboer
2016-01-11 22:44:41 +00:00
parent 3ce8804937
commit ae0cc64b4b
1 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
_scripts/generate-gallery.php
View File

@@ -15,6 +15,7 @@ $oConsole
->setDefinition([ ->setDefinition([
new InputOption('export', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'Target image export sizes'), new InputOption('export', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'Target image export sizes'),
new InputOption('layout', null, InputOption::VALUE_REQUIRED, 'Rendering layout for individual images', 'gallery-photo'), new InputOption('layout', null, InputOption::VALUE_REQUIRED, 'Rendering layout for individual images', 'gallery-photo'),
new InputOption('skip-resize', null, InputOption::VALUE_NONE, 'Skip resizing'),
new InputArgument('name', InputArgument::REQUIRED, 'Gallery name'), new InputArgument('name', InputArgument::REQUIRED, 'Gallery name'),
new InputArgument('dir', InputArgument::REQUIRED, 'Directory to scan for images'), new InputArgument('dir', InputArgument::REQUIRED, 'Directory to scan for images'),
new InputArgument('assetdir', InputArgument::OPTIONAL, 'Asset directory for exported images', 'asset/gallery'), new InputArgument('assetdir', InputArgument::OPTIONAL, 'Asset directory for exported images', 'asset/gallery'),
@@ -35,6 +36,8 @@ $oConsole
$sRenderPath = $oInput->getArgument('mdowndir') . '/' . $sGallery; $sRenderPath = $oInput->getArgument('mdowndir') . '/' . $sGallery;
$sLayout = $oInput->getOption('layout'); $sLayout = $oInput->getOption('layout');
$sExports = $oInput->getOption('export'); $sExports = $oInput->getOption('export');
$bSkipResize = $oInput->getOption('skip-resize');
$bSkipResize = true;
$oImagine = new Imagine\Gd\Imagine(); $oImagine = new Imagine\Gd\Imagine();
@@ -156,15 +159,17 @@ $oConsole
$oOutput->write(' <comment>' . $sExport . '</comment>'); $oOutput->write(' <comment>' . $sExport . '</comment>');
if (false !== strpos($sExport, 'x')) { if (false !== strpos($sExport, 'x')) {
list($iW, $iH) = explode('x', $sExport); list($iX, $iY) = explode('x', $sExport);
if ($iW > $oSourceSize->getWidth() || $iH > $oSourceSize->getHeight()) { if ($iX > $oSourceSize->getWidth() || $iY > $oSourceSize->getHeight()) {
$oOutput->writeln(' <comment>[skipping]</comment>'); $oOutput->writeln(' <comment>[skipping]</comment>');
continue; continue;
} }
$sExportImage = $oSourceJpg->thumbnail( if (!$bSkipResize) {
new \Imagine\Image\Box($iW, $iH), $sExportImage = $oSourceJpg->thumbnail(
\Imagine\Image\ImageInterface::THUMBNAIL_OUTBOUND new \Imagine\Image\Box($iX, $iY),
); \Imagine\Image\ImageInterface::THUMBNAIL_OUTBOUND
);
}
} else { } else {
if ('w' == substr($sExport, -1)) { if ('w' == substr($sExport, -1)) {
$iX = (int) $sExport; $iX = (int) $sExport;
@@ -185,29 +190,42 @@ $oConsole
continue; continue;
} }
$sExportImage = $oSourceJpg->thumbnail( $iX = ceil($iX);
new \Imagine\Image\Box(ceil($iX), ceil($iY)), $iY = ceil($iY);
\Imagine\Image\ImageInterface::THUMBNAIL_INSET if (!$bSkipResize) {
); $sExportImage = $oSourceJpg->thumbnail(
new \Imagine\Image\Box($iX, $iY),
\Imagine\Image\ImageInterface::THUMBNAIL_INSET
);
}
} }
$sExportsize = $sExportImage->getSize(); if ($bSkipResize) {
$oOutput->writeln('');
} else {
$aExportsize = $sExportImage->getSize();
if ($iX != $aExportsize->getWidth() || $iY != $aExportsize->getHeight()) {
$oOutput->writeln(sprintf(' [%dx%d] vs [%dx%d]', $iX, $iY, $aExportsize->getWidth(), $aExportsize->getHeight()));
} else {
$oOutput->writeln(sprintf(' [%dx%d]', $iX, $iY));
}
$sExportPath = $sAssetPath . '/' . $aPhoto['id'] . '~' . $sExport . '.jpg';
// Write converted image
file_put_contents(
$sExportPath,
$sExportImage->get('jpeg', ['quality' => 90])
);
touch($sExportPath, $aPhoto['date']->getTimestamp());
$sExportImage = null;
$iX = $aExportsize->getWidth();
$iY = $aExportsize->getHeight();
}
$aPhoto['sizes'][$sExport] = [ $aPhoto['sizes'][$sExport] = [
'width' => $sExportsize->getWidth(), 'width' => $iX,
'height' => $sExportsize->getHeight(), 'height' => $iY,
]; ];
$oOutput->writeln(' [' . $sExportsize->getWidth() . 'x' . $sExportsize->getHeight() . ']');
$sExportPath = $sAssetPath . '/' . $aPhoto['id'] . '~' . $sExport . '.jpg';
// Write converted image
file_put_contents(
$sExportPath,
$sExportImage->get('jpeg', ['quality' => 90])
);
touch($sExportPath, $aPhoto['date']->getTimestamp());
$sExportImage = null;
} }
$oSourceJpg = null; $oSourceJpg = null;
} }