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:
@@ -4,7 +4,6 @@ namespace App\Domain\Manga\Application\QueryHandler;
|
||||
|
||||
use App\Domain\Manga\Application\Query\DownloadVolume;
|
||||
use App\Domain\Manga\Application\Response\DownloadResponse;
|
||||
use App\Domain\Manga\Domain\Contract\Repository\ChapterRepositoryInterface;
|
||||
use App\Domain\Manga\Domain\Contract\Repository\MangaRepositoryInterface;
|
||||
use App\Domain\Manga\Domain\Contract\Service\FileServiceInterface;
|
||||
use App\Domain\Manga\Domain\Exception\MangaNotFoundException;
|
||||
@@ -16,7 +15,6 @@ use App\Domain\Shared\Domain\Contract\ResponseInterface;
|
||||
readonly class DownloadVolumeHandler implements QueryHandlerInterface
|
||||
{
|
||||
public function __construct(
|
||||
private ChapterRepositoryInterface $chapterRepository,
|
||||
private MangaRepositoryInterface $mangaRepository,
|
||||
private FileServiceInterface $fileService
|
||||
) {
|
||||
@@ -32,7 +30,7 @@ readonly class DownloadVolumeHandler implements QueryHandlerInterface
|
||||
throw new MangaNotFoundException($query->mangaId);
|
||||
}
|
||||
|
||||
$chapters = $this->chapterRepository->findVisibleWithCbzByMangaIdAndVolume(
|
||||
$chapters = $this->mangaRepository->findVisibleChaptersWithPagesByMangaIdAndVolume(
|
||||
$query->mangaId,
|
||||
$query->volume
|
||||
);
|
||||
@@ -41,10 +39,9 @@ readonly class DownloadVolumeHandler implements QueryHandlerInterface
|
||||
throw new VolumeNotFoundException($query->mangaId, $query->volume);
|
||||
}
|
||||
|
||||
// Collect CBZ paths for all chapters
|
||||
$cbzPaths = [];
|
||||
foreach ($chapters as $chapter) {
|
||||
$cbzPaths[] = $chapter->getCbzPath();
|
||||
$cbzPaths[] = $chapter->getPagesDirectory();
|
||||
}
|
||||
|
||||
$volumeName = sprintf(
|
||||
|
||||
Reference in New Issue
Block a user