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

Ensure scheduled catalog scan/move jobs ids are unique. Remove deprecated objectType()

Browse Source
This commit is contained in:
Deon George 2024-09-18 13:30:49 +10:00
parent f136360e5c
commit 90323fef5f
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Jobs/CatalogMove.php
View File

@ -32,7 +32,7 @@ class CatalogMove implements ShouldQueue,ShouldBeUnique
public function middleware(): array public function middleware(): array
{ {
return [new WithoutOverlapping($this->o->id)]; return [new WithoutOverlapping($this->o::config.'|'.$this->o->id)];
} }
/** /**
@ -43,12 +43,12 @@ class CatalogMove implements ShouldQueue,ShouldBeUnique
*/ */
public function handle() public function handle()
{ {
$from = $this->o->file_name_rel(TRUE); $from = $this->o->file_name_rel();
$to = $this->o->file_name_rel(FALSE); $to = $this->o->file_name_rel(FALSE);
Log::info(sprintf('%s: Moving [%s|%s] from [%s] to [%s]', Log::info(sprintf('%s: Moving [%s|%s] from [%s] to [%s]',
__METHOD__, __METHOD__,
$this->o->objecttype(), $this->o::config,
$this->o->id, $this->o->id,
$from, $from,
$to, $to,

2
app/Jobs/CatalogScan.php
View File

@ -32,7 +32,7 @@ class CatalogScan implements ShouldQueue, ShouldBeUnique
public function middleware(): array public function middleware(): array
{ {
return [new WithoutOverlapping($this->o->id)]; return [new WithoutOverlapping($this->o::config.'|'.$this->o->id)];
} }
/** /**

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

@ -530,14 +530,6 @@ abstract class Catalog extends Model
->first(); ->first();
} }
/**
* Return my class shortname
*/
public function objectType(): string
{
return (new \ReflectionClass($this))->getShortName();
}
/** /**
* Get the id of the previous record * Get the id of the previous record
*/ */