Added:

- toogle chapter visibility
- delete chapter cbz
- preferred ContentSource.php and modal
- minor fixes

src/Controller/MangaController.php

@@ -9,6 +9,7 @@ use App\Manager\Toolbar\Factory\ToolbarFactory;
 use App\Message\DownloadChapter;
 use App\Message\RefreshMetadata;
 use App\Repository\ChapterRepository;
+use App\Repository\ContentSourceRepository;
 use App\Repository\MangaRepository;
 use App\Service\CbzService;
 use App\Service\MangadexProvider;
@@ -37,16 +38,17 @@ class MangaController extends AbstractController
     private ImageManager $imageManager;
 
     public function __construct(
-        private readonly string                 $projectDir,
-        private readonly MangaRepository        $mangaRepository,
-        private readonly ChapterRepository      $chapterRepository,
-        private readonly MessageBusInterface    $bus,
-        private readonly CbzService             $cbzService,
-        private readonly ToolbarFactory         $toolbarFactory,
-        private readonly MangadexProvider       $mangadexProvider,
-        private readonly EntityManagerInterface $entityManager,
-        private readonly NotificationService    $notificationService,
-        private readonly SluggerInterface       $slugger
+        private readonly string                  $projectDir,
+        private readonly MangaRepository         $mangaRepository,
+        private readonly ChapterRepository       $chapterRepository,
+        private readonly MessageBusInterface     $bus,
+        private readonly CbzService              $cbzService,
+        private readonly ToolbarFactory          $toolbarFactory,
+        private readonly MangadexProvider        $mangadexProvider,
+        private readonly EntityManagerInterface  $entityManager,
+        private readonly NotificationService     $notificationService,
+        private readonly SluggerInterface        $slugger,
+        private readonly ContentSourceRepository $contentSourceRepository
     )
     {
         $this->imageManager = new ImageManager(new Driver());
@@ -81,11 +83,13 @@ class MangaController extends AbstractController
         }
 
         $form = $this->createForm(MangaEditType::class, $manga);
+        $contentSources = $this->contentSourceRepository->findAll();
 
         return $this->render('manga/show_chapters.html.twig', [
             'manga' => $manga,
-            'toolbar' => $this->toolbarFactory->createToolbar('chapter_list', ['mangaId' => $manga->getId(), 'isMonitored' => (int) $manga->isMonitored()])->getGroups(),
+            'toolbar' => $this->toolbarFactory->createToolbar('chapter_list', ['mangaId' => $manga->getId(), 'isMonitored' => (int)$manga->isMonitored()])->getGroups(),
             'form' => $form->createView(),
+            'contentSources' => $contentSources,
         ]);
     }
 
@@ -94,6 +98,7 @@ class MangaController extends AbstractController
     {
         try {
             foreach ($manga->getChapters() as $chapter) {
+                    file_exists($chapter->getCbzPath()) ?? unlink($chapter->getCbzPath());
                 $this->entityManager->remove($chapter);
             }
             $this->entityManager->remove($manga);
@@ -125,6 +130,30 @@ class MangaController extends AbstractController
         return new JsonResponse(['errors' => $errors], 400);
     }
 
+    #[Route('/manga/{id}/preferred-sources', name: 'manga_preferred_sources', methods: ['POST'])]
+    public function updatePreferredSources(
+        Request                 $request,
+        Manga                   $manga,
+        ContentSourceRepository $contentSourceRepository
+    ): JsonResponse
+    {
+        $data = json_decode($request->getContent(), true);
+        $preferredSourceIds = $data['preferredSources'] ?? [];
+
+        $preferredSources = $contentSourceRepository->findBy(['id' => $preferredSourceIds]);
+
+        // This will maintain the order of the sources as they were sent in the request
+        $orderedPreferredSources = array_map(
+            fn($id) => current(array_filter($preferredSources, fn($s) => $s->getId() == $id)),
+            $preferredSourceIds
+        );
+
+        $manga->setPreferredSources(array_filter($orderedPreferredSources));
+        $this->entityManager->flush();
+
+        return new JsonResponse(['success' => true]);
+    }
+
     public function _chaptersByManga(int $id): Response
     {
         $manga = $this->mangaRepository->find($id);
@@ -157,6 +186,33 @@ class MangaController extends AbstractController
         ]);
     }
 
+    #[Route('/delete_cbz/{id}', name: 'app_delete_cbz')]
+    public function deleteChapterCbz(Chapter $chapter): JsonResponse
+    {
+        $cbzPath = $chapter->getCbzPath();
+        if (!$cbzPath) {
+            return new JsonResponse(['error' => 'No CBZ path for this chapter.'], 400);
+        }
+
+            file_exists($cbzPath) ?? unlink($cbzPath);
+
+        $chapter->setCbzPath(null);
+        $this->entityManager->persist($chapter);
+        $this->entityManager->flush();
+
+        return new JsonResponse(['success' => 'CBZ file deleted.'], 200);
+    }
+
+    #[Route('/hide_chapter/{id}', name: 'app_hide_chapter')]
+    public function hideChapter(Chapter $chapter): JsonResponse
+    {
+        $chapter->setVisible(false);
+        $this->entityManager->persist($chapter);
+        $this->entityManager->flush();
+
+        return new JsonResponse(['success' => 'Chapter hidden.'], 200);
+    }
+
     #[Route('/manga/read/{mangaSlug}/{chapterNumber}/{pageNumber}', name: 'app_manga_read')]
     public function readChapterPage(string $mangaSlug, float $chapterNumber, int $pageNumber = 1): Response
     {
@@ -171,17 +227,7 @@ class MangaController extends AbstractController
         }
 
         if (is_null($chapter->getCbzPath())) {
-            $currentPage = $chapter->getPageByNumber($pageNumber);
-            if (!$currentPage) {
-                throw $this->createNotFoundException("La page demandée n'existe pas.");
-            }
-
-            return $this->render('manga/manga_reader.html.twig', [
-                'manga' => $manga,
-                'chapter' => $chapter,
-                'pages' => $chapter->getPagesLink(),
-                'currentPage' => $currentPage,
-            ]);
+            throw $this->createNotFoundException("Le chapitre demandé n'a pas été scrapé.");
         }
 
         $pageContent = $this->cbzService->getPageContent($chapter->getCbzPath(), $pageNumber);
@@ -226,7 +272,9 @@ class MangaController extends AbstractController
             ->setAuthor($request->request->get('author'))
             ->setPublicationYear($request->request->get('publicationYear'))
             ->setRating($request->request->get('rating'))
-            ->setExternalId($request->request->get('externalId'));
+            ->setExternalId($request->request->get('externalId'))
+            ->setMonitored(false)
+        ;
 
         // Traitement de l'image
         $imageUrl = $request->request->get('imageUrl');
@@ -327,7 +375,8 @@ class MangaController extends AbstractController
 
         $volumeChapters = $this->chapterRepository->findBy([
             'manga' => $manga,
-            'volume' => $volume
+            'volume' => $volume,
+            'visible' => true
         ]);
 
         if (empty($volumeChapters)) {
@@ -374,7 +423,8 @@ class MangaController extends AbstractController
 
         $volumeChapters = $this->chapterRepository->findBy([
             'manga' => $manga,
-            'volume' => $volume
+            'volume' => $volume,
+            'visible' => true
         ]);
 
         if (empty($volumeChapters)) {