fix: refactors tv season monitor
This commit is contained in:
@@ -39,6 +39,12 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
|
|||||||
$downloadedEpisodes = $this->mediaFiles
|
$downloadedEpisodes = $this->mediaFiles
|
||||||
->getEpisodes($monitor->getTitle())
|
->getEpisodes($monitor->getTitle())
|
||||||
->map(fn($episode) => (object) (new PTN())->parse($episode))
|
->map(fn($episode) => (object) (new PTN())->parse($episode))
|
||||||
|
->filter(fn ($episode) =>
|
||||||
|
property_exists($episode, 'episode')
|
||||||
|
&& property_exists($episode, 'season')
|
||||||
|
&& null !== $episode->episode
|
||||||
|
&& null !== $episode->season
|
||||||
|
)
|
||||||
->rekey(fn($episode) => $episode->episode);
|
->rekey(fn($episode) => $episode->episode);
|
||||||
$this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
|
$this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
|
||||||
|
|
||||||
@@ -55,20 +61,22 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
|
|||||||
|
|
||||||
// Dispatch Episode commands for each missing Episode
|
// Dispatch Episode commands for each missing Episode
|
||||||
foreach ($episodesInSeason as $episode) {
|
foreach ($episodesInSeason as $episode) {
|
||||||
$monitorCheck = $this->monitorRepository->findOneBy([
|
// Check if the episode is already downloaded
|
||||||
'imdbId' => $monitor->getImdbId(),
|
$episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
|
||||||
'title' => $monitor->getTitle(),
|
$this->logger->info('> [MonitorTvSeasonHandler] Episode exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeExists ? 'YES' : 'NO'));
|
||||||
'monitorType' => 'tvepisode',
|
if (true === $episodeExists) {
|
||||||
'season' => $monitor->getSeason(),
|
$this->logger->info('> [MonitorTvSeasonHandler] Episode exists for title: ' . $monitor->getTitle() . ', skipping');
|
||||||
'episode' => $episode['episode_number'],
|
continue;
|
||||||
'status' => ['New', 'Active', 'In Progress']
|
}
|
||||||
]);
|
|
||||||
|
|
||||||
$this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for season ' . $monitor->getSeason() . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (null !== $monitorCheck ? 'YES' : 'NO'));
|
// Check for existing monitors
|
||||||
|
$monitorExists = $this->monitorExists($monitor, $episode);
|
||||||
|
$this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $monitorExists ? 'YES' : 'NO'));
|
||||||
|
if (true === $monitorExists) {
|
||||||
|
$this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for title: ' . $monitor->getTitle() . ', skipping');
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (!array_key_exists($episode['episode_number'], $downloadedEpisodes->toArray())
|
|
||||||
&& null === $monitorCheck
|
|
||||||
) {
|
|
||||||
$episodeMonitor = (new Monitor())
|
$episodeMonitor = (new Monitor())
|
||||||
->setParent($monitor)
|
->setParent($monitor)
|
||||||
->setUser($monitor->getUser())
|
->setUser($monitor->getUser())
|
||||||
@@ -89,7 +97,6 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
|
|||||||
$this->monitorTvEpisodeHandler->handle($command);
|
$this->monitorTvEpisodeHandler->handle($command);
|
||||||
$this->logger->info('> [MonitorTvSeasonHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
|
$this->logger->info('> [MonitorTvSeasonHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
|
||||||
}
|
}
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
$monitor->setStatus('Complete');
|
$monitor->setStatus('Complete');
|
||||||
}
|
}
|
||||||
@@ -106,4 +113,24 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
|
|||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool
|
||||||
|
{
|
||||||
|
return $downloadedEpisodes->filter(
|
||||||
|
fn (object $episode) => $episode->episode === $episodeInShow['episode_number']
|
||||||
|
&& $episode->season === $episodeInShow['season_number']
|
||||||
|
)->count() > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function monitorExists(Monitor $monitor, array $episode): bool
|
||||||
|
{
|
||||||
|
return $this->monitorRepository->findOneBy([
|
||||||
|
'imdbId' => $monitor->getImdbId(),
|
||||||
|
'title' => $monitor->getTitle(),
|
||||||
|
'monitorType' => 'tvepisode',
|
||||||
|
'season' => $episode['season_number'],
|
||||||
|
'episode' => $episode['episode_number'],
|
||||||
|
'status' => ['New', 'Active', 'In Progress']
|
||||||
|
]) !== null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user