Minor fixes

This commit is contained in:
Deon George
2019-12-27 13:32:42 +11:00
parent 8c453d7b0e
commit fe155525a3
6 changed files with 23 additions and 10 deletions

View File

@@ -45,8 +45,9 @@ class CatalogMove extends Command
continue;
}
$x = NULL;
if (! $o->scanned OR $o->duplicate OR $o->remove OR ($x=$o->moveable()) !== TRUE) {
$this->warn(sprintf('Ignoring [%s]...',$o->file_path()));
$this->warn(sprintf('Ignoring (%s)[%s]... [%s]',$o->id,$o->file_path(),$x));
continue;
}

View File

@@ -48,7 +48,7 @@ class CatalogScan extends Command
$o->setThumbnail();
// If this is a duplicate
$x = $class::whereIN('id',$o->list_duplicate())->get();
$x = $o->duplicates()->get();
if (count($x)) {
foreach ($x as $oo) {
// And that photo is not marked as a duplicate