Internal optimisations and additional flags for Photo/Video

2020-01-05 00:28:00 +11:00
parent 93364ab53a
commit 1ffc2d994e
19 changed files with 402 additions and 279 deletions
--- a/resources/views/catalog/deletereview.blade.php
+++ b/resources/views/catalog/deletereview.blade.php
@@ -21,12 +21,13 @@

 			<form action="{{ $return }}" method="POST">
 				{{ csrf_field() }}
+				<input type="hidden" name="type" value="{{ $type }}">

 				@include('catalog.widgets.duplicates')

 				<div class="pb-2"><button class="btn btn-sm btn-danger">Confirm Delete</button></div>

-				<input type="hidden" name="pagenext" value="{{ $catalog->hasMorePages() ? $catalog->currentPage()+1 : NULL }}">
+				<input type="hidden" name="page" value="{{ $catalog->hasMorePages() ? $catalog->currentPage()+1 : NULL }}">
 			</form>
 		@else
 			NONE!
--- a/resources/views/catalog/duplicatereview.blade.php
+++ b/resources/views/catalog/duplicatereview.blade.php
@@ -21,10 +21,13 @@

 			<form action="{{ $return }}" method="POST">
 				{{ csrf_field() }}
+				<input type="hidden" name="type" value="{{ $type }}">

 				@include('catalog.widgets.duplicates')

 				<div class="pb-2"><button class="btn btn-sm btn-primary">Update</button></div>
+
+				<input type="hidden" name="page" value="{{ $catalog->currentPage() }}">
 			</form>
 		@else
 			NONE!
--- a/resources/views/catalog/widgets/duplicates.blade.php
+++ b/resources/views/catalog/widgets/duplicates.blade.php
@@ -6,7 +6,15 @@
 	</tr>
 	</thead>

+	@php
+		// Remember what we have rendered
+		$rendered = collect();
+	@endphp
+
 	@foreach ($catalog as $o)
+		@if($rendered->search($o->id)) @continue @endif
+		@php($rendered->push($o->id))
+
 		<tbody>
 		<tr>
 			<td>
@@ -14,7 +22,7 @@
 				@include($o->type.'.widgets.thumbnail',['o'=>$o])
 			</td>

-			@if (! ($d=$o->duplicates()->get())->count())
+			@if (! ($d=$o->myduplicates()->get())->count())
 				<td>
 					No other duplicates found?
 				</td>
@@ -22,6 +30,8 @@

 			@else
 				@foreach($d as $item)
+					@if($rendered->search($item->id)) @continue @endif
+					@php($rendered->push($item->id))
 					<td>
 						<input type="hidden" name="items[]" value="{{ $item->id }}">
 						@include($item->type.'.widgets.thumbnail',['o'=>$item])
--- a/resources/views/photo/view.blade.php
+++ b/resources/views/photo/view.blade.php
@@ -10,6 +10,7 @@
@section('contentheader_description')
 	@if(! $o->scanned)<button class="btn btn-sm btn-info">TO SCAN</button>@endif
 	@if($o->duplicate)<button class="btn btn-sm btn-warning">DUPLICATE</button>@endif
+	@if($o->ignore_duplicate)<button class="btn btn-sm btn-secondary">DUPLICATE IGNORE</button>@endif
 	@if($o->remove)<button class="btn btn-sm btn-danger">PENDING DELETE</button>@endif
@endsection
@section('page_title')
@@ -41,10 +42,10 @@
 		<div class="col-9">
 			<div class="dl-horizontal">
 				<dt>Signature</dt><dd>{{ $o->signature(TRUE) }}</dd>
-				<dt>Filename</dt><dd>{{ $o->file_path(TRUE) }}<dd>
+				<dt>Filename</dt><dd>{{ $o->filename }}<dd>

 				@if ($o->shouldMove())
-					<dt>NEW Filename</dt><dd>{{ $o->file_path(TRUE,TRUE) }}<dd>
+					<dt>NEW Filename</dt><dd>{{ $o->file_name() }}<dd>
 				@endif

 				<dt>Size</dt><dd>{{ $o->file_size() }}<dd>
@@ -70,7 +71,7 @@
 					</table>
 				</dd>
 				<hr>
-				@if($x = $o->duplicates()->get())
+				@if(($x=$o->myduplicates()->get())->count())
 					<dt>Duplicates</dt>
 					<dd>
 						@foreach($x as $oo)
--- a/resources/views/photo/widgets/thumbnail.blade.php
+++ b/resources/views/photo/widgets/thumbnail.blade.php
@@ -2,20 +2,21 @@
 	'ID'=>['id','idlink'],
 	'Signature'=>['signature','signature'],
 	'File Signature'=>['file_signature','file_signature'],
-	'Date Created'=>['date_created','date_created'],
+	'Date Created'=>['created','created'],
 	'Filename'=>['filename','filename'],
 	'Filesize'=>['filesize','filesize'],
 	'Dimensions'=>['height','dimensions'],
 	'Duplicate'=>['duplicate','duplicatecheckbox'],
 	'Flagged'=>['flag','flagcheckbox'],
+	'Ignore Duplicate'=>['ignore','ignorecheckbox'],
 	'Delete'=>['remove','removecheckbox'],
 ];?>

 <div class="card card-widget">
 	<div class="card-header">
 		<div class="user-block">
