From ff83ea5949041eadeff670a5963eed0d78f01635 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 16 Jul 2018 12:15:41 +0200 Subject: [PATCH] Update various scripts in misc folder --- Blacklight/TmuxRun.php | 6 +- Changelog | 1 + misc/update/backfill.php | 20 +- misc/update/match_prefiles.php | 12 +- .../multiprocessing/.do_not_run/switch.php | 332 ++++++++++++------ misc/update/multiprocessing/backfill.php | 9 +- misc/update/multiprocessing/binaries.php | 6 +- misc/update/multiprocessing/fixrelnames.php | 6 +- misc/update/multiprocessing/releases.php | 6 +- misc/update/multiprocessing/requestid.php | 6 +- misc/update/multiprocessing/safe.php | 6 +- .../multiprocessing/update_per_group.php | 6 +- misc/update/postprocess.php | 11 +- misc/update/update_binaries.php | 7 +- 14 files changed, 292 insertions(+), 142 deletions(-) diff --git a/Blacklight/TmuxRun.php b/Blacklight/TmuxRun.php index e9f85e208..a3d717efd 100755 --- a/Blacklight/TmuxRun.php +++ b/Blacklight/TmuxRun.php @@ -262,7 +262,7 @@ class TmuxRun extends Tmux $log = $this->writelog($runVar['panes']['one'][1]); shell_exec( "tmux respawnp -t{$runVar['constants']['tmux_session']}:1.1 ' \ - {$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update/postprocess.php amazon true $log; \ + {$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update/multiprocessing/postprocess.php ama $log; \ date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['post_timer_amazon']}' 2>&1 1> /dev/null" ); break; @@ -752,7 +752,7 @@ class TmuxRun extends Tmux { if ((int) $runVar['constants']['run_ircscraper'] === 1) { //Check to see if the pane is dead, if so respawn it. - if (shell_exec("tmux list-panes -t{$runVar['constants']['tmux_session']}:${pane} | grep ^0 | grep -c dead") == 1) { + if ((int) shell_exec("tmux list-panes -t{$runVar['constants']['tmux_session']}:${pane} | grep ^0 | grep -c dead") === 1) { shell_exec( "tmux respawnp -t{$runVar['constants']['tmux_session']}:${pane}.0 ' \ {$runVar['commands']['_phpn']} {$runVar['paths']['scraper']} true'" @@ -774,7 +774,7 @@ class TmuxRun extends Tmux if ((int) $sharing['enabled'] === 1 && (int) $runVar['settings']['run_sharing'] === 1 && ((int) $sharing['posting'] === 1 || (int) $sharing['fetching'] === 1) && shell_exec("tmux list-panes -t{$runVar['constants']['tmux_session']}:${pane} | grep ^0 | grep -c dead") == 1) { shell_exec( "tmux respawnp -t{$runVar['constants']['tmux_session']}:${pane}.0 ' \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}/update/postprocess.php sharing true; \ + {$runVar['commands']['_php']} {$runVar['paths']['misc']}/update/multiprocessing/postprocess.php sha; \ {$runVar['commands']['_sleep']} {$runVar['settings']['sharing_timer']}' 2>&1 1> /dev/null" ); } diff --git a/Changelog b/Changelog index cae17f332..3664b1657 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-07-16 DariusIII + * Chg: Update various scripts in misc folder * Chg: Update sphinx tables creation scripts * Chg: Update used libraries to latest versions 2018-07-14 DariusIII diff --git a/misc/update/backfill.php b/misc/update/backfill.php index 76ad6729f..8b4c2e9ba 100644 --- a/misc/update/backfill.php +++ b/misc/update/backfill.php @@ -3,34 +3,28 @@ require_once dirname(__DIR__, 2).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use Blacklight\NNTP; -use Blacklight\db\DB; use Blacklight\Backfill; -$pdo = new DB(); - // Create the connection here and pass -$nntp = new NNTP(['Settings' => $pdo]); -if ($nntp->doConnect() !== true) { - exit($pdo->log->error('Unable to connect to usenet.')); -} +$nntp = new NNTP(); if (isset($argv[1]) && $argv[1] === 'all' && ! isset($argv[2])) { - $backfill = new Backfill(['NNTP' => $nntp, 'Settings' => $pdo]); + $backfill = new Backfill(['NNTP' => $nntp]); $backfill->backfillAllGroups(); } elseif (isset($argv[1]) && ! isset($argv[2]) && preg_match('/^alt\.binaries\..+$/i', $argv[1])) { - $backfill = new Backfill(['NNTP' => $nntp, 'Settings' => $pdo]); + $backfill = new Backfill(['NNTP' => $nntp]); $backfill->backfillAllGroups($argv[1]); } elseif (isset($argv[1], $argv[2]) && is_numeric($argv[2]) && preg_match('/^alt\.binaries\..+$/i', $argv[1])) { - $backfill = new Backfill(['NNTP' => $nntp, 'Settings' => $pdo]); + $backfill = new Backfill(['NNTP' => $nntp]); $backfill->backfillAllGroups($argv[1], $argv[2]); } elseif (isset($argv[1], $argv[2]) && $argv[1] === 'alph' && is_numeric($argv[2])) { - $backfill = new Backfill(['NNTP' => $nntp, 'Settings' => $pdo]); + $backfill = new Backfill(['NNTP' => $nntp]); $backfill->backfillAllGroups('', $argv[2], 'normal'); } elseif (isset($argv[1], $argv[2]) && $argv[1] === 'date' && is_numeric($argv[2])) { - $backfill = new Backfill(['NNTP' => $nntp, 'Settings' => $pdo]); + $backfill = new Backfill(['NNTP' => $nntp]); $backfill->backfillAllGroups('', $argv[2], 'date'); } elseif (isset($argv[1], $argv[2]) && $argv[1] === 'safe' && is_numeric($argv[2])) { - $backfill = new Backfill(['NNTP' => $nntp, 'Settings' => $pdo]); + $backfill = new Backfill(['NNTP' => $nntp]); $backfill->safeBackfill($argv[2]); } else { exit(\Blacklight\ColorCLI::error("\nWrong set of arguments.\n" diff --git a/misc/update/match_prefiles.php b/misc/update/match_prefiles.php index 6b90058eb..1a122682f 100755 --- a/misc/update/match_prefiles.php +++ b/misc/update/match_prefiles.php @@ -17,6 +17,14 @@ if (! isset($argv[1]) && ($argv[1] !== 'full' || ! is_numeric($argv[1]))) { ); } -$nameFixer = new NameFixer(); +try { + $nameFixer = new NameFixer(); +} catch (Exception $e) { + echo $e->getMessage(); +} -$nameFixer->getPreFileNames($argv); +try { + $nameFixer->getPreFileNames($argv); +} catch (Exception $e) { + echo $e->getMessage(); +} diff --git a/misc/update/multiprocessing/.do_not_run/switch.php b/misc/update/multiprocessing/.do_not_run/switch.php index f49cb4165..07e6eb461 100644 --- a/misc/update/multiprocessing/.do_not_run/switch.php +++ b/misc/update/multiprocessing/.do_not_run/switch.php @@ -8,15 +8,15 @@ require_once dirname(__DIR__, 4) . DIRECTORY_SEPARATOR . 'bootstrap/autoload.php use App\Models\Group; use App\Models\Settings; -use \Blacklight\db\DB; -use \Blacklight\processing\PostProcess; -use \Blacklight\processing\ProcessReleases; -use \Blacklight\processing\post\ProcessAdditional; +use Blacklight\processing\PostProcess; +use Blacklight\processing\ProcessReleases; +use Blacklight\processing\post\ProcessAdditional; use Blacklight\Backfill; use Blacklight\Binaries; use Blacklight\Nfo; use Blacklight\NNTP; use Blacklight\processing\ProcessReleasesMultiGroup; +use Illuminate\Support\Facades\DB; // Are we coming from python or php ? $options[0] => (string): python|php // The type of process we want to do: $options[1] => (string): releases @@ -29,12 +29,19 @@ switch ($options[1]) { // $options[3] => (int) backfill type from tmux settings. 1 = Backfill interval , 2 = Bakfill all case 'backfill': if (in_array((int)$options[3], [1, 2], false)) { - $pdo = new DB(); $value = Settings::settingValue('site.tmux.backfill_qty'); if ($value !== false) { - $nntp = nntp($pdo); - (new Backfill())->backfillAllGroups($options[2], ($options[3] === 1 ? '' : $value['value'])); - } + try { + $nntp = nntp(); + } catch (Exception $e) { + echo $e->getMessage(); + } + try { + (new Backfill())->backfillAllGroups($options[2], ($options[3] === 1 ? '' : $value['value'])); + } catch (Exception $e) { + echo $e->getMessage(); + } + } } break; @@ -44,18 +51,32 @@ switch ($options[1]) { * $options[3] => (int) Quantity of articles to download. */ case 'backfill_all_quantity': - $pdo = new DB(); - $nntp = nntp($pdo); - (new Backfill())->backfillAllGroups($options[2], $options[3]); - break; + try { + $nntp = nntp(); + } catch (Exception $e) { + echo $e->getMessage(); + } + try { + (new Backfill())->backfillAllGroups($options[2], $options[3]); + } catch (Exception $e) { + echo $e->getMessage(); + } + break; // BackFill a single group, 10000 parts. // $options[2] => (string)group name, Name of group to work on. case 'backfill_all_quick': - $pdo = new DB(); - $nntp = nntp($pdo); - (new Backfill())->backfillAllGroups($options[2], 10000, 'normal'); - break; + try { + $nntp = nntp(); + } catch (Exception $e) { + echo $e->getMessage(); + } + try { + (new Backfill())->backfillAllGroups($options[2], 10000, 'normal'); + } catch (Exception $e) { + echo $e->getMessage(); + } + break; /* Get a range of article headers for a group. * @@ -66,17 +87,30 @@ switch ($options[1]) { * $options[6] => (int) Number of threads. */ case 'get_range': - $pdo = new DB(); - $nntp = nntp($pdo); - $groupMySQL = Group::getByName($options[3]); - if ($nntp->isError($nntp->selectGroup($groupMySQL['name']))) { - if ($nntp->isError($nntp->dataError($nntp, $groupMySQL['name']))) { - return; - } - } - $binaries = new Binaries(['NNTP' => $nntp, 'Settings' => $pdo, 'Groups' => null]); - $return = $binaries->scan($groupMySQL, $options[4], $options[5], (Settings::settingValue('..safepartrepair') == 1 ? 'update' : 'backfill')); - if (empty($return)) { + try { + $nntp = nntp(); + } catch (Exception $e) { + echo $e->getMessage(); + } + $groupMySQL = Group::getByName($options[3]); + try { + if ($nntp->isError($nntp->selectGroup($groupMySQL['name'])) && $nntp->isError($nntp->dataError($nntp, $groupMySQL['name']))) { + return; + } + } catch (Exception $e) { + echo $e->getMessage(); + } + try { + $binaries = new Binaries(['NNTP' => $nntp, 'Groups' => null]); + } catch (Exception $e) { + echo $e->getMessage(); + } + try { + $return = $binaries->scan($groupMySQL, $options[4], $options[5], ((int) Settings::settingValue('..safepartrepair') === 1 ? 'update' : 'backfill')); + } catch (Exception $e) { + echo $e->getMessage(); + } + if (empty($return)) { exit(); } $columns = []; @@ -85,11 +119,10 @@ switch ($options[1]) { if ($return['lastArticleNumber'] <= $groupMySQL['last_record']){ exit(); } + $unixTime = is_numeric($return['lastArticleDate']) ? $return['lastArticleDate'] : strtotime($return['lastArticleDate']); $columns[1] = sprintf( - 'last_record_postdate = %s', - $pdo->from_unixtime( - (is_numeric($return['lastArticleDate']) ? $return['lastArticleDate'] : strtotime($return['lastArticleDate'])) - ) + 'last_record_postdate = FROM_UNIXTIME(%s)', + $unixTime ); $columns[2] = sprintf('last_record = %s', $return['lastArticleNumber']); $query = sprintf( @@ -104,11 +137,10 @@ switch ($options[1]) { if ($return['firstArticleNumber'] >= $groupMySQL['first_record']){ exit(); } + $unixTime = is_numeric($return['firstArticleDate']) ? $return['firstArticleDate'] : strtotime($return['firstArticleDate']); $columns[1] = sprintf( - 'first_record_postdate = %s', - $pdo->from_unixtime( - (is_numeric($return['firstArticleDate']) ? $return['firstArticleDate'] : strtotime($return['firstArticleDate'])) - ) + 'first_record_postdate = FROM_UNIXTIME(%s)', + $unixTime ); $columns[2] = sprintf('first_record = %s', $return['firstArticleNumber']); $query = sprintf( @@ -122,7 +154,7 @@ switch ($options[1]) { default: exit(); } - $pdo->queryExec($query); + DB::update($query); break; /* Do part repair for a group. @@ -130,46 +162,86 @@ switch ($options[1]) { * $options[2] => (string) Group name. */ case 'part_repair': - $pdo = new DB(); $groupMySQL = Group::getByName($options[2]); - $nntp = nntp($pdo); - // Select group, here, only once - $data = $nntp->selectGroup($groupMySQL['name']); - if ($nntp->isError($data)) { - if ($nntp->dataError($nntp, $groupMySQL['name']) === false) { - exit(); - } - } - (new Binaries(['NNTP' => $nntp, 'Settings' => $pdo]))->partRepair($groupMySQL); - break; + try { + $nntp = nntp(); + } catch (Exception $e) { + echo $e->getMessage(); + } + // Select group, here, only once + try { + $data = $nntp->selectGroup($groupMySQL['name']); + } catch (Exception $e) { + echo $e->getMessage(); + } + try { + if ($nntp->isError($data) && $nntp->dataError($nntp, $groupMySQL['name']) === false) { + exit(); + } + } catch (Exception $e) { + echo $e->getMessage(); + } + try { + (new Binaries(['NNTP' => $nntp]))->partRepair($groupMySQL); + } catch (Exception $e) { + echo $e->getMessage(); + } + break; // Process releases. // $options[2] => (string)groupCount, number of groups terminated by _ | (int)groupid, group to work on case 'releases': - $pdo = new DB(); - $releases = new ProcessReleases(['Settings' => $pdo]); - $mgrreleases = new ProcessReleasesMultiGroup(['Settings' => $pdo]); + try { + $releases = new ProcessReleases(); + } catch (Exception $e) { + echo $e->getMessage(); + } + try { + $mgrreleases = new ProcessReleasesMultiGroup(); + } catch (Exception $e) { + echo $e->getMessage(); + } - //Runs function that are per group + //Runs function that are per group if (is_numeric($options[2])) { - processReleases($releases, $options[2]); - } else { + try { + processReleases($releases, $options[2]); + } catch (Exception $e) { + echo $e->getMessage(); + } + } else { // Run MGR once after all other release updates for standard groups - processReleases(new ProcessReleasesMultiGroup(['Settings' => $pdo]), ''); + try { + processReleases(new ProcessReleasesMultiGroup(), ''); + } catch (Exception $e) { + echo $e->getMessage(); + } - // Run functions that run on releases table after all others completed. + // Run functions that run on releases table after all others completed. $groupCount = rtrim($options[2], '_'); if (!is_numeric($groupCount)) { $groupCount = 1; } - $releases->deletedReleasesByGroup(); - $releases->deleteReleases(); - //$releases->processRequestIDs('', (5000 * $groupCount), true); + try { + $releases->deletedReleasesByGroup(); + } catch (Exception $e) { + echo $e->getMessage(); + } + try { + $releases->deleteReleases(); + } catch (Exception $e) { + echo $e->getMessage(); + } + //$releases->processRequestIDs('', (5000 * $groupCount), true); //$releases->processRequestIDs('', (1000 * $groupCount), false); - $releases->categorizeReleases(2); - } + try { + $releases->categorizeReleases(2); + } catch (Exception $e) { + echo $e->getMessage(); + } + } break; /* Update a single group's article headers. @@ -177,46 +249,83 @@ switch ($options[1]) { * $options[2] => (string) Group name. */ case 'update_group_headers': - $pdo = new DB(); - $nntp = nntp($pdo); - $groupMySQL = Group::getByName($options[2]); - (new Binaries(['NNTP' => $nntp, 'Settings' => $pdo]))->updateGroup($groupMySQL); - break; + try { + $nntp = nntp(); + } catch (Exception $e) { + echo $e->getMessage(); + } + $groupMySQL = Group::getByName($options[2]); + try { + (new Binaries(['NNTP' => $nntp]))->updateGroup($groupMySQL); + } catch (Exception $e) { + echo $e->getMessage(); + } + break; // Do a single group (update_binaries/backFill/update_releases/postprocess). // $options[2] => (int)groupid, group to work on case 'update_per_group': if (is_numeric($options[2])) { - - $pdo = new DB(); - // Get the group info from MySQL. - $groupMySQL = $pdo->queryOneRow(sprintf('SELECT * FROM groups WHERE id = %d', $options[2])); + $groupMySQL = Group::find($options[2]); - if ($groupMySQL === false) { + if ($groupMySQL === null) { exit('ERROR: Group not found with id ' . $options[2] . PHP_EOL); } // Connect to NNTP. - $nntp = nntp($pdo); - $backFill = new Backfill(); + try { + $nntp = nntp(); + } catch (Exception $e) { + echo $e->getMessage(); + } + try { + $backFill = new Backfill(); + } catch (Exception $e) { + echo $e->getMessage(); + } - // Update the group for new binaries. - (new Binaries())->updateGroup($groupMySQL); + // Update the group for new binaries. + try { + (new Binaries())->updateGroup($groupMySQL); + } catch (Exception $e) { + echo $e->getMessage(); + } - // BackFill the group with 20k articles. - $backFill->backfillAllGroups($groupMySQL['name'], 20000, 'normal'); + // BackFill the group with 20k articles. + try { + $backFill->backfillAllGroups($groupMySQL['name'], 20000, 'normal'); + } catch (Exception $e) { + echo $e->getMessage(); + } - // Create releases. - processReleases(new ProcessReleases(['Settings' => $pdo]), $options[2]); - processReleases(new ProcessReleasesMultiGroup(['Settings' => $pdo]), $options[2]); + // Create releases. + try { + processReleases(new ProcessReleases(), $options[2]); + } catch (Exception $e) { + echo $e->getMessage(); + } + try { + processReleases(new ProcessReleasesMultiGroup(), $options[2]); + } catch (Exception $e) { + echo $e->getMessage(); + } - // Post process the releases. - (new ProcessAdditional(['Echo' => true, 'NNTP' => $nntp, 'Settings' => $pdo]))->start($options[2]); - (new Nfo())->processNfoFiles($nntp, $options[2], '', (int) Settings::settingValue('..lookupimdb'), (int) Settings::settingValue('..lookuptvrage')); - - } + // Post process the releases. + try { + (new ProcessAdditional(['Echo' => true, 'NNTP' => $nntp]))->start($options[2]); + } catch (\Blacklight\processing\post\ProcessAdditionalException $e) { + echo $e->getMessage(); + } catch (Exception $e) { + echo $e->getMessage(); + } + try { + (new Nfo())->processNfoFiles($nntp, $options[2], '', (int) Settings::settingValue('..lookupimdb'), (int) Settings::settingValue('..lookuptvrage')); + } catch (Exception $e) { + echo $e->getMessage(); + } + } break; // Post process additional and NFO. @@ -224,16 +333,29 @@ switch ($options[1]) { case 'pp_additional': case 'pp_nfo': if (charCheck($options[2])) { - $pdo = new DB(); // Create the connection here and pass, this is for post processing, so check for alternate. - $nntp = nntp($pdo, true); + try { + $nntp = nntp(true); + } catch (Exception $e) { + echo $e->getMessage(); + } - if ($options[1] === 'pp_nfo') { - (new Nfo())->processNfoFiles($nntp, '', $options[2], (int) Settings::settingValue('..lookupimdb'), (int) Settings::settingValue('..lookuptvrage')); - } else { - (new ProcessAdditional(['Echo' => true, 'NNTP' => $nntp, 'Settings' => $pdo]))->start('', $options[2]); - } + if ($options[1] === 'pp_nfo') { + try { + (new Nfo())->processNfoFiles($nntp, '', $options[2], (int) Settings::settingValue('..lookupimdb'), (int) Settings::settingValue('..lookuptvrage')); + } catch (Exception $e) { + echo $e->getMessage(); + } + } else { + try { + (new ProcessAdditional(['Echo' => true, 'NNTP' => $nntp]))->start('', $options[2]); + } catch (\Blacklight\processing\post\ProcessAdditionalException $e) { + echo $e->getMessage(); + } catch (Exception $e) { + echo $e->getMessage(); + } + } } break; @@ -244,9 +366,12 @@ switch ($options[1]) { */ case 'pp_movie': if (charCheck($options[2])) { - $pdo = new DB(); - (new PostProcess(['Settings' => $pdo]))->processMovies('', $options[2], $options[3] ?? ''); - } + try { + (new PostProcess())->processMovies('', $options[2], $options[3] ?? ''); + } catch (Exception $e) { + echo $e->getMessage(); + } + } break; /* Post process TV. @@ -256,9 +381,12 @@ switch ($options[1]) { */ case 'pp_tv': if (charCheck($options[2])) { - $pdo = new DB(); - (new PostProcess(['Settings' => $pdo]))->processTv('', $options[2], $options[3] ?? ''); - } + try { + (new PostProcess())->processTv('', $options[2], $options[3] ?? ''); + } catch (Exception $e) { + echo $e->getMessage(); + } + } break; } @@ -303,13 +431,12 @@ function charCheck($char) /** * Check if the group should be processed. * - * @param \Blacklight\db\DB $pdo * @param int $groupID */ -function collectionCheck(&$pdo, $groupID) +function collectionCheck($groupID) { try { - if ($pdo->queryOneRow(sprintf('SELECT id FROM collections_%d LIMIT 1', $groupID)) === false) { + if (DB::select(sprintf('SELECT id FROM collections_%d LIMIT 1', $groupID)) === 0) { exit(); } } catch (PDOException $e) { @@ -320,15 +447,14 @@ function collectionCheck(&$pdo, $groupID) /** * Connect to usenet, return NNTP object. * - * @param DB $pdo * @param bool $alternate Use alternate NNTP provider. * * @return NNTP * @throws \Exception */ -function &nntp(&$pdo, $alternate = false) +function &nntp($alternate = false) { - $nntp = new NNTP(['Settings' => $pdo]); + $nntp = new NNTP(); if (($alternate && (int)Settings::settingValue('..alternate_nntp') === 1 ? $nntp->doConnect(true, true) : $nntp->doConnect()) !== true) { exit('ERROR: Unable to connect to usenet.' . PHP_EOL); } diff --git a/misc/update/multiprocessing/backfill.php b/misc/update/multiprocessing/backfill.php index 0059753d4..a17a72024 100644 --- a/misc/update/multiprocessing/backfill.php +++ b/misc/update/multiprocessing/backfill.php @@ -5,7 +5,8 @@ require_once dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use Blacklight\libraries\Forking; // Check if argument 1 is numeric, which is to limit article count. -(new Forking())->processWorkType( - 'backfill', - (isset($argv[1]) && is_numeric($argv[1]) && $argv[1] > 0 ? [0 => $argv[1]] : [0 => false]) -); +try { + (new Forking())->processWorkType('backfill', (isset($argv[1]) && is_numeric($argv[1]) && $argv[1] > 0 ? [0 => $argv[1]] : [0 => false])); +} catch (Exception $e) { + echo $e->getMessage(); +} diff --git a/misc/update/multiprocessing/binaries.php b/misc/update/multiprocessing/binaries.php index b80d92f1f..099d56f6d 100644 --- a/misc/update/multiprocessing/binaries.php +++ b/misc/update/multiprocessing/binaries.php @@ -9,4 +9,8 @@ declare(ticks=1); require_once dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use Blacklight\libraries\Forking; -(new Forking())->processWorkType('binaries', [0 => $argv[1]]); +try { + (new Forking())->processWorkType('binaries', [0 => $argv[1]]); +} catch (Exception $e) { + echo $e->getMessage(); +} diff --git a/misc/update/multiprocessing/fixrelnames.php b/misc/update/multiprocessing/fixrelnames.php index 7205f1250..69b181b4d 100644 --- a/misc/update/multiprocessing/fixrelnames.php +++ b/misc/update/multiprocessing/fixrelnames.php @@ -14,4 +14,8 @@ use Blacklight\libraries\Forking; declare(ticks=1); -(new Forking())->processWorkType('fixRelNames_'.$argv[1], [0 => $argv[1]]); +try { + (new Forking())->processWorkType('fixRelNames_'.$argv[1], [0 => $argv[1]]); +} catch (Exception $e) { + echo $e->getMessage(); +} diff --git a/misc/update/multiprocessing/releases.php b/misc/update/multiprocessing/releases.php index 1b7541cda..ffd7cf54d 100644 --- a/misc/update/multiprocessing/releases.php +++ b/misc/update/multiprocessing/releases.php @@ -5,4 +5,8 @@ require_once dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use Blacklight\libraries\Forking; -(new Forking())->processWorkType('releases'); +try { + (new Forking())->processWorkType('releases'); +} catch (Exception $e) { + echo $e->getMessage(); +} diff --git a/misc/update/multiprocessing/requestid.php b/misc/update/multiprocessing/requestid.php index 68e22ef21..b0bea83bc 100644 --- a/misc/update/multiprocessing/requestid.php +++ b/misc/update/multiprocessing/requestid.php @@ -5,4 +5,8 @@ require_once dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use Blacklight\libraries\Forking; -(new Forking())->processWorkType('request_id'); +try { + (new Forking())->processWorkType('request_id'); +} catch (Exception $e) { + echo $e->getMessage(); +} diff --git a/misc/update/multiprocessing/safe.php b/misc/update/multiprocessing/safe.php index ed54976e1..bbe5c0dc8 100644 --- a/misc/update/multiprocessing/safe.php +++ b/misc/update/multiprocessing/safe.php @@ -13,4 +13,8 @@ require_once dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use Blacklight\libraries\Forking; -(new Forking())->processWorkType('safe_'.$argv[1]); +try { + (new Forking())->processWorkType('safe_'.$argv[1]); +} catch (Exception $e) { + echo $e->getMessage(); +} diff --git a/misc/update/multiprocessing/update_per_group.php b/misc/update/multiprocessing/update_per_group.php index 3ad3f59fc..c8204414b 100644 --- a/misc/update/multiprocessing/update_per_group.php +++ b/misc/update/multiprocessing/update_per_group.php @@ -5,4 +5,8 @@ require_once dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use Blacklight\libraries\Forking; -(new Forking())->processWorkType('update_per_group'); +try { + (new Forking())->processWorkType('update_per_group'); +} catch (Exception $e) { + echo $e->getMessage(); +} diff --git a/misc/update/postprocess.php b/misc/update/postprocess.php index 4bdb8fff3..dba9221de 100644 --- a/misc/update/postprocess.php +++ b/misc/update/postprocess.php @@ -3,11 +3,9 @@ require_once dirname(__DIR__, 2).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use Blacklight\NNTP; -use Blacklight\db\DB; use App\Models\Settings; use Blacklight\processing\PostProcess; -$pdo = new DB(); /** * Array with possible arguments for run and * whether or not those methods of operation require NNTP. @@ -36,7 +34,7 @@ $bool = [ 'false', ]; -if (! isset($argv[1]) || ! in_array($argv[1], $args, false) || ! isset($argv[2]) || ! in_array($argv[2], $bool, false)) { +if (! isset($argv[1], $argv[2]) || ! in_array($argv[1], $args, false) || ! in_array($argv[2], $bool, false)) { exit( \Blacklight\ColorCLI::error( "\nIncorrect arguments.\n" @@ -62,13 +60,14 @@ if (! isset($argv[1]) || ! in_array($argv[1], $args, false) || ! isset($argv[2]) $nntp = null; if ($args[$argv[1]] === true) { - $nntp = new NNTP(['Settings' => $pdo]); + $nntp = new NNTP(); if ((Settings::settingValue('..alternate_nntp') === 1 ? $nntp->doConnect(true, true) : $nntp->doConnect()) !== true) { - exit($pdo->log->error('Unable to connect to usenet.'.PHP_EOL)); + echo('Unable to connect to usenet.'.PHP_EOL); + exit; } } -$postProcess = new PostProcess(['Settings' => $pdo, 'Echo' => $argv[2] === 'true']); +$postProcess = new PostProcess(['Echo' => $argv[2] === 'true']); $charArray = ['a', 'b', 'c', 'd', 'e', 'f', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9']; diff --git a/misc/update/update_binaries.php b/misc/update/update_binaries.php index a57715c11..b912f8024 100644 --- a/misc/update/update_binaries.php +++ b/misc/update/update_binaries.php @@ -4,21 +4,18 @@ require_once dirname(__DIR__, 2).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use Blacklight\NNTP; use App\Models\Group; -use Blacklight\db\DB; use App\Models\Settings; use Blacklight\Binaries; use Blacklight\ColorCLI; -$pdo = new DB(); - $maxHeaders = (int) Settings::settingValue('..max_headers_iteration') ?: 1000000; // Create the connection here and pass -$nntp = new NNTP(['Settings' => $pdo]); +$nntp = new NNTP(); if ($nntp->doConnect() !== true) { exit(ColorCLI::error('Unable to connect to usenet.')); } -$binaries = new Binaries(['NNTP' => $nntp, 'Settings' => $pdo]); +$binaries = new Binaries(['NNTP' => $nntp]); if (isset($argv[1]) && ! is_numeric($argv[1])) { $groupName = $argv[1];