Compare commits

...

3 Commits

8 changed files with 60 additions and 41 deletions

View File

@@ -2,5 +2,5 @@ dev.caldwell.digital:443
tls /etc/ssl/wildcard.crt /etc/ssl/wildcard.pem tls /etc/ssl/wildcard.crt /etc/ssl/wildcard.pem
reverse_proxy web:80 reverse_proxy app:80

View File

@@ -10,9 +10,4 @@ sleep $SLEEP_TIME
php /var/www/bin/console doctrine:migrations:migrate --no-interaction php /var/www/bin/console doctrine:migrations:migrate --no-interaction
php /var/www/bin/console db:seed php /var/www/bin/console db:seed
# Start Apache in the foreground /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
echo "Starting PHP-FPM..."
php-fpm
exec "$@"

View File

@@ -20,11 +20,13 @@ server {
} }
location ~ \.php$ { location ~ \.php$ {
fastcgi_pass app:9000; fastcgi_pass unix:/run/php-fpm.sock;
fastcgi_split_path_info ^(.+\.php)(/.*)$; fastcgi_split_path_info ^(.+\.php)(/.*)$;
fastcgi_buffers 16 16k;
fastcgi_buffer_size 32k;
include fastcgi_params; include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
fastcgi_param DOCUMENT_ROOT $document_root; fastcgi_param DOCUMENT_ROOT $realpath_root;
internal; internal;
} }
} }

View File

@@ -12,14 +12,6 @@ services:
- $PWD/bash/caddy:/etc/caddy - $PWD/bash/caddy:/etc/caddy
- $PWD/bash/certs:/etc/ssl - $PWD/bash/certs:/etc/ssl
web:
build:
dockerfile: docker/Dockerfile.web
context: .
depends_on:
app:
condition: service_healthy
redis: redis:
image: redis:latest image: redis:latest
volumes: volumes:
@@ -31,6 +23,8 @@ services:
build: build:
dockerfile: docker/Dockerfile.app dockerfile: docker/Dockerfile.app
context: . context: .
ports:
- "8001:80"
volumes: volumes:
- ./:/var/www - ./:/var/www
depends_on: depends_on:
@@ -45,7 +39,7 @@ services:
- ./:/app - ./:/app
- ./var/downloads/movies:/var/download/movies - ./var/downloads/movies:/var/download/movies
- ./var/downloads/tvshows:/var/download/tvshows - ./var/downloads/tvshows:/var/download/tvshows
command: -v --time-limit=3600 --limit=10 command: -vvv --time-limit=3600
env_file: env_file:
- .env - .env
depends_on: depends_on:

View File

@@ -29,6 +29,7 @@ framework:
'App\Monitor\Action\Command\MonitorTvSeasonCommand': async 'App\Monitor\Action\Command\MonitorTvSeasonCommand': async
'App\Monitor\Action\Command\MonitorTvShowCommand': async 'App\Monitor\Action\Command\MonitorTvShowCommand': async
'App\Monitor\Action\Command\MonitorMovieCommand': async 'App\Monitor\Action\Command\MonitorMovieCommand': async
'App\Torrentio\Action\Command\GetTvShowOptionsCommand': async
# when@test: # when@test:
# framework: # framework:

View File

@@ -1,20 +1,19 @@
FROM php:8.4-fpm-alpine3.21 FROM trafex/php-nginx:3.9.0
RUN docker-php-ext-install pdo_mysql USER root
# SETUP PHP-FPM CONFIG SETTINGS (max_children / max_requests) RUN apk add --no-cache \
RUN echo 'pm = dynamic' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \ php84-pdo_mysql \
echo 'pm.max_children = 75' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \ php84-simplexml
echo 'pm.start_servers = 30' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
echo 'pm.min_spare_servers = 5' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
echo 'pm.max_spare_servers = 30' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
echo 'pm.process_idle_timeout = 10s' >> /usr/local/etc/php-fpm.d/zz-docker.conf
COPY --chown=www-data:www-data . /var/www USER nobody
COPY --chown=nobody:nobody . /var/www
COPY --chmod=0775 ./bash/entrypoint.sh /usr/local/bin/ COPY --chmod=0775 ./bash/entrypoint.sh /usr/local/bin/
COPY --chmod=0755 ./bash/nginx.conf /etc/nginx/conf.d/site.conf
HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ] HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ]
ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ] ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
WORKDIR /var/www WORKDIR /var/www

