colgora/Mangarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: ajout de la gestion des sources préférées pour les mangas, incluant la récupération et la configuration des sources via l'API, ainsi que l'intégration d'une modale pour l'interface utilisateur.

Browse Source
This commit is contained in:
ext.jeremy.guillot@maxicoffee.domains
2025-06-20 15:33:54 +02:00
parent 15d92d1aff
commit 75f8e1686c
22 changed files with 1168 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Domain/Scraping/Application/Command/SetMangaPreferredSources.php Normal file
View File

@@ -0,0 +1,26 @@
<?php
namespace App\Domain\Scraping\Application\Command;
readonly class SetMangaPreferredSources
{
public function __construct(
public string $mangaId,
public array $sourceIds
) {
if (empty($mangaId)) {
throw new \InvalidArgumentException('Manga ID cannot be empty');
}
if (!is_array($sourceIds)) {
throw new \InvalidArgumentException('Source IDs must be an array');
}
// Valider que tous les éléments sont des strings
foreach ($sourceIds as $sourceId) {
if (!is_string($sourceId) && !is_int($sourceId)) {
throw new \InvalidArgumentException('All source IDs must be strings or integers');
}
}
}
}

1
src/Domain/Scraping/Application/CommandHandler/ScrapeChapterHandler.php
View File

@@ -56,6 +56,7 @@ readonly class ScrapeChapterHandler
// 3. Détermination des sources à utiliser
$sources = $this->getSourcesToTry($manga);
dd($sources);
if (empty($sources)) {
throw new \InvalidArgumentException("No sources available for scraping");
}

39
src/Domain/Scraping/Application/CommandHandler/SetMangaPreferredSourcesHandler.php Normal file
View File

@@ -0,0 +1,39 @@
<?php
namespace App\Domain\Scraping\Application\CommandHandler;
use App\Domain\Scraping\Application\Command\SetMangaPreferredSources;
use App\Domain\Scraping\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Scraping\Domain\Contract\Repository\SourceRepositoryInterface;
readonly class SetMangaPreferredSourcesHandler
{
public function __construct(
private MangaRepositoryInterface $mangaRepository,
private SourceRepositoryInterface $sourceRepository
) {
}
public function handle(SetMangaPreferredSources $command): void
{
// 1. Vérifier que le manga existe
$manga = $this->mangaRepository->getById($command->mangaId);
if (!$manga) {
throw new \InvalidArgumentException("Manga not found with ID: {$command->mangaId}");
}
// 2. Si pas de sources spécifiées, supprimer les sources préférées
if (empty($command->sourceIds)) {
$this->mangaRepository->updatePreferredSources($command->mangaId, []);
return;
}
// 3. Valider que toutes les sources existent et sont actives
if (!$this->sourceRepository->validateSourcesExist($command->sourceIds)) {
throw new \InvalidArgumentException('One or more sources do not exist or are not active');
}
// 4. Sauvegarder les sources préférées dans l'ordre fourni
$this->mangaRepository->updatePreferredSources($command->mangaId, $command->sourceIds);
}
}

14
src/Domain/Scraping/Application/Query/GetMangaPreferredSources.php Normal file
View File

@@ -0,0 +1,14 @@
<?php
namespace App\Domain\Scraping\Application\Query;
readonly class GetMangaPreferredSources
{
public function __construct(
public string $mangaId
) {
if (empty($mangaId)) {
throw new \InvalidArgumentException('Manga ID cannot be empty');
}
}
}

71
src/Domain/Scraping/Application/QueryHandler/GetMangaPreferredSourcesHandler.php Normal file
View File

