Merge branch 'main' of ssh://git.homelab.nestor-server.fr:2222/colgora/Mangarr
All checks were successful
Build and Deploy / deploy (push) Successful in 1m46s
All checks were successful
Build and Deploy / deploy (push) Successful in 1m46s
# Conflicts: # src/Domain/Manga/Application/CommandHandler/DeleteChapterHandler.php # src/Domain/Manga/Application/CommandHandler/EditMultipleChaptersHandler.php # src/Domain/Manga/Application/EventListener/ChapterImportedEventListener.php # src/Domain/Manga/Application/EventListener/VolumeImportedEventListener.php # src/Domain/Manga/Application/Response/ChapterResponse.php # src/Domain/Manga/Infrastructure/ApiPlatform/State/Provider/DeleteCbzProvider.php # src/Domain/Manga/Infrastructure/ApiPlatform/State/Provider/DeleteChapterProvider.php # src/Domain/Manga/Infrastructure/Persistence/Repository/LegacyChapterRepository.php
This commit is contained in:
@@ -3,20 +3,15 @@
|
||||
namespace App\Domain\Manga\Application\CommandHandler;
|
||||
|
||||
use App\Domain\Manga\Application\Command\ImportChapter;
|
||||
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
|
||||
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
|
||||
use App\Domain\Manga\Domain\Exception\MangaNotFoundException;
|
||||
use App\Domain\Manga\Domain\Exception\ChapterNotFoundException;
|
||||
use App\Domain\Manga\Domain\Model\Chapter;
|
||||
use App\Domain\Manga\Domain\Model\ValueObject\ChapterId;
|
||||
use App\Domain\Shared\Domain\Contract\MangaPathManagerInterface;
|
||||
use Ramsey\Uuid\Uuid;
|
||||
|
||||
readonly class ImportChapterHandler
|
||||
{
|
||||
public function __construct(
|
||||
private MangaRepositoryInterface $mangaRepository,
|
||||
private ChapterRepositoryInterface $chapterRepository,
|
||||
private MangaPathManagerInterface $pathManager
|
||||
) {
|
||||
}
|
||||
@@ -35,7 +30,7 @@ readonly class ImportChapterHandler
|
||||
}
|
||||
|
||||
// 3. Check if chapter exists
|
||||
$existingChapter = $this->chapterRepository->findByMangaIdAndChapterNumber(
|
||||
$existingChapter = $this->mangaRepository->findChapterByMangaIdAndNumber(
|
||||
$command->mangaId,
|
||||
$command->chapterNumber
|
||||
);
|
||||
@@ -47,37 +42,20 @@ readonly class ImportChapterHandler
|
||||
// 4. Save the CBZ file to storage using the path manager
|
||||
$cbzPath = $this->saveCbzFile($command, $manga, $existingChapter);
|
||||
|
||||
// 5. Update existing chapter with new CBZ path
|
||||
$updatedChapter = new Chapter(
|
||||
id: new ChapterId($existingChapter->getId()),
|
||||
mangaId: $existingChapter->getMangaId(),
|
||||
number: $existingChapter->getNumber(),
|
||||
title: $existingChapter->getTitle(),
|
||||
volume: $existingChapter->getVolume(),
|
||||
isVisible: $existingChapter->isVisible(),
|
||||
cbzPath: $cbzPath,
|
||||
createdAt: $existingChapter->getCreatedAt()
|
||||
);
|
||||
$this->chapterRepository->save($updatedChapter);
|
||||
// 5. Update existing chapter with new path through the aggregate
|
||||
$manga->updateChapterPages($existingChapter, $cbzPath, $existingChapter->getPageCount());
|
||||
$this->mangaRepository->save($manga);
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate that the binary data is a valid CBZ (ZIP) file
|
||||
*/
|
||||
private function isValidCbzFile(string $fileBinary): bool
|
||||
{
|
||||
// CBZ files are ZIP archives, check for ZIP magic number
|
||||
$zipMagicNumber = "\x50\x4b\x03\x04"; // PK\x03\x04
|
||||
|
||||
return strpos($fileBinary, $zipMagicNumber) === 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Save the CBZ file to storage and return the path
|
||||
*/
|
||||
private function saveCbzFile(ImportChapter $command, \App\Domain\Manga\Domain\Model\Manga $manga, Chapter $chapter): string
|
||||
private function saveCbzFile(ImportChapter $command, \App\Domain\Manga\Domain\Model\Manga $manga, \App\Domain\Manga\Domain\Model\Chapter $chapter): string
|
||||
{
|
||||
// Build the final CBZ path using the path manager (creates directories)
|
||||
$volumeNumber = $chapter->getVolume() ?? 0;
|
||||
$cbzPath = $this->pathManager->buildChapterCbzPath(
|
||||
$manga->getTitle()->getValue(),
|
||||
@@ -86,7 +64,6 @@ readonly class ImportChapterHandler
|
||||
(string)$command->chapterNumber
|
||||
);
|
||||
|
||||
// Write the binary content directly to the CBZ path
|
||||
if (!file_put_contents($cbzPath, $command->fileBinary)) {
|
||||
throw new \RuntimeException('Failed to save CBZ file');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user