Merge branch 'main' into dev-cache

docs/examples/.env

@@ -27,7 +27,7 @@ DATABASE_URL="mysql://root:password@database:3306/app?serverVersion=10.6.19.2-Ma
 # Popular Movies and TV Shows section.
 #TMDB_API=
 
-REAL_DEBRID_KEY="QYYBR7OSQ4VEFKWASDEZ2B4VO67KHUJY6IWOT7HHA7ATXO7QCYDQ"
+REAL_DEBRID_KEY=""
 TMDB_API=eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiI0ZTJjYjJhOGUzOGJhNjdiNjVhOGU1NGM0ZWI1MzhmOCIsIm5iZiI6MTczNzkyNjA0NC41NjQsInN1YiI6IjY3OTZhNTljYzdiMDFiNzJjNzIzZWM5YiIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.e8DbNe9qrSBC1y-ANRv-VWBAtls-ZS2r7aNCiI68mpw
 
 

docs/examples/compose.yml

@@ -11,6 +11,13 @@ services:
       - '8006:80'
     env_file:
       - .env
+    volumes:
+      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
+    environment:
+      TZ: America/Chicago
+      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
     depends_on:
       database:
         condition: service_healthy
@@ -27,6 +34,8 @@ services:
     volumes:
       - /mnt/media/downloads/movies:/var/download/movies
       - /mnt/media/downloads/tvshows:/var/download/tvshows
+    environment:
+      TZ: America/Chicago
     command: -vvv
     env_file:
       - .env
@@ -43,35 +52,17 @@ services:
   scheduler:
     image: code.caldwell.digital/home/torsearch-scheduler:latest
     volumes:
-      - ./downloads:/var/download
+      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
     env_file:
       - .env
+    environment:
+      TZ: America/Chicago
     restart: always
     depends_on:
       app:
         condition: service_healthy
 
-  # This container facilitates viewing the progress of downloads
-  # in realtime. It also handles sending alerts and notifications.
-  # The MERCURE_PUBLISHER_JWT key & MERCURE_SUBSCRIBER_JWT_KEY should
-  # match the MERCURE_JWT_SECRET environment variable.
-  mercure:
-    image: dunglas/mercure
-    restart: unless-stopped
-    ports:
-      - "3001:80"
-    environment:
-      SERVER_NAME: ':80'
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_EXTRA_DIRECTIVES: |
-        cors_origins *
-        anonymous
-    command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
-    volumes:
-      - mercure_data:/data
-      - mercure_config:/config
-
   database:
     image: mariadb:10.11.2
     volumes:

src/Monitor/Framework/Controller/ApiController.php

@@ -2,17 +2,13 @@
 
 namespace App\Monitor\Framework\Controller;
 
-use App\Download\Action\Input\DeleteDownloadInput;
 use App\Monitor\Action\Handler\AddMonitorHandler;
 use App\Monitor\Action\Handler\DeleteMonitorHandler;
 use App\Monitor\Action\Input\AddMonitorInput;
 use App\Monitor\Action\Input\DeleteMonitorInput;
 use App\Util\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
 use Symfony\Component\Routing\Attribute\Route;
 
 class ApiController extends AbstractController
@@ -46,19 +42,9 @@ class ApiController extends AbstractController
     public function deleteMonitor(
         DeleteMonitorInput $input,
         DeleteMonitorHandler $handler,
-        HubInterface $hub,
     ) {
         $response = $handler->handle($input->toCommand());
 
-        $hub->publish(new Update(
-            'alerts',
-            $this->renderer->render('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => 'Success',
-                'message' => "New monitor added for {$response->monitor->getTitle()}",
-            ])
-        ));
-
         return $this->json([
             'status' => 200,
             'message' => $response

src/Torrentio/Client/Torrentio.php

@@ -10,8 +10,8 @@ use App\Torrentio\Exception\TorrentioRateLimitException;
 use GuzzleHttp\Client;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
-use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
+use Symfony\Contracts\Cache\TagAwareCacheInterface;
 
 class Torrentio
 {
@@ -23,7 +23,7 @@ class Torrentio
 
     public function __construct(
         #[Autowire(env: 'REAL_DEBRID_KEY')] private string $realDebridKey,
-        private CacheInterface $cache,
+        private TagAwareCacheInterface $cache,
         private LoggerInterface $logger,
     ) {
         $this->searchUrl = str_replace('{realDebridKey}', $this->realDebridKey, $this->baseUrl);
@@ -36,8 +36,9 @@ class Torrentio
     {
         $cacheKey = "torrentio.{$imdbCode}";
 
-        $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode) {
+        $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode, $type) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
+            $item->tag(['torrentio', $type, $imdbCode]);
             try {
                 $response = $this->client->get("$this->searchUrl/$imdbCode.json");
                 return json_decode(
@@ -63,6 +64,7 @@ class Torrentio
         $cacheKey = "torrentio.$imdbId.$season.$episode";
         $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbId, $season, $episode) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
+            $item->tag(['torrentio', 'tvshows', 'torrentio.tvshows', $imdbId, "torrentio.$imdbId", "$imdbId.$season", "torrentio.$imdbId.$season", "$imdbId.$season.$episode", "torrentio.$imdbId.$season.$episode"]);
             try {
                 $response = $this->client->get("$this->searchUrl/$imdbId:$season:$episode.json");
                 return json_decode(

src/User/Framework/Controller/Web/RegistrationController.php

@@ -17,13 +17,16 @@ use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Routing\Attribute\Route;
 
 class RegistrationController extends AbstractController
 {
-    public function __construct(private readonly RegisterUserHandler $registerUserHandler)
+    public function __construct(private readonly RegisterUserHandler $registerUserHandler,
+        private readonly RequestStack $requestStack
+    )
     {
     }
 
@@ -71,6 +74,7 @@ class RegistrationController extends AbstractController
             ));
 
             $security->login($user->user);
+            $this->requestStack->getCurrentRequest()->getSession()->set('mercure_alert_topic', 'alerts_' . uniqid());
 
             return $this->redirectToRoute('app_index');
         }

templates/base.html.twig

@@ -19,7 +19,12 @@
             </div>
             <div class="col-span-5 h-screen overflow-y-scroll">
                 <twig:Header />
-                <h2 class="px-4 my-2 text-3xl font-bold text-gray-50">{% block h2 %}{% endblock %}</h2>
+                <div class="px-4 mt-3 flex flex-row justify-between">
+                    <h2 class="text-3xl font-bold text-gray-50">{% block h2 %}{% endblock %}</h2>
+                    <div class="flex flex-row gap-1 align-end justify-end items-end">
+                        {% block action_buttons %}{% endblock %}
+                    </div>
+                </div>
                 {% block body %}{% endblock %}
             </div>
         </div>

templates/user/preferences.html.twig

@@ -2,6 +2,14 @@
 {% block title %}Preferences{% endblock %}
 {% block h2 %}Preferences{% endblock %}
 
+{% block action_buttons %}
+<button
+  class="px-1.5 py-1 my-2 text-white text-sm bg-blue-950 hover:bg-black/80 border-2 border-blue-500/90 rounded-md inline-block"
+>
+    Clear Cache
+</button>
+{% endblock %}
+
 {% block body %}
 <div class="p-4 flex flex-row gap-2">
     <twig:Card title="Media Preferences" class="w-full">