Compare commits
1 Commits
aba8e36231
...
4da9742f7f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4da9742f7f |
41
TASK.md
41
TASK.md
@@ -75,47 +75,6 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## [Perf] Reader — Lazy-loading des pages (InfiniteReader)
|
|
||||||
|
|
||||||
**Problème :** `readerStore.js` charge toutes les pages avec `itemsPerPage=9999`. `InfiniteReader.vue` monte tous les composants `ReaderPage` simultanément dans le DOM. Sur un chapitre de 200 pages, cela représente 200 composants actifs et autant d'images pré-chargées.
|
|
||||||
|
|
||||||
- [ ] Implémenter un `IntersectionObserver` sur les wrappers de page pour ne charger les images qu'au moment où elles entrent dans le viewport (`loading="lazy"` ou src conditionnel)
|
|
||||||
- [ ] Limiter le nombre de composants montés simultanément (virtualisation ou windowing) : ne rendre que les pages proches de la page courante (ex. fenêtre de ±3 pages)
|
|
||||||
- [ ] Adapter `readerStore.js` : remplacer `itemsPerPage=9999` par la vraie pagination côté API si la virtualisation le justifie, sinon conserver le fetch unique mais différer le rendu
|
|
||||||
- [ ] Vérifier que le mode `single` n'est pas impacté (il affiche déjà une seule page)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## [Bug] Reader — N+1 requêtes SQL dans `getChapterContext()`
|
|
||||||
|
|
||||||
**Problème :** `LegacyChapterRepository::getChapterContext()` émet 5 requêtes SQL pour un seul chargement : la requête principale + 2 doublons dans `getPreviousChapterId()` / `getNextChapterId()` (chacune re-fetche le chapitre courant) + les 2 requêtes de navigation.
|
|
||||||
|
|
||||||
- [ ] Refactorer `getPreviousChapterId()` et `getNextChapterId()` pour accepter l'entité `ChapterEntity` déjà chargée en paramètre (au lieu de re-fetcher par ID)
|
|
||||||
- [ ] Appeler ces méthodes depuis `getChapterContext()` en passant l'entité déjà disponible
|
|
||||||
- [ ] Résultat attendu : 3 requêtes maximum (1 pour le chapitre courant + 1 prev + 1 next), idéalement 1 seule avec une requête SQL combinée
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## [Bug] Reader — Division par zéro dans `ChapterPagesResponse::getTotalPages()`
|
|
||||||
|
|
||||||
**Problème :** `ceil($totalItems / $itemsPerPage)` crashe si `itemsPerPage = 0`. Le test existant documente le bug avec un TODO et assert un HTTP 500 au lieu de corriger.
|
|
||||||
|
|
||||||
- [ ] Ajouter une validation dans `ChapterPagesProvider` : rejeter la requête avec HTTP 400 si `itemsPerPage <= 0`
|
|
||||||
- [ ] Corriger le test `GetChapterPagesTest` pour vérifier HTTP 400 (et non 500)
|
|
||||||
- [ ] Supprimer le commentaire TODO du test une fois corrigé
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## [Bug] Reader — `totalPages` toujours égal à 0 dans `ChapterContext`
|
|
||||||
|
|
||||||
**Problème :** `LegacyChapterRepository::getChapterContext()` hardcode `totalPages: 0`. La méthode `getTotalPagesForChapter()` existe mais n'est jamais appelée depuis `GetChapterContextHandler`.
|
|
||||||
|
|
||||||
- [ ] Appeler `getTotalPagesForChapter()` dans `getChapterContext()` (ou dans le handler) pour calculer le vrai nombre de pages
|
|
||||||
- [ ] Vérifier que la valeur est correctement sérialisée dans la réponse API Platform (`ChapterContextResponse`)
|
|
||||||
- [ ] Adapter les tests existants qui pourraient asserter `totalPages: 0`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## [Style] Page conversion CBR → CBZ — Simplification UI + notifications toast
|
## [Style] Page conversion CBR → CBZ — Simplification UI + notifications toast
|
||||||
|
|
||||||
**Objectif :** Revoir le style de la page de conversion CBR → CBZ pour le simplifier, et remplacer le message statique "Conversion réussie" par les notifications toast de l'application.
|
**Objectif :** Revoir le style de la page de conversion CBR → CBZ pour le simplifier, et remplacer le message statique "Conversion réussie" par les notifications toast de l'application.
|
||||||
|
|||||||
@@ -22,7 +22,6 @@
|
|||||||
:pages="store.pages"
|
:pages="store.pages"
|
||||||
:zoom="store.zoom"
|
:zoom="store.zoom"
|
||||||
:double-page-mode="store.effectiveDoublePageMode"
|
:double-page-mode="store.effectiveDoublePageMode"
|
||||||
:initial-page="store.currentPage"
|
|
||||||
@page-visible="store.handlePageVisible"
|
@page-visible="store.handlePageVisible"
|
||||||
ref="infiniteReaderRef" />
|
ref="infiniteReaderRef" />
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -126,10 +126,10 @@ services:
|
|||||||
tags:
|
tags:
|
||||||
- { name: messenger.message_handler, bus: command.bus }
|
- { name: messenger.message_handler, bus: command.bus }
|
||||||
|
|
||||||
App\Domain\Shared\Domain\Contract\ImageStorageInterface:
|
App\Domain\Scraping\Domain\Contract\Service\ImageStorageInterface:
|
||||||
alias: App\Domain\Shared\Infrastructure\Service\ImageStorageManager
|
alias: App\Domain\Scraping\Infrastructure\Service\LocalImageStorage
|
||||||
|
|
||||||
App\Domain\Shared\Infrastructure\Service\ImageStorageManager:
|
App\Domain\Scraping\Infrastructure\Service\LocalImageStorage:
|
||||||
arguments:
|
arguments:
|
||||||
$storagePath: '%kernel.project_dir%/public/images'
|
$storagePath: '%kernel.project_dir%/public/images'
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ services:
|
|||||||
class: 'App\Tests\Domain\Scraping\Adapter\InMemoryScrapingJobRepository'
|
class: 'App\Tests\Domain\Scraping\Adapter\InMemoryScrapingJobRepository'
|
||||||
public: true
|
public: true
|
||||||
|
|
||||||
App\Domain\Shared\Domain\Contract\ImageStorageInterface:
|
App\Domain\Scraping\Domain\Contract\Service\ImageStorageInterface:
|
||||||
class: 'App\Tests\Domain\Scraping\Adapter\InMemoryImageStorage'
|
class: 'App\Tests\Domain\Scraping\Adapter\InMemoryImageStorage'
|
||||||
public: true
|
public: true
|
||||||
|
|
||||||
|
|||||||
@@ -6,13 +6,13 @@ use App\Domain\Manga\Application\Command\ImportChapter;
|
|||||||
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
|
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
|
||||||
use App\Domain\Manga\Domain\Exception\MangaNotFoundException;
|
use App\Domain\Manga\Domain\Exception\MangaNotFoundException;
|
||||||
use App\Domain\Manga\Domain\Exception\ChapterNotFoundException;
|
use App\Domain\Manga\Domain\Exception\ChapterNotFoundException;
|
||||||
use App\Domain\Shared\Domain\Contract\ImageStorageInterface;
|
use App\Domain\Shared\Domain\Contract\MangaPathManagerInterface;
|
||||||
|
|
||||||
readonly class ImportChapterHandler
|
readonly class ImportChapterHandler
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private MangaRepositoryInterface $mangaRepository,
|
private MangaRepositoryInterface $mangaRepository,
|
||||||
private ImageStorageInterface $imageStorage
|
private MangaPathManagerInterface $pathManager
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39,15 +39,11 @@ readonly class ImportChapterHandler
|
|||||||
throw new ChapterNotFoundException("Chapter {$command->chapterNumber} not found for manga {$command->mangaId}");
|
throw new ChapterNotFoundException("Chapter {$command->chapterNumber} not found for manga {$command->mangaId}");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 4. Extract CBZ into individual images storage
|
// 4. Save the CBZ file to storage using the path manager
|
||||||
$pagesDirectory = $this->imageStorage->extractFromCbz(
|
$cbzPath = $this->saveCbzFile($command, $manga, $existingChapter);
|
||||||
$existingChapter->getId(),
|
|
||||||
$command->fileBinary
|
|
||||||
);
|
|
||||||
$pageCount = $this->imageStorage->countCbzImages($command->fileBinary);
|
|
||||||
|
|
||||||
// 5. Update existing chapter with new path through the aggregate
|
// 5. Update existing chapter with new path through the aggregate
|
||||||
$manga->updateChapterPages($existingChapter, $pagesDirectory, $pageCount);
|
$manga->updateChapterPages($existingChapter, $cbzPath, $existingChapter->getPageCount());
|
||||||
$this->mangaRepository->save($manga);
|
$this->mangaRepository->save($manga);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,4 +53,21 @@ readonly class ImportChapterHandler
|
|||||||
|
|
||||||
return strpos($fileBinary, $zipMagicNumber) === 0;
|
return strpos($fileBinary, $zipMagicNumber) === 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function saveCbzFile(ImportChapter $command, \App\Domain\Manga\Domain\Model\Manga $manga, \App\Domain\Manga\Domain\Model\Chapter $chapter): string
|
||||||
|
{
|
||||||
|
$volumeNumber = $chapter->getVolume() ?? 0;
|
||||||
|
$cbzPath = $this->pathManager->buildChapterCbzPath(
|
||||||
|
$manga->getTitle()->getValue(),
|
||||||
|
(string)$manga->getPublicationYear(),
|
||||||
|
$volumeNumber,
|
||||||
|
(string)$command->chapterNumber
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!file_put_contents($cbzPath, $command->fileBinary)) {
|
||||||
|
throw new \RuntimeException('Failed to save CBZ file');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $cbzPath;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,13 +5,13 @@ namespace App\Domain\Manga\Application\CommandHandler;
|
|||||||
use App\Domain\Manga\Application\Command\ImportVolume;
|
use App\Domain\Manga\Application\Command\ImportVolume;
|
||||||
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
|
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
|
||||||
use App\Domain\Manga\Domain\Exception\MangaNotFoundException;
|
use App\Domain\Manga\Domain\Exception\MangaNotFoundException;
|
||||||
use App\Domain\Shared\Domain\Contract\ImageStorageInterface;
|
use App\Domain\Shared\Domain\Contract\MangaPathManagerInterface;
|
||||||
|
|
||||||
readonly class ImportVolumeHandler
|
readonly class ImportVolumeHandler
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private MangaRepositoryInterface $mangaRepository,
|
private MangaRepositoryInterface $mangaRepository,
|
||||||
private ImageStorageInterface $imageStorage
|
private MangaPathManagerInterface $pathManager
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,14 +40,12 @@ readonly class ImportVolumeHandler
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 4. Extract CBZ into individual images storage (shared directory for all volume chapters)
|
// 4. Save the CBZ file to storage using the path manager
|
||||||
$volumeDirectoryId = sprintf('volume_%s_%d', $command->mangaId, $command->volumeNumber);
|
$cbzPath = $this->saveCbzFile($command, $manga);
|
||||||
$pagesDirectory = $this->imageStorage->extractFromCbz($volumeDirectoryId, $command->fileBinary);
|
|
||||||
$pageCount = $this->imageStorage->countCbzImages($command->fileBinary);
|
|
||||||
|
|
||||||
// 5. Update all chapters with the volume path through the aggregate
|
// 5. Update all chapters with the volume path through the aggregate
|
||||||
foreach ($chapters as $chapter) {
|
foreach ($chapters as $chapter) {
|
||||||
$manga->updateChapterPages($chapter, $pagesDirectory, $pageCount);
|
$manga->updateChapterPages($chapter, $cbzPath, $chapter->getPageCount());
|
||||||
}
|
}
|
||||||
$this->mangaRepository->save($manga);
|
$this->mangaRepository->save($manga);
|
||||||
}
|
}
|
||||||
@@ -58,4 +56,19 @@ readonly class ImportVolumeHandler
|
|||||||
|
|
||||||
return strpos($fileBinary, $zipMagicNumber) === 0;
|
return strpos($fileBinary, $zipMagicNumber) === 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function saveCbzFile(ImportVolume $command, \App\Domain\Manga\Domain\Model\Manga $manga): string
|
||||||
|
{
|
||||||
|
$cbzPath = $this->pathManager->buildVolumeCbzPath(
|
||||||
|
$manga->getTitle()->getValue(),
|
||||||
|
(string)$manga->getPublicationYear(),
|
||||||
|
$command->volumeNumber
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!file_put_contents($cbzPath, $command->fileBinary)) {
|
||||||
|
throw new \RuntimeException('Failed to save CBZ file');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $cbzPath;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ readonly class LegacyChapterRepository implements ChapterRepositoryInterface
|
|||||||
$pages[] = new Page(
|
$pages[] = new Page(
|
||||||
basename($files[$i]),
|
basename($files[$i]),
|
||||||
new PageNumber($i + 1),
|
new PageNumber($i + 1),
|
||||||
sprintf('/images/pages/%s/%s', basename($pagesDirectory), basename($files[$i])),
|
sprintf('/images/pages/%s/%s', $chapterId->getValue(), basename($files[$i])),
|
||||||
$imageSize[0],
|
$imageSize[0],
|
||||||
$imageSize[1]
|
$imageSize[1]
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use App\Domain\Scraping\Application\Command\ScrapeChapter;
|
|||||||
use App\Domain\Scraping\Domain\Contract\Repository\ChapterRepositoryInterface;
|
use App\Domain\Scraping\Domain\Contract\Repository\ChapterRepositoryInterface;
|
||||||
use App\Domain\Scraping\Domain\Contract\Repository\MangaRepositoryInterface;
|
use App\Domain\Scraping\Domain\Contract\Repository\MangaRepositoryInterface;
|
||||||
use App\Domain\Scraping\Domain\Contract\Repository\SourceRepositoryInterface;
|
use App\Domain\Scraping\Domain\Contract\Repository\SourceRepositoryInterface;
|
||||||
use App\Domain\Shared\Domain\Contract\ImageStorageInterface;
|
use App\Domain\Scraping\Domain\Contract\Service\ImageStorageInterface;
|
||||||
use App\Domain\Scraping\Domain\Contract\Service\ImageDownloaderInterface;
|
use App\Domain\Scraping\Domain\Contract\Service\ImageDownloaderInterface;
|
||||||
use App\Domain\Scraping\Domain\Contract\Service\ScraperFactoryInterface;
|
use App\Domain\Scraping\Domain\Contract\Service\ScraperFactoryInterface;
|
||||||
use App\Domain\Shared\Domain\Event\ChapterScraped;
|
use App\Domain\Shared\Domain\Event\ChapterScraped;
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domain\Scraping\Domain\Contract\Service;
|
||||||
|
|
||||||
|
interface ImageStorageInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Copies images to permanent storage. Returns the pagesDirectory path.
|
||||||
|
*
|
||||||
|
* @param string $chapterId The chapter UUID used as directory name
|
||||||
|
* @param string[] $localImagePaths Paths to the locally downloaded image files
|
||||||
|
*
|
||||||
|
* @return string Absolute path to the directory where images were stored
|
||||||
|
*/
|
||||||
|
public function storeChapterImages(string $chapterId, array $localImagePaths): string;
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domain\Scraping\Infrastructure\Service;
|
||||||
|
|
||||||
|
use App\Domain\Scraping\Domain\Contract\Service\ImageStorageInterface;
|
||||||
|
|
||||||
|
readonly class LocalImageStorage implements ImageStorageInterface
|
||||||
|
{
|
||||||
|
public function __construct(private string $storagePath)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public function storeChapterImages(string $chapterId, array $localImagePaths): string
|
||||||
|
{
|
||||||
|
$targetDir = $this->storagePath . '/pages/' . $chapterId;
|
||||||
|
|
||||||
|
if (!is_dir($targetDir)) {
|
||||||
|
mkdir($targetDir, 0755, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
sort($localImagePaths);
|
||||||
|
|
||||||
|
foreach ($localImagePaths as $index => $localPath) {
|
||||||
|
$extension = pathinfo($localPath, PATHINFO_EXTENSION) ?: 'jpg';
|
||||||
|
$targetFile = sprintf('%s/%03d.%s', $targetDir, $index + 1, $extension);
|
||||||
|
copy($localPath, $targetFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $targetDir;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Domain\Shared\Domain\Contract;
|
|
||||||
|
|
||||||
interface ImageStorageInterface
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Store images from local file paths into the individual images storage.
|
|
||||||
* Used by the scraping flow.
|
|
||||||
*
|
|
||||||
* @param string[] $localImagePaths
|
|
||||||
* @return string The directory path where images are stored (pagesDirectory)
|
|
||||||
*/
|
|
||||||
public function storeChapterImages(string $targetId, array $localImagePaths): string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Extract images from a CBZ binary into the individual images storage.
|
|
||||||
* Used by the import flow.
|
|
||||||
*
|
|
||||||
* @return string The directory path where images are stored (pagesDirectory)
|
|
||||||
*/
|
|
||||||
public function extractFromCbz(string $targetId, string $cbzBinary): string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Count images in a CBZ binary.
|
|
||||||
*/
|
|
||||||
public function countCbzImages(string $cbzBinary): int;
|
|
||||||
}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Domain\Shared\Infrastructure\Service;
|
|
||||||
|
|
||||||
use App\Domain\Shared\Domain\Contract\ImageStorageInterface;
|
|
||||||
use ZipArchive;
|
|
||||||
|
|
||||||
class ImageStorageManager implements ImageStorageInterface
|
|
||||||
{
|
|
||||||
public function __construct(private string $storagePath)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public function storeChapterImages(string $targetId, array $localImagePaths): string
|
|
||||||
{
|
|
||||||
$targetDir = $this->storagePath . '/pages/' . $targetId;
|
|
||||||
|
|
||||||
if (!is_dir($targetDir)) {
|
|
||||||
mkdir($targetDir, 0755, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
sort($localImagePaths);
|
|
||||||
|
|
||||||
foreach ($localImagePaths as $index => $localPath) {
|
|
||||||
$extension = pathinfo($localPath, PATHINFO_EXTENSION) ?: 'jpg';
|
|
||||||
$targetFile = sprintf('%s/%03d.%s', $targetDir, $index + 1, $extension);
|
|
||||||
copy($localPath, $targetFile);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $targetDir;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function extractFromCbz(string $targetId, string $cbzBinary): string
|
|
||||||
{
|
|
||||||
$targetDir = $this->storagePath . '/pages/' . $targetId;
|
|
||||||
|
|
||||||
if (!is_dir($targetDir)) {
|
|
||||||
mkdir($targetDir, 0755, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
$tmpFile = tempnam(sys_get_temp_dir(), 'cbz_');
|
|
||||||
file_put_contents($tmpFile, $cbzBinary);
|
|
||||||
|
|
||||||
$zip = new ZipArchive();
|
|
||||||
if ($zip->open($tmpFile) !== true) {
|
|
||||||
unlink($tmpFile);
|
|
||||||
throw new \RuntimeException('Failed to open CBZ file as ZIP archive');
|
|
||||||
}
|
|
||||||
|
|
||||||
$imageEntries = [];
|
|
||||||
for ($i = 0; $i < $zip->numFiles; $i++) {
|
|
||||||
$name = $zip->getNameIndex($i);
|
|
||||||
if (preg_match('/\.(jpg|jpeg|png|webp|gif)$/i', $name)) {
|
|
||||||
$imageEntries[] = ['index' => $i, 'name' => $name];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
usort($imageEntries, fn ($a, $b) => strcmp($a['name'], $b['name']));
|
|
||||||
|
|
||||||
foreach ($imageEntries as $seq => $entry) {
|
|
||||||
$extension = strtolower(pathinfo($entry['name'], PATHINFO_EXTENSION)) ?: 'jpg';
|
|
||||||
$targetFile = sprintf('%s/%03d.%s', $targetDir, $seq + 1, $extension);
|
|
||||||
$content = $zip->getFromIndex($entry['index']);
|
|
||||||
file_put_contents($targetFile, $content);
|
|
||||||
}
|
|
||||||
|
|
||||||
$zip->close();
|
|
||||||
unlink($tmpFile);
|
|
||||||
|
|
||||||
return $targetDir;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function countCbzImages(string $cbzBinary): int
|
|
||||||
{
|
|
||||||
$tmpFile = tempnam(sys_get_temp_dir(), 'cbz_');
|
|
||||||
file_put_contents($tmpFile, $cbzBinary);
|
|
||||||
|
|
||||||
$zip = new ZipArchive();
|
|
||||||
if ($zip->open($tmpFile) !== true) {
|
|
||||||
unlink($tmpFile);
|
|
||||||
throw new \RuntimeException('Failed to open CBZ file as ZIP archive');
|
|
||||||
}
|
|
||||||
|
|
||||||
$count = 0;
|
|
||||||
for ($i = 0; $i < $zip->numFiles; $i++) {
|
|
||||||
$name = $zip->getNameIndex($i);
|
|
||||||
if (preg_match('/\.(jpg|jpeg|png|webp|gif)$/i', $name)) {
|
|
||||||
$count++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$zip->close();
|
|
||||||
unlink($tmpFile);
|
|
||||||
|
|
||||||
return $count;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -13,22 +13,22 @@ use App\Domain\Manga\Domain\Model\ValueObject\MangaId;
|
|||||||
use App\Domain\Manga\Domain\Model\ValueObject\MangaSlug;
|
use App\Domain\Manga\Domain\Model\ValueObject\MangaSlug;
|
||||||
use App\Domain\Manga\Domain\Model\ValueObject\MangaTitle;
|
use App\Domain\Manga\Domain\Model\ValueObject\MangaTitle;
|
||||||
use App\Tests\Domain\Manga\Adapter\InMemoryMangaRepository;
|
use App\Tests\Domain\Manga\Adapter\InMemoryMangaRepository;
|
||||||
use App\Tests\Domain\Scraping\Adapter\InMemoryImageStorage;
|
use App\Tests\Domain\Manga\Adapter\InMemoryPathManager;
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
class ImportChapterHandlerTest extends TestCase
|
class ImportChapterHandlerTest extends TestCase
|
||||||
{
|
{
|
||||||
private InMemoryMangaRepository $mangaRepository;
|
private InMemoryMangaRepository $mangaRepository;
|
||||||
private InMemoryImageStorage $imageStorage;
|
private InMemoryPathManager $pathManager;
|
||||||
private ImportChapterHandler $handler;
|
private ImportChapterHandler $handler;
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
$this->mangaRepository = new InMemoryMangaRepository();
|
$this->mangaRepository = new InMemoryMangaRepository();
|
||||||
$this->imageStorage = new InMemoryImageStorage();
|
$this->pathManager = new InMemoryPathManager();
|
||||||
$this->handler = new ImportChapterHandler(
|
$this->handler = new ImportChapterHandler(
|
||||||
$this->mangaRepository,
|
$this->mangaRepository,
|
||||||
$this->imageStorage
|
$this->pathManager
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,22 +12,22 @@ use App\Domain\Manga\Domain\Model\ValueObject\MangaId;
|
|||||||
use App\Domain\Manga\Domain\Model\ValueObject\MangaSlug;
|
use App\Domain\Manga\Domain\Model\ValueObject\MangaSlug;
|
||||||
use App\Domain\Manga\Domain\Model\ValueObject\MangaTitle;
|
use App\Domain\Manga\Domain\Model\ValueObject\MangaTitle;
|
||||||
use App\Tests\Domain\Manga\Adapter\InMemoryMangaRepository;
|
use App\Tests\Domain\Manga\Adapter\InMemoryMangaRepository;
|
||||||
use App\Tests\Domain\Scraping\Adapter\InMemoryImageStorage;
|
use App\Tests\Domain\Manga\Adapter\InMemoryPathManager;
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
class ImportVolumeHandlerTest extends TestCase
|
class ImportVolumeHandlerTest extends TestCase
|
||||||
{
|
{
|
||||||
private InMemoryMangaRepository $mangaRepository;
|
private InMemoryMangaRepository $mangaRepository;
|
||||||
private InMemoryImageStorage $imageStorage;
|
private InMemoryPathManager $pathManager;
|
||||||
private ImportVolumeHandler $handler;
|
private ImportVolumeHandler $handler;
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
$this->mangaRepository = new InMemoryMangaRepository();
|
$this->mangaRepository = new InMemoryMangaRepository();
|
||||||
$this->imageStorage = new InMemoryImageStorage();
|
$this->pathManager = new InMemoryPathManager();
|
||||||
$this->handler = new ImportVolumeHandler(
|
$this->handler = new ImportVolumeHandler(
|
||||||
$this->mangaRepository,
|
$this->mangaRepository,
|
||||||
$this->imageStorage
|
$this->pathManager
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,31 +2,18 @@
|
|||||||
|
|
||||||
namespace App\Tests\Domain\Scraping\Adapter;
|
namespace App\Tests\Domain\Scraping\Adapter;
|
||||||
|
|
||||||
use App\Domain\Shared\Domain\Contract\ImageStorageInterface;
|
use App\Domain\Scraping\Domain\Contract\Service\ImageStorageInterface;
|
||||||
|
|
||||||
class InMemoryImageStorage implements ImageStorageInterface
|
class InMemoryImageStorage implements ImageStorageInterface
|
||||||
{
|
{
|
||||||
/** @var array<string, string> targetId => pagesDirectory */
|
/** @var array<string, string> chapterId => pagesDirectory */
|
||||||
public array $stored = [];
|
public array $stored = [];
|
||||||
|
|
||||||
public function storeChapterImages(string $targetId, array $localImagePaths): string
|
public function storeChapterImages(string $chapterId, array $localImagePaths): string
|
||||||
{
|
{
|
||||||
$dir = '/fake/pages/' . $targetId;
|
$dir = '/fake/pages/' . $chapterId;
|
||||||
$this->stored[$targetId] = $dir;
|
$this->stored[$chapterId] = $dir;
|
||||||
|
|
||||||
return $dir;
|
return $dir;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function extractFromCbz(string $targetId, string $cbzBinary): string
|
|
||||||
{
|
|
||||||
$dir = '/fake/pages/' . $targetId;
|
|
||||||
$this->stored[$targetId] = $dir;
|
|
||||||
|
|
||||||
return $dir;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function countCbzImages(string $cbzBinary): int
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user