From 6512e96b9cbe326cd92aa56c19e067993a858850 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Fri, 20 Jul 2018 13:51:44 +0200 Subject: [PATCH] Update rest of the postproc scripts --- Changelog | 1 + misc/testing/PostProc/updateMovieImages.php | 58 ++++++++++----------- misc/testing/PostProc/updateMusicImages.php | 37 +++++++------ misc/testing/PostProc/updateXXXImages.php | 51 ++++++++---------- 4 files changed, 68 insertions(+), 79 deletions(-) diff --git a/Changelog b/Changelog index 206c8034b..d9d01f37b 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-07-20 DariusIII + * Chg: Update rest of the postproc scripts * Chg: Update more postproc scripts * Chg: Update paragonie/compat and ramsey/uuid to their latest versions 2018-07-19 DariusIII diff --git a/misc/testing/PostProc/updateMovieImages.php b/misc/testing/PostProc/updateMovieImages.php index 47314c634..a58fe04ee 100644 --- a/misc/testing/PostProc/updateMovieImages.php +++ b/misc/testing/PostProc/updateMovieImages.php @@ -2,19 +2,20 @@ require_once dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; -use Blacklight\db\DB; +use App\Models\MovieInfo; +use App\Models\Settings; +use Blacklight\ColorCLI; use Blacklight\utility\Utility; -$pdo = new DB(); $covers = $updated = $deleted = 0; -if ($argc == 1 || $argv[1] != 'true') { - exit($pdo->log->error("\nThis script will check all images in covers/movies and compare to db->movieinfo.\nTo run:\nphp $argv[0] true\n")); +if ($argc === 1 || $argv[1] !== 'true') { + exit(ColorCLI::error("\nThis script will check all images in covers/movies and compare to db->movieinfo.\nTo run:\nphp $argv[0] true\n")); } -$row = $pdo->queryOneRow("SELECT value FROM settings WHERE setting = 'coverspath'"); -if ($row !== false) { - Utility::setCoversConstant($row['value']); +$row = Settings::settingValue('site.main.coverspath'); +if ($row !== null) { + Utility::setCoversConstant($row); } else { die("Unable to set Covers' constant!\n"); } @@ -26,13 +27,13 @@ foreach ($itr as $filePath) { if (is_file($filePath) && preg_match('/-cover\.jpg/', $filePath)) { preg_match('/(\d+)-cover\.jpg/', basename($filePath), $match); if (isset($match[1])) { - $run = $pdo->queryDirect('UPDATE movieinfo SET cover = 1 WHERE cover = 0 AND imdbid = '.$match[1]); - if ($run->rowCount() >= 1) { + $run = MovieInfo::query()->where('cover', '=', 0)->where('imdbid', $match[1])->update(['cover' => 1]); + if ($run >= 1) { $covers++; } else { - $run = $pdo->queryDirect('SELECT imdbid FROM movieinfo WHERE imdbid = '.$match[1]); - if ($run->rowCount() == 0) { - echo $pdo->log->info($filePath.' not found in db.'); + $run = MovieInfo::query()->where('imdbid', '=', $match[1])->select(['imdbid'])->get(); + if ($run->count() === 0) { + echo ColorCLI::info($filePath.' not found in db.'); } } } @@ -40,40 +41,35 @@ foreach ($itr as $filePath) { if (is_file($filePath) && preg_match('/-backdrop\.jpg/', $filePath)) { preg_match('/(\d+)-backdrop\.jpg/', basename($filePath), $match1); if (isset($match1[1])) { - $run = $pdo->queryDirect('UPDATE movieinfo SET backdrop = 1 WHERE backdrop = 0 AND imdbid = '.$match1[1]); - if ($run->rowCount() >= 1) { + $run = MovieInfo::query()->where(['backdrop' => 0, 'imdbid' => $match1[1]])->update(['backdrop' => 1]); + if ($run >= 1) { $updated++; - printf('UPDATE movieinfo SET backdrop = 1 WHERE backdrop = 0 AND imdbid = '.$match1[1]."\n"); } else { - $run = $pdo->queryDirect('SELECT imdbid FROM movieinfo WHERE imdbid = '.$match1[1]); - if ($run->rowCount() == 0) { - echo $pdo->log->info($filePath.' not found in db.'); + $run = MovieInfo::query()->where('imdbid', $match1[1])->select(['imdbid'])->get(); + if ($run->count() === 0) { + echo ColorCLI::info($filePath.' not found in db.'); } } } } } -$qry = $pdo->queryDirect('SELECT imdbid FROM movieinfo WHERE cover = 1'); -if ($qry instanceof \Traversable) { +$qry = MovieInfo::query()->where('cover', '=', 1)->select(['imdbid'])->get(); foreach ($qry as $rows) { if (! is_file($path2covers.$rows['imdbid'].'-cover.jpg')) { - $pdo->queryDirect('UPDATE movieinfo SET cover = 0 WHERE cover = 1 AND imdbid = '.$rows['imdbid']); - echo $pdo->log->info($path2covers.$rows['imdbid'].'-cover.jpg does not exist.'); + MovieInfo::query()->where('cover', '=', 1)->where('imdbid', $rows['imdbid'])->update(['cover' => 0]); + echo ColorCLI::info($path2covers.$rows['imdbid'].'-cover.jpg does not exist.'); $deleted++; } } -} -$qry1 = $pdo->queryDirect('SELECT imdbid FROM movieinfo WHERE backdrop = 1'); -if ($qry1 instanceof \Traversable) { + $qry1 = MovieInfo::query()->where('backdrop', '=', 1)->select(['imdbid'])->get(); foreach ($qry1 as $rows) { if (! is_file($path2covers.$rows['imdbid'].'-backdrop.jpg')) { - $pdo->queryDirect('UPDATE movieinfo SET backdrop = 0 WHERE backdrop = 1 AND imdbid = '.$rows['imdbid']); - echo $pdo->log->info($path2covers.$rows['imdbid'].'-backdrop.jpg does not exist.'); + MovieInfo::query()->where('backdrop', '=', 1)->where('imdbid', $rows['imdbid'])->update(['backdrop' => 0]); + echo ColorCLI::info($path2covers.$rows['imdbid'].'-backdrop.jpg does not exist.'); $deleted++; } } -} -echo $pdo->log->header($covers.' covers set.'); -echo $pdo->log->header($updated.' backdrops set.'); -echo $pdo->log->header($deleted.' movies unset.'); +echo ColorCLI::header($covers.' covers set.'); +echo ColorCLI::header($updated.' backdrops set.'); +echo ColorCLI::header($deleted.' movies unset.'); diff --git a/misc/testing/PostProc/updateMusicImages.php b/misc/testing/PostProc/updateMusicImages.php index c66bd7c07..62afd2e59 100644 --- a/misc/testing/PostProc/updateMusicImages.php +++ b/misc/testing/PostProc/updateMusicImages.php @@ -2,13 +2,13 @@ require_once dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; -use Blacklight\db\DB; +use App\Models\MusicInfo; +use Blacklight\ColorCLI; -$pdo = new DB(); $covers = $updated = $deleted = 0; -if ($argc == 1 || $argv[1] != 'true') { - exit($pdo->log->error("\nThis script will check all images in covers/music and compare to db->musicinfo.\nTo run:\nphp $argv[0] true\n")); +if ($argc === 1 || $argv[1] !== 'true') { + exit(ColorCLI::error("\nThis script will check all images in covers/music and compare to db->musicinfo.\nTo run:\nphp $argv[0] true\n")); } $path2covers = NN_COVERS.'music'.DS; @@ -19,28 +19,27 @@ foreach ($itr as $filePath) { if (is_file($filePath) && preg_match('/\d+\.jpg/', $filePath)) { preg_match('/(\d+)\.jpg/', basename($filePath), $match); if (isset($match[1])) { - $run = $pdo->queryDirect('UPDATE musicinfo SET cover = 1 WHERE cover = 0 AND id = '.$match[1]); - if ($run->rowCount() >= 1) { + $run = MusicInfo::query()->where('cover', '=', 0)->where('id', $match[1])->update(['cover' => 1]); + if ($run >= 1) { $covers++; } else { - $run = $pdo->queryDirect('SELECT id FROM musicinfo WHERE id = '.$match[1]); - if ($run->rowCount() == 0) { - echo $pdo->log->info($filePath.' not found in db.'); + $run = MusicInfo::query()->where('id', $match[1])->select(['id'])->get(); + if ($run->count() === 0) { + echo ColorCLI::info($filePath.' not found in db.'); } } } } } -$qry = $pdo->queryDirect('SELECT id FROM musicinfo WHERE cover = 1'); -if ($qry instanceof \Traversable) { - foreach ($qry as $rows) { - if (! is_file($path2covers.$rows['id'].'.jpg')) { - $pdo->queryDirect('UPDATE musicinfo SET cover = 0 WHERE cover = 1 AND id = '.$rows['id']); - echo $pdo->log->info($path2covers.$rows['id'].'.jpg does not exist.'); - $deleted++; - } +$qry = MusicInfo::query()->where('cover', '=', 1)->select(['id'])->get(); +foreach ($qry as $rows) { + if (! is_file($path2covers.$rows['id'].'.jpg')) { + MusicInfo::query()->where(['cover' => 1, 'id' => $rows['id']])->update(['cover' => 0]); + echo ColorCLI::info($path2covers.$rows['id'].'.jpg does not exist.'); + $deleted++; } } -echo $pdo->log->header($covers.' covers set.'); -echo $pdo->log->header($deleted.' music unset.'); +echo ColorCLI::header($covers.' covers set.'); +echo ColorCLI::header($deleted.' music unset.'); + diff --git a/misc/testing/PostProc/updateXXXImages.php b/misc/testing/PostProc/updateXXXImages.php index b7d8fb41a..20b03f2bf 100644 --- a/misc/testing/PostProc/updateXXXImages.php +++ b/misc/testing/PostProc/updateXXXImages.php @@ -2,15 +2,13 @@ require_once dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; -use Blacklight\db\DB; +use App\Models\XxxInfo; use Blacklight\ColorCLI; -$pdo = new DB(); -$c = new ColorCLI(); $covers = $updated = $deleted = 0; -if ($argc == 1 || $argv[1] != 'true') { - exit($c->error("\nThis script will check all images in covers/xxx and compare to db->xxxinfo.\nTo run:\nphp $argv[0] true\n")); +if ($argc === 1 || $argv[1] !== 'true') { + exit(ColorCLI::error("\nThis script will check all images in covers/xxx and compare to db->xxxinfo.\nTo run:\nphp $argv[0] true\n")); } $path2covers = NN_COVERS.'xxx'.DS; @@ -21,13 +19,13 @@ foreach ($itr as $filePath) { if (is_file($filePath) && preg_match('/-cover\.jpg/', $filePath)) { preg_match('/(\d+)-cover\.jpg/', basename($filePath), $match); if (isset($match[1])) { - $run = $pdo->queryDirect('UPDATE xxxinfo SET cover = 1 WHERE cover = 0 AND id = '.$match[1]); - if ($run->rowCount() >= 1) { + $run = XxxInfo::query()->where('cover', '=', 0)->where('id', $match[1])->update(['cover' => 1]); + if ($run >= 1) { $covers++; } else { - $run = $pdo->queryDirect('SELECT id FROM xxxinfo WHERE id = '.$match[1]); - if ($run->rowCount() == 0) { - echo $c->info($filePath.' not found in db.'); + $run = XxxInfo::query()->where('id', $match[1])->select(['id'])->get(); + if ($run->count() === 0) { + echo ColorCLI::info($filePath.' not found in db.'); } } } @@ -35,40 +33,35 @@ foreach ($itr as $filePath) { if (is_file($filePath) && preg_match('/-backdrop\.jpg/', $filePath)) { preg_match('/(\d+)-backdrop\.jpg/', basename($filePath), $match1); if (isset($match1[1])) { - $run = $pdo->queryDirect('UPDATE xxxinfo SET backdrop = 1 WHERE backdrop = 0 AND id = '.$match1[1]); - if ($run->rowCount() >= 1) { + $run = XxxInfo::query()->where(['backdrop' => 0, 'id' => $match1[1]])->update(['backdrop' => 1]); + if ($run >= 1) { $updated++; - printf('UPDATE xxxinfo SET backdrop = 1 WHERE backdrop = 0 AND id = '.$match1[1]."\n"); } else { - $run = $pdo->queryDirect('SELECT id FROM xxxinfo WHERE id = '.$match1[1]); - if ($run->rowCount() == 0) { - echo $c->info($filePath.' not found in db.'); + $run = XxxInfo::query()->where('id', $match1[1])->select(['id'])->get(); + if ($run->count() === 0) { + echo ColorCLI::info($filePath.' not found in db.'); } } } } } -$qry = $pdo->queryDirect('SELECT id FROM xxxinfo WHERE cover = 1'); -if ($qry instanceof Traversable) { +$qry = XxxInfo::query()->where('cover', '=', 1)->select(['id'])->get(); foreach ($qry as $rows) { if (! is_file($path2covers.$rows['id'].'-cover.jpg')) { - $pdo->queryDirect('UPDATE xxxinfo SET cover = 0 WHERE cover = 1 AND id = '.$rows['id']); - echo $c->info($path2covers.$rows['id'].'-cover.jpg does not exist.'); + XxxInfo::query()->where(['cover' => 1, 'id' => $rows['id']])->update(['cover' => 0]); + echo ColorCLI::info($path2covers.$rows['id'].'-cover.jpg does not exist.'); $deleted++; } } -} -$qry1 = $pdo->queryDirect('SELECT id FROM xxxinfo WHERE backdrop = 1'); -if ($qry1 instanceof Traversable) { +$qry = XxxInfo::query()->where('backdrop', '=', 1)->select(['id'])->get(); foreach ($qry1 as $rows) { if (! is_file($path2covers.$rows['id'].'-backdrop.jpg')) { - $pdo->queryDirect('UPDATE xxxinfo SET backdrop = 0 WHERE backdrop = 1 AND id = '.$rows['id']); - echo $c->info($path2covers.$rows['id'].'-backdrop.jpg does not exist.'); + XxxInfo::query()->where(['backdrop' => 1, 'id' => $rows['id']])->update(['backdrop' => 0]); + echo ColorCLI::info($path2covers.$rows['id'].'-backdrop.jpg does not exist.'); $deleted++; } } -} -echo $c->header($covers.' covers set.'); -echo $c->header($updated.' backdrops set.'); -echo $c->header($deleted.' movies unset.'); +echo ColorCLI::header($covers.' covers set.'); +echo ColorCLI::header($updated.' backdrops set.'); +echo ColorCLI::header($deleted.' movies unset.');