From 08fc10b0caa810dabd6229bfca7031fd3205d8d0 Mon Sep 17 00:00:00 2001 From: paranarimasu <33796518+paranarimasu@users.noreply.github.com> Date: Thu, 4 Jan 2018 21:03:24 -0600 Subject: [PATCH] Additional Logging --- app/Console/Commands/SyncVideosCommand.php | 40 +++++++++++----------- app/Http/Controllers/SitemapController.php | 5 +++ app/Http/Controllers/VideosController.php | 4 +++ app/Http/Controllers/WelcomeController.php | 2 ++ 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/app/Console/Commands/SyncVideosCommand.php b/app/Console/Commands/SyncVideosCommand.php index 6699b79ae..f5a7cfa67 100644 --- a/app/Console/Commands/SyncVideosCommand.php +++ b/app/Console/Commands/SyncVideosCommand.php @@ -45,7 +45,26 @@ class SyncVideosCommand extends Command LOG::info('sync-videos start'); $fs = Storage::disk('spaces'); - // Step 1: Create video objects for new files + // Step 1: Delete video objects for removed files + $videos = Video::all(); + foreach ($videos as $video) { + $flag = false; + try { + $metaData = $fs->getMetadata($video->path); + $flag = !$metaData || $metaData['filename'] !== $video->alias || $metaData['path'] !== $video->path; + } catch (FileNotFoundException $fnf) { + $flag = true; + } catch (RequestException $r) { + Log::error('verify video', ['alias' => $video->alias, 'path' => $video->path]); + } + + if ($flag) { + LOG::info('delete video', ['alias' => $video->alias, 'path' => $video->path]); + $video->delete(); + } + } + + // Step 2: Create video objects for new files $files = $fs->listContents('', true); foreach ($files as $file) { $isFile = $file['type'] == 'file'; @@ -61,25 +80,6 @@ class SyncVideosCommand extends Command } } - // Step 2: Delete video objects for removed files - $videos = Video::all(); - foreach ($videos as $video) { - $flag = false; - try { - $metaData = $fs->getMetadata($video->path); - $flag = !$metaData || $metaData['filename'] !== $video->alias || $metaData['path'] !== $video->path; - } catch (FileNotFoundException $fnf) { - $flag = true; - } catch (RequestException $r) { - $flag = true; - } - - if ($flag) { - LOG::info('delete video', ['alias' => $video->alias, 'path' => $video->path]); - $video->delete(); - } - } - LOG::info('sync-videos end'); } } diff --git a/app/Http/Controllers/SitemapController.php b/app/Http/Controllers/SitemapController.php index 7e08bbfab..0189292f9 100644 --- a/app/Http/Controllers/SitemapController.php +++ b/app/Http/Controllers/SitemapController.php @@ -4,10 +4,13 @@ namespace App\Http\Controllers; use App\Models\Video; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Log; class SitemapController extends Controller { public function index() { + LOG::info('Page Visit - Sitemap Index'); + $video = Video::orderBy('updated_at', 'desc')->first(); return response()->view('sitemap.index', [ @@ -16,6 +19,8 @@ class SitemapController extends Controller } public function videos() { + LOG::info('Page Visit - Videos Sitemap'); + $videos = Video::all(); return response()->view('sitemap.videos', [ 'videos' => $videos diff --git a/app/Http/Controllers/VideosController.php b/app/Http/Controllers/VideosController.php index 9433544d8..e0fcc726e 100644 --- a/app/Http/Controllers/VideosController.php +++ b/app/Http/Controllers/VideosController.php @@ -10,6 +10,8 @@ class VideosController extends Controller { public function index() { + LOG::info('Page Visit - Video Index'); + $videos = Video::orderByRaw('udf_NaturalSortFormat(alias, 10, ".")')->paginate(50); return view('videos', [ @@ -18,6 +20,8 @@ class VideosController extends Controller } public function show($alias) { + LOG::info('Page Visit - Video', ['alias' => $alias]); + set_time_limit(0); $video = Video::where('alias', $alias)->firstOrFail(); diff --git a/app/Http/Controllers/WelcomeController.php b/app/Http/Controllers/WelcomeController.php index 93b073290..fa15428f9 100644 --- a/app/Http/Controllers/WelcomeController.php +++ b/app/Http/Controllers/WelcomeController.php @@ -9,6 +9,8 @@ use Illuminate\Http\Request; class WelcomeController extends Controller { public function do() { + LOG::info('Page Visit - Welcome'); + // View Data $grill = GrillFactory::getGrill(); $videoCount = Video::count();