Added Move, started to add delete

This commit is contained in:
Deon George
2015-05-15 14:12:10 +10:00
parent dfe10e490d
commit 9359564ea8
7 changed files with 302 additions and 71 deletions

View File

@@ -10,7 +10,7 @@
* @license http://dev.leenooks.net/license.html
*/
class Model_Photo extends ORM {
private $path = '/mnt/net/qnap/Multimedia/Photos';
private $_path = '/mnt/net/qnap/Multimedia/Photos';
private $_io = NULL;
protected $_has_many = array(
@@ -33,44 +33,27 @@ class Model_Photo extends ORM {
),
);
public function duplicate_find() {
$po = ORM::factory($this->_object_name);
if ($this->loaded())
$po->where('id','!=',$this->id);
$po->where_open();
$po->where('delete','!=',TRUE);
$po->or_where('delete','is',NULL);
$po->where_close();
$po->where_open();
$po->where('signature','=',$this->signature);
if ($this->date_taken AND ($this->model OR $this->make)) {
$po->or_where_open();
$po->where('date_taken','=',$this->date_taken);
$po->where('subsectime','=',$this->subsectime);
if (! is_null($this->model))
$po->and_where('model','=',$this->model);
if (! is_null($this->make))
$po->and_where('make','=',$this->make);
$po->where_close();
public function date_file($type,$format=FALSE) {
switch ($type) {
case 'a': $t = fileatime($this->file_path());
break;
case 'c': $t = filectime($this->file_path());
break;
case 'm': $t = filemtime($this->file_path());
break;
}
$po->where_close();
return $po;
return $format ? Site::Datetime($t) : $t;
}
public function date_taken() {
return $this->display('date_taken').($this->subsectime ? '.'.$this->subsectime : '');
}
public function duplicate_get() {
return $this->duplicate_find()->find_all();
public function file_path($short=FALSE,$new=FALSE) {
$file = $new ? sprintf('%s_%03s.%s',date('Y/m/d-His',$this->date_taken),$this->subsectime,$this->type()) : $this->filename;
return (($short OR preg_match('/^\//',$file)) ? '' : $this->_path.DIRECTORY_SEPARATOR).$file;
}
public function gps(array $coordinate,$hemisphere) {
@@ -100,7 +83,9 @@ class Model_Photo extends ORM {
public function image() {
$imo = $this->io();
$imo->removeImageProfile('exif');
if (array_key_exists('exif',$imo->getImageProfiles()))
$imo->removeImageProfile('exif');
$this->rotate($imo);
return $imo->getImageBlob();
@@ -114,29 +99,45 @@ class Model_Photo extends ORM {
public function io($attr=NULL) {
if (is_nulL($this->_io))
$this->_io = new Imagick($this->path.'/'.$this->filename);
$this->_io = new Imagick($this->_path.DIRECTORY_SEPARATOR.$this->filename);
return is_null($attr) ? $this->_io : $this->_io->getImageProperty($attr);
}
public function path() {
$path = '';
$ao = $this->album->where('primary','=',TRUE)->find();
public function move($path='') {
if (! $path)
$path = $this->file_path(FALSE,TRUE);
if ($ao->loaded()) {
$path .= $ao->path.'/';
$po = ORM::factory('Photo',$path);
if ($ao->subpath_age) {
$po = $this->people->where('primary','=',TRUE)->find();
$path .= $po->age($this->date_taken).'/';
}
// If the file already exists, we'll ignore the move.
if ($po->loaded() OR file_exists($path) OR ! File::ParentDirExist(dirname($path),TRUE))
return FALSE;
if (rename($this->file_path(FALSE,FALSE),$path)) {
$this->filename = preg_replace(":^{$this->_path}/:",'',$path);
// If the DB update failed, move it back.
if (! $this->save() AND ! rename($path,$this->file_path()))
throw new Kohana_Exception('Error: Unable to move file, ID: :id, OLD: :oldname, NEW: :newname',
array(':id'=>$this->id,':oldname'=>$this->file_path(),':newname'=>$this->file_path()));
return TRUE;
}
$path .= sprintf('%s_%03s.%s',date('Ymd-His',$this->date_taken),$this->subsectime,$this->type());
return $path;
}
public function propertydiff($id) {
if ($id == $this->id)
return;
$po = ORM::factory($this->_object_name,$id);
if (! $po->loaded())
return;
$result = array_diff_assoc($this->info(),$po->info());
return join('|',array_keys($result));
}
private function rotate(Imagick $imo) {
switch ($this->orientation) {
case 3: $imo->rotateImage(new ImagickPixel('none'),180);
@@ -148,15 +149,28 @@ class Model_Photo extends ORM {
}
}
public static function Signaturetrim($signature) {
public function rotation() {
switch ($this->orientation) {
case 1: return 'None!';
case 3: return 'Upside Down';
case 6: return 'Rotate Right';
case 8: return 'Rotate Left';
default:
return 'unknown?';
}
}
public static function SignatureTrim($signature) {
return sprintf('%s...%s',substr($signature,0,6),substr($signature,-6));
}
public function thumbnail() {
public function thumbnail($rotate=TRUE) {
$imo = new Imagick();
$imo->readImageBlob($this->thumbnail);
$this->rotate($imo);
if ($rotate)
$this->rotate($imo);
return $imo->getImageBlob();
}
@@ -164,5 +178,41 @@ class Model_Photo extends ORM {
public function type($mime=FALSE) {
return strtolower($mime ? File::mime_by_ext(pathinfo($this->filename,PATHINFO_EXTENSION)) : pathinfo($this->filename,PATHINFO_EXTENSION));
}
public function list_duplicate() {
$po = ORM::factory($this->_object_name);
if ($this->loaded())
$po->where('id','!=',$this->id);
// Ignore photo's pending removal.
$po->where_open();
$po->where('remove','!=',TRUE);
$po->or_where('remove','is',NULL);
$po->where_close();
// Where the signature is the same
$po->where_open();
$po->where('signature','=',$this->signature);
// Or they have the same time taken with the same camera
if ($this->date_taken AND ($this->model OR $this->make)) {
$po->or_where_open();
$po->where('date_taken','=',$this->date_taken);
$po->where('subsectime','=',$this->subsectime);
if (! is_null($this->model))
$po->and_where('model','=',$this->model);
if (! is_null($this->make))
$po->and_where('make','=',$this->make);
$po->where_close();
}
$po->where_close();
return $po;
}
}
?>