starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix PP reset command

Browse Source
This commit is contained in:
DariusIII
2025-08-15 15:01:46 +02:00
parent 97a9e32b76
commit cf5831d156
3 changed files with 145 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Blacklight/processing/PostProcess.php
+1 -1
View File
@@ -97,7 +97,7 @@ class PostProcess
*/
public function processAll($nntp): void
{
$this->processAdditional($nntp);
$this->processAdditional();
$this->processNfos($nntp);
$this->processMovies();
$this->processMusic();
app/Console/Commands/NntmuxResetPostProcessing.php
+114 -52
View File
@@ -27,7 +27,7 @@ class NntmuxResetPostProcessing extends Command
*
* @var string
*/
protected $signature = 'nntmux:resetpp {--c|category=* : Reset all, multiple or single category}';
protected $signature = 'nntmux:resetpp {--c|category=* : Reset all, multiple or single category (music, console, movie, game, tv, adult, book, misc). Supports comma-separated and repeated options}';
/**
* The console command description.
@@ -51,9 +51,9 @@ class NntmuxResetPostProcessing extends Command
*/
public function handle(): void
{
if (empty($this->option('category'))) {
$raw = (array) $this->option('category');
if (empty($raw)) {
$qry = Release::query()->select(['id'])->get();
$affected = 0;
$total = \count($qry);
if ($total > 0) {
$bar = $this->output->createProgressBar($total);
@@ -88,50 +88,119 @@ class NntmuxResetPostProcessing extends Command
$this->info('No releases to reset');
}
} else {
foreach ($this->option('category') as $option) {
$adjusted = str_replace('=', '', $option);
if (\in_array($adjusted, self::$allowedCategories, false)) {
$this->info('Resetting postprocessing for '.$adjusted.' category');
switch ($adjusted) {
case 'console':
$this->resetConsole();
break;
case 'movie':
$this->resetMovies();
break;
case 'game':
$this->resetGames();
break;
case 'book':
$this->resetBooks();
break;
case 'music':
$this->resetMusic();
break;
case 'adult':
$this->resetAdult();
break;
case 'tv':
$this->resetTv();
break;
case 'misc':
$this->resetMisc();
break;
}
$normalized = $this->normalizeCategories($raw);
// Validate
$invalid = $this->invalidCategories($normalized);
if (! empty($invalid)) {
$this->error('Unknown category option(s): '.implode(', ', $invalid));
$this->line('Allowed: '.implode(', ', self::$allowedCategories).' (or omit --category to reset all).');
return;
}
// If user explicitly passed 'all', treat as full reset
if (in_array('all', $normalized, true) || empty($normalized)) {
$this->call('nntmux:resetpp'); // fall back to full reset
return;
}
foreach ($normalized as $adjusted) {
// skip 'all' since handled above
if ($adjusted === 'all') {
continue;
}
$this->info('Resetting postprocessing for '.$adjusted.' category');
switch ($adjusted) {
case 'console':
$this->resetConsole();
break;
case 'movie':
$this->resetMovies();
break;
case 'game':
$this->resetGames();
break;
case 'book':
$this->resetBooks();
break;
case 'music':
$this->resetMusic();
break;
case 'adult':
$this->resetAdult();
break;
case 'tv':
$this->resetTv();
break;
case 'misc':
$this->resetMisc();
break;
}
}
}
}
/**
* Normalize raw category options into a unique, lowercased list.
* Handles comma-separated values, repeated options, casing, simple plurals,
* and values provided as key=value (e.g. category=tv or the single-dash typo -category=tv).
*/
private function normalizeCategories(array $raw): array
{
$normalized = collect($raw)
->flatMap(function ($opt) {
$opt = is_array($opt) ? implode(',', $opt) : (string) $opt;
return preg_split('/[\s,]+/', $opt, -1, PREG_SPLIT_NO_EMPTY);
})
->map(function ($opt) {
$opt = trim((string) $opt);
// If the token contains '=', take the substring after the last '='
if (str_contains($opt, '=')) {
$parts = explode('=', $opt);
$opt = end($parts);
}
$opt = strtolower(trim($opt));
// normalize common plurals
$singular = rtrim($opt, 's');
if (in_array($singular, self::$allowedCategories, true)) {
return $singular;
}
return $opt;
})
->filter()
->unique()
->values()
->all();
return $normalized;
}
/**
* Return invalid categories from a normalized list.
* Keeps 'all' as a special allowed token.
*/
private function invalidCategories(array $normalized): array
{
return collect($normalized)
->reject(function ($opt) {
return in_array($opt, self::$allowedCategories, true) || $opt === 'all';
})
->values()
->all();
}
private function resetConsole(): void
{
$qry = Release::query()->whereNotNull('consoleinfo_id')->whereBetween('categories_id', [Category::GAME_ROOT, Category::GAME_OTHER])->get();
$total = $qry->count();
$bar = $this->output->createProgressBar($total);
$bar->setOverwrite(true); // Terminal needs to support ANSI Encoding for this?
$bar->start();
if ($total > 0) {
$conCount = 0;
$bar = $this->output->createProgressBar($total);
$bar->setOverwrite(true); // Terminal needs to support ANSI Encoding for this?
$bar->start();
foreach ($qry as $releases) {
Release::query()->where('id', $releases->id)->update(
[
@@ -141,7 +210,7 @@ class NntmuxResetPostProcessing extends Command
}
$bar->finish();
$this->newLine();
$this->info(number_format($conCount).' consoleinfo_id\'s reset.');
$this->info(number_format($total).' consoleinfo_id\'s reset.');
} else {
$this->info('No releases to reset');
}
@@ -155,7 +224,6 @@ class NntmuxResetPostProcessing extends Command
$bar = $this->output->createProgressBar($total);
$bar->setOverwrite(true); // Terminal needs to support ANSI Encoding for this?
$bar->start();
$conCount = 0;
foreach ($qry as $releases) {
Release::query()->where('id', $releases->id)->update(
[
@@ -166,7 +234,7 @@ class NntmuxResetPostProcessing extends Command
}
$bar->finish();
$this->newLine();
$this->info(number_format($conCount).' movieinfo_id\'s reset.');
$this->info(number_format($total).' movieinfo_id\'s reset.');
} else {
$this->info('No releases to reset');
}
@@ -180,7 +248,6 @@ class NntmuxResetPostProcessing extends Command
$bar = $this->output->createProgressBar($total);
$bar->setOverwrite(true); // Terminal needs to support ANSI Encoding for this?
$bar->start();
$conCount = 0;
foreach ($qry as $releases) {
Release::query()->where('id', $releases->id)->update(
[
@@ -190,7 +257,7 @@ class NntmuxResetPostProcessing extends Command
}
$bar->finish();
$this->newLine();
$this->info(number_format($conCount).' gamesinfo_id\'s reset.');
$this->info(number_format($total).' gamesinfo_id\'s reset.');
} else {
$this->info('No releases to reset');
}
@@ -204,7 +271,6 @@ class NntmuxResetPostProcessing extends Command
$bar = $this->output->createProgressBar($total);
$bar->setOverwrite(true); // Terminal needs to support ANSI Encoding for this?
$bar->start();
$conCount = 0;
foreach ($qry as $releases) {
Release::query()->where('id', $releases->id)->update(
[
@@ -214,7 +280,7 @@ class NntmuxResetPostProcessing extends Command
}
$bar->finish();
$this->newLine();
$this->info(number_format($conCount).' bookinfo_id\'s reset.');
$this->info(number_format($total).' bookinfo_id\'s reset.');
} else {
$this->info('No releases to reset');
}
@@ -228,7 +294,6 @@ class NntmuxResetPostProcessing extends Command
$bar = $this->output->createProgressBar($total);
$bar->setOverwrite(true); // Terminal needs to support ANSI Encoding for this?
$bar->start();
$conCount = 0;
foreach ($qry as $releases) {
Release::query()->where('id', $releases->id)->update(
[
@@ -238,7 +303,7 @@ class NntmuxResetPostProcessing extends Command
}
$bar->finish();
$this->newLine();
$this->info(number_format($conCount).' musicinfo_id\'s reset.');
$this->info(number_format($total).' musicinfo_id\'s reset.');
} else {
$this->info('No releases to reset');
}
@@ -252,7 +317,6 @@ class NntmuxResetPostProcessing extends Command
$bar = $this->output->createProgressBar($total);
$bar->setOverwrite(true); // Terminal needs to support ANSI Encoding for this?
$bar->start();
$conCount = 0;
foreach ($qry as $releases) {
Release::query()->where('id', $releases->id)->update(
[
@@ -262,7 +326,7 @@ class NntmuxResetPostProcessing extends Command
}
$bar->finish();
$this->newLine();
$this->info(number_format($conCount).' xxxinfo_id\'s reset.');
$this->info(number_format($total).' xxxinfo_id\'s reset.');
} else {
$this->info('No releases to reset');
}
@@ -276,7 +340,6 @@ class NntmuxResetPostProcessing extends Command
$bar = $this->output->createProgressBar($total);
$bar->setOverwrite(true); // Terminal needs to support ANSI Encoding for this?
$bar->start();
$conCount = 0;
foreach ($qry as $releases) {
Release::query()->where('id', $releases->id)->update(
[
@@ -287,7 +350,7 @@ class NntmuxResetPostProcessing extends Command
}
$bar->finish();
$this->newLine();
$this->info(number_format($conCount).' video_id\'s reset.');
$this->info(number_format($total).' video_id\'s reset.');
} else {
$this->info('No releases to reset');
}
@@ -301,7 +364,6 @@ class NntmuxResetPostProcessing extends Command
$bar = $this->output->createProgressBar($total);
$bar->setOverwrite(true); // Terminal needs to support ANSI Encoding for this?
$bar->start();
$conCount = 0;
foreach ($qry as $releases) {
Release::query()->where('id', $releases->id)->update(
[
@@ -316,7 +378,7 @@ class NntmuxResetPostProcessing extends Command
}
$bar->finish();
$this->newLine();
$this->info(number_format($conCount).' misc releases reset.');
$this->info(number_format($total).' misc releases reset.');
} else {
$this->info('No releases to reset');
}
misc/update/postprocess.php
+30 -29
View File
@@ -10,7 +10,7 @@ use Blacklight\processing\PostProcess;
* whether or not those methods of operation require NNTP.
**/
$args = [
'additional' => true,
'additional' => false,
'all' => true,
'allinf' => true,
'amazon' => false,
@@ -33,28 +33,27 @@ $bool = [
'false',
];
if (! isset($argv[1], $argv[2]) || ! in_array($argv[1], $args, false) || ! in_array($argv[2], $bool, false)) {
exit(
(new Blacklight\ColorCLI)->error(
"\nIncorrect arguments.\n"
."The second argument (true/false) determines wether to echo or not.\n\n"
."php postprocess.php all true ...: Does all the types of post processing.\n"
."php postprocess.php pre true ...: Processes all Predb sites.\n"
."php postprocess.php nfo true ...: Processes NFO files.\n"
."php postprocess.php movies true ...: Processes movies.\n"
."php postprocess.php music true ...: Processes music.\n"
."php postprocess.php console true ...: Processes console games.\n"
."php postprocess.php games true ...: Processes games.\n"
."php postprocess.php book true ...: Processes books.\n"
."php postprocess.php anime true ...: Processes anime.\n"
."php postprocess.php tv true ...: Processes tv.\n"
."php postprocess.php xxx true ...: Processes xxx.\n"
."php postprocess.php additional true ...: Processes previews/mediainfo/etc...\n"
."php postprocess.php sharing true ...: Processes uploading/downloading comments.\n"
."php postprocess.php allinf true ...: Does all the types of post processing on a loop, sleeping 15 seconds between.\n"
."php postprocess.php amazon true ...: Does all the amazon (books/console/games/music/xxx).\n"
)
if (! isset($argv[1], $argv[2]) || ! array_key_exists($argv[1], $args) || ! in_array($argv[2], $bool, false)) {
(new Blacklight\ColorCLI)->error(
"\nIncorrect arguments.\n"
."The second argument (true/false) determines wether to echo or not.\n\n"
."php postprocess.php all true ...: Does all the types of post processing.\n"
."php postprocess.php pre true ...: Processes all Predb sites.\n"
."php postprocess.php nfo true ...: Processes NFO files.\n"
."php postprocess.php movies true ...: Processes movies.\n"
."php postprocess.php music true ...: Processes music.\n"
."php postprocess.php console true ...: Processes console games.\n"
."php postprocess.php games true ...: Processes games.\n"
."php postprocess.php book true ...: Processes books.\n"
."php postprocess.php anime true ...: Processes anime.\n"
."php postprocess.php tv true ...: Processes tv.\n"
."php postprocess.php xxx true ...: Processes xxx.\n"
."php postprocess.php additional true ...: Processes previews/mediainfo/etc...\n"
."php postprocess.php sharing true ...: Processes uploading/downloading comments.\n"
."php postprocess.php allinf true ...: Does all the types of post processing on a loop, sleeping 15 seconds between.\n"
."php postprocess.php amazon true ...: Does all the amazon (books/console/games/music/xxx).\n"
);
exit(1);
}
$nntp = null;
@@ -63,11 +62,11 @@ if ($args[$argv[1]] === true) {
$compressedHeaders = config('nntmux_nntp.compressed_headers');
if ((config('nntmux_nntp.use_alternate_nntp_server') === true ? $nntp->doConnect($compressedHeaders, true) : $nntp->doConnect()) !== true) {
echo 'Unable to connect to usenet.'.PHP_EOL;
exit;
exit(1);
}
}
$postProcess = new PostProcess(['Echo' => $argv[2] === 'true']);
$postProcess = new PostProcess;
$charArray = ['a', 'b', 'c', 'd', 'e', 'f', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
@@ -76,14 +75,12 @@ switch ($argv[1]) {
$postProcess->processAll($nntp);
break;
case 'allinf':
$i = 1;
while ($i = 1) {
while (true) {
$postProcess->processAll($nntp);
sleep(15);
}
break;
case 'additional':
$postProcess->processAdditional($nntp, '', (isset($argv[3]) && in_array($argv[3], $charArray, false) ? $argv[3] : ''));
$postProcess->processAdditional('', (isset($argv[3]) && in_array($argv[3], $charArray, false) ? $argv[3] : ''));
break;
case 'amazon':
$postProcess->processBooks();
@@ -116,7 +113,11 @@ switch ($argv[1]) {
case 'pre':
break;
case 'sharing':
$postProcess->processSharing($nntp);
if (method_exists($postProcess, 'processSharing')) {
$postProcess->processSharing($nntp);
} else {
echo "'sharing' operation is not available in this build.".PHP_EOL;
}
break;
case 'tv':
$postProcess->processTv('', (isset($argv[3]) && in_array($argv[3], $charArray, false) ? $argv[3] : ''));