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

Enable some disabled functions

Browse Source
This commit is contained in:
Deon George 2020-01-05 21:55:26 +11:00
parent 2e222b814b
commit 948e8ce9fc
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Console/Commands/CatalogAutoDelete.php
View File

@ -49,14 +49,13 @@ class CatalogAutoDelete extends Command
$class = $this->getModelType($this->argument('type')); $class = $this->getModelType($this->argument('type'));
$class::where('remove',1)->each(function($o) { $class::where('remove',1)->each(function($o) {
foreach ($o->myduplicates() as $oo) { foreach ($o->myduplicates()->get() as $oo) {
if (! $oo->signature OR ! $oo->file_signature) if (! $oo->signature OR ! $oo->file_signature)
continue; continue;
if ($oo->signature == $o->signature AND $oo->file_signature == $o->file_signature) { if ($oo->signature == $o->signature AND $oo->file_signature == $o->file_signature) {
$this->info(sprintf('Removing: %s (%s)',$o->id,$o->filename)); $this->info(sprintf('Removing: %s (%s)',$o->id,$o->filename));
continue;
// Dispatch Job to move file. // Dispatch Job to move file.
switch (strtolower($this->argument('type'))) { switch (strtolower($this->argument('type'))) {
case 'photo': case 'photo':

4
app/Models/Abstracted/Catalog.php
View File

@ -13,7 +13,7 @@ use App\Models\{Person,Software,Tag};
abstract class Catalog extends Model abstract class Catalog extends Model
{ {
protected static $includeSubSecTime = FALSE; protected static $includeSubSecTime = FALSE;
protected $dates = ['created']; protected $dates = ['created','created_manual'];
protected $casts = [ protected $casts = [
'subsectime' => 'int', 'subsectime' => 'int',
@ -256,7 +256,7 @@ abstract class Catalog extends Model
$file = $this->filename; $file = $this->filename;
if ($new) if ($new)
$file = $this->file_name(FALSE); $file = $this->file_name(TRUE);
return (($short OR preg_match('/^\//',$file)) ? '' : config($this->type.'.dir').DIRECTORY_SEPARATOR).$file; return (($short OR preg_match('/^\//',$file)) ? '' : config($this->type.'.dir').DIRECTORY_SEPARATOR).$file;
} }

1
app/Models/Video.php
View File

@ -8,7 +8,6 @@ class Video extends Abstracted\Catalog
{ {
// ID3 Object // ID3 Object
private $_o = NULL; private $_o = NULL;
protected $dates = ['created','created_manual'];
public function getIDLinkAttribute() public function getIDLinkAttribute()
{ {

19
app/Traits/Multimedia.php
View File

@ -2,11 +2,11 @@
namespace App\Traits; namespace App\Traits;
use App\Jobs\PhotoDelete;
use App\Models\Photo;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use App\Jobs\{PhotoDelete,VideoDelete};
/** /**
* Multimedia Controller Functions * Multimedia Controller Functions
* *
@ -65,6 +65,21 @@ trait Multimedia
if ($delete AND $o->remove AND ($request->input('remove.'.$id) ? 1 : NULL)) { if ($delete AND $o->remove AND ($request->input('remove.'.$id) ? 1 : NULL)) {
Log::info(sprintf('Dispatching delete for [%s]',$o->id)); Log::info(sprintf('Dispatching delete for [%s]',$o->id));
switch ($class) {
case 'photo':
$this->dispatch((new PhotoDelete($o))->onQueue('delete'));
Log::info(sprintf('Dispatching delete for [%s]',$o->id));
break;
case 'video':
$this->dispatch((new VideoDelete($o))->onQueue('delete'));
Log::info(sprintf('Dispatching delete for [%s]',$o->id));
break;
default:
Log::info(sprintf('Ignoring delete for [%s] - not configured.',$o->id));
}
} else { } else {
$o->remove = $request->input('remove.'.$id) ? 1 : NULL; $o->remove = $request->input('remove.'.$id) ? 1 : NULL;
} }