app/Jobs/CatalogMove.php

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

app/Jobs/CatalogScan.php

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

app/Models/Abstracted/Catalog.php

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

public/css/custom.css

@@ -1,4 +0,0 @@
-.thumbnail {
-	width: auto !important;
-	height: 20em !important;
-}

resources/views/catalog/widgets/duplicates.blade.php

@@ -17,7 +17,7 @@
 		<tr>
 			<td>
 				<input type="hidden" name="items[]" value="{{ $o->id }}">
-				@include($o::config.'.widgets.thumbnail',['o'=>$o,'reference'=>$o->newInstance(),'css'=>'thumbnail'])
+				@include($o::config.'.widgets.thumbnail',['o'=>$o,'reference'=>$o->newInstance()])
 			</td>
 
 			@if (! ($d=$o->myduplicates()->get())->count())
@@ -32,7 +32,7 @@
 					@php($rendered->push($item))
 					<td>
 						<input type="hidden" name="items[]" value="{{ $item->id }}">
-						@include($item::config.'.widgets.thumbnail',['o'=>$item,'reference'=>$o,'css'=>'thumbnail'])
+						@include($item::config.'.widgets.thumbnail',['o'=>$item,'reference'=>$o])
 					</td>
 				@endforeach
 			@endif

resources/views/components/photo/thumbnail.blade.php

@@ -1,3 +1,3 @@
 <a href="{{ url('p/view',$id) }}" target="{{ $id }}">
-	<img @class(['pb-3','w-100',$css]) src="{{ url('p/thumbnail',$id) }}">
+	<img class="pb-3 w-100" src="{{ url('p/thumbnail',$id) }}">
 </a>

resources/views/photo/widgets/thumbnail.blade.php

@@ -25,7 +25,7 @@
 	</div>
 
 	<div class="card-body">
-		<x-photo.thumbnail :id="$o->id" :css="$css ?? NULL"/>
+		<x-photo.thumbnail :id="$o->id"/>
 	</div>
 
 	<div class="card-footer card-comments">
@@ -33,7 +33,7 @@
 			<tr><th>ID</th><td><x-info :id="$o->id"/></td></tr>
 
 			@foreach($data as $k=>$v)
-				<tr @class(['bg-success'=>($reference->exists && ((string)$reference->{$v[1]} === (string)$o->{$v[1]}))])>
+				<tr @class(['bg-success'=>($reference->exists && $reference->{$v[1]} === $o->{$v[1]})])>
 					<th>{{$k}}</th>
 					<td>{!! $o->{$v[1]} !!}</td>
 				</tr>