malhuda/jikan-rest
1
0
Fork 0
mirror of https://github.com/jikan-me/jikan-rest.git synced 2025-02-20 11:23:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed some issues with IncrementalIndexer

Browse Source
This commit is contained in:
pushrbx 2024-11-08 19:30:00 +00:00 committed by GitHub
parent cc5c12ff39
commit a87b4617d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Console/Commands/Indexer/IncrementalIndexer.php
View File

@ -103,7 +103,9 @@ class IncrementalIndexer extends Command
$this->info("Resuming from index: $index"); $this->info("Resuming from index: $index");
} }
if ($index > 0 && !isset($this->ids[$index])) $ids = array_merge($idsToFetch['sfw'], $idsToFetch['nsfw']);
if ($index > 0 && !isset($ids[$index]))
{ {
$index = 0; $index = 0;
$this->warn('Invalid index; set back to 0'); $this->warn('Invalid index; set back to 0');
@ -112,7 +114,6 @@ class IncrementalIndexer extends Command
Storage::put("indexer/incremental/{$mediaType}_resume.save", 0); Storage::put("indexer/incremental/{$mediaType}_resume.save", 0);
$this->info("$idCount $mediaType entries available"); $this->info("$idCount $mediaType entries available");
$ids = array_merge($idsToFetch['sfw'], $idsToFetch['nsfw']);
for ($i = $index; $i <= ($idCount - 1); $i++) for ($i = $index; $i <= ($idCount - 1); $i++)
{ {
@ -184,7 +185,7 @@ class IncrementalIndexer extends Command
} }
// we want to handle signals from the OS // we want to handle signals from the OS
$this->trap(SIGTERM, fn () => $this->cancelled = true); $this->trap([SIGTERM, SIGQUIT, SIGINT], fn () => $this->cancelled = true);
$resume = $this->option('resume') ?? false; $resume = $this->option('resume') ?? false;
$onlyFailed = $this->option('failed') ?? false; $onlyFailed = $this->option('failed') ?? false;
@ -208,13 +209,14 @@ class IncrementalIndexer extends Command
$idsToFetch = $this->getIdsToFetch($mediaType); $idsToFetch = $this->getIdsToFetch($mediaType);
} }
$idCount = count($idsToFetch); if ($this->cancelled)
if ($idCount == 0) {
return 127;
}
$idCount = count($idsToFetch);
if ($idCount === 0)
{ {
if ($this->cancelled)
{
return 127;
}
continue; continue;
} }