diff --git a/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/switch.php b/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/switch.php index 0883c4639..c5c8c32f0 100644 --- a/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/switch.php +++ b/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/switch.php @@ -7,7 +7,7 @@ if (!isset($argv[1])) { require_once dirname(__FILE__) . '/../../../../../www/config.php'; use \newznab\db\Settings; -use \newznab\processing\PProcess; +use \newznab\processing\PostProcess; use \newznab\processing\ProcessReleases; use \newznab\processing\post\ProcessAdditional; @@ -249,7 +249,7 @@ switch ($options[1]) { case 'pp_movie': if (charCheck($options[2])) { $pdo = new Settings(); - (new PProcess(['Settings' => $pdo]))->processMovies('', $options[2], (isset($options[3]) ? $options[3] : '')); + (new PostProcess(['Settings' => $pdo]))->processMovies('', $options[2], (isset($options[3]) ? $options[3] : '')); } break; @@ -261,7 +261,7 @@ switch ($options[1]) { case 'pp_tv': if (charCheck($options[2])) { $pdo = new Settings(); - (new PProcess(['Settings' => $pdo]))->processTv('', $options[2], (isset($options[3]) ? $options[3] : '')); + (new PostProcess(['Settings' => $pdo]))->processTv('', $options[2], (isset($options[3]) ? $options[3] : '')); } break; } diff --git a/misc/update_scripts/nix_scripts/tmux/bin/fixreleasenames.php b/misc/update_scripts/nix_scripts/tmux/bin/fixreleasenames.php index 176e970c1..b6ce262ea 100644 --- a/misc/update_scripts/nix_scripts/tmux/bin/fixreleasenames.php +++ b/misc/update_scripts/nix_scripts/tmux/bin/fixreleasenames.php @@ -3,7 +3,7 @@ require_once(dirname(__FILE__) . "/config.php"); use newznab\db\Settings; -use newznab\processing\PProcess; +use newznab\processing\PostProcess; $c = new ColorCLI(); if (!isset($argv[1])) { @@ -62,7 +62,7 @@ if (!isset($argv[1])) { $relID = $pieces[1]; $guid = $pieces[2]; $groupID = $pieces[3]; - $nzbcontents = new NZBContents(array('echo' => true, 'nntp' => $nntp, 'nfo' => new Nfo(), 'db' => $db, 'pp' => new PProcess(['Settings' => $pdo, 'Nfo' => $Nfo, 'NameFixer' => $namefixer]))); + $nzbcontents = new NZBContents(array('echo' => true, 'nntp' => $nntp, 'nfo' => new Nfo(), 'db' => $db, 'pp' => new PostProcess(['Settings' => $pdo, 'Nfo' => $Nfo, 'NameFixer' => $namefixer]))); $res = $nzbcontents->checkPAR2($guid, $relID, $groupID, 1, 1); if ($res === false) { echo '.'; diff --git a/misc/update_scripts/nix_scripts/tmux/bin/groupfixrelnames.php b/misc/update_scripts/nix_scripts/tmux/bin/groupfixrelnames.php index c7018f4d1..ea29720d7 100644 --- a/misc/update_scripts/nix_scripts/tmux/bin/groupfixrelnames.php +++ b/misc/update_scripts/nix_scripts/tmux/bin/groupfixrelnames.php @@ -2,7 +2,7 @@ require_once(dirname(__FILE__) . "/config.php"); use newznab\db\Settings; -use newznab\processing\PProcess; +use newznab\processing\PostProcess; $pdo = new Settings(); @@ -136,7 +136,7 @@ if (!isset($argv[1])) { $nzbcontents = new NZBContents( array( 'Echo' => true, 'NNTP' => $nntp, 'Nfo' => $Nfo, 'Settings' => $pdo, - 'PostProcess' => new PProcess(['Settings' => $pdo, 'Nfo' => $Nfo, 'NameFixer' => $namefixer]) + 'PostProcess' => new PostProcess(['Settings' => $pdo, 'Nfo' => $Nfo, 'NameFixer' => $namefixer]) ) ); foreach ($releases as $release) { diff --git a/misc/update_scripts/nix_scripts/tmux/bin/postprocess.php b/misc/update_scripts/nix_scripts/tmux/bin/postprocess.php index 16cef7bca..7e28f6193 100644 --- a/misc/update_scripts/nix_scripts/tmux/bin/postprocess.php +++ b/misc/update_scripts/nix_scripts/tmux/bin/postprocess.php @@ -3,7 +3,7 @@ require_once(dirname(__FILE__) . '/config.php'); use newznab\db\Settings; -use newznab\processing\PProcess; +use newznab\processing\PostProcess; $pdo = new Settings(); /** @@ -70,7 +70,7 @@ if ($args[$argv[1]] === true) { } } -$postProcess = new PProcess(['Settings' => $pdo, 'Echo' => ($argv[2] === 'true' ? true : false)]); +$postProcess = new PostProcess(['Settings' => $pdo, 'Echo' => ($argv[2] === 'true' ? true : false)]); $charArray = ['a','b','c','d','e','f','0','1','2','3','4','5','6','7','8','9']; diff --git a/misc/update_scripts/nix_scripts/tmux/bin/postprocess_threaded.php b/misc/update_scripts/nix_scripts/tmux/bin/postprocess_threaded.php index 5846f07c2..3d1f4a615 100644 --- a/misc/update_scripts/nix_scripts/tmux/bin/postprocess_threaded.php +++ b/misc/update_scripts/nix_scripts/tmux/bin/postprocess_threaded.php @@ -1,7 +1,7 @@ get()->post; $pieces = explode(' =+= ', $argv[1]); -$postprocess = new PProcess(['Echo' => true]); +$postprocess = new PostProcess(['Echo' => true]); if (isset($pieces[6])) { // Create the connection here and pass $nntp = new NNTP(); diff --git a/newznab/controllers/NZBContents.php b/newznab/controllers/NZBContents.php index 657b4851b..0f19d4f21 100644 --- a/newznab/controllers/NZBContents.php +++ b/newznab/controllers/NZBContents.php @@ -1,7 +1,7 @@ Nfo ; Class Nfo. * 'NZB' => NZB ; Class NZB. * 'Settings' => DB ; Class newznab\db\Settings. - * 'PostProcess' => PProcess ; Class PProcess. + * 'PostProcess' => PostProcess ; Class PostProcess. * ) * * @access public @@ -91,9 +91,9 @@ Class NZBContents $this->nntp = ($options['NNTP'] instanceof \NNTP ? $options['NNTP'] : new \NNTP(['Echo' => $this->echooutput, 'Settings' => $this->pdo])); $this->nfo = ($options['Nfo'] instanceof \Nfo ? $options['Nfo'] : new \Nfo(['Echo' => $this->echooutput, 'Settings' => $this->pdo])); $this->pp = ( - $options['PostProcess'] instanceof PProcess + $options['PostProcess'] instanceof PostProcess ? $options['PostProcess'] - : new PProcess(['Echo' => $this->echooutput, 'Nfo' => $this->nfo, 'Settings' => $this->pdo]) + : new PostProcess(['Echo' => $this->echooutput, 'Nfo' => $this->nfo, 'Settings' => $this->pdo]) ); $this->nzb = ($options['NZB'] instanceof \NZB ? $options['NZB'] : new \NZB($this->pdo)); $t = new Tmux(); diff --git a/newznab/controllers/NameFixer.php b/newznab/controllers/NameFixer.php index c1d6e20d1..b89e6bf41 100644 --- a/newznab/controllers/NameFixer.php +++ b/newznab/controllers/NameFixer.php @@ -1,7 +1,7 @@ $nntp, 'Nfo' => $Nfo, 'Settings' => $this->pdo, - 'PostProcess' => new PProcess(['Settings' => $this->pdo, 'Nfo' => $Nfo]) + 'PostProcess' => new PostProcess(['Settings' => $this->pdo, 'Nfo' => $Nfo]) ] ); diff --git a/newznab/controllers/Nfo.php b/newznab/controllers/Nfo.php index c3112b8d9..2f2121676 100644 --- a/newznab/controllers/Nfo.php +++ b/newznab/controllers/Nfo.php @@ -1,6 +1,6 @@ $nntp, 'Nfo' => $this, 'Settings' => $this->pdo, - 'PostProcess' => new PProcess(['Echo' => $this->echo, 'Settings' => $this->pdo, 'Nfo' => $this]) + 'PostProcess' => new PostProcess(['Echo' => $this->echo, 'Settings' => $this->pdo, 'Nfo' => $this]) ] ); $nzbContents->parseNZB($release['guid'], $release['id'], $release['groupid']); @@ -335,7 +335,7 @@ class Nfo 'NNTP' => $nntp, 'Nfo' => $this, 'Settings' => $this->pdo, - 'PostProcess' => new PProcess(['Echo' => $this->echo, 'Nfo' => $this, 'Settings' => $this->pdo]) + 'PostProcess' => new PostProcess(['Echo' => $this->echo, 'Nfo' => $this, 'Settings' => $this->pdo]) ] ); $movie = new Movie(['Echo' => $this->echo, 'Settings' => $this->pdo]); diff --git a/newznab/libraries/Forking.php b/newznab/libraries/Forking.php index b5f62bc23..e13209a1a 100644 --- a/newznab/libraries/Forking.php +++ b/newznab/libraries/Forking.php @@ -2,7 +2,7 @@ namespace newznab\libraries; use \newznab\db\Settings; -use \newznab\processing\PProcess; +use \newznab\processing\PostProcess; require_once(NN_LIBS . 'forkdaemon-php' . DS . 'fork_daemon.php'); @@ -863,7 +863,7 @@ class Forking extends \fork_daemon if ($sharing !== false && $sharing['enabled'] == 1) { $nntp = new \NNTP(['Settings' => $this->pdo]); if (($this->pdo->getSetting('alternate_nntp') == 1 ? $nntp->doConnect(true, true) : $nntp->doConnect()) === true) { - (new PProcess(['Settings' => $this->pdo, 'ColorCLI' => $this->_colorCLI]))->processSharing($nntp); + (new PostProcess(['Settings' => $this->pdo, 'ColorCLI' => $this->_colorCLI]))->processSharing($nntp); } return true; } @@ -875,7 +875,7 @@ class Forking extends \fork_daemon */ private function processSingle() { - $postProcess = new PProcess(['Settings' => $this->pdo, 'ColorCLI' => $this->_colorCLI]); + $postProcess = new PostProcess(['Settings' => $this->pdo, 'ColorCLI' => $this->_colorCLI]); //$postProcess->processAnime(); $postProcess->processBooks(); $postProcess->processConsoles(); diff --git a/newznab/processing/PProcess.php b/newznab/processing/PostProcess.php similarity index 99% rename from newznab/processing/PProcess.php rename to newznab/processing/PostProcess.php index 9818d2937..0ed505e2b 100644 --- a/newznab/processing/PProcess.php +++ b/newznab/processing/PostProcess.php @@ -7,7 +7,7 @@ use \newznab\processing\post\ProcessAdditional; require_once NN_LIBS . 'rarinfo/par2info.php'; -class PProcess +class PostProcess { /** * @var \newznab\db\Settings diff --git a/newznab/processing/ProcessReleases.php b/newznab/processing/ProcessReleases.php index 3eda30bee..f8eea1f7a 100644 --- a/newznab/processing/ProcessReleases.php +++ b/newznab/processing/ProcessReleases.php @@ -828,7 +828,7 @@ class ProcessReleases public function postProcessReleases($postProcess, &$nntp) { if ($postProcess == 1) { - (new PProcess(['Echo' => $this->echoCLI, 'Settings' => $this->pdo, 'Groups' => $this->groups]))->processAll($nntp); + (new PostProcess(['Echo' => $this->echoCLI, 'Settings' => $this->pdo, 'Groups' => $this->groups]))->processAll($nntp); } else { if ($this->echoCLI) { $this->pdo->log->doEcho(