Merge branch 'main' into dev-redis

.env.dist

@@ -8,3 +8,4 @@ MERCURE_PUBLIC_URL=%%mercure_public_url%%
 MERCURE_JWT_SECRET="%%mercure_jwt_secret%%"
 JELLYFIN_URL=%%jellyfin_url%%
 JELLYFIN_TOKEN=%%jellyfin_token%%
+REDIS_HOST="%%redis_host%%"

assets/controllers/movie_results_controller.js

@@ -18,13 +18,15 @@ export default class extends Controller {
     static targets = ['list']
 
     options = []
+    optionsLoaded = false
 
     async connect() {
         await this.setOptions();
     }
 
     async setOptions() {
-        if (this.options.length === 0) {
+        if (false === this.optionsLoaded) {
+            this.optionsLoaded = true;
             await fetch(`/torrentio/movies/${this.tmdbIdValue}/${this.imdbIdValue}`)
                 .then(res => res.text())
                 .then(response => {

bash/app/wget_download.sh

@@ -1,2 +1,2 @@
 # $1 = movies/tvshows/etc, $2 = title of media, $3 = URL of download
-cd /var/download/${1} && if [ ! -d "${2}" ]; then mkdir "${2}"; fi && cd "${2}" && wget -c "${3}"
+cd /var/download/${1} && if [ ! -d "${2}" ]; then mkdir "${2}"; fi && cd "${2}" && wget "${3}"

build.xml

@@ -34,6 +34,7 @@
                     <token key="mercure_jwt_secret" value="${MERCURE_JWT_SECRET}" />
                     <token key="jellyfin_url" value="${JELLYFIN_URL}" />
                     <token key="jellyfin_token" value="${JELLYFIN_TOKEN}" />
+                    <token key="redis_host" value="${REDIS_HOST}" />
                 </replacetokens>
             </filterchain>
         </copy>

compose.yml

@@ -12,6 +12,13 @@ services:
       - $PWD/bash/caddy:/etc/caddy
       - $PWD/bash/certs:/etc/ssl
 
+  redis:
+    image: redis:latest
+    volumes:
+      - redis_data:/data
+    command: redis-server --maxmemory 512MB
+    restart: unless-stopped
+
   php:
     build: .
     volumes:
@@ -63,3 +70,4 @@ volumes:
   mysql:
   mercure_data:
   mercure_config:
+  redis_data:

composer.json

@@ -17,6 +17,7 @@
         "nyholm/psr7": "*",
         "p3k/emoji-detector": "^1.2",
         "php-tmdb/api": "^4.1",
+        "predis/predis": "^2.4",
         "symfony/asset": "7.2.*",
         "symfony/console": "7.2.*",
         "symfony/doctrine-messenger": "7.2.*",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e0322cfec0023bee458190f38b4cab8c",
+    "content-hash": "94d3dbf218bac7512ce9ced86ff066aa",
     "packages": [
         {
             "name": "1tomany/data-uri",
@@ -2314,6 +2314,68 @@
             },
             "time": "2025-02-19T13:28:12+00:00"
         },
+        {
+            "name": "predis/predis",
+            "version": "v2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/predis/predis.git",
+                "reference": "f49e13ee3a2a825631562aa0223ac922ec5d058b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/predis/predis/zipball/f49e13ee3a2a825631562aa0223ac922ec5d058b",
+                "reference": "f49e13ee3a2a825631562aa0223ac922ec5d058b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.3",
+                "phpstan/phpstan": "^1.9",
+                "phpunit/phpcov": "^6.0 || ^8.0",
+                "phpunit/phpunit": "^8.0 || ^9.4"
+            },
+            "suggest": {
+                "ext-relay": "Faster connection with in-memory caching (>=0.6.2)"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Predis\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Till Krüss",
+                    "homepage": "https://till.im",
+                    "role": "Maintainer"
+                }
+            ],
+            "description": "A flexible and feature-complete Redis/Valkey client for PHP.",
+            "homepage": "http://github.com/predis/predis",
+            "keywords": [
+                "nosql",
+                "predis",
+                "redis"
+            ],
+            "support": {
+                "issues": "https://github.com/predis/predis/issues",
+                "source": "https://github.com/predis/predis/tree/v2.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/tillkruss",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-04-30T15:16:02+00:00"
+        },
         {
             "name": "psr/cache",
             "version": "3.0.0",

config/packages/cache.yaml

@@ -8,8 +8,8 @@ framework:
         # Other options include:
 
         # Redis
-        #app: cache.adapter.redis
-        #default_redis_provider: redis://localhost
+        app: cache.adapter.redis
+        default_redis_provider: '%env(REDIS_HOST)%'
 
         # APCu (not recommended with heavy random-write workloads as memory fragmentation can cause perf issues)
         #app: cache.adapter.apcu

src/Controller/DownloadController.php

@@ -37,25 +37,4 @@ class DownloadController extends AbstractController
 
         return $this->json(['status' => 200, 'message' => 'Added to Queue']);
     }
-
-    #[Route('/download/test', name: 'app_download_test', methods: ['GET'])]
-    public function downloadTest(
-
-    ): Response {
-        $download = $this->downloadRepository->find(32);
-        try {
-            $this->bus->dispatch(new \App\Download\Action\Command\DownloadMediaCommand(
-                $download->getUrl(),
-                $download->getTitle(),
-                $download->getFilename(),
-                $download->getMediaType(),
-                $download->getImdbId(),
-                $download->getId(),
-            ));
-        } catch (\Throwable $exception) {
-            return $this->json(['error' => $exception->getMessage()], Response::HTTP_INTERNAL_SERVER_ERROR);
-        }
-
-        return $this->json(['status' => 200, 'message' => 'Added to Queue']);
-    }
 }

templates/components/ActiveDownloadList.html.twig

@@ -17,7 +17,7 @@
             {% for download in this.getDownloads() %}
                 <tr  id="ad_download_{{ download.id }}">
                     <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
-                        {{ download.filename }}
+                        {{ download.title }}
                     </td>
                     <td class="px-6 py-4 whitespace-nowrap text-sm text-end text-gray-800 dark:text-gray-50">
                         <span class="p-1.5 bg-purple-600 rounded-full">
@@ -26,11 +26,6 @@
                     </td>
                 </tr>
             {% endfor %}
-            <tr class="bg-amber-600">
-                <td class="px-6 py-4 whitespace-nowrap text-xs uppercase text-center col-span-2 font-medium text-gray-50 dark:text-gray-50" colspan="2">
-                    <a href="#">View all active downloads</a>
-                </td>
-            </tr>
         {% else %}
             <tr>
                 <td class="px-6 py-4 whitespace-nowrap text-xs uppercase text-center col-span-2 font-medium text-gray-800 dark:text-stone-800" colspan="2">