Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cc88660c07 | ||
|
|
dbcc24c49f |
@@ -10,6 +10,8 @@ use App\Download\Action\Command\DownloadSeasonCommand;
|
||||
use App\Download\Action\Result\DownloadMediaResult;
|
||||
use App\Download\Action\Result\DownloadSeasonResult;
|
||||
use App\Download\DownloadOptionEvaluator;
|
||||
use App\Download\Framework\Entity\Download;
|
||||
use App\Download\Framework\Repository\DownloadRepository;
|
||||
use App\Tmdb\TmdbClient;
|
||||
use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
|
||||
use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
|
||||
@@ -32,7 +34,7 @@ readonly class DownloadSeasonHandler implements HandlerInterface
|
||||
private MessageBusInterface $bus,
|
||||
private DownloadOptionEvaluator $downloadOptionEvaluator,
|
||||
private GetTvShowOptionsHandler $getTvShowOptionsHandler,
|
||||
private UserRepository $userRepository,
|
||||
private UserRepository $userRepository, private DownloadRepository $downloadRepository,
|
||||
) {}
|
||||
|
||||
public function handle(CommandInterface $command): ResultInterface
|
||||
@@ -68,13 +70,15 @@ readonly class DownloadSeasonHandler implements HandlerInterface
|
||||
if (null !== $result) {
|
||||
$this->logger->info('> [DownloadTvSeasonHandler] ......Found 1 matching result');
|
||||
$this->logger->info('> [DownloadTvSeasonHandler] ......Dispatching DownloadMediaCommand for "' . $series->title . '" season ' . $command->season . ' episode ' . $episode->episodeNumber);
|
||||
$download = $this->createDownload($command, $result->url, $series->title, $result->filename, $episode->episodeNumber);
|
||||
$downloadCommand = new DownloadMediaCommand(
|
||||
$result->url,
|
||||
$series->title,
|
||||
$result->filename,
|
||||
'tvshows',
|
||||
$command->imdbId,
|
||||
$command->userId,
|
||||
$download->getUrl(),
|
||||
$download->getTitle(),
|
||||
$download->getFilename(),
|
||||
$download->getMediaType(),
|
||||
$download->getImdbId(),
|
||||
$download->getUser()->getId(),
|
||||
$download->getId()
|
||||
);
|
||||
$this->bus->dispatch($downloadCommand);
|
||||
$downloadCommands[] = $downloadCommand;
|
||||
@@ -90,19 +94,26 @@ readonly class DownloadSeasonHandler implements HandlerInterface
|
||||
);
|
||||
}
|
||||
|
||||
private function getDownloadedEpisodes(string $title)
|
||||
private function createDownload(DownloadSeasonCommand $command, string $url, string $title, string $filename, int $episodeNumber): Download
|
||||
{
|
||||
// Check current episodes
|
||||
$downloadedEpisodes = $this->mediaFiles
|
||||
->getEpisodes($title)
|
||||
->map(fn($episode) => (object) (new PTN())->parse($episode))
|
||||
->filter(fn ($episode) =>
|
||||
property_exists($episode, 'episode')
|
||||
&& property_exists($episode, 'season')
|
||||
&& null !== $episode->episodeNumber
|
||||
&& null !== $episode->season
|
||||
)
|
||||
->rekey(fn($episode) => $episode->episodeNumber);
|
||||
$this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
|
||||
$download = new Download();
|
||||
$download->setUrl($url);
|
||||
$download->setTitle($title);
|
||||
$download->setFilename($filename);
|
||||
$download->setImdbId($command->imdbId);
|
||||
$download->setMediaType(MediaType::TvShow->value);
|
||||
$download->setEpisodeId($this->getEpisodeNumber($command->season, $episodeNumber));
|
||||
$download->setUser($this->userRepository->find($command->userId));
|
||||
$this->downloadRepository->getEntityManager()->persist($download);
|
||||
return $download;
|
||||
}
|
||||
|
||||
private function getEpisodeNumber(int $season, int $episode): string
|
||||
{
|
||||
return sprintf(
|
||||
"S%sE%s",
|
||||
str_pad($season, 2, "0", STR_PAD_LEFT),
|
||||
str_pad($episode, 2, "0", STR_PAD_LEFT)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,9 +21,10 @@ class DownloadOptionEvaluator
|
||||
return false;
|
||||
}
|
||||
|
||||
if (false === $this->validateSize($result, $filter)) {
|
||||
return false;
|
||||
}
|
||||
// todo: This is arbitrary- revisit in the future
|
||||
//if (false === $this->validateSize($result, $filter)) {
|
||||
// return false;
|
||||
//}
|
||||
|
||||
if (false === $this->validateDownloadUrl($result->url)) {
|
||||
return false;
|
||||
@@ -51,15 +52,15 @@ class DownloadOptionEvaluator
|
||||
$valid = false;
|
||||
}
|
||||
|
||||
if (null !== $filter->codec && in_array($result->codec, $filter->codec)) {
|
||||
if (null !== $filter->codec && !in_array($result->codec, $filter->codec)) {
|
||||
$valid = false;
|
||||
}
|
||||
|
||||
if (null !== $filter->quality && in_array($result->quality, $filter->quality)) {
|
||||
if (null !== $filter->quality && !in_array($result->quality, $filter->quality)) {
|
||||
$valid = false;
|
||||
}
|
||||
|
||||
if (null !== $filter->provider && in_array($result->provider, $filter->provider)) {
|
||||
if (null !== $filter->provider && !in_array($result->provider, $filter->provider)) {
|
||||
$valid = false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user