Compare commits
8 Commits
v0.16.10
...
pause-resu
| Author | SHA1 | Date | |
|---|---|---|---|
| 3c2092095f | |||
| a7bedae3db | |||
| 51c2a1c577 | |||
| f5ed464719 | |||
| aa31701ac8 | |||
| 781e4dcd23 | |||
| b5cd240fbd | |||
| ce5bc525dd |
@@ -1,4 +1,4 @@
|
||||
FROM dunglas/frankenphp:php8.4-alpine
|
||||
FROM dunglas/frankenphp:php8.4
|
||||
|
||||
ENV SERVER_NAME=":80"
|
||||
ENV CADDY_GLOBAL_OPTIONS="auto_https off"
|
||||
@@ -11,8 +11,8 @@ RUN install-php-extensions \
|
||||
zip \
|
||||
opcache
|
||||
|
||||
RUN apk add --no-cache wget
|
||||
RUN apt update && apt install -y wget
|
||||
|
||||
HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]
|
||||
|
||||
COPY docker/app/Caddyfile /etc/frankenphp/Caddyfile
|
||||
COPY --chmod=0755 docker/app/Caddyfile /etc/frankenphp/Caddyfile
|
||||
|
||||
4
assets/bootstrap.js
vendored
4
assets/bootstrap.js
vendored
@@ -1,6 +1,10 @@
|
||||
import { startStimulusApp } from '@symfony/stimulus-bundle';
|
||||
import Popover from '@stimulus-components/popover'
|
||||
import Dialog from '@stimulus-components/dialog'
|
||||
import Dropdown from '@stimulus-components/dropdown'
|
||||
|
||||
const app = startStimulusApp();
|
||||
// register any custom, 3rd party controllers here
|
||||
app.register('popover', Popover);
|
||||
app.register('dialog', Dialog);
|
||||
app.register('dropdown', Dropdown);
|
||||
|
||||
@@ -29,6 +29,18 @@ export default class extends Controller {
|
||||
}
|
||||
}
|
||||
|
||||
pauseDownload(data) {
|
||||
fetch(`/api/download/${data.params.id}/pause`, {method: 'PATCH'})
|
||||
.then(res => res.json())
|
||||
.then(json => console.debug(json));
|
||||
}
|
||||
|
||||
resumeDownload(data) {
|
||||
fetch(`/api/download/${data.params.id}/resume`, {method: 'PATCH'})
|
||||
.then(res => res.json())
|
||||
.then(json => console.debug(json));
|
||||
}
|
||||
|
||||
deleteDownload(data) {
|
||||
fetch(`/api/download/${data.params.id}`, {method: 'DELETE'})
|
||||
.then(res => res.json())
|
||||
|
||||
1
assets/icons/icon-park-twotone/pause-one.svg
Normal file
1
assets/icons/icon-park-twotone/pause-one.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 48 48"><defs><mask id="ipTPauseOne0"><g fill="none" stroke="#fff" stroke-linejoin="round" stroke-width="4"><path fill="#555" d="M24 44c11.046 0 20-8.954 20-20S35.046 4 24 4S4 12.954 4 24s8.954 20 20 20Z"/><path stroke-linecap="round" d="M19 18v12m10-12v12"/></g></mask></defs><path fill="currentColor" d="M0 0h48v48H0z" mask="url(#ipTPauseOne0)"/></svg>
|
||||
|
After Width: | Height: | Size: 407 B |
1
assets/icons/icon-park-twotone/play.svg
Normal file
1
assets/icons/icon-park-twotone/play.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 48 48"><defs><mask id="ipTPlay0"><g fill="#555" stroke="#fff" stroke-linejoin="round" stroke-width="4"><path d="M24 44c11.046 0 20-8.954 20-20S35.046 4 24 4S4 12.954 4 24s8.954 20 20 20Z"/><path d="M20 24v-6.928l6 3.464L32 24l-6 3.464l-6 3.464z"/></g></mask></defs><path fill="currentColor" d="M0 0h48v48H0z" mask="url(#ipTPlay0)"/></svg>
|
||||
|
After Width: | Height: | Size: 392 B |
@@ -11,3 +11,40 @@
|
||||
font-size: var(--text-xl);
|
||||
}
|
||||
}
|
||||
|
||||
/* Prevent scrolling while dialog is open */
|
||||
body:has(dialog[data-dialog-target="dialog"][open]) {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* Customize the dialog backdrop */
|
||||
dialog {
|
||||
box-shadow: 0 0 0 100vw rgb(0 0 0 / 0.5);
|
||||
}
|
||||
|
||||
@keyframes fade-in {
|
||||
0% {
|
||||
opacity: 0;
|
||||
}
|
||||
100% {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes fade-out {
|
||||
0% {
|
||||
opacity: 1;
|
||||
}
|
||||
100% {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* Add animations */
|
||||
dialog[data-dialog-target="dialog"][open] {
|
||||
animation: fade-in 200ms forwards;
|
||||
}
|
||||
|
||||
dialog[data-dialog-target="dialog"][closing] {
|
||||
animation: fade-out 200ms forwards;
|
||||
}
|
||||
|
||||
@@ -10,10 +10,22 @@ framework:
|
||||
options:
|
||||
use_notify: true
|
||||
check_delayed_interval: 60000
|
||||
queue_name: default
|
||||
retry_strategy:
|
||||
max_retries: 1
|
||||
multiplier: 1
|
||||
|
||||
media_cache:
|
||||
dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
|
||||
options:
|
||||
use_notify: true
|
||||
check_delayed_interval: 60000
|
||||
queue_name: media_cache
|
||||
retry_strategy:
|
||||
max_retries: 1
|
||||
multiplier: 1
|
||||
|
||||
|
||||
failed: 'doctrine://default?queue_name=failed'
|
||||
|
||||
default_bus: messenger.bus.default
|
||||
@@ -29,7 +41,7 @@ framework:
|
||||
'App\Monitor\Action\Command\MonitorTvSeasonCommand': async
|
||||
'App\Monitor\Action\Command\MonitorTvShowCommand': async
|
||||
'App\Monitor\Action\Command\MonitorMovieCommand': async
|
||||
'App\Torrentio\Action\Command\GetTvShowOptionsCommand': async
|
||||
'App\Torrentio\Action\Command\GetTvShowOptionsCommand': media_cache
|
||||
|
||||
# when@test:
|
||||
# framework:
|
||||
|
||||
@@ -9,4 +9,8 @@ sleep $SLEEP_TIME
|
||||
php /app/bin/console doctrine:migrations:migrate --no-interaction
|
||||
php /app/bin/console db:seed
|
||||
|
||||
exec docker-php-entrypoint "$@"
|
||||
# Start the media cache warming services
|
||||
systemctl --user enable messenger-worker.service
|
||||
systemctl --user start messenger-worker.service
|
||||
|
||||
frankenphp php-server /etc/frankenphp/Caddyfile
|
||||
|
||||
12
docker/app/messenger-worker@.service
Normal file
12
docker/app/messenger-worker@.service
Normal file
@@ -0,0 +1,12 @@
|
||||
[Unit]
|
||||
Description=Torsearch media cache warming services
|
||||
|
||||
[Service]
|
||||
ExecStart=php /app/bin/console messenger:consume media_cache --time-limit=3600
|
||||
# for Redis, set a custom consumer name for each instance
|
||||
Environment="MESSENGER_CONSUMER_NAME=symfony-%n-%i"
|
||||
Restart=always
|
||||
RestartSec=30
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
@@ -31,4 +31,13 @@ return [
|
||||
'@stimulus-components/popover' => [
|
||||
'version' => '7.0.0',
|
||||
],
|
||||
'@stimulus-components/dialog' => [
|
||||
'version' => '1.0.1',
|
||||
],
|
||||
'@stimulus-components/dropdown' => [
|
||||
'version' => '3.0.0',
|
||||
],
|
||||
'stimulus-use' => [
|
||||
'version' => '0.52.2',
|
||||
],
|
||||
];
|
||||
|
||||
@@ -52,13 +52,13 @@ final class TorrentioController extends AbstractController
|
||||
$input->episode,
|
||||
);
|
||||
|
||||
return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
|
||||
$item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
|
||||
// return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
|
||||
// $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
|
||||
$results = $this->getTvShowOptionsHandler->handle($input->toCommand());
|
||||
return $this->render('torrentio/tvshows.html.twig', [
|
||||
'results' => $results,
|
||||
]);
|
||||
});
|
||||
// });
|
||||
}
|
||||
|
||||
#[Route('/torrentio/tvshows/clear/{tmdbId}/{imdbId}/{season?}/{episode?}', name: 'app_clear_torrentio_tvshows')]
|
||||
|
||||
15
src/Download/Action/Command/PauseDownloadCommand.php
Normal file
15
src/Download/Action/Command/PauseDownloadCommand.php
Normal file
@@ -0,0 +1,15 @@
|
||||
<?php
|
||||
|
||||
namespace App\Download\Action\Command;
|
||||
|
||||
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||
|
||||
/**
|
||||
* @implements CommandInterface<PauseDownloadCommand>
|
||||
*/
|
||||
class PauseDownloadCommand implements CommandInterface
|
||||
{
|
||||
public function __construct(
|
||||
public int $downloadId,
|
||||
) {}
|
||||
}
|
||||
15
src/Download/Action/Command/ResumeDownloadCommand.php
Normal file
15
src/Download/Action/Command/ResumeDownloadCommand.php
Normal file
@@ -0,0 +1,15 @@
|
||||
<?php
|
||||
|
||||
namespace App\Download\Action\Command;
|
||||
|
||||
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||
|
||||
/**
|
||||
* @implements CommandInterface<ResumeDownloadCommand>
|
||||
*/
|
||||
class ResumeDownloadCommand implements CommandInterface
|
||||
{
|
||||
public function __construct(
|
||||
public int $downloadId,
|
||||
) {}
|
||||
}
|
||||
@@ -38,7 +38,9 @@ readonly class DownloadMediaHandler implements HandlerInterface
|
||||
}
|
||||
|
||||
try {
|
||||
$this->downloadRepository->updateStatus($download->getId(), 'In Progress');
|
||||
if ($download->getStatus() !== 'Paused') {
|
||||
$this->downloadRepository->updateStatus($download->getId(), 'In Progress');
|
||||
}
|
||||
|
||||
$this->downloader->download(
|
||||
$command->mediaType,
|
||||
@@ -47,7 +49,9 @@ readonly class DownloadMediaHandler implements HandlerInterface
|
||||
$download->getId()
|
||||
);
|
||||
|
||||
$this->downloadRepository->updateStatus($download->getId(), 'Complete');
|
||||
if ($download->getStatus() !== 'Paused') {
|
||||
$this->downloadRepository->updateStatus($download->getId(), 'Complete');
|
||||
}
|
||||
|
||||
} catch (\Throwable $exception) {
|
||||
throw new UnrecoverableMessageHandlingException($exception->getMessage(), 500);
|
||||
|
||||
33
src/Download/Action/Handler/PauseDownloadHandler.php
Normal file
33
src/Download/Action/Handler/PauseDownloadHandler.php
Normal file
@@ -0,0 +1,33 @@
|
||||
<?php
|
||||
|
||||
namespace App\Download\Action\Handler;
|
||||
|
||||
use App\Download\Action\Command\PauseDownloadCommand;
|
||||
use App\Download\Action\Result\PauseDownloadResult;
|
||||
use App\Download\Framework\Entity\Download;
|
||||
use App\Download\Framework\Repository\DownloadRepository;
|
||||
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||
use OneToMany\RichBundle\Contract\HandlerInterface;
|
||||
use OneToMany\RichBundle\Contract\ResultInterface;
|
||||
use Symfony\Contracts\Cache\CacheInterface;
|
||||
|
||||
/** @implements HandlerInterface<PauseDownloadCommand, PauseDownloadResult> */
|
||||
readonly class PauseDownloadHandler implements HandlerInterface
|
||||
{
|
||||
public function __construct(
|
||||
private DownloadRepository $downloadRepository,
|
||||
private CacheInterface $cache,
|
||||
) {}
|
||||
|
||||
public function handle(CommandInterface $command): ResultInterface
|
||||
{
|
||||
/** @var Download $download */
|
||||
$download = $this->downloadRepository->find($command->downloadId);
|
||||
|
||||
$this->cache->get('download.pause.' . $download->getId(), function () {
|
||||
return true;
|
||||
});
|
||||
|
||||
return new PauseDownloadResult(200, 'Success', $download);
|
||||
}
|
||||
}
|
||||
40
src/Download/Action/Handler/ResumeDownloadHandler.php
Normal file
40
src/Download/Action/Handler/ResumeDownloadHandler.php
Normal file
@@ -0,0 +1,40 @@
|
||||
<?php
|
||||
|
||||
namespace App\Download\Action\Handler;
|
||||
|
||||
use App\Download\Action\Command\DownloadMediaCommand;
|
||||
use App\Download\Action\Command\ResumeDownloadCommand;
|
||||
use App\Download\Action\Result\ResumeDownloadResult;
|
||||
use App\Download\Framework\Entity\Download;
|
||||
use App\Download\Framework\Repository\DownloadRepository;
|
||||
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||
use OneToMany\RichBundle\Contract\HandlerInterface;
|
||||
use OneToMany\RichBundle\Contract\ResultInterface;
|
||||
use Symfony\Component\Messenger\MessageBusInterface;
|
||||
|
||||
/** @implements HandlerInterface<ResumeDownloadCommand, ResumeDownloadResult> */
|
||||
readonly class ResumeDownloadHandler implements HandlerInterface
|
||||
{
|
||||
public function __construct(
|
||||
private DownloadRepository $downloadRepository,
|
||||
private MessageBusInterface $messageBus,
|
||||
) {}
|
||||
|
||||
public function handle(CommandInterface $command): ResultInterface
|
||||
{
|
||||
/** @var Download $download */
|
||||
$download = $this->downloadRepository->find($command->downloadId);
|
||||
|
||||
$this->messageBus->dispatch(new DownloadMediaCommand(
|
||||
$download->getUrl(),
|
||||
$download->getTitle(),
|
||||
$download->getFilename(),
|
||||
$download->getMediaType(),
|
||||
$download->getImdbId(),
|
||||
$download->getUser()->getId(),
|
||||
$download->getId()
|
||||
));
|
||||
|
||||
return new ResumeDownloadResult(200, 'Success', $download);
|
||||
}
|
||||
}
|
||||
24
src/Download/Action/Input/PauseDownloadInput.php
Normal file
24
src/Download/Action/Input/PauseDownloadInput.php
Normal file
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
namespace App\Download\Action\Input;
|
||||
|
||||
use App\Download\Action\Command\PauseDownloadCommand;
|
||||
use OneToMany\RichBundle\Attribute\SourceRoute;
|
||||
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||
use OneToMany\RichBundle\Contract\InputInterface;
|
||||
|
||||
/** @implements InputInterface<PauseDownloadInput, PauseDownloadCommand> */
|
||||
class PauseDownloadInput implements InputInterface
|
||||
{
|
||||
public function __construct(
|
||||
#[SourceRoute('downloadId')]
|
||||
public int $downloadId,
|
||||
) {}
|
||||
|
||||
public function toCommand(): CommandInterface
|
||||
{
|
||||
return new PauseDownloadCommand(
|
||||
$this->downloadId,
|
||||
);
|
||||
}
|
||||
}
|
||||
24
src/Download/Action/Input/ResumeDownloadInput.php
Normal file
24
src/Download/Action/Input/ResumeDownloadInput.php
Normal file
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
namespace App\Download\Action\Input;
|
||||
|
||||
use App\Download\Action\Command\PauseDownloadCommand;
|
||||
use OneToMany\RichBundle\Attribute\SourceRoute;
|
||||
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||
use OneToMany\RichBundle\Contract\InputInterface;
|
||||
|
||||
/** @implements InputInterface<PauseDownloadInput, PauseDownloadCommand> */
|
||||
class ResumeDownloadInput implements InputInterface
|
||||
{
|
||||
public function __construct(
|
||||
#[SourceRoute('downloadId')]
|
||||
public int $downloadId,
|
||||
) {}
|
||||
|
||||
public function toCommand(): CommandInterface
|
||||
{
|
||||
return new PauseDownloadCommand(
|
||||
$this->downloadId,
|
||||
);
|
||||
}
|
||||
}
|
||||
16
src/Download/Action/Result/PauseDownloadResult.php
Normal file
16
src/Download/Action/Result/PauseDownloadResult.php
Normal file
@@ -0,0 +1,16 @@
|
||||
<?php
|
||||
|
||||
namespace App\Download\Action\Result;
|
||||
|
||||
use App\Download\Framework\Entity\Download;
|
||||
use OneToMany\RichBundle\Contract\ResultInterface;
|
||||
|
||||
/** @implements ResultInterface<PauseDownloadResult> */
|
||||
class PauseDownloadResult implements ResultInterface
|
||||
{
|
||||
public function __construct(
|
||||
public int $status,
|
||||
public string $message,
|
||||
public Download $download,
|
||||
) {}
|
||||
}
|
||||
16
src/Download/Action/Result/ResumeDownloadResult.php
Normal file
16
src/Download/Action/Result/ResumeDownloadResult.php
Normal file
@@ -0,0 +1,16 @@
|
||||
<?php
|
||||
|
||||
namespace App\Download\Action\Result;
|
||||
|
||||
use App\Download\Framework\Entity\Download;
|
||||
use OneToMany\RichBundle\Contract\ResultInterface;
|
||||
|
||||
/** @implements ResultInterface<ResumeDownloadResult> */
|
||||
class ResumeDownloadResult implements ResultInterface
|
||||
{
|
||||
public function __construct(
|
||||
public int $status,
|
||||
public string $message,
|
||||
public Download $download,
|
||||
) {}
|
||||
}
|
||||
@@ -5,14 +5,21 @@ namespace App\Download\Downloader;
|
||||
use App\Download\Framework\Entity\Download;
|
||||
use App\Monitor\Service\MediaFiles;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Component\Cache\Adapter\RedisAdapter;
|
||||
use Symfony\Component\Process\Exception\ProcessFailedException;
|
||||
use Symfony\Component\Process\Process;
|
||||
use Symfony\Contracts\Cache\CacheInterface;
|
||||
|
||||
class ProcessDownloader implements DownloaderInterface
|
||||
{
|
||||
/**
|
||||
* @var RedisAdapter $cache
|
||||
*/
|
||||
|
||||
public function __construct(
|
||||
private EntityManagerInterface $entityManager,
|
||||
private MediaFiles $mediaFiles,
|
||||
private CacheInterface $cache,
|
||||
) {}
|
||||
|
||||
/**
|
||||
@@ -22,16 +29,23 @@ class ProcessDownloader implements DownloaderInterface
|
||||
{
|
||||
/** @var Download $downloadEntity */
|
||||
$downloadEntity = $this->entityManager->getRepository(Download::class)->find($downloadId);
|
||||
$downloadEntity->setProgress(0);
|
||||
$this->entityManager->flush();
|
||||
|
||||
$downloadPreferences = $downloadEntity->getUser()->getDownloadPreferences();
|
||||
$path = $this->getDownloadPath($mediaType, $title, $downloadPreferences);
|
||||
|
||||
$process = (new Process([
|
||||
'wget',
|
||||
$url
|
||||
]))->setWorkingDirectory($path);
|
||||
$processArgs = ['wget', $url];
|
||||
|
||||
if ($downloadEntity->getStatus() === 'Paused') {
|
||||
$downloadEntity->setStatus('In Progress');
|
||||
$processArgs = ['wget', '-c', $url];
|
||||
} else {
|
||||
$downloadEntity->setProgress(0);
|
||||
}
|
||||
|
||||
fwrite(STDOUT, implode(" ", $processArgs));
|
||||
|
||||
$process = (new Process($processArgs))->setWorkingDirectory($path);
|
||||
|
||||
$process->setTimeout(1800); // 30 min
|
||||
$process->setIdleTimeout(600); // 10 min
|
||||
@@ -41,7 +55,18 @@ class ProcessDownloader implements DownloaderInterface
|
||||
try {
|
||||
$progress = 0;
|
||||
$this->entityManager->flush();
|
||||
$process->wait(function ($type, $buffer) use ($progress, $downloadEntity): void {
|
||||
|
||||
$process->wait(function ($type, $buffer) use ($progress, $downloadEntity, $process): void {
|
||||
// The PauseDownloadHandler will set this to 'true'
|
||||
$doPause = $this->cache->getItem('download.pause.' . $downloadEntity->getId());
|
||||
|
||||
if (true === $doPause->isHit() && true === $doPause->get()) {
|
||||
$downloadEntity->setStatus('Paused');
|
||||
$this->cache->deleteItem('download.pause.' . $downloadEntity->getId());
|
||||
$this->entityManager->flush();
|
||||
$process->stop();
|
||||
}
|
||||
|
||||
if (Process::ERR === $type) {
|
||||
$pregMatchOutput = [];
|
||||
preg_match('/[\d]+%/', $buffer, $pregMatchOutput);
|
||||
@@ -56,7 +81,9 @@ class ProcessDownloader implements DownloaderInterface
|
||||
}
|
||||
fwrite(STDOUT, $buffer);
|
||||
});
|
||||
$downloadEntity->setProgress(100);
|
||||
if ($downloadEntity->getStatus() !== 'Paused') {
|
||||
$downloadEntity->setProgress(100);
|
||||
}
|
||||
} catch (ProcessFailedException $exception) {
|
||||
$downloadEntity->setStatus('Failed');
|
||||
}
|
||||
|
||||
@@ -3,8 +3,12 @@
|
||||
namespace App\Download\Framework\Controller;
|
||||
|
||||
use App\Download\Action\Handler\DeleteDownloadHandler;
|
||||
use App\Download\Action\Handler\PauseDownloadHandler;
|
||||
use App\Download\Action\Handler\ResumeDownloadHandler;
|
||||
use App\Download\Action\Input\DeleteDownloadInput;
|
||||
use App\Download\Action\Input\DownloadMediaInput;
|
||||
use App\Download\Action\Input\PauseDownloadInput;
|
||||
use App\Download\Action\Input\ResumeDownloadInput;
|
||||
use App\Download\Framework\Repository\DownloadRepository;
|
||||
use App\Util\Broadcaster;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
@@ -65,4 +69,32 @@ class ApiController extends AbstractController
|
||||
|
||||
return $this->json(['status' => 200, 'message' => 'Download Deleted']);
|
||||
}
|
||||
|
||||
#[Route('/api/download/{downloadId}/pause', name: 'api_download_pause', methods: ['PATCH'])]
|
||||
public function pauseDownload(
|
||||
PauseDownloadInput $input,
|
||||
PauseDownloadHandler $handler,
|
||||
): Response {
|
||||
$result = $handler->handle($input->toCommand());
|
||||
$this->broadcaster->alert(
|
||||
title: 'Success',
|
||||
message: "{$result->download->getTitle()} has been Paused.",
|
||||
);
|
||||
|
||||
return $this->json(['status' => 200, 'message' => 'Download Paused']);
|
||||
}
|
||||
|
||||
#[Route('/api/download/{downloadId}/resume', name: 'api_download_resume', methods: ['PATCH'])]
|
||||
public function resumeDownload(
|
||||
ResumeDownloadInput $input,
|
||||
ResumeDownloadHandler $handler,
|
||||
): Response {
|
||||
$result = $handler->handle($input->toCommand());
|
||||
$this->broadcaster->alert(
|
||||
title: 'Success',
|
||||
message: "{$result->download->getTitle()} has been Resumed.",
|
||||
);
|
||||
|
||||
return $this->json(['status' => 200, 'message' => 'Download Resumed']);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ class DownloadRepository extends ServiceEntityRepository
|
||||
$query = $this->createQueryBuilder('d')
|
||||
->andWhere('d.status IN (:statuses)')
|
||||
->andWhere('d.user = :user')
|
||||
->andWhere('(d.title LIKE :term OR d.imdbId LIKE :term)')
|
||||
->andWhere('(d.title LIKE :term OR d.filename LIKE :term OR d.imdbId LIKE :term OR d.status LIKE :term OR d.mediaType LIKE :term)')
|
||||
->orderBy('d.id', 'DESC')
|
||||
->setParameter('statuses', ['Complete'])
|
||||
->setParameter('user', $user)
|
||||
@@ -45,9 +45,9 @@ class DownloadRepository extends ServiceEntityRepository
|
||||
$query = $this->createQueryBuilder('d')
|
||||
->andWhere('d.status IN (:statuses)')
|
||||
->andWhere('d.user = :user')
|
||||
->andWhere('(d.title LIKE :term OR d.imdbId LIKE :term)')
|
||||
->andWhere('(d.title LIKE :term OR d.filename LIKE :term OR d.imdbId LIKE :term OR d.status LIKE :term OR d.mediaType LIKE :term)')
|
||||
->orderBy('d.id', 'ASC')
|
||||
->setParameter('statuses', ['New', 'In Progress'])
|
||||
->setParameter('statuses', ['New', 'In Progress', 'Paused'])
|
||||
->setParameter('user', $user)
|
||||
->setParameter('term', '%' . $term . '%')
|
||||
->getQuery();
|
||||
|
||||
@@ -21,7 +21,7 @@ class MonitorRepository extends ServiceEntityRepository
|
||||
$this->paginator = $paginator;
|
||||
}
|
||||
|
||||
public function getUserMonitorsPaginated(UserInterface $user, int $page, int $perPage): Paginator
|
||||
public function getUserMonitorsPaginated(UserInterface $user, int $page, int $perPage, string $searchTerm): Paginator
|
||||
{
|
||||
$query = $this->createQueryBuilder('m')
|
||||
->andWhere('m.status IN (:statuses)')
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Monitor\Service;
|
||||
|
||||
use Aimeos\Map;
|
||||
use App\Download\Framework\Entity\Download;
|
||||
use Nihilarr\PTN;
|
||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||
use Symfony\Component\Filesystem\Filesystem;
|
||||
@@ -151,6 +152,10 @@ class MediaFiles
|
||||
foreach ($existingEpisodes as $episode) {
|
||||
$ptn = (object) (new PTN())->parse($episode->getFilename());
|
||||
|
||||
if (!property_exists($episode, 'season') || !property_exists($episode, 'episode')) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ($ptn->season === $seasonNumber && $ptn->episode === $episodeNumber) {
|
||||
return $episode;
|
||||
}
|
||||
@@ -183,4 +188,36 @@ class MediaFiles
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public function getDownloadPath(Download $download): string
|
||||
{
|
||||
$basePath = $this->getBasePath();
|
||||
|
||||
if ($download->getMediaType() === 'movies') {
|
||||
$basePath = $this->getMoviesPath();
|
||||
if ($download->getUser()->hasUserPreference('movie_folder')) {
|
||||
$basePath .= DIRECTORY_SEPARATOR . $download->getTitle();
|
||||
}
|
||||
} elseif ($download->getMediaType() === 'tvshows') {
|
||||
$basePath = $this->getTvShowsPath() . DIRECTORY_SEPARATOR . $download->getTitle();
|
||||
}
|
||||
|
||||
$filepath = $basePath . DIRECTORY_SEPARATOR . $download->getFilename();
|
||||
|
||||
if (false === $this->filesystem->exists($filepath)) {
|
||||
throw new \Exception(sprintf('File %s does not exist.', $filepath));
|
||||
}
|
||||
|
||||
return $filepath;
|
||||
}
|
||||
|
||||
public function renameFile(string $oldFile, string $newFile)
|
||||
{
|
||||
$this->filesystem->rename($oldFile, $newFile);
|
||||
}
|
||||
|
||||
public function setFilePermissions(string $filepath, int $permissions)
|
||||
{
|
||||
$this->filesystem->chmod($filepath, $permissions);
|
||||
}
|
||||
}
|
||||
|
||||
10
src/Twig/Components/Modal.php
Normal file
10
src/Twig/Components/Modal.php
Normal file
@@ -0,0 +1,10 @@
|
||||
<?php
|
||||
|
||||
namespace App\Twig\Components;
|
||||
|
||||
use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
|
||||
|
||||
#[AsTwigComponent]
|
||||
final class Modal
|
||||
{
|
||||
}
|
||||
@@ -17,6 +17,9 @@ final class MonitorList extends AbstractController
|
||||
|
||||
use PaginateTrait;
|
||||
|
||||
#[LiveProp(writable: true)]
|
||||
public string $term = "";
|
||||
|
||||
#[LiveProp(writable: true)]
|
||||
public string $type;
|
||||
|
||||
@@ -44,7 +47,9 @@ final class MonitorList extends AbstractController
|
||||
{
|
||||
return $this->asPaginator($this->monitorRepository->createQueryBuilder('m')
|
||||
->andWhere('m.status IN (:statuses)')
|
||||
->andWhere('(m.title LIKE :term OR m.imdbId LIKE :term OR m.monitorType LIKE :term OR m.status LIKE :term)')
|
||||
->setParameter('statuses', ['New', 'In Progress'])
|
||||
->setParameter('term', '%'.$this->term.'%')
|
||||
->orderBy('m.id', 'DESC')
|
||||
->getQuery()
|
||||
);
|
||||
@@ -55,7 +60,9 @@ final class MonitorList extends AbstractController
|
||||
{
|
||||
return $this->asPaginator($this->monitorRepository->createQueryBuilder('m')
|
||||
->andWhere('m.status = :status')
|
||||
->andWhere('(m.title LIKE :term OR m.imdbId LIKE :term OR m.monitorType LIKE :term OR m.status LIKE :term)')
|
||||
->setParameter('status', 'Complete')
|
||||
->setParameter('term', '%'.$this->term.'%')
|
||||
->orderBy('m.id', 'DESC')
|
||||
->getQuery()
|
||||
);
|
||||
|
||||
@@ -14,10 +14,31 @@
|
||||
{% if entity.status != "Complete" %}
|
||||
<turbo-stream action="update" target="download_progress_{{ id }}">
|
||||
<template>
|
||||
<div class="text-green-700 rounded-sm text-bold text-gray-950 text-center bg-green-600 h-5"
|
||||
<div class="text-black text-center rounded-sm text-bold bg-green-300 h-5 relative z-10"
|
||||
style="width:{{ entity.progress }}%">
|
||||
<span>{{ entity.progress }}%</span>
|
||||
</div>
|
||||
<div class="absolute text-black text-center"
|
||||
style="z-index: 400;margin-top: -1.25rem; margin-left: 1.2rem">
|
||||
{{ entity.progress }}%
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</turbo-stream>
|
||||
<turbo-stream action="update" target="action_buttons_{{ id }}">
|
||||
<template>
|
||||
{% if entity.status == "In Progress" and entity.progress < 100 %}
|
||||
<button id="pause_{{ entity.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'pauseDownload', 'click', {id: entity.id}) }}>
|
||||
<twig:ux:icon name="icon-park-twotone:pause-one" width="16.75px" height="16.75px" class="rounded-full" />
|
||||
</button>
|
||||
{% elseif entity.status == "Paused" %}
|
||||
<button id="resume_{{ entity.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'resumeDownload', 'click', {id: entity.id}) }}>
|
||||
<twig:ux:icon name="icon-park-twotone:play" width="16.75px" height="16.75px" class="rounded-full" />
|
||||
</button>
|
||||
{% endif %}
|
||||
{% set delete_button = component('ux:icon', {name: 'ic:twotone-cancel', width: '17.5px', class: 'rounded-full align-middle text-red-600' }) %}
|
||||
<twig:Modal heading="But wait!" button_text="{{ delete_button }}" submit_action="{{ stimulus_action('download_list', 'deleteDownload', 'click', {id: entity.id}) }}" show_cancel show_submit>
|
||||
Are you sure you want to delete <span class="font-bold">{{ entity.filename }}</span>?
|
||||
</twig:Modal>
|
||||
</template>
|
||||
</turbo-stream>
|
||||
{% else %}
|
||||
@@ -27,6 +48,9 @@
|
||||
<turbo-stream action="remove" target="ad_download_{{ id }}">
|
||||
</turbo-stream>
|
||||
|
||||
<turbo-stream action="remove" target="action_buttons_{{ id }}">
|
||||
</turbo-stream>
|
||||
|
||||
<turbo-stream action="prepend" target="alert_list">
|
||||
<template>
|
||||
<twig:Alert title="Finished downloading" message="{{ entity.title }}" alert_id="{{ entity.id }}" data-controller="alert" />
|
||||
|
||||
@@ -32,13 +32,20 @@
|
||||
<twig:StatusBadge color="green" status="Complete" />
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="px-6 py-4 flex flex-row align-middle justify-center">
|
||||
<button {{ stimulus_action('download_list', 'deleteDownload', 'click', {id: download.id}) }}>
|
||||
<twig:ux:icon
|
||||
name="ic:twotone-cancel" width="18px"
|
||||
class="rounded-full align-middle text-red-600"
|
||||
title="Remove {{ download.title }} from your Download list. This will not delete the file."
|
||||
/>
|
||||
</button>
|
||||
<td id="action_buttons_{{ download.id }}" class="px-6 py-4 flex flex-row items-center">
|
||||
{% if download.status == 'In Progress' and download.progress < 100 %}
|
||||
<button id="pause_{{ download.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'pauseDownload', 'click', {id: download.id}) }}>
|
||||
<twig:ux:icon name="icon-park-twotone:pause-one" width="16.75px" height="16.75px" class="rounded-full" />
|
||||
</button>
|
||||
{% elseif download.status == 'Paused' %}
|
||||
<button id="resume_{{ download.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'resumeDownload', 'click', {id: download.id}) }}>
|
||||
<twig:ux:icon name="icon-park-twotone:play" width="16.75px" height="16.75px" class="rounded-full" />
|
||||
</button>
|
||||
{% endif %}
|
||||
|
||||
{% set delete_button = component('ux:icon', {name: 'ic:twotone-cancel', height: '17.75px', width: '17.75px', class: 'rounded-full align-middle text-red-600' }) %}
|
||||
<twig:Modal heading="But wait!" button_text="{{ delete_button }}" submit_action="{{ stimulus_action('download_list', 'deleteDownload', 'click', {id: download.id}) }}" show_cancel show_submit>
|
||||
Are you sure you want to delete <span class="font-bold">{{ download.filename }}</span>?
|
||||
</twig:Modal>
|
||||
</td>
|
||||
</tr>
|
||||
26
templates/components/Modal.html.twig
Normal file
26
templates/components/Modal.html.twig
Normal file
@@ -0,0 +1,26 @@
|
||||
<div{{ attributes }} data-controller="dialog" data-action="click->dialog#backdropClose" class="flex flex-row items-center">
|
||||
<dialog data-dialog-target="dialog" class="py-3 px-4 w-[30rem] rounded-md">
|
||||
<h2 class="mb-4 text-2xl font-bold">{{ heading }}</h2>
|
||||
|
||||
<div class="mb-4">
|
||||
{% block content %}{% endblock %}
|
||||
</div>
|
||||
|
||||
{% if show_cancel is defined or show_submit is defined %}
|
||||
<div class="flex justify-end">
|
||||
{% if show_cancel is defined %}
|
||||
<button type="button" data-action="dialog#close" class="px-1 py-1 rounded-md self-end w-16 hover:bg-stone-100" autofocus>
|
||||
{{ cancel_text|default('Cancel') }}
|
||||
</button>
|
||||
{% endif %}
|
||||
{% if show_submit is defined %}
|
||||
<button type="button" {{ submit_action|raw }} class="px-1 py-1 rounded-md bg-orange-500 self-end text-white w-16 ml-2 hover:bg-orange-600" autofocus>
|
||||
{{ submit_text|default('Submit') }}
|
||||
</button>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</dialog>
|
||||
|
||||
<button type="button" data-action="dialog#open">{{ button_text|raw }}</button>
|
||||
</div>
|
||||
@@ -1,4 +1,9 @@
|
||||
<div{{ attributes.defaults(stimulus_controller('monitor_list')) }}>
|
||||
{% if this.isWidget == false %}
|
||||
<div class="flex flex-row mb-2 justify-end">
|
||||
<twig:DownloadSearch search_path="app_search" placeholder="Find one of your monitors..." />
|
||||
</div>
|
||||
{% endif %}
|
||||
<table id="monitor_list" class="divide-y divide-gray-200 bg-gray-50 overflow-hidden rounded-lg table-auto w-full" {{ turbo_stream_listen('App\\Monitor\\Framework\\Entity\\Monitor') }}>
|
||||
<thead>
|
||||
<tr class="bg-orange-500 bg-filter bg-blur-lg bg-opacity-80 text-gray-950">
|
||||
|
||||
@@ -33,12 +33,41 @@
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="px-6 py-4 flex flex-row align-middle justify-center">
|
||||
<button {{ stimulus_action('monitor_list', 'deleteMonitor', 'click', {id: monitor.id}) }}>
|
||||
<twig:ux:icon
|
||||
name="ic:twotone-cancel" width="18px"
|
||||
class="rounded-full align-middle text-red-600"
|
||||
title="Remove {{ monitor.title }} from your Monitor list."
|
||||
/>
|
||||
</button>
|
||||
{% set delete_button = component('ux:icon', {name: 'ic:twotone-cancel', width: '18px', class: 'rounded-full align-middle text-red-600' }) %}
|
||||
<twig:Modal heading="But wait!" button_text="{{ delete_button }}" submit_action="{{ stimulus_action('monitor_list', 'deleteMonitor', 'click', {id: monitor.id}) }}" show_cancel show_submit>
|
||||
Are you sure you want to delete this monitor?<br />
|
||||
<div class="mt-2 border-2 border-orange-500 overflow-hidden rounded-lg">
|
||||
<table class="table-auto">
|
||||
<tr>
|
||||
<td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-stone-800 truncate">
|
||||
{{ monitor.title }}
|
||||
</td>
|
||||
{% if monitor|monitor_media_id != "-" %}
|
||||
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800">
|
||||
{{ monitor|monitor_media_id }}
|
||||
</td>
|
||||
{% endif %}
|
||||
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800">
|
||||
{% if monitor.monitorType == "tvshow" %}
|
||||
<twig:StatusBadge color="blue" number="300" text="black" status="{{ monitor.monitorType|monitor_type }}" />
|
||||
{% elseif monitor.monitorType == "tvseason" %}
|
||||
<twig:StatusBadge color="orange" number="300" text="black" status="{{ monitor.monitorType|monitor_type }}" />
|
||||
{% else %}
|
||||
<twig:StatusBadge color="fuchsia" number="300" text="black" status="{{ monitor.monitorType|monitor_type }}" />
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800">
|
||||
{% if monitor.status == "New" %}
|
||||
<twig:StatusBadge color="orange" status="{{ monitor.status }}" />
|
||||
{% elseif monitor.status == "In Progress" or monitor.status == "Active" %}
|
||||
<twig:StatusBadge color="purple" status="{{ monitor.status }}" />
|
||||
{% else %}
|
||||
<twig:StatusBadge color="green" status="{{ monitor.status }}" />
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</twig:Modal>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -22,6 +22,48 @@
|
||||
{{ results.media.title }} - {{ results.media.year }}
|
||||
</h3>
|
||||
|
||||
{# <div data-controller="dropdown" class="relative"#}
|
||||
{# {{ stimulus_controller('monitor_button', {#}
|
||||
{# tmdbId: results.media.tmdbId,#}
|
||||
{# imdbId: results.media.imdbId,#}
|
||||
{# title: results.media.title,#}
|
||||
{# })}}#}
|
||||
{# data-monitor-button-result-filter-outlet="#filter"#}
|
||||
{# >#}
|
||||
{# <button type="button" data-action="dropdown#toggle click@window->dropdown#hide"#}
|
||||
{# class="h-8 text-white bg-green-800 bg-opacity-60 font-medium rounded-lg text-sm#}
|
||||
{# px-2 py-1.5 text-center inline-flex items-center hover:bg-green-900 border-2#}
|
||||
{# border-green-500">#}
|
||||
{# Monitor#}
|
||||
{# <svg class="w-2.5 h-2.5 ms-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">#}
|
||||
{# <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4" /></svg>#}
|
||||
{# </svg>#}
|
||||
{# </button>#}
|
||||
|
||||
{# <div#}
|
||||
{# data-dropdown-target="menu"#}
|
||||
{# class="hidden transition transform origin-top-right absolute right-0#}
|
||||
{# flex flex-col rounded-md shadow-sm w-44 bg-green-800 border-2 border-green-500 mt-1"#}
|
||||
{# data-transition-enter-from="opacity-0 scale-95"#}
|
||||
{# data-transition-enter-to="opacity-100 scale-100"#}
|
||||
{# data-transition-leave-from="opacity-100 scale-100"#}
|
||||
{# data-transition-leave-to="opacity-0 scale-95"#}
|
||||
{# >#}
|
||||
{# <a href="#"#}
|
||||
{# data-action="dropdown#toggle"#}
|
||||
{# class="backdrop-filter p-2 bg-opacity-100 hover:bg-green-950 rounded-t-md"#}
|
||||
{# >#}
|
||||
{# Entire Series#}
|
||||
{# </a>#}
|
||||
{# <a href="#"#}
|
||||
{# data-action="dropdown#toggle"#}
|
||||
{# class="backdrop-filter p-2 bg-opacity-100 hover:bg-green-950 rounded-b-md"#}
|
||||
{# >#}
|
||||
{# Season#}
|
||||
{# </a>#}
|
||||
{# </div>#}
|
||||
{# </div>#}
|
||||
|
||||
|
||||
<div {{ stimulus_controller('monitor_button', {
|
||||
tmdbId: results.media.tmdbId,
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
</h4>
|
||||
<p>{{ results.media.description }}</p>
|
||||
<div>
|
||||
<small class="py-1 px-1.5 mr-1 grow-0 font-bold bg-green-600 rounded-lg hover:cursor-pointer hover:bg-green-700 text-white"
|
||||
<button class="py-1 px-1.5 mr-1 grow-0 font-bold text-xs bg-green-600 rounded-lg hover:cursor-pointer hover:bg-green-700 text-white"
|
||||
{{ stimulus_action('tv-results', 'toggleList', 'click') }}
|
||||
>
|
||||
<span {{ stimulus_target('tv-results', 'count') }}>{{ results.results|length }}</span> results
|
||||
</small>
|
||||
</button>
|
||||
|
||||
{% if results.file != false %}
|
||||
<span data-controller="popover">
|
||||
@@ -57,16 +57,13 @@
|
||||
<input type="checkbox"
|
||||
{{ stimulus_target('tv-results', 'episodeSelector') }}
|
||||
/>
|
||||
<span title="You have this downloaded!">
|
||||
<twig:ux:icon width="20" class="mt-2 text-green-600" name="line-md:circle-twotone" />
|
||||
</span>
|
||||
</div>
|
||||
<div class="flex flex-col items-end hover:cursor-pointer"
|
||||
<button class="flex flex-col items-end"
|
||||
{{ stimulus_action('tv-results', 'toggleList', 'click') }}>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="2em" height="2em" viewBox="0 0 32 32">
|
||||
<path fill="currentColor" d="m16 10l10 10l-1.4 1.4l-8.6-8.6l-8.6 8.6L6 20z"/>
|
||||
</svg>
|
||||
</div>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="inline-block overflow-hidden rounded-lg">
|
||||
|
||||
Reference in New Issue
Block a user