Rename Info class into Nfo class.

This commit is contained in:
DariusIII
2015-09-01 22:37:25 +02:00
parent 4fe6f7ab18
commit e95455a7fb
10 changed files with 11 additions and 11 deletions
@@ -218,7 +218,7 @@ switch ($options[1]) {
// Post process the releases.
(new ProcessAdditional(['Echo' => true, 'NNTP' => $nntp, 'Settings' => $pdo]))->start($options[2]);
(new \Info(['Echo' => true, 'Settings' => $pdo]))->processNfoFiles($nntp, $options[2]);
(new \Nfo(['Echo' => true, 'Settings' => $pdo]))->processNfoFiles($nntp, $options[2]);
}
break;
@@ -234,7 +234,7 @@ switch ($options[1]) {
$nntp = nntp($pdo, true);
if ($options[1] === 'pp_nfo') {
(new \Info(['Echo' => true, 'Settings' => $pdo]))->processNfoFiles($nntp, '', $options[2]);
(new \Nfo(['Echo' => true, 'Settings' => $pdo]))->processNfoFiles($nntp, '', $options[2]);
} else {
(new ProcessAdditional(['Echo' => true, 'NNTP' => $nntp, 'Settings' => $pdo]))->start('', $options[2]);
}
@@ -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 Info(), '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 PProcess(['Settings' => $pdo, 'Nfo' => $Nfo, 'NameFixer' => $namefixer])));
$res = $nzbcontents->checkPAR2($guid, $relID, $groupID, 1, 1);
if ($res === false) {
echo '.';
@@ -132,7 +132,7 @@ if (!isset($argv[1])) {
exit($pdo->log->error("Unable to connect to usenet."));
}
$Nfo = new Info(['Settings' => $pdo, 'Echo' => true]);
$Nfo = new Nfo(['Settings' => $pdo, 'Echo' => true]);
$nzbcontents = new NZBContents(
array(
'Echo' => true, 'NNTP' => $nntp, 'Nfo' => $Nfo, 'Settings' => $pdo,
+1 -1
View File
@@ -89,7 +89,7 @@ Class NZBContents
$this->echooutput = ($options['Echo'] && NN_ECHOCLI);
$this->pdo = ($options['Settings'] instanceof Settings ? $options['Settings'] : new Settings());
$this->nntp = ($options['NNTP'] instanceof \NNTP ? $options['NNTP'] : new \NNTP(['Echo' => $this->echooutput, 'Settings' => $this->pdo]));
$this->nfo = ($options['Nfo'] instanceof \Info ? $options['Nfo'] : new \Info(['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']
+1 -1
View File
@@ -342,7 +342,7 @@ class NameFixer
$this->_totalReleases = $total;
echo $this->pdo->log->primary(number_format($total) . ' releases to process.');
$Nfo = new Info(['Echo' => $this->echooutput, 'Settings' => $this->pdo]);
$Nfo = new Nfo(['Echo' => $this->echooutput, 'Settings' => $this->pdo]);
$nzbContents = new NZBContents(
[
'Echo' => $this->echooutput,
@@ -11,7 +11,7 @@ require_once NN_LIBS . 'rarinfo/sfvinfo.php';
* Class Nfo
* Class for handling fetching/storing of NFO files.
*/
class Info
class Nfo
{
/**
* Instance of class DB
+1 -1
View File
@@ -162,7 +162,7 @@ class PostProcess
if ($this->pdo->getSetting('lookupnfo') == 1)
{
$nfo = new Nfo($this->echooutput);
$nfo->processNfoFiles(500);
$nfo->processNfoFiles();
}
}
+1 -1
View File
@@ -708,7 +708,7 @@ class Forking extends \fork_daemon
private function checkProcessNfo()
{
if ($this->pdo->getSetting('lookupnfo') == 1) {
$this->nfoQueryString = \Info::NfoQueryString($this->pdo);
$this->nfoQueryString = \Nfo::NfoQueryString($this->pdo);
return (
$this->pdo->queryOneRow(
sprintf(
+1 -1
View File
@@ -94,7 +94,7 @@ class PProcess
$this->_par2Info = new \Par2Info();
$this->debugging = ($options['Logger'] instanceof \Logger ? $options['Logger'] : new \Logger(['ColorCLI' => $this->pdo->log]));
$this->nameFixer = (($options['NameFixer'] instanceof \NameFixer) ? $options['NameFixer'] : new \NameFixer(['Echo' => $this->echooutput, 'Settings' => $this->pdo, 'Groups' => $this->groups]));
$this->Nfo = (($options['Nfo'] instanceof \Info ) ? $options['Nfo'] : new \Info(['Echo' => $this->echooutput, 'Settings' => $this->pdo]));
$this->Nfo = (($options['Nfo'] instanceof \Nfo ) ? $options['Nfo'] : new \Nfo(['Echo' => $this->echooutput, 'Settings' => $this->pdo]));
$this->releaseFiles = (($options['ReleaseFiles'] instanceof \ReleaseFiles) ? $options['ReleaseFiles'] : new \ReleaseFiles($this->pdo));
//\\
@@ -296,7 +296,7 @@ class ProcessAdditional
$this->_releaseExtra = ($options['ReleaseExtra'] instanceof \ReleaseExtra ? $options['ReleaseExtra'] : new \ReleaseExtra($this->pdo));
$this->_releaseImage = ($options['ReleaseImage'] instanceof \ReleaseImage ? $options['ReleaseImage'] : new \ReleaseImage($this->pdo));
$this->_par2Info = new \Par2Info();
$this->_nfo = ($options['Nfo'] instanceof \Info ? $options['Nfo'] : new \Info(['Echo' => $this->_echoCLI, 'Settings' => $this->pdo]));
$this->_nfo = ($options['Nfo'] instanceof \Nfo ? $options['Nfo'] : new \Nfo(['Echo' => $this->_echoCLI, 'Settings' => $this->pdo]));
$this->sphinx = ($options['SphinxSearch'] instanceof \SphinxSearch ? $options['SphinxSearch'] : new \SphinxSearch());
$s = new \Sites();
$this->site = $s->get();