Added delete and removed Kohana

This commit is contained in:
Deon George
2016-06-30 16:01:12 +10:00
parent e1c5b1e413
commit 3adfcd8d8f
20 changed files with 223 additions and 926 deletions

View File

@@ -134,20 +134,20 @@ class Import extends Command
$po->filename = $file;
}
$po->date_taken = strtotime($po->io('exif:DateTime'));
$po->subsectime = $po->io('exif:SubSecTimeOriginal');
$po->date_taken = strtotime($po->property('exif:DateTime'));
$po->subsectime = $po->property('exif:SubSecTimeOriginal');
$po->signature = $po->io()->getImageSignature();
$po->signature = $po->property('signature');
$po->make = $po->io('exif:Make');
$po->model = $po->io('exif:Model');
$po->make = $po->property('exif:Make');
$po->model = $po->property('exif:Model');
$po->height = $po->io()->getImageheight();
$po->width = $po->io()->getImageWidth();
$po->orientation = $po->io()->getImageOrientation();
$po->height = $po->property('height');
$po->width = $po->property('width');
$po->orientation = $po->property('orientation');
$po->gps_lat = Photo::latlon(preg_split('/,\s?/',$po->io()->getImageProperty('exif:GPSLatitude')),$po->io()->getImageProperty('exif:GPSLatitudeRef'));
$po->gps_lon = Photo::latlon(preg_split('/,\s?/',$po->io()->getImageProperty('exif:GPSLongitude')),$po->io()->getImageProperty('exif:GPSLongitudeRef'));
$po->gps_lat = Photo::latlon(preg_split('/,\s?/',$po->property('exif:GPSLatitude')),$po->property('exif:GPSLatitudeRef'));
$po->gps_lon = Photo::latlon(preg_split('/,\s?/',$po->property('exif:GPSLongitude')),$po->property('exif:GPSLongitudeRef'));
try {
$po->thumbnail = exif_thumbnail($po->file_path());
@@ -156,7 +156,7 @@ class Import extends Command
}
// If this is a duplicate
$x = $po->list_duplicate()->get();
$x = Photo::whereIN('id',$po->list_duplicate())->get();
if (count($x)) {
$skip = FALSE;