-			<i class="float-left fa fa-2x fa-camera"></i><span class="username"><a href="#">#{{ $o->id }} - {{ \Illuminate\Support\Str::limit($o->filename,12).\Illuminate\Support\Str::substr($o->filename,-16) }}</a></span>
-			<span class="description">{{ $o->date_created ? $o->date_created->toDateTimeString() : '-' }} [{{ $o->device() }}]</span>
+			<i class="float-left fa fa-2x fa-camera"></i><span class="username"><a href="{{ url('p/info',$o->id) }}">#{{ $o->id }} - {{ \Illuminate\Support\Str::limit($o->filename,12).\Illuminate\Support\Str::substr($o->filename,-16) }}</a></span>
+			<span class="description">{{ $o->created ? $o->created->toDateTimeString() : '-' }} [{{ $o->device() }}]</span>
 		</div>
 		<!-- /.user-block -->
 		<div class="card-tools">
--- a/resources/views/vendor/adminlte/layouts/partials/sidebarmenu.blade.php
+++ b/resources/views/vendor/adminlte/layouts/partials/sidebarmenu.blade.php
@@ -15,7 +15,7 @@
 		<li class="nav-item">
 			<a href="{{ url('p/duplicates') }}" class="nav-link @if(preg_match('#^p/duplicates$#',request()->path())) active @endif">
 				<i class="fa fa-link nav-icon"></i> <p>Duplicate</p>
-				<span class="badge badge-warning right">{{ \App\Models\Photo::where('duplicate',TRUE)->count() }}</span>
+				<span class="badge badge-warning right">{{ \App\Models\Photo::duplicates()->count() }}</span>
 			</a>
 		</li>

@@ -37,7 +37,7 @@
 		<li class="nav-item">
 			<a href="{{ url('v/duplicates') }}" class="nav-link @if(preg_match('#^v/duplicates$#',request()->path())) active @endif">
 				<i class="fa fa-link nav-icon"></i> <p>Duplicate</p>
-				<span class="badge badge-warning right">{{ \App\Models\Video::where('duplicate',TRUE)->count() }}</span>
+				<span class="badge badge-warning right">{{ \App\Models\Video::duplicates()->count() }}</span>
 			</a>
 		</li>

--- a/resources/views/video/view.blade.php
+++ b/resources/views/video/view.blade.php
@@ -10,6 +10,7 @@
@section('contentheader_description')
 	@if(! $o->scanned)<button class="btn btn-sm btn-info">TO SCAN</button>@endif
 	@if($o->duplicate)<button class="btn btn-sm btn-warning">DUPLICATE</button>@endif
+	@if($o->ignore_duplicate)<button class="btn btn-sm btn-secondary">DUPLICATE IGNORE</button>@endif
 	@if($o->remove)<button class="btn btn-sm btn-danger">PENDING DELETE</button>@endif
@endsection
@section('page_title')
@@ -41,10 +42,10 @@
 		<div class="col-8">
 			<div class="dl-horizontal">
 				<dt>Signature</dt><dd>{{ $o->signature(TRUE) }}</dd>
-				<dt>Filename</dt><dd>{{ $o->file_path(TRUE) }}<dd>
+				<dt>Filename</dt><dd>{{ $o->filename }}<dd>

 				@if ($o->shouldMove())
-					<dt>NEW Filename</dt><dd>{{ $o->file_path(TRUE,TRUE) }}<dd>
+					<dt>NEW Filename</dt><dd>{{ $o->file_name() }}<dd>
 				@endif

 				<dt>Size</dt><dd>{{ $o->file_size() }}<dd>
@@ -69,7 +70,7 @@
 					@endif
 				</dd>

-				@if($x = $o->duplicates()->get())
+				@if(($x=$o->myduplicates()->get())->count())
 					<dt>Duplicates</dt>
 					<dd>
 						@foreach($x as $oo)
--- a/resources/views/video/widgets/thumbnail.blade.php
+++ b/resources/views/video/widgets/thumbnail.blade.php
@@ -2,21 +2,22 @@
 	'ID'=>['id','idlink'],
 	'Signature'=>['signature','signature'],
 	'File Signature'=>['file_signature','file_signature'],
-	'Date Created'=>['date_created','date_created'],
+	'Date Created'=>['created','created'],
 	'Filename'=>['filename','filename'],
 	'Filesize'=>['filesize','filesize'],
 	'Dimensions'=>['height','dimensions'],
 	'Length'=>['length','length'],
 	'Duplicate'=>['duplicate','duplicatecheckbox'],
 	'Flagged'=>['flag','flagcheckbox'],
+	'Ignore Duplicate'=>['ignore','ignorecheckbox'],
 	'Delete'=>['remove','removecheckbox'],
 ];?>

 <div class="card card-widget">
 	<div class="card-header">
 		<div class="user-block">
-			<i class="float-left fa fa-2x fa-camera"></i><span class="username"><a href="#">#{{ $o->id }} - {{ \Illuminate\Support\Str::limit($o->filename,12).\Illuminate\Support\Str::substr($o->filename,-16) }}</a></span>
-			<span class="description">{{ $o->date_created ? $o->date_created->toDateTimeString() : '-' }} [{{ $o->device() }}]</span>
+			<i class="float-left fa fa-2x fa-camera"></i><span class="username"><a href="{{ url('v/info',$o->id) }}">#{{ $o->id }} - {{ \Illuminate\Support\Str::limit($o->filename,12).\Illuminate\Support\Str::substr($o->filename,-16) }}</a></span>
+			<span class="description">{{ $o->created ? $o->created->toDateTimeString() : '-' }} [{{ $o->device() }}]</span>
 		</div>
 		<!-- /.user-block -->
 		<div class="card-tools">
@@ -28,7 +29,7 @@

 	<!-- /.card-body -->
 	<div class="card-body">
-		<a href="{{ url('p/view',$o->id) }}" target="{{ $o->id }}">{!! $o->getHtmlImageURL() !!}</a>
+		<a href="{{ url('v/view',$o->id) }}" target="{{ $o->id }}">{!! $o->getHtmlImageURL() !!}</a>
 	</div>

 	<!-- /.card-body -->