deon
/
photo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated ScanAll to enable scanning all photos

This commit is contained in:
Deon George 2019-11-09 14:58:15 +11:00
parent 83d6d1e055
commit bd5fb5d46f
3 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/CatalogScan.php
View File

@ -39,7 +39,7 @@ class CatalogScan extends Command
if (! is_readable($o->file_path())) {
$this->warn(sprintf('Ignoring [%s], it is not readable',$o->file_path()));
exit;
return;
}
$o->setDateCreated();

86
app/Console/Commands/PhotoScanAll.php
View File

@ -4,55 +4,59 @@ namespace App\Console\Commands;
use Illuminate\Console\Command;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Log;
use App\Model\Photo;
use Illuminate\Support\Facades\Log;
use App\Models\Photo;
use App\Jobs\CatalogScan;
class PhotoScanAll extends Command
{
use DispatchesJobs;
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'photo:scanall';
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'photo:scanall '.
'{--scanned : Rescan Scanned Photos}';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Command description';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Rescan Photos';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
Photo::NotScanned()->chunk(200,function ($data) {
foreach ($data as $o)
{
if ($o->remove) {
Log::warning(sprintf('Not scanning [%s], marked for removal',$o->id));
continue;
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
$o = ($this->option('scanned') ? Photo::NotRemove() : Photo::NotScanned());
$o->each(function ($item) {
if ($item->remove) {
Log::warning(sprintf('Not scanning [%s], marked for removal',$item->id));
return;
}
$this->dispatch((new CatalogScan($o))->onQueue('scan'));
}
});
}
}
Log::info(sprintf('%s: Rescanning [%s]',__METHOD__,$item->id));
$this->dispatch((new CatalogScan($item))->onQueue('scan'));
});
Log::info(sprintf('Processed [%s]',$o->count()));
}
}

1
app/Models/Photo.php
View File

@ -192,6 +192,7 @@ class Photo extends Abstracted\Catalog
$this->thumbnail = exif_thumbnail($this->file_path());
} catch (\Exception $e) {
// @todo Couldnt get the thumbnail, so we should create one.
Log::info(sprintf('Unable to create thumbnail for %s (%s)',$this->id,$e->getMessage()));
}
}