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

Some minor fixes

Browse Source
This commit is contained in:
Deon George
2016-07-01 15:59:22 +10:00
parent ad10cb32ce
commit ec4c7ae3d1
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Console/Commands/Import.php
View File

@@ -66,14 +66,14 @@ class Import extends Command
if ($this->option('tags'))
{
$tags = explode(',',$this->option('tags'));
$t = Tag::whereIn('tag',$tags)->pluck('id');
$t = Tag::whereIn('tag',$tags)->pluck('id')->toArray();
}
// People
if ($this->option('people'))
{
$tags = explode(',',$this->option('people'));
$p = Person::whereIn('tag',$tags)->pluck('id');
$p = Person::whereIn('tag',$tags)->pluck('id')->toArray();
}
$c = 0;
@@ -106,7 +106,7 @@ class Import extends Command
$po->filename = $file;
}
$po->date_taken = strtotime($po->property('exif:DateTime'));
$po->date_taken = strtotime($po->property('exif:DateTime') ? $po->property('exif:DateTime') : $po->property('exif:DateTimeOriginal'));
$po->subsectime = $po->property('exif:SubSecTimeOriginal');
$po->signature = $po->property('signature');
@@ -168,8 +168,10 @@ class Import extends Command
$this->info(sprintf('Image [%s] stored in DB: %s',$file,$po->id));
// Record our people and tags
$po->People()->sync($p->toArray());
$po->Tags()->sync($t->toArray());
if ($p)
$po->People()->sync($p);
if ($t)
$po->Tags()->sync($t);
}
$bar->finish();

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

@@ -50,7 +50,7 @@ class Move extends Command
}
elseif ($this->option('id'))
{
$po = Photo::notRemove()->notDuplicate()->where('id',Photo::path($this->option('id')));
$po = Photo::notRemove()->notDuplicate()->where('id',$this->option('id'));
}
else
{