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

feat(manga): regrouper les chapitres d'un volume importé dans la liste API

Browse Source 
Les chapitres partageant le même pagesDirectory non-null et le même volume
non-null (import CBZ en bloc) sont fusionnés en un seul item isVolumeGroup=true
côté Application, avec volumeChaptersRange et volumeChapterCount. Le frontend
affiche "Vol. X — Chapitres Y-Z" à la place de N lignes identiques.
This commit is contained in:
ext.jeremy.guillot@maxicoffee.domains
2026-03-15 19:21:02 +01:00
parent c268b2c312
commit fb8f64ee59
9 changed files with 287 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/Domain/Manga/Application/QueryHandler/GetMangaChaptersHandler.php
View File

@@ -23,18 +23,60 @@ readonly class GetMangaChaptersHandler
throw new MangaNotFoundException();
}
$chapters = $this->mangaRepository->findChapters(
$allChapters = $this->mangaRepository->findAllChapters(
mangaId: $query->mangaId,
page: $query->page,
limit: $query->limit,
sortOrder: $query->sortOrder
sortOrder: 'asc'
);
$total = $this->mangaRepository->countChapters($query->mangaId);
$grouped = $this->groupChapters($allChapters);
if ($query->sortOrder === 'desc') {
usort($grouped, fn (ChapterResponse $a, ChapterResponse $b) => $b->number <=> $a->number);
}
$total = count($grouped);
$offset = ($query->page - 1) * $query->limit;
$paginatedChapters = array_slice($grouped, $offset, $query->limit);
return new ChapterListResponse(
chapters: array_map(
fn (Chapter $chapter) => new ChapterResponse(
chapters: $paginatedChapters,
total: $total,
page: $query->page,
limit: $query->limit
);
}
/** @param Chapter[] $chapters */
private function groupChapters(array $chapters): array
{
$result = [];
$currentGroup = [];
$currentPagesDir = null;
$currentVolume = null;
foreach ($chapters as $chapter) {
$pagesDir = $chapter->getPagesDirectory();
$volume = $chapter->getVolume();
if ($pagesDir !== null && $volume !== null) {
if ($pagesDir === $currentPagesDir && $volume === $currentVolume) {
$currentGroup[] = $chapter;
} else {
if (!empty($currentGroup)) {
$result[] = $this->buildVolumeGroupResponse($currentGroup);
}
$currentGroup = [$chapter];
$currentPagesDir = $pagesDir;
$currentVolume = $volume;
}
} else {
if (!empty($currentGroup)) {
$result[] = $this->buildVolumeGroupResponse($currentGroup);
$currentGroup = [];
$currentPagesDir = null;
$currentVolume = null;
}
$result[] = new ChapterResponse(
id: $chapter->getId(),
number: $chapter->getNumber(),
title: $chapter->getTitle(),
@@ -42,12 +84,39 @@ readonly class GetMangaChaptersHandler
isVisible: $chapter->isVisible(),
pagesDirectory: $chapter->getPagesDirectory(),
createdAt: $chapter->getCreatedAt()->format(\DateTimeInterface::RFC3339)
),
$chapters
),
total: $total,
page: $query->page,
limit: $query->limit
);
}
}
if (!empty($currentGroup)) {
$result[] = $this->buildVolumeGroupResponse($currentGroup);
}
return $result;
}
/** @param Chapter[] $group */
private function buildVolumeGroupResponse(array $group): ChapterResponse
{
$first = $group[0];
$numbers = array_map(fn (Chapter $c) => $c->getNumber(), $group);
$min = min($numbers);
$max = max($numbers);
$fmt = fn (float $n) => $n == (int) $n ? (string) (int) $n : (string) $n;
$range = count($group) > 1 ? $fmt($min) . '-' . $fmt($max) : $fmt($min);
return new ChapterResponse(
id: $first->getId(),
number: $first->getNumber(),
title: $first->getTitle(),
volume: $first->getVolume(),
isVisible: $first->isVisible(),
pagesDirectory: $first->getPagesDirectory(),
createdAt: $first->getCreatedAt()->format(\DateTimeInterface::RFC3339),
isVolumeGroup: true,
volumeChaptersRange: $range,
volumeChapterCount: count($group)
);
}
}