wip: working episode pagination, season switcher, monitor only new content
This commit is contained in:
@@ -3,6 +3,8 @@
|
||||
namespace App\Controller;
|
||||
|
||||
use App\Download\Framework\Repository\DownloadRepository;
|
||||
use App\Monitor\Action\Command\MonitorTvShowCommand;
|
||||
use App\Monitor\Action\Handler\MonitorTvShowHandler;
|
||||
use App\Tmdb\Tmdb;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
@@ -13,6 +15,7 @@ final class IndexController extends AbstractController
|
||||
{
|
||||
public function __construct(
|
||||
private readonly Tmdb $tmdb,
|
||||
private readonly MonitorTvShowHandler $monitorTvShowHandler,
|
||||
) {}
|
||||
|
||||
#[Route('/', name: 'app_index')]
|
||||
@@ -25,4 +28,11 @@ final class IndexController extends AbstractController
|
||||
'popular_tvshows' => $this->tmdb->popularTvShows(1, 6),
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/test', name: 'app_test')]
|
||||
public function test()
|
||||
{
|
||||
$result = $this->monitorTvShowHandler->handle(new MonitorTvShowCommand(355));
|
||||
return $this->json($result);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,13 +33,14 @@ final class SearchController extends AbstractController
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/result/{mediaType}/{imdbId}', name: 'app_search_result')]
|
||||
#[Route('/result/{mediaType}/{imdbId}/{season}', name: 'app_search_result')]
|
||||
public function result(
|
||||
GetMediaInfoInput $input,
|
||||
?int $season = null,
|
||||
): Response {
|
||||
$result = $this->getMediaInfoHandler->handle($input->toCommand());
|
||||
|
||||
$this->warmDownloadOptionCache($result->media);
|
||||
// $this->warmDownloadOptionCache($result->media);
|
||||
|
||||
return $this->render('search/result.html.twig', [
|
||||
'results' => $result,
|
||||
|
||||
@@ -10,6 +10,7 @@ use App\Monitor\Framework\Entity\Monitor;
|
||||
use App\Monitor\Framework\Repository\MonitorRepository;
|
||||
use App\Monitor\Service\MediaFiles;
|
||||
use App\Tmdb\Tmdb;
|
||||
use Carbon\Carbon;
|
||||
use DateTimeImmutable;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Nihilarr\PTN;
|
||||
@@ -55,9 +56,18 @@ readonly class MonitorTvShowHandler implements HandlerInterface
|
||||
|
||||
$this->logger->info('> [MonitorTvShowHandler] Found ' . count($episodesInShow) . ' episodes for title: ' . $monitor->getTitle());
|
||||
|
||||
$episodeMonitors = [];
|
||||
if ($downloadedEpisodes->count() !== $episodesInShow->count()) {
|
||||
// Dispatch Episode commands for each missing Episode
|
||||
foreach ($episodesInShow as $episode) {
|
||||
// Only monitor future episodes
|
||||
$episodeInFuture = $this->episodeInFuture($episode);
|
||||
$this->logger->info('> [MonitorTvShowHandler] Episode is in future for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
|
||||
if (false === $episodeInFuture) {
|
||||
$this->logger->info('> [MonitorTvShowHandler] Episode not in future for title: ' . 'for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ', skipping');
|
||||
continue;
|
||||
}
|
||||
|
||||
// Check if the episode is already downloaded
|
||||
$episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
|
||||
$this->logger->info('> [MonitorTvShowHandler] Episode exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeExists ? 'YES' : 'NO'));
|
||||
@@ -91,6 +101,8 @@ readonly class MonitorTvShowHandler implements HandlerInterface
|
||||
$this->monitorRepository->getEntityManager()->persist($episodeMonitor);
|
||||
$this->monitorRepository->getEntityManager()->flush();
|
||||
|
||||
$episodeMonitors[] = $episodeMonitor;
|
||||
|
||||
// Immediately run the monitor
|
||||
$command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
|
||||
$this->monitorTvEpisodeHandler->handle($command);
|
||||
@@ -108,10 +120,18 @@ readonly class MonitorTvShowHandler implements HandlerInterface
|
||||
status: 'OK',
|
||||
result: [
|
||||
'monitor' => $monitor,
|
||||
'new_monitors' => $episodeMonitors,
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
private function episodeInFuture(array $episodeInShow): bool
|
||||
{
|
||||
static $today = Carbon::today();
|
||||
$episodeAirDate = Carbon::parse($episodeInShow['air_date']);
|
||||
return $episodeAirDate > $today;
|
||||
}
|
||||
|
||||
private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool
|
||||
{
|
||||
return $downloadedEpisodes->filter(
|
||||
|
||||
@@ -10,5 +10,6 @@ class GetMediaInfoCommand implements CommandInterface
|
||||
public function __construct(
|
||||
public string $imdbId,
|
||||
public string $mediaType,
|
||||
public ?int $season = null,
|
||||
) {}
|
||||
}
|
||||
@@ -20,6 +20,6 @@ class GetMediaInfoHandler implements HandlerInterface
|
||||
{
|
||||
$media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
|
||||
|
||||
return new GetMediaInfoResult($media);
|
||||
return new GetMediaInfoResult($media, $command->season);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Search\Action\Input;
|
||||
|
||||
use App\Download\Action\Command\DownloadMediaCommand;
|
||||
use App\Enum\MediaType;
|
||||
use App\Search\Action\Command\GetMediaInfoCommand;
|
||||
use OneToMany\RichBundle\Attribute\SourceRoute;
|
||||
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||
@@ -17,10 +18,16 @@ class GetMediaInfoInput implements InputInterface
|
||||
|
||||
#[SourceRoute('mediaType')]
|
||||
public string $mediaType,
|
||||
|
||||
#[SourceRoute('season', nullify: true)]
|
||||
public ?int $season,
|
||||
) {}
|
||||
|
||||
public function toCommand(): CommandInterface
|
||||
{
|
||||
return new GetMediaInfoCommand($this->imdbId, $this->mediaType);
|
||||
if ("tvshows" === $this->mediaType && null === $this->season) {
|
||||
$this->season = 1;
|
||||
}
|
||||
return new GetMediaInfoCommand($this->imdbId, $this->mediaType, $this->season);
|
||||
}
|
||||
}
|
||||
@@ -10,5 +10,6 @@ class GetMediaInfoResult implements ResultInterface
|
||||
{
|
||||
public function __construct(
|
||||
public TmdbResult $media,
|
||||
public ?int $season,
|
||||
) {}
|
||||
}
|
||||
|
||||
65
src/Search/TvEpisodePaginator.php
Normal file
65
src/Search/TvEpisodePaginator.php
Normal file
@@ -0,0 +1,65 @@
|
||||
<?php
|
||||
|
||||
namespace App\Search;
|
||||
|
||||
use App\Search\Action\Command\GetMediaInfoCommand;
|
||||
use App\Search\Action\Handler\GetMediaInfoHandler;
|
||||
use App\Search\Action\Result\GetMediaInfoResult;
|
||||
use stdClass;
|
||||
|
||||
class TvEpisodePaginator
|
||||
{
|
||||
/**
|
||||
* @var integer
|
||||
*/
|
||||
private $total;
|
||||
|
||||
/**
|
||||
* @var integer
|
||||
*/
|
||||
private $lastPage;
|
||||
|
||||
private $items;
|
||||
|
||||
public $limit = 20;
|
||||
|
||||
public $currentPage = 1;
|
||||
|
||||
public function paginate(GetMediaInfoResult $results, int $page = 1, int $limit = 20): static
|
||||
{
|
||||
$this->total = count($results->media->episodes[$results->season]);
|
||||
$this->lastPage = (int) ceil($this->total / $limit);
|
||||
$this->items = array_slice($results->media->episodes[$results->season], ($page - 1) * $limit, $limit);
|
||||
$this->currentPage = $page;
|
||||
$this->limit = $limit;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getTotal(): int
|
||||
{
|
||||
return $this->total;
|
||||
}
|
||||
|
||||
public function getLastPage(): int
|
||||
{
|
||||
return $this->lastPage;
|
||||
}
|
||||
|
||||
public function getItems()
|
||||
{
|
||||
return $this->items;
|
||||
}
|
||||
|
||||
public function getShowing()
|
||||
{
|
||||
$showingStart = (($this->currentPage - 1) * $this->limit) + 1;
|
||||
$showingEnd = (($this->currentPage - 1) * $this->limit) + $this->limit;
|
||||
|
||||
if ($showingEnd > $this->total) {
|
||||
$showingEnd = $this->total;
|
||||
}
|
||||
|
||||
return sprintf("Showing %d - %d of %d results.", $showingStart, $showingEnd, $this->total);
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Tmdb;
|
||||
|
||||
use Aimeos\Map;
|
||||
use App\Enum\MediaType;
|
||||
use App\ValueObject\ResultFactory;
|
||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||
@@ -97,6 +98,16 @@ class Tmdb
|
||||
return $this->parseResult($movies[$movie], "movie");
|
||||
});
|
||||
|
||||
$movies = Map::from($movies->toArray())->filter(function ($movie) {
|
||||
return $movie !== null
|
||||
&& $movie->imdbId !== null
|
||||
&& $movie->tmdbId !== null
|
||||
&& $movie->title !== null
|
||||
&& $movie->poster !== null
|
||||
&& $movie->description !== null
|
||||
&& $movie->mediaType !== null;
|
||||
});
|
||||
|
||||
$movies = array_values($movies->toArray());
|
||||
|
||||
if (null !== $limit) {
|
||||
@@ -114,6 +125,16 @@ class Tmdb
|
||||
return $this->parseResult($movies[$movie], "movie");
|
||||
});
|
||||
|
||||
$movies = Map::from($movies->toArray())->filter(function ($movie) {
|
||||
return $movie !== null
|
||||
&& $movie->imdbId !== null
|
||||
&& $movie->tmdbId !== null
|
||||
&& $movie->title !== null
|
||||
&& $movie->poster !== null
|
||||
&& $movie->description !== null
|
||||
&& $movie->mediaType !== null;
|
||||
});
|
||||
|
||||
$movies = array_values($movies->toArray());
|
||||
|
||||
if (null !== $limit) {
|
||||
|
||||
44
src/Twig/Components/TvEpisodeList.php
Normal file
44
src/Twig/Components/TvEpisodeList.php
Normal file
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
namespace App\Twig\Components;
|
||||
|
||||
use App\Search\Action\Command\GetMediaInfoCommand;
|
||||
use App\Search\Action\Handler\GetMediaInfoHandler;
|
||||
use App\Search\TvEpisodePaginator;
|
||||
use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
|
||||
use Symfony\UX\LiveComponent\Attribute\LiveProp;
|
||||
use Symfony\UX\LiveComponent\DefaultActionTrait;
|
||||
|
||||
#[AsLiveComponent]
|
||||
final class TvEpisodeList
|
||||
{
|
||||
use DefaultActionTrait;
|
||||
use PaginateTrait;
|
||||
|
||||
#[LiveProp(writable: true)]
|
||||
public string $title = "";
|
||||
|
||||
#[LiveProp(writable: true)]
|
||||
public string $imdbId = "";
|
||||
|
||||
#[LiveProp(writable: true)]
|
||||
public string $tmdbId = "";
|
||||
|
||||
#[LiveProp(writable: true)]
|
||||
public int $season = 1;
|
||||
|
||||
public function __construct(
|
||||
private GetMediaInfoHandler $getMediaInfoHandler,
|
||||
) {}
|
||||
|
||||
public function getEpisodes()
|
||||
{
|
||||
$results = $this->getMediaInfoHandler->handle(new GetMediaInfoCommand($this->imdbId, "tvshows", $this->season));
|
||||
return new TvEpisodePaginator()->paginate($results, $this->pageNumber, $this->perPage);
|
||||
}
|
||||
|
||||
public function setPage(int $page)
|
||||
{
|
||||
$this->pageNumber = $page;
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ use App\Monitor\Framework\Entity\Monitor;
|
||||
use App\Monitor\Service\MediaFiles;
|
||||
use ChrisUllyott\FileSize;
|
||||
use Twig\Attribute\AsTwigFilter;
|
||||
use Twig\Attribute\AsTwigFunction;
|
||||
|
||||
class UtilExtension
|
||||
{
|
||||
@@ -14,6 +15,12 @@ class UtilExtension
|
||||
private readonly MediaFiles $mediaFiles,
|
||||
) {}
|
||||
|
||||
#[AsTwigFunction('uniqid')]
|
||||
public function uniqid(): string
|
||||
{
|
||||
return uniqid();
|
||||
}
|
||||
|
||||
#[AsTwigFilter('filesize')]
|
||||
public function type(string|int $size)
|
||||
{
|
||||
|
||||
@@ -22,6 +22,8 @@ class Paginator
|
||||
|
||||
public $currentPage = 1;
|
||||
|
||||
public $limit = 5;
|
||||
|
||||
/**
|
||||
* @param QueryBuilder|Query $query
|
||||
* @param int $page
|
||||
@@ -41,6 +43,7 @@ class Paginator
|
||||
$this->lastPage = (int) ceil($paginator->count() / $paginator->getQuery()->getMaxResults());
|
||||
$this->items = $paginator;
|
||||
$this->currentPage = $page;
|
||||
$this->limit = $limit;
|
||||
|
||||
return $this;
|
||||
}
|
||||
@@ -59,4 +62,11 @@ class Paginator
|
||||
{
|
||||
return $this->items;
|
||||
}
|
||||
|
||||
public function getShowing()
|
||||
{
|
||||
$showingStart = ($this->currentPage - 1) * $this->limit;
|
||||
$showingEnd = $showingStart + $this->limit;
|
||||
return sprintf("Showing %d - %d of %d results.", $showingStart, $showingEnd, $this->total);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user