@@ -0,0 +1,71 @@
<?php
namespace App\Domain\Scraping\Application\QueryHandler;
use App\Domain\Scraping\Application\Query\GetMangaPreferredSources;
use App\Domain\Scraping\Application\Response\GetMangaPreferredSourcesResponse;
use App\Domain\Scraping\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Scraping\Domain\Contract\Repository\SourceRepositoryInterface;
readonly class GetMangaPreferredSourcesHandler
{
public function __construct(
private MangaRepositoryInterface $mangaRepository,
private SourceRepositoryInterface $sourceRepository
) {
}
public function handle(GetMangaPreferredSources $query): GetMangaPreferredSourcesResponse
{
// 1. Vérifier que le manga existe
$manga = $this->mangaRepository->getById($query->mangaId);
if (!$manga) {
throw new \InvalidArgumentException("Manga not found with ID: {$query->mangaId}");
}
// 2. Récupérer toutes les sources actives
$allActiveSources = $this->sourceRepository->getAllActive();
// 3. Si le manga a des sources préférées, les organiser par ordre de préférence
if ($manga->hasPreferredSources()) {
$preferredSourceIds = $manga->getPreferredSources();
// Séparer les sources préférées et les autres
$preferredSources = [];
$otherSources = [];
// D'abord, ajouter les sources préférées dans l'ordre de préférence
foreach ($preferredSourceIds as $preferredId) {
foreach ($allActiveSources as $source) {
if ($source->getId()->getValue() === $preferredId) {
$preferredSources[] = $source;
break;
}
}
}
// Ensuite, ajouter les autres sources actives qui ne sont pas dans les préférées
foreach ($allActiveSources as $source) {
if (!in_array($source->getId()->getValue(), $preferredSourceIds, true)) {
$otherSources[] = $source;
}
}
// Combiner les sources : préférées en premier, puis les autres
$orderedSources = array_merge($preferredSources, $otherSources);
return new GetMangaPreferredSourcesResponse(
$query->mangaId,
$orderedSources,
true
);
}
// 4. Si pas de sources préférées, retourner toutes les sources actives
return new GetMangaPreferredSourcesResponse(
$query->mangaId,
$allActiveSources,
false
);
}
}

18
src/Domain/Scraping/Application/Response/GetMangaPreferredSourcesResponse.php Normal file
View File

@@ -0,0 +1,18 @@
<?php
namespace App\Domain\Scraping\Application\Response;
readonly class GetMangaPreferredSourcesResponse
{
/**
* @param string $mangaId
* @param array $sources Array of Source objects
* @param bool $hasPreferredSources Whether sources are preferred or all available sources
*/
public function __construct(
public string $mangaId,
public array $sources,
public bool $hasPreferredSources
) {
}
}

9
src/Domain/Scraping/Domain/Contract/Repository/MangaRepositoryInterface.php
View File

@@ -7,4 +7,13 @@ use App\Domain\Scraping\Domain\Model\Manga;
interface MangaRepositoryInterface
{
public function getById(string $id): ?Manga;
/**
* Update the preferred sources for a manga in the specified order
*
* @param string $mangaId
* @param array $sourceIds Array of source IDs in preferred order
* @return void
*/
public function updatePreferredSources(string $mangaId, array $sourceIds): void;
}

23
src/Domain/Scraping/Domain/Contract/Repository/SourceRepositoryInterface.php
View File

@@ -12,4 +12,27 @@ interface SourceRepositoryInterface
* @return Source[]
*/
public function getAll(): array;
/**
* Validate that all source IDs exist and are active
*
* @param array $sourceIds
* @return bool
*/
public function validateSourcesExist(array $sourceIds): bool;
/**
* Get sources by their IDs in the same order as provided
*
* @param array $sourceIds
* @return Source[]
*/
public function getByIds(array $sourceIds): array;
/**
* Get all active sources
*
* @return Source[]
*/
public function getAllActive(): array;
}

13
src/Domain/Scraping/Infrastructure/ApiPlatform/Dto/MangaPreferredSourcesDetail.php Normal file
View File

@@ -0,0 +1,13 @@
<?php
namespace App\Domain\Scraping\Infrastructure\ApiPlatform\Dto;
readonly class MangaPreferredSourcesDetail
{
public function __construct(
public string $mangaId,
public array $sources,
public bool $hasPreferredSources
) {
}
}

81
src/Domain/Scraping/Infrastructure/ApiPlatform/Resource/GetMangaPreferredSourcesResource.php Normal file
View File

