-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
127 changed files
with
5,284 additions
and
3,090 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 0.4 | ||
| 0.5 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| <?php | ||
|
|
||
| namespace App\Console\Commands; | ||
|
|
||
| use Illuminate\Console\Command; | ||
| use Illuminate\Support\Facades\Storage; | ||
|
|
||
| use Intervention\Image\ImageManager; | ||
| use marijnvdwerf\palette\Palette; | ||
|
|
||
| use App\Models\Collections\Image; | ||
|
|
||
| class ImagesColor extends Command | ||
| { | ||
|
|
||
| protected $signature = "images:color | ||
| {start? : Manual offset for multi processing. Use with force } | ||
| {count? : Manual count for multi processing. Use with force } | ||
| {--force : Don't skip images that have a dominant color on record already }"; | ||
|
|
||
| protected $description = 'Determine dominant color for each image'; | ||
|
|
||
| public function handle() | ||
| { | ||
|
|
||
| ini_set("memory_limit", "-1"); | ||
|
|
||
| $files = Storage::files( 'images' ); | ||
|
|
||
| $files = collect( $files ); | ||
|
|
||
| // Ignore any file that's not a jpg | ||
| $files = $files->filter( function( $file ) { | ||
| return stripos(strrev($file), 'gpj.') === 0; | ||
| }); | ||
|
|
||
| // Reduce the set for testing | ||
| // $files = $files->slice( 0, 200 ); | ||
|
|
||
| // Place to target specific files for debug: | ||
| // $files = [ | ||
| // 'images/3d473396-9994-c487-51a3-87c23132f0e5.jpg', | ||
| // 'images/9eabaa4f-bfcd-0fc0-1ea2-dbc64a8b0761.jpg', | ||
| // ]; | ||
|
|
||
| // Grab just the ids - assumes that the folder is `images` | ||
| $ids = $files->map( function( $file ) { | ||
| return substr( $file, 7, strlen( $file ) - 11 ); | ||
| }); | ||
|
|
||
| $this->info( $ids->count() . ' files found...' ); | ||
|
|
||
| if( !$this->option('force') ) { | ||
|
|
||
| $processed = Image::select('lake_guid')->whereNotNull('metadata->color')->get()->pluck('lake_guid'); | ||
|
|
||
| $this->info( $processed->count() . ' images have already been processed...' ); | ||
|
|
||
| $ids = $ids->diff( $processed ); | ||
|
|
||
| } | ||
|
|
||
| if( $this->argument('start') !== null && $this->argument('count') !== null && $this->option('force') ) { | ||
|
|
||
| $this->info('Applying start of ' . $this->argument('start') . ' and count of ' . $this->argument('count') ); | ||
|
|
||
| $ids = $ids->slice( (int) $this->argument('start'), (int) $this->argument('count') ); | ||
|
|
||
| } | ||
|
|
||
| $this->info( $ids->count() . ' files will be processed.' ); | ||
|
|
||
| $total = count( $ids ); | ||
|
|
||
| foreach( $ids as $i => $id ) | ||
| { | ||
|
|
||
| $file = 'images/' . $id . '.jpg'; | ||
|
|
||
| // Skip touched files | ||
| if( Storage::size( $file ) < 1 ) { | ||
| $this->warn( $this->prefix( $i, $total, $id ) . 'Skipping touched file!' ); | ||
| continue; | ||
| } | ||
|
|
||
| $contents = Storage::get( $file ); | ||
|
|
||
| $manager = new ImageManager(array('driver' => 'imagick')); | ||
| $image = $manager->make( $contents ); | ||
|
|
||
| try { | ||
| $palette = Palette::generate( $image ); | ||
| } catch( \Exception $e ) { | ||
| // TODO: Resolve [ErrorException] max(): Array must contain at least one element | ||
| // See vendor/marijnvdwerf/material-palette/src/Palette.php:81 | ||
| // https://github.com/marijnvdwerf/material-palette-php/issues/6 | ||
| $this->warn( $this->prefix( $i, $total, $id ) . 'Monotone image skipped!' ); | ||
| continue; | ||
| } | ||
|
|
||
| // TODO: Reorder these for better results? | ||
| $swatches = [ | ||
| 'vibrant' => $palette->getVibrantSwatch(), | ||
| 'muted' => $palette->getMutedSwatch(), | ||
| 'vibrant_light' => $palette->getLightVibrantSwatch(), | ||
| 'muted_light' => $palette->getLightMutedSwatch(), | ||
| 'vibrant_dark' => $palette->getDarkVibrantSwatch(), | ||
| 'muted_dark' => $palette->getDarkMutedSwatch(), | ||
| ]; | ||
|
|
||
| $swatches = collect( $swatches ); | ||
|
|
||
| // Select the first swatch that (1) isn't empty, and (2) isn't derived | ||
| $swatch = $swatches->first( function( $swatch ) { | ||
| return !is_null( $swatch ) && $swatch->getPopulation() > 0; | ||
| }); | ||
|
|
||
| // I guess this might happen if the image is black-and-white? | ||
| if( !$swatch ) { | ||
| $this->warn( $this->prefix( $i, $total, $id ) . 'No swatches generated!' ); | ||
| continue; | ||
| } | ||
|
|
||
| // Convert to HSL - better for searching w/ Elasticsearch: | ||
| // https://dpb587.me/blog/2014/04/24/color-searching-with-elasticsearch.html | ||
| $color = $swatch->getColor()->asHSLColor(); | ||
|
|
||
| // For calculating percentage of pixel population | ||
| $size = getimagesize( storage_path() . '/app/' . $file ); | ||
|
|
||
| // @TODO Consider using HSV instead | ||
| $out = [ | ||
| 'population' => $swatch->getPopulation(), | ||
| 'percentage' => $swatch->getPopulation() / ( $size[0] * $size[1] ) * 100, | ||
| 'h' => floor( $this->normalize( $color->getHue() * 360, 0, 360 ) ), | ||
| 's' => floor( $this->normalize( $color->getSaturation() * 100, 0, 100 ) ), | ||
| 'l' => floor( $this->normalize( $color->getLightness() * 100, 0, 100 ) ), | ||
| ]; | ||
|
|
||
| // Save the color to Image metadata | ||
| $image = Image::find( $id ); | ||
|
|
||
| // Image not found | ||
| if( !$image ) { | ||
| $this->warn( $this->prefix( $i, $total, $id ) . 'Image not found!' ); | ||
| continue; | ||
| } | ||
|
|
||
| $metadata = $image->metadata ?? (object) []; | ||
| $metadata->color = $out; | ||
|
|
||
| $image->metadata = $metadata; | ||
| $image->save(); | ||
|
|
||
| $this->info( $this->prefix( $i, $total, $id ) . json_encode( $out ) ); | ||
|
|
||
| } | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * Normalizes any number to an arbitrary range by assuming the range | ||
| * wraps around when going below min or above max. | ||
| * | ||
| * @link https://stackoverflow.com/questions/1628386/normalise-orientation-between-0-and-360 | ||
| */ | ||
| private function normalize( $value, $min, $max ) | ||
| { | ||
| $range = $max - $min; | ||
| $offset = $value - $min; | ||
|
|
||
| // + start to reset back to start of original range | ||
| return ( $offset - ( floor( $offset / $range ) * $range ) ) + $min; | ||
| } | ||
|
|
||
| /** | ||
| * Helper for consistent console output. | ||
| */ | ||
| private function prefix( $i, $total, $id ) | ||
| { | ||
| return $i . ' of ' . $total . ': ' . $id . ' = '; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.