Updated VideoMove

app/Console/Commands/CatalogDump.php

@@ -3,13 +3,9 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class CatalogDump extends Command
 {
-    // Our photo object
-    private $o = NULL;
-
     /**
      * The name and signature of the console command.
      *

app/Console/Commands/CatalogMove.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+
+use App\Jobs\VideoMove;
+
+class CatalogMove extends Command
+{
+	use DispatchesJobs;
+
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'catalog:move {type : Photo | Video }';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Trigger Moves';
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		$class = 'App\Models\\'.$this->argument('type');
+
+		if (! class_exists($class))
+			abort(500,sprintf('No class [%s]',$this->argument('type')));
+
+		foreach ($class::where('filename','LIKE','%INCOMING%')->get() as $o) {
+			if ($o->scanned AND ! $o->duplicate AND ! $o->remove AND ($x=$o->moveable()) === TRUE) {
+				$this->warn(sprintf('Ignoring [%s], it is not readable',$o->file_path()));
+				continue;
+			}
+
+			switch (strtolower($this->argument('type'))) {
+				case 'video':
+					$this->dispatch((new VideoMove($o))->onQueue('move'));
+					break;
+			}
+		}
+	}
+}

app/Console/Commands/PhotoMove.php

@@ -88,7 +88,7 @@ class PhotoMove extends Command
 
 				} else {
 					if ($x > 0)
-						$this->warn(sprintf('Unable to move (%s) [%s] to [%s], moveable returned (%s)',$o->id,$o->file_path(),$o->file_path(FALSE,TRUE),$x));
+						$this->warn(sprintf('Unable to move (%s) [%s] to [%s], movable returned (%s)',$o->id,$o->file_path(),$o->file_path(FALSE,TRUE),$x));
 				}
 			}
 

app/Console/Commands/VideoMove.php

@@ -2,14 +2,15 @@
 
 namespace App\Console\Commands;
 
-use DB;
+use Illuminate\Support\Facades\Log;
-use Log;
 use Illuminate\Console\Command;
-use App\Model\Video;
+
+use App\Traits\Files;
+use App\Models\Video;
 
 class VideoMove extends Command
 {
-	use \App\Traits\Files;
+	use Files;
 
 	/**
 	 * The name and signature of the console command.
@@ -44,16 +45,13 @@ class VideoMove extends Command
 	 */
 	public function handle()
 	{
-	if ($this->option('file'))
+		if ($this->option('file')) {
-	{
 			$vo = Video::notRemove()->notDuplicate()->where('filename',Video::path($this->option('file')));
-	}
+
-	elseif ($this->option('id'))
+		} elseif ($this->option('id')) {
-	{
 			$vo = Video::notRemove()->notDuplicate()->where('id',$this->option('id'));
-	}
+
-	else
+		} else {
-	{
 			$vo = Video::notRemove()->notDuplicate();
 		}
 
@@ -66,22 +64,11 @@ class VideoMove extends Command
 		$bar->setRedrawFrequency(100);
 
 		$vo->chunk(1,function($video) use ($bar) {
-		while ($o = $video->shift())
+			while ($o = $video->shift()) {
-		{
 				if (($x = $o->moveable()) === TRUE) {
 					Log::info(sprintf('%s: Moving (%s)[%s]',__METHOD__,$o->id,$o->filename));
 
-				$fs = $o->file_size();
+					if ($this->makeParentDir(dirname($o->file_path(FALSE,TRUE))) AND rename($o->file_path(),$o->file_path(FALSE,TRUE))) {
-				$ft = $o->file_date('m');
-				if ($this->makeParentDir(dirname($o->file_path(FALSE,TRUE))) AND copy($o->file_path(),$o->file_path(FALSE,TRUE)))
-				{
-					// If the copy worked, remove the original.
-					if (file_exists($o->file_path(FALSE,TRUE)) AND $fs === filesize($o->file_path(FALSE,TRUE)))
-					{
-						touch($o->file_path(FALSE,TRUE),$ft);
-						unlink($o->file_path());
-					}
-
 						// Convert the path to a relative one.
 						$o->filename = $o->file_path(TRUE,TRUE);
 
@@ -91,19 +78,18 @@ class VideoMove extends Command
 							$this->error(sprintf('Save after rename failed for (%s)',$o->id));
 							continue;
 						}
-				}
+
-				else
+					} else {
-				{
 						$this->error(sprintf('Rename failed for (%s)',$o->id));
 						continue;
 					}
 
 					chmod($o->file_path(),0444);
-			}
+
-			else
+				} else {
-			{
 					if ($x > 0) {
-					$this->warn(sprintf('Unable to move (%s) [%s] to [%s], moveable returned (%s)',$o->id,$o->file_path(),$o->file_path(FALSE,TRUE),$x));
+						$this->warn(sprintf('Unable to move (%s) [%s] to [%s], movable returned (%s)',$o->id,$o->file_path(),$o->file_path(FALSE,TRUE),$x));
+
 						if ($x == 1 AND $v = Video::where('filename',$o->file_path(TRUE,TRUE))->first())
 							$this->warn(sprintf('File is id (%s) [%s]',$v->file_path(),$v->id));
 					}