@@ -0,0 +1,81 @@
<?php
namespace App\Domain\Scraping\Infrastructure\ApiPlatform\Resource;
use ApiPlatform\Metadata\ApiResource;
use ApiPlatform\Metadata\Get;
use ApiPlatform\OpenApi\Model\Operation as OpenApiOperation;
use ApiPlatform\OpenApi\Model\Response;
use App\Domain\Scraping\Infrastructure\ApiPlatform\Dto\MangaPreferredSourcesDetail;
use App\Domain\Scraping\Infrastructure\ApiPlatform\State\Provider\GetMangaPreferredSourcesStateProvider;
#[ApiResource(
shortName: 'Scraping',
operations: [
new Get(
uriTemplate: '/mangas/{id}/preferred-sources',
provider: GetMangaPreferredSourcesStateProvider::class,
output: MangaPreferredSourcesDetail::class,
description: 'Récupérer les sources préférées d\'un manga ou toutes les sources si aucune préférence',
openapi: new OpenApiOperation(
summary: 'Récupérer les sources préférées d\'un manga',
description: 'Retourne les sources préférées configurées pour un manga, ou toutes les sources disponibles si aucune préférence définie',
responses: [
'200' => new Response(
description: 'Sources récupérées avec succès',
content: new \ArrayObject([
'application/json' => [
'schema' => [
'type' => 'object',
'properties' => [
'mangaId' => ['type' => 'string'],
'hasPreferredSources' => ['type' => 'boolean'],
'sources' => [
'type' => 'array',
'items' => [
'type' => 'object',
'properties' => [
'id' => ['type' => 'string'],
'name' => ['type' => 'string'],
'baseUrl' => ['type' => 'string'],
'description' => ['type' => 'string'],
'isActive' => ['type' => 'boolean']
]
]
]
]
],
'example' => [
'mangaId' => '1',
'hasPreferredSources' => true,
'sources' => [
[
'id' => '1',
'name' => 'MangaDex',
'baseUrl' => 'https://mangadex.org',
'description' => 'Source principale',
'isActive' => true
],
[
'id' => '2',
'name' => 'MangaKakalot',
'baseUrl' => 'https://mangakakalot.com',
'description' => 'Source secondaire',
'isActive' => true
]
]
]
]
])
)
]
)
)
]
)]
class GetMangaPreferredSourcesResource
{
public function __construct(
public string $id
) {}
}

54
src/Domain/Scraping/Infrastructure/ApiPlatform/Resource/SetMangaPreferredSourcesResource.php Normal file
View File

@@ -0,0 +1,54 @@
<?php
namespace App\Domain\Scraping\Infrastructure\ApiPlatform\Resource;
use ApiPlatform\Metadata\ApiResource;
use ApiPlatform\Metadata\Post;
use ApiPlatform\OpenApi\Model\Operation as OpenApiOperation;
use ApiPlatform\OpenApi\Model\RequestBody;
use App\Domain\Scraping\Infrastructure\ApiPlatform\State\Processor\SetMangaPreferredSourcesStateProcessor;
use Symfony\Component\Validator\Constraints as Assert;
#[ApiResource(
shortName: 'Scraping',
operations: [
new Post(
uriTemplate: '/mangas/{id}/preferred-sources',
processor: SetMangaPreferredSourcesStateProcessor::class,
status: 200,
description: 'Définir les sources préférées d\'un manga dans l\'ordre de priorité',
openapi: new OpenApiOperation(
summary: 'Configurer les sources préférées d\'un manga',
description: 'Définit l\'ordre de priorité des sources de scraping pour un manga. Format attendu: {"sourceIds": ["source1", "source2"]}',
requestBody: new RequestBody(
content: new \ArrayObject([
'application/json' => [
'schema' => [
'type' => 'object',
'properties' => [
'sourceIds' => [
'type' => 'array',
'items' => ['type' => 'string']
]
]
],
'example' => [
'sourceIds' => ['1', '2']
]
]
])
)
)
)
]
)]
class SetMangaPreferredSourcesResource
{
public function __construct(
#[Assert\NotNull]
#[Assert\All([
new Assert\Type('string')
])]
public array $sourceIds = []
) {}
}

38
src/Domain/Scraping/Infrastructure/ApiPlatform/State/Processor/SetMangaPreferredSourcesStateProcessor.php Normal file
View File