View File

@@ -3,18 +3,12 @@ services:
# proxies traffic back to their respective services. If not # proxies traffic back to their respective services. If not
# running behind a reverse proxy inject your SSL certificates # running behind a reverse proxy inject your SSL certificates
# into this container. # into this container.
web:
image: code.caldwell.digital/home/torsearch-web:latest
ports:
- '8006:80'
depends_on:
app:
condition: service_healthy
# This container runs the actual web app in a php:8.4-fpm # This container runs the actual web app in a php:8.4-fpm
# base container. # base container.
app: app:
image: code.caldwell.digital/home/torsearch-app:latest image: code.caldwell.digital/home/torsearch-app:latest
ports:
- '8006:80'
env_file: env_file:
- .env - .env
depends_on: depends_on:
@@ -36,6 +30,7 @@ services:
command: -v --time-limit=3600 --limit=10 command: -v --time-limit=3600 --limit=10
env_file: env_file:
- .env - .env
restart: always
depends_on: depends_on:
app: app:
condition: service_healthy condition: service_healthy
@@ -52,6 +47,7 @@ services:
command: -vv --time-limit=3600 command: -vv --time-limit=3600
env_file: env_file:
- .env - .env
restart: always
depends_on: depends_on:
app: app:
condition: service_healthy condition: service_healthy

View File

@@ -6,18 +6,20 @@ use App\Search\Action\Handler\GetMediaInfoHandler;
use App\Search\Action\Handler\SearchHandler; use App\Search\Action\Handler\SearchHandler;
use App\Search\Action\Input\GetMediaInfoInput; use App\Search\Action\Input\GetMediaInfoInput;
use App\Search\Action\Input\SearchInput; use App\Search\Action\Input\SearchInput;
use Carbon\Carbon; use App\Tmdb\TmdbResult;
use App\Torrentio\Action\Command\GetMovieOptionsCommand;
use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Messenger\MessageBusInterface;
use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Routing\Attribute\Route;
use Symfony\Contracts\Cache\CacheInterface;
use Symfony\Contracts\Cache\ItemInterface;
final class SearchController extends AbstractController final class SearchController extends AbstractController
{ {
public function __construct( public function __construct(
private SearchHandler $searchHandler, private SearchHandler $searchHandler,
private GetMediaInfoHandler $getMediaInfoHandler, private GetMediaInfoHandler $getMediaInfoHandler,
private MessageBusInterface $bus,
) {} ) {}
#[Route('/search', name: 'app_search', methods: ['GET'])] #[Route('/search', name: 'app_search', methods: ['GET'])]
@@ -36,6 +38,8 @@ final class SearchController extends AbstractController
GetMediaInfoInput $input, GetMediaInfoInput $input,
): Response { ): Response {
$result = $this->getMediaInfoHandler->handle($input->toCommand()); $result = $this->getMediaInfoHandler->handle($input->toCommand());
$this->warmDownloadOptionCache($result->media);
return $this->render('search/result.html.twig', [ return $this->render('search/result.html.twig', [
'results' => $result, 'results' => $result,
'filter' => [ 'filter' => [
@@ -48,4 +52,32 @@ final class SearchController extends AbstractController
] ]
]); ]);
} }
private function warmDownloadOptionCache(TmdbResult $result)
{
if ($result->mediaType === 'tvshows') {
// dispatches a job to get the download options
// for each episode and load them in cache
foreach ($result->episodes as $season => $episodes) {
// Only do the first 2 seasons, so we reduce
// getting rate-limited by Torrentio
if ($season > 2) {
return;
}
foreach ($episodes as $episode) {
$this->bus->dispatch(new GetTvShowOptionsCommand(
tmdbId: $result->tmdbId,
imdbId: $result->imdbId,
season: $season,
episode: $episode['episode_number'],
));
}
}
} elseif ($result->mediaType === 'movies') {
$this->bus->dispatch(new GetMovieOptionsCommand(
$result->tmdbId,
$result->imdbId,
));
}
}
} }