@@ -0,0 +1,38 @@
<?php
namespace App\Domain\Scraping\Infrastructure\ApiPlatform\State\Processor;
use ApiPlatform\Metadata\Operation;
use ApiPlatform\State\ProcessorInterface;
use App\Domain\Scraping\Application\Command\SetMangaPreferredSources;
use App\Domain\Scraping\Infrastructure\ApiPlatform\Resource\SetMangaPreferredSourcesResource;
use Symfony\Component\Messenger\MessageBusInterface;
final class SetMangaPreferredSourcesStateProcessor implements ProcessorInterface
{
public function __construct(
private readonly MessageBusInterface $commandBus
) {
}
/**
* @param SetMangaPreferredSourcesResource $data
*/
public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): array
{
$mangaId = $uriVariables['id'] ?? null;
if (!$mangaId) {
throw new \InvalidArgumentException('Manga ID is required');
}
$this->commandBus->dispatch(
new SetMangaPreferredSources(
(string) $mangaId,
$data->sourceIds
)
);
return ['success' => true];
}
}

46
src/Domain/Scraping/Infrastructure/ApiPlatform/State/Provider/GetMangaPreferredSourcesStateProvider.php Normal file
View File

@@ -0,0 +1,46 @@
<?php
namespace App\Domain\Scraping\Infrastructure\ApiPlatform\State\Provider;
use ApiPlatform\Metadata\Operation;
use ApiPlatform\State\ProviderInterface;
use App\Domain\Scraping\Application\Query\GetMangaPreferredSources;
use App\Domain\Scraping\Application\QueryHandler\GetMangaPreferredSourcesHandler;
use App\Domain\Scraping\Infrastructure\ApiPlatform\Dto\MangaPreferredSourcesDetail;
final class GetMangaPreferredSourcesStateProvider implements ProviderInterface
{
public function __construct(
private readonly GetMangaPreferredSourcesHandler $queryHandler
) {
}
public function provide(Operation $operation, array $uriVariables = [], array $context = []): MangaPreferredSourcesDetail
{
$mangaId = $uriVariables['id'] ?? null;
if (!$mangaId) {
throw new \InvalidArgumentException('Manga ID is required');
}
$query = new GetMangaPreferredSources((string) $mangaId);
$response = $this->queryHandler->handle($query);
// Convertir les objets Source en array pour l'API
$sourcesData = array_map(function ($source) {
return [
'id' => $source->getId()->getValue(),
'name' => $source->getName(),
'baseUrl' => $source->getBaseUrl(),
'description' => $source->getDescription(),
'isActive' => $source->isActive()
];
}, $response->sources);
return new MangaPreferredSourcesDetail(
$response->mangaId,
$sourcesData,
$response->hasPreferredSources
);
}
}

21
src/Domain/Scraping/Infrastructure/CommandHandler/SymfonySetMangaPreferredSourcesHandler.php Normal file
View File

@@ -0,0 +1,21 @@
<?php
namespace App\Domain\Scraping\Infrastructure\CommandHandler;
use App\Domain\Scraping\Application\Command\SetMangaPreferredSources;
use App\Domain\Scraping\Application\CommandHandler\SetMangaPreferredSourcesHandler;
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
#[AsMessageHandler]
class SymfonySetMangaPreferredSourcesHandler
{
public function __construct(
private SetMangaPreferredSourcesHandler $handler
) {
}
public function __invoke(SetMangaPreferredSources $command): void
{
$this->handler->handle($command);
}
}

39
src/Domain/Scraping/Infrastructure/Persistence/LegacyMangaRepository.php
View File

@@ -5,6 +5,7 @@ namespace App\Domain\Scraping\Infrastructure\Persistence;
use App\Domain\Scraping\Domain\Contract\Repository\MangaRepositoryInterface;
use App\Domain\Scraping\Domain\Model\Manga;
use App\Entity\Manga as EntityManga;
use App\Entity\ContentSource;
use Doctrine\ORM\EntityManagerInterface;
readonly class LegacyMangaRepository implements MangaRepositoryInterface
@@ -26,17 +27,49 @@ readonly class LegacyMangaRepository implements MangaRepositoryInterface
// Récupération des sources préférées
$preferredSourceIds = [];
foreach ($mangaEntity->getPreferredSources() as $source) {
$preferredSourceIds[] = $source->getId();
$preferredSourceIds[] = (string) $source->getId();
}
return new Manga(
$mangaEntity->getId(),
(string) $mangaEntity->getId(),
$mangaEntity->getTitle(),
$mangaEntity->getSlug(),
$mangaEntity->getDescription() ?? '',
$mangaEntity->getAuthor() ?? '',
$mangaEntity->getPublicationYear() ?? '',
(string) ($mangaEntity->getPublicationYear() ?? ''),
$preferredSourceIds,
);
}
public function updatePreferredSources(string $mangaId, array $sourceIds): void
{
/** @var EntityManga|null $mangaEntity */
$mangaEntity = $this->entityManager->getRepository(EntityManga::class)->find($mangaId);
if (!$mangaEntity) {
throw new \InvalidArgumentException("Manga not found with ID: {$mangaId}");
}
// Si pas de sources, vider les sources préférées
if (empty($sourceIds)) {
$mangaEntity->setPreferredSources([]);
$this->entityManager->flush();
return;
}
// Récupérer les sources existantes
$sources = $this->entityManager->getRepository(ContentSource::class)->findBy(['id' => $sourceIds]);
// Maintenir l'ordre exact des sources comme dans l'ancien controller
$orderedPreferredSources = array_map(
fn ($id) => current(array_filter($sources, fn ($s) => $s->getId() == $id)),
$sourceIds
);
// Filtrer les sources nulles (au cas où certaines n'existeraient pas)
$validSources = array_filter($orderedPreferredSources);
$mangaEntity->setPreferredSources($validSources);
$this->entityManager->flush();
}
}

83
src/Domain/Scraping/Infrastructure/Persistence/LegacySourceRepository.php
View File

@@ -17,34 +17,16 @@ readonly class LegacySourceRepository implements SourceRepositoryInterface
) {
}
/**
* @throws SourceNotFoundException
*/
public function getById(string $id): Source
public function getById(string $id): ?Source
{
/** @var ContentSource|null $source */
$source = $this->entityManager->getRepository(ContentSource::class)->find($id);
if (!$source) {
throw new SourceNotFoundException("Source not found");
return null;
}
return new Source(
id: new SourceId($source->getId()),
name: $source->getCleanBaseUrl(),
description: 'Legacy Source: ' . $source->getBaseUrl(),
baseUrl: $source->getBaseUrl(),
scrappingParameters: [
'imageSelector' => $source->getImageSelector(),
'nextPageSelector' => $source->getNextPageSelector(),
'chapterUrlFormat' => $source->getChapterUrlFormat(),
'scrapingType' => $source->getScrapingType(),
'chapterSelector' => $source->getChapterSelector()
],
isActive: true,
createdAt: new DateTimeImmutable(),
updatedAt: new DateTimeImmutable()
);
return $this->convertEntityToModel($source);
}
/**
@@ -63,13 +45,70 @@ readonly class LegacySourceRepository implements SourceRepositoryInterface
return $sources;
}
public function validateSourcesExist(array $sourceIds): bool
{
if (empty($sourceIds)) {
return true;
}
// Compter le nombre de sources qui existent réellement
$existingCount = $this->entityManager->getRepository(ContentSource::class)
->createQueryBuilder('c')
->select('COUNT(c.id)')
->where('c.id IN (:ids)')
->setParameter('ids', $sourceIds)
->getQuery()
->getSingleScalarResult();
// Vérifier que toutes les sources demandées existent
return $existingCount === count($sourceIds);
}
/**
* @return Source[]
*/
public function getByIds(array $sourceIds): array
{
if (empty($sourceIds)) {
return [];
}
/** @var ContentSource[] $sourceEntities */
$sourceEntities = $this->entityManager->getRepository(ContentSource::class)->findBy(['id' => $sourceIds]);
// Maintenir l'ordre des IDs fournis
$sourcesMap = [];
foreach ($sourceEntities as $sourceEntity) {
$sourcesMap[$sourceEntity->getId()] = $this->convertEntityToModel($sourceEntity);
}
$orderedSources = [];
foreach ($sourceIds as $sourceId) {
if (isset($sourcesMap[$sourceId])) {
$orderedSources[] = $sourcesMap[$sourceId];
}
}
return $orderedSources;
}
/**
* @return Source[]
*/
public function getAllActive(): array
{
// Pour le moment, toutes les sources sont considérées comme actives
// dans le système legacy
return $this->getAll();
}
/**
* Convertit une entité ContentSource en modèle Source
*/
private function convertEntityToModel(ContentSource $source): Source
{
return new Source(
id: new SourceId($source->getId()),
id: new SourceId((string) $source->getId()),
name: $source->getCleanBaseUrl(),
description: 'Legacy Source: ' . $source->getBaseUrl(),
baseUrl: $source->getBaseUrl(),