Compare commits
98 Commits
v0.14.10
...
dev-stream
| Author | SHA1 | Date | |
|---|---|---|---|
| eb37df7c3e | |||
| be7b610111 | |||
| 3e93a7c9c1 | |||
| bc78b83f8d | |||
| c5bcaeb1d4 | |||
| e39182ba91 | |||
| 965b747594 | |||
| 937e3c6270 | |||
| 2bb2845ead | |||
| fca189648b | |||
| 2121466322 | |||
| 1e130c3490 | |||
| 4b97faeadb | |||
| 3701e31ee0 | |||
| 210c674f25 | |||
| 175f4330f1 | |||
| 12aaf8e737 | |||
| 2e468dd9b0 | |||
| e070b95a36 | |||
| 20d397589a | |||
| 6c7a35005e | |||
| 0f16423f66 | |||
| 937313fe59 | |||
| 9b3506ab17 | |||
| 6e0eed8b4e | |||
| 38a5baa17e | |||
| 1d573c09e7 | |||
| 7989e2abd2 | |||
| df6c68aa46 | |||
| 6cd9a9b18e | |||
| b95e8f3794 | |||
| 8cc81fea19 | |||
| 15648e711b | |||
| f855aabd69 | |||
| 55a866170e | |||
| 9ab4f6cf57 | |||
| d40a4764eb | |||
| 0119830ea7 | |||
| 7ffa927d55 | |||
| 0b80779975 | |||
| 3c2092095f | |||
| a7bedae3db | |||
| 51c2a1c577 | |||
| f5ed464719 | |||
| aa31701ac8 | |||
| 781e4dcd23 | |||
| b5cd240fbd | |||
| ce5bc525dd | |||
| 63850e48fd | |||
| f9a284cb67 | |||
| 228d320edc | |||
| 6858d2d722 | |||
| 8cd004db4a | |||
| 6cc8985c4d | |||
| 9bfd92a011 | |||
| ac6276f444 | |||
| 6d4bbf2e72 | |||
| 8004de1dc8 | |||
| 2d9a2a1f14 | |||
| b6bc1645b4 | |||
| 16023f1a26 | |||
| 725034dd4e | |||
| 234aeab120 | |||
| 044df00982 | |||
| 92015feaac | |||
| 5b704d9b36 | |||
| 4f72481829 | |||
| 4ee338e397 | |||
| 08d28d9a4f | |||
| b17313c8fb | |||
| f2b50b4f60 | |||
| 393e3ef41f | |||
| b1ccf3bf00 | |||
| 785794790c | |||
| c0f67a32ff | |||
| 325e4e14a7 | |||
| f9017297f3 | |||
| 0c4def42a2 | |||
| 3100912927 | |||
| 07553a172f | |||
| a88da4f637 | |||
| a88f128ccb | |||
| b1ec344f42 | |||
| 1ee6db4668 | |||
| 76bad88190 | |||
| a4029725f9 | |||
| aed3d92462 | |||
| 76531f397f | |||
| c763d67fcb | |||
| e85ae5ac95 | |||
| 794189d70a | |||
| 34d9029b7c | |||
| 168bf04550 | |||
| 81eb2d1f62 | |||
| f5102b859f | |||
| a9c6abe06b | |||
| 764fef37e5 | |||
| 565481aa5a |
3
.env
3
.env
@@ -38,6 +38,3 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
|
|||||||
###< symfony/messenger ###
|
###< symfony/messenger ###
|
||||||
|
|
||||||
REDIS_HOST=redis://redis
|
REDIS_HOST=redis://redis
|
||||||
|
|
||||||
MOVIES_PATH=/var/download/movies
|
|
||||||
TVSHOWS_PATH=/var/download/tvshows
|
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,4 +1,5 @@
|
|||||||
.idea
|
.idea
|
||||||
|
bolt.db
|
||||||
###> symfony/framework-bundle ###
|
###> symfony/framework-bundle ###
|
||||||
/.env.local
|
/.env.local
|
||||||
/.env.local.php
|
/.env.local.php
|
||||||
|
|||||||
28
Dockerfile
28
Dockerfile
@@ -1,19 +1,19 @@
|
|||||||
FROM php:8.4-fpm-alpine3.21
|
FROM dunglas/frankenphp:php8.4
|
||||||
|
|
||||||
RUN docker-php-ext-install pdo_mysql
|
ENV SERVER_NAME=":80"
|
||||||
|
ENV CADDY_GLOBAL_OPTIONS="auto_https off"
|
||||||
|
ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
|
||||||
|
ENV APP_VERSION="0.0.1"
|
||||||
|
|
||||||
# SETUP PHP-FPM CONFIG SETTINGS (max_children / max_requests)
|
RUN install-php-extensions \
|
||||||
RUN echo 'pm = dynamic' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
|
pdo_mysql \
|
||||||
echo 'pm.max_children = 75' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
|
gd \
|
||||||
echo 'pm.start_servers = 30' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
|
intl \
|
||||||
echo 'pm.min_spare_servers = 5' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
|
zip \
|
||||||
echo 'pm.max_spare_servers = 30' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
|
opcache
|
||||||
echo 'pm.process_idle_timeout = 10s' >> /usr/local/etc/php-fpm.d/zz-docker.conf
|
|
||||||
|
|
||||||
COPY --chmod=0775 ./bash/entrypoint.sh /usr/local/bin/
|
RUN apt update && apt install -y wget
|
||||||
|
|
||||||
HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ]
|
HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]
|
||||||
|
|
||||||
ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
|
COPY --chmod=0755 docker/app/Caddyfile /etc/frankenphp/Caddyfile
|
||||||
|
|
||||||
WORKDIR /var/www
|
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
FROM registry.caldwell.digital/library/php:8.4-apache
|
|
||||||
|
|
||||||
RUN apt-get update && \
|
|
||||||
apt-get install libldap2-dev -y && \
|
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
|
||||||
docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
|
|
||||||
docker-php-ext-install ldap
|
|
||||||
|
|
||||||
COPY --chown=www-data:www-data . /var/www
|
|
||||||
COPY bash/nginx.conf /etc/apache2/sites-enabled/vhost.conf
|
|
||||||
RUN rm /etc/apache2/sites-enabled/000-default.conf
|
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import './bootstrap.js';
|
import './bootstrap.js';
|
||||||
|
import Hls from "./vendor/hls.js/hls.js.index.js";
|
||||||
/*
|
/*
|
||||||
* Welcome to your app's main JavaScript file!
|
* Welcome to your app's main JavaScript file!
|
||||||
*
|
*
|
||||||
@@ -18,3 +19,29 @@ var observer = new MutationObserver(function(mutations) {
|
|||||||
|
|
||||||
observer.observe(document, {attributes: false, childList: true, characterData: false, subtree:true});
|
observer.observe(document, {attributes: false, childList: true, characterData: false, subtree:true});
|
||||||
|
|
||||||
|
document.addEventListener("DOMContentLoaded", () => {
|
||||||
|
const videoUrl = "http://127.0.0.1:11470/hlsv2/2b76fe2ec12c83d264076fb859923c5d/master.m3u8?mediaURL=https%3A%2F%2Ftorrentio.strem.fun%2Frealdebrid%2FQYYBR7OSQ4VEFKWASDEZ2B4VO67KHUJY6IWOT7HHA7ATXO7QCYDQ%2F6bf1938db882f6fcbb0dafa6e7326230e7f4eae0%2Fnull%2F3%2FSurvivor.S48E01.1080p.HEVC.x265-MeGusta.mkv%26videoCodecs%3Dh264%26videoCodecs%3Dh265%26videoCodecs%3Dhevc%26videoCodecs%3Dvp9%26audioCodecs%3Daac%26audioCodecs%3Dmp3%26audioCodecs%3Dopus%26maxAudioChannels%3D2";
|
||||||
|
|
||||||
|
var video = document.getElementById('video');
|
||||||
|
if (Hls.isSupported()) {
|
||||||
|
var hls = new Hls({
|
||||||
|
debug: true,
|
||||||
|
});
|
||||||
|
hls.loadSource(videoUrl);
|
||||||
|
hls.attachMedia(video);
|
||||||
|
hls.on(Hls.Events.MEDIA_ATTACHED, function () {
|
||||||
|
video.muted = true;
|
||||||
|
video.play();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// hls.js is not supported on platforms that do not have Media Source Extensions (MSE) enabled.
|
||||||
|
// When the browser has built-in HLS support (check using `canPlayType`), we can provide an HLS manifest (i.e. .m3u8 URL) directly to the video element through the `src` property.
|
||||||
|
// This is using the built-in support of the plain video element, without using hls.js.
|
||||||
|
else if (video.canPlayType('application/vnd.apple.mpegurl')) {
|
||||||
|
video.src = videoUrl;
|
||||||
|
video.addEventListener('canplay', function () {
|
||||||
|
video.play();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
|||||||
7
assets/bootstrap.js
vendored
7
assets/bootstrap.js
vendored
@@ -1,5 +1,10 @@
|
|||||||
import { startStimulusApp } from '@symfony/stimulus-bundle';
|
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();
|
const app = startStimulusApp();
|
||||||
// register any custom, 3rd party controllers here
|
// register any custom, 3rd party controllers here
|
||||||
// app.register('some_controller_name', SomeImportedController);
|
app.register('popover', Popover);
|
||||||
|
app.register('dialog', Dialog);
|
||||||
|
app.register('dropdown', Dropdown);
|
||||||
|
|||||||
@@ -29,6 +29,24 @@ 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())
|
||||||
|
.then(json => console.debug(json));
|
||||||
|
}
|
||||||
|
|
||||||
// Add custom controller actions here
|
// Add custom controller actions here
|
||||||
// fooBar() { this.fooTarget.classList.toggle(this.bazClass) }
|
// fooBar() { this.fooTarget.classList.toggle(this.bazClass) }
|
||||||
|
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
import { Controller } from '@hotwired/stimulus';
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The following line makes this controller "lazy": it won't be downloaded until needed
|
|
||||||
* See https://github.com/symfony/stimulus-bridge#lazy-controllers
|
|
||||||
*/
|
|
||||||
/* stimulusFetch: 'lazy' */
|
|
||||||
export default class extends Controller {
|
|
||||||
static values = {
|
|
||||||
title: String,
|
|
||||||
tmdbId: String,
|
|
||||||
imdbId: String,
|
|
||||||
mediaType: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
addMovieMonitor() {
|
|
||||||
console.log(`/monitor/movies/${this.tmdbIdValue}/${this.imdbIdValue}/${encodeURI(this.titleValue)}`)
|
|
||||||
fetch(`/monitor/movies/${this.tmdbIdValue}/${this.imdbIdValue}/${encodeURI(this.titleValue)}`)
|
|
||||||
.then(res => res.json())
|
|
||||||
.then(json => {
|
|
||||||
console.log(json)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
14
assets/controllers/monitor_list_controller.js
Normal file
14
assets/controllers/monitor_list_controller.js
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
import { Controller } from '@hotwired/stimulus';
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The following line makes this controller "lazy": it won't be downloaded until needed
|
||||||
|
* See https://github.com/symfony/stimulus-bridge#lazy-controllers
|
||||||
|
*/
|
||||||
|
/* stimulusFetch: 'lazy' */
|
||||||
|
export default class extends Controller {
|
||||||
|
deleteMonitor(data) {
|
||||||
|
fetch(`/api/monitor/${data.params.id}`, {method: 'DELETE'})
|
||||||
|
.then(res => res.json())
|
||||||
|
.then(json => console.debug(json));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,7 +20,7 @@ export default class extends Controller {
|
|||||||
"provider": "",
|
"provider": "",
|
||||||
}
|
}
|
||||||
|
|
||||||
static outlets = ['movie-results', 'tv-results']
|
static outlets = ['movie-results', 'tv-results', 'tv-episode-list']
|
||||||
static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'selectAll', 'downloadSelected']
|
static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'selectAll', 'downloadSelected']
|
||||||
static values = {
|
static values = {
|
||||||
'media-type': String,
|
'media-type': String,
|
||||||
@@ -127,6 +127,10 @@ export default class extends Controller {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setSeason(event) {
|
||||||
|
this.tvEpisodeListOutlet.setSeason(event.target.value);
|
||||||
|
}
|
||||||
|
|
||||||
uncheckSelectAllBtn() {
|
uncheckSelectAllBtn() {
|
||||||
this.selectAllTarget.checked = false;
|
this.selectAllTarget.checked = false;
|
||||||
}
|
}
|
||||||
|
|||||||
51
assets/controllers/tv_episode_list_controller.js
Normal file
51
assets/controllers/tv_episode_list_controller.js
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
import { Controller } from '@hotwired/stimulus';
|
||||||
|
import { getComponent } from '@symfony/ux-live-component';
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The following line makes this controller "lazy": it won't be downloaded until needed
|
||||||
|
* See https://symfony.com/bundles/StimulusBundle/current/index.html#lazy-stimulus-controllers
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* stimulusFetch: 'lazy' */
|
||||||
|
export default class extends Controller {
|
||||||
|
|
||||||
|
async initialize() {
|
||||||
|
this.component = await getComponent(this.element);
|
||||||
|
this.component.on('render:finished', (component) => {
|
||||||
|
console.log(component);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
setSeason(season) {
|
||||||
|
this.element.querySelectorAll(".episode-container").forEach(element => element.remove());
|
||||||
|
this.component.set('pageNumber', 1);
|
||||||
|
this.component.set('season', parseInt(season));
|
||||||
|
this.component.render();
|
||||||
|
}
|
||||||
|
|
||||||
|
paginate(event) {
|
||||||
|
this.element.querySelectorAll(".episode-container").forEach(element => element.remove());
|
||||||
|
this.component.action('paginate', {page: event.params.page});
|
||||||
|
this.component.render();
|
||||||
|
}
|
||||||
|
|
||||||
|
connect() {
|
||||||
|
// Called every time the controller is connected to the DOM
|
||||||
|
// (on page load, when it's added to the DOM, moved in the DOM, etc.)
|
||||||
|
|
||||||
|
// Here you can add event listeners on the element or target elements,
|
||||||
|
// add or remove classes, attributes, dispatch custom events, etc.
|
||||||
|
// this.fooTarget.addEventListener('click', this._fooBar)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add custom controller actions here
|
||||||
|
// fooBar() { this.fooTarget.classList.toggle(this.bazClass) }
|
||||||
|
|
||||||
|
disconnect() {
|
||||||
|
// Called anytime its element is disconnected from the DOM
|
||||||
|
// (on page change, when it's removed from or moved in the DOM, etc.)
|
||||||
|
|
||||||
|
// Here you should remove all event listeners added in "connect()"
|
||||||
|
// this.fooTarget.removeEventListener('click', this._fooBar)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,32 +18,43 @@ export default class extends Controller {
|
|||||||
active: Boolean,
|
active: Boolean,
|
||||||
};
|
};
|
||||||
|
|
||||||
static targets = ['list', 'count', 'episodeSelector']
|
static targets = ['list', 'count', 'episodeSelector', 'toggleButton', 'listContainer']
|
||||||
static outlets = ['loading-icon']
|
static outlets = ['loading-icon']
|
||||||
|
|
||||||
options = []
|
options = []
|
||||||
optionsLoaded = false
|
optionsLoaded = false
|
||||||
|
isOpen = false
|
||||||
|
|
||||||
async connect() {
|
async connect() {
|
||||||
await this.setOptions();
|
await this.setOptions();
|
||||||
}
|
}
|
||||||
|
|
||||||
async setOptions() {
|
async setOptions() {
|
||||||
if (true === this.activeValue && this.optionsLoaded === false) {
|
if (this.optionsLoaded === false) {
|
||||||
this.optionsLoaded = true;
|
this.optionsLoaded = true;
|
||||||
await fetch(`/torrentio/tvshows/${this.tmdbIdValue}/${this.imdbIdValue}/${this.seasonValue}/${this.episodeValue}`)
|
let response;
|
||||||
.then(res => res.text())
|
|
||||||
.then(response => {
|
try {
|
||||||
this.element.innerHTML = response;
|
response = await fetch(`/torrentio/tvshows/${this.tmdbIdValue}/${this.imdbIdValue}/${this.seasonValue}/${this.episodeValue}`)
|
||||||
this.options = this.element.querySelectorAll('tbody tr');
|
} catch (error) {
|
||||||
if (this.options.length > 0) {
|
console.log('There was an error', error);
|
||||||
this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
|
}
|
||||||
this.options[0].querySelector('input[type="checkbox"]').checked = true;
|
|
||||||
} else {
|
if (response?.ok) {
|
||||||
this.episodeSelectorTarget.disabled = true;
|
response = await response.text()
|
||||||
}
|
this.listContainerTarget.innerHTML = response;
|
||||||
this.loadingIconOutlet.increaseCount();
|
this.options = this.element.querySelectorAll('tbody tr');
|
||||||
});
|
if (this.options.length > 0) {
|
||||||
|
this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
|
||||||
|
this.options[0].querySelector('input[type="checkbox"]').checked = true;
|
||||||
|
} else {
|
||||||
|
this.countTarget.innerText = 0;
|
||||||
|
this.episodeSelectorTarget.disabled = true;
|
||||||
|
}
|
||||||
|
this.loadingIconOutlet.increaseCount();
|
||||||
|
} else {
|
||||||
|
console.log(`HTTP Response Code: ${response?.status}`)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,19 +66,13 @@ export default class extends Controller {
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
async setActive() {
|
async setActive() {
|
||||||
this.activeValue = true;
|
|
||||||
this.element.classList.remove('hidden');
|
|
||||||
if (false === this.optionsLoaded) {
|
if (false === this.optionsLoaded) {
|
||||||
await this.setOptions();
|
await this.setOptions();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async setInActive() {
|
async setInActive() {
|
||||||
this.activeValue = false;
|
|
||||||
// if (true === this.hasEpisodeSelectorTarget()) {
|
|
||||||
this.episodeSelectorTarget.checked = false;
|
this.episodeSelectorTarget.checked = false;
|
||||||
// }
|
|
||||||
this.element.classList.add('hidden');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
isActive() {
|
isActive() {
|
||||||
@@ -85,7 +90,16 @@ export default class extends Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
toggleList() {
|
toggleList() {
|
||||||
|
// if (!this.isOpen) {
|
||||||
|
// this.toggleButtonTarget.classList.add('rotate-180');
|
||||||
|
// this.toggleButtonTarget.classList.remove('-rotate-180');
|
||||||
|
// } else {
|
||||||
|
// this.toggleButtonTarget.classList.add('-rotate-180');
|
||||||
|
// this.toggleButtonTarget.classList.remove('rotate-180');
|
||||||
|
// }
|
||||||
this.listTarget.classList.toggle('hidden');
|
this.listTarget.classList.toggle('hidden');
|
||||||
|
this.toggleButtonTarget.classList.toggle('rotate-90');
|
||||||
|
this.toggleButtonTarget.classList.toggle('-rotate-90');
|
||||||
}
|
}
|
||||||
|
|
||||||
download() {
|
download() {
|
||||||
|
|||||||
1
assets/icons/ic/twotone-cancel.svg
Normal file
1
assets/icons/ic/twotone-cancel.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" d="M12 4c-4.41 0-8 3.59-8 8s3.59 8 8 8s8-3.59 8-8s-3.59-8-8-8m5 11.59L15.59 17L12 13.41L8.41 17L7 15.59L10.59 12L7 8.41L8.41 7L12 10.59L15.59 7L17 8.41L13.41 12z" opacity=".3"/><path fill="currentColor" d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10s10-4.47 10-10S17.53 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8s8 3.59 8 8s-3.59 8-8 8m3.59-13L12 10.59L8.41 7L7 8.41L10.59 12L7 15.59L8.41 17L12 13.41L15.59 17L17 15.59L13.41 12L17 8.41z"/></svg>
|
||||||
|
After Width: | Height: | Size: 526 B |
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 |
1
assets/icons/line-md/circle-twotone.svg
Normal file
1
assets/icons/line-md/circle-twotone.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" fill-opacity="0" stroke="currentColor" stroke-dasharray="64" stroke-dashoffset="64" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12c0 -4.97 4.03 -9 9 -9c4.97 0 9 4.03 9 9c0 4.97 -4.03 9 -9 9c-4.97 0 -9 -4.03 -9 -9Z"><animate fill="freeze" attributeName="fill-opacity" begin="0.6s" dur="0.15s" values="0;0.3"/><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.6s" values="64;0"/></path></svg>
|
||||||
|
After Width: | Height: | Size: 517 B |
@@ -10,4 +10,56 @@
|
|||||||
h2 {
|
h2 {
|
||||||
font-size: var(--text-xl);
|
font-size: var(--text-xl);
|
||||||
}
|
}
|
||||||
|
.rounded-ms {
|
||||||
|
border-radius: 0.275rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@layer components {
|
||||||
|
.alert {
|
||||||
|
@apply text-white text-sm min-w-[250px] border px-4 py-3 rounded-md
|
||||||
|
}
|
||||||
|
.alert-success {
|
||||||
|
@apply bg-green-950 hover:bg-green-900 border-green-500
|
||||||
|
}
|
||||||
|
.alert-warning {
|
||||||
|
@apply bg-yellow-500/70 hover:bg-yellow-600 border-yellow-400 text-black
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
# $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 "${3}"
|
|
||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Sleep for a second to ensure DB is awake and ready
|
|
||||||
SLEEP_TIME=$(shuf -i 2-5 -n 1)
|
|
||||||
echo "> Sleeping for ${SLEEP_TIME} seconds to wait for the database"
|
|
||||||
echo "> If there are errors after the migration runs, it's possible another container (scheduler, worker, etc.) already ran the migrations"
|
|
||||||
sleep $SLEEP_TIME
|
|
||||||
|
|
||||||
# Provision database
|
|
||||||
php /var/www/bin/console doctrine:migrations:migrate --no-interaction
|
|
||||||
php /var/www/bin/console db:seed
|
|
||||||
|
|
||||||
# Start Apache in the foreground
|
|
||||||
echo "Starting PHP-FPM..."
|
|
||||||
php-fpm
|
|
||||||
|
|
||||||
exec "$@"
|
|
||||||
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
server {
|
|
||||||
listen 80;
|
|
||||||
listen [::]:80;
|
|
||||||
server_name localhost;
|
|
||||||
|
|
||||||
root /var/www/public;
|
|
||||||
|
|
||||||
location /hub/ {
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_redirect off;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_pass http://mercure/;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
location / {
|
|
||||||
# try to serve file directly, fallback to index.php
|
|
||||||
try_files $uri /index.php$is_args$args;
|
|
||||||
}
|
|
||||||
|
|
||||||
location ~ \.php$ {
|
|
||||||
fastcgi_pass app:9000;
|
|
||||||
fastcgi_split_path_info ^(.+\.php)(/.*)$;
|
|
||||||
include fastcgi_params;
|
|
||||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
|
||||||
fastcgi_param DOCUMENT_ROOT $document_root;
|
|
||||||
internal;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
104
compose.yml
104
compose.yml
@@ -12,74 +12,56 @@ services:
|
|||||||
- $PWD/bash/caddy:/etc/caddy
|
- $PWD/bash/caddy:/etc/caddy
|
||||||
- $PWD/bash/certs:/etc/ssl
|
- $PWD/bash/certs:/etc/ssl
|
||||||
|
|
||||||
web:
|
|
||||||
build:
|
app:
|
||||||
dockerfile: docker/Dockerfile.web
|
build: .
|
||||||
context: .
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- $PWD:/app
|
||||||
|
- $PWD/var/download:/var/download
|
||||||
|
- mercure_data:/data
|
||||||
|
- mercure_config:/config
|
||||||
|
tty: true
|
||||||
|
environment:
|
||||||
|
TZ: America/Chicago
|
||||||
|
MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
|
||||||
|
MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
|
||||||
depends_on:
|
depends_on:
|
||||||
app:
|
database:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
||||||
|
|
||||||
|
worker:
|
||||||
|
build: .
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- $PWD:/app
|
||||||
|
- $PWD/var/download:/var/download
|
||||||
|
tty: true
|
||||||
|
environment:
|
||||||
|
TZ: America/Chicago
|
||||||
|
command: php /app/bin/console messenger:consume media_cache -vv --time-limit=3600
|
||||||
|
|
||||||
|
|
||||||
|
scheduler:
|
||||||
|
build: .
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- $PWD:/app
|
||||||
|
environment:
|
||||||
|
TZ: America/Chicago
|
||||||
|
command: php /app/bin/console messenger:consume scheduler_monitor -vv
|
||||||
|
tty: true
|
||||||
|
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:latest
|
image: redis:latest
|
||||||
volumes:
|
volumes:
|
||||||
- redis_data:/data
|
- redis_data:/data
|
||||||
command: redis-server --maxmemory 512MB
|
command: redis-server --maxmemory 512MB
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
app:
|
|
||||||
build:
|
|
||||||
dockerfile: docker/Dockerfile.app
|
|
||||||
context: .
|
|
||||||
volumes:
|
|
||||||
- ./:/var/www
|
|
||||||
depends_on:
|
|
||||||
database:
|
|
||||||
condition: service_healthy
|
|
||||||
|
|
||||||
worker:
|
|
||||||
build:
|
|
||||||
dockerfile: docker/Dockerfile.worker
|
|
||||||
context: .
|
|
||||||
volumes:
|
|
||||||
- ./:/app
|
|
||||||
- ./var/downloads/movies:/var/download/movies
|
|
||||||
- ./var/downloads/tvshows:/var/download/tvshows
|
|
||||||
command: -v --time-limit=3600 --limit=10
|
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
depends_on:
|
|
||||||
app:
|
|
||||||
condition: service_healthy
|
|
||||||
|
|
||||||
scheduler:
|
|
||||||
build:
|
|
||||||
dockerfile: docker/Dockerfile.scheduler
|
|
||||||
context: .
|
|
||||||
volumes:
|
|
||||||
- ./:/var/www
|
|
||||||
- ./var/download:/var/download
|
|
||||||
command: -vv --time-limit=3600
|
|
||||||
depends_on:
|
|
||||||
app:
|
|
||||||
condition: service_healthy
|
|
||||||
|
|
||||||
mercure:
|
|
||||||
image: dunglas/mercure
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- "3000:80"
|
|
||||||
environment:
|
environment:
|
||||||
SERVER_NAME: ':80'
|
TZ: America/Chicago
|
||||||
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:
|
database:
|
||||||
@@ -89,20 +71,24 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- mysql:/var/lib/mysql
|
- mysql:/var/lib/mysql
|
||||||
environment:
|
environment:
|
||||||
|
TZ: America/Chicago
|
||||||
MYSQL_DATABASE: app
|
MYSQL_DATABASE: app
|
||||||
MYSQL_USERNAME: app
|
MYSQL_USERNAME: app
|
||||||
MYSQL_PASSWORD: password
|
MYSQL_PASSWORD: password
|
||||||
MYSQL_ROOT_PASSWORD: password
|
MYSQL_ROOT_PASSWORD: password
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
|
test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
|
||||||
timeout: 10s
|
interval: 5s
|
||||||
|
timeout: 5s
|
||||||
retries: 10
|
retries: 10
|
||||||
|
|
||||||
|
|
||||||
adminer:
|
adminer:
|
||||||
image: adminer
|
image: adminer
|
||||||
ports:
|
ports:
|
||||||
- "8081:8080"
|
- "8081:8080"
|
||||||
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
mysql:
|
mysql:
|
||||||
mercure_data:
|
mercure_data:
|
||||||
|
|||||||
@@ -4,17 +4,19 @@
|
|||||||
"minimum-stability": "stable",
|
"minimum-stability": "stable",
|
||||||
"prefer-stable": true,
|
"prefer-stable": true,
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=8.2",
|
"php": ">=8.4",
|
||||||
"ext-ctype": "*",
|
"ext-ctype": "*",
|
||||||
"ext-iconv": "*",
|
"ext-iconv": "*",
|
||||||
"1tomany/rich-bundle": "^1.8",
|
"1tomany/rich-bundle": "^1.8",
|
||||||
"aimeos/map": "^3.12",
|
"aimeos/map": "^3.12",
|
||||||
|
"chrisullyott/php-filesize": "^4.2",
|
||||||
"doctrine/dbal": "^3",
|
"doctrine/dbal": "^3",
|
||||||
"doctrine/doctrine-bundle": "^2.14",
|
"doctrine/doctrine-bundle": "^2.14",
|
||||||
"doctrine/doctrine-fixtures-bundle": "^4.1",
|
"doctrine/doctrine-fixtures-bundle": "^4.1",
|
||||||
"doctrine/doctrine-migrations-bundle": "^3.4",
|
"doctrine/doctrine-migrations-bundle": "^3.4",
|
||||||
"doctrine/orm": "^3.3",
|
"doctrine/orm": "^3.3",
|
||||||
"dragonmantank/cron-expression": "^3.4",
|
"dragonmantank/cron-expression": "^3.4",
|
||||||
|
"guzzlehttp/guzzle": "^7.9",
|
||||||
"league/pipeline": "^1.1",
|
"league/pipeline": "^1.1",
|
||||||
"nesbot/carbon": "^3.9",
|
"nesbot/carbon": "^3.9",
|
||||||
"nihilarr/parse-torrent-name": "^0.0.1",
|
"nihilarr/parse-torrent-name": "^0.0.1",
|
||||||
@@ -22,28 +24,30 @@
|
|||||||
"p3k/emoji-detector": "^1.2",
|
"p3k/emoji-detector": "^1.2",
|
||||||
"php-tmdb/api": "^4.1",
|
"php-tmdb/api": "^4.1",
|
||||||
"predis/predis": "^2.4",
|
"predis/predis": "^2.4",
|
||||||
"symfony/asset": "7.2.*",
|
"runtime/frankenphp-symfony": "^0.2.0",
|
||||||
"symfony/console": "7.2.*",
|
"stof/doctrine-extensions-bundle": "^1.14",
|
||||||
"symfony/doctrine-messenger": "7.2.*",
|
"symfony/asset": "7.3.*",
|
||||||
"symfony/dotenv": "7.2.*",
|
"symfony/console": "7.3.*",
|
||||||
"symfony/filesystem": "7.2.*",
|
"symfony/doctrine-messenger": "7.3.*",
|
||||||
"symfony/finder": "7.2.*",
|
"symfony/dotenv": "7.3.*",
|
||||||
|
"symfony/filesystem": "7.3.*",
|
||||||
|
"symfony/finder": "7.3.*",
|
||||||
"symfony/flex": "^2",
|
"symfony/flex": "^2",
|
||||||
"symfony/form": "7.2.*",
|
"symfony/form": "7.3.*",
|
||||||
"symfony/framework-bundle": "7.2.*",
|
"symfony/framework-bundle": "7.3.*",
|
||||||
"symfony/ldap": "7.2.*",
|
"symfony/ldap": "7.3.*",
|
||||||
"symfony/mercure-bundle": "^0.3.9",
|
"symfony/mercure-bundle": "^0.3.9",
|
||||||
"symfony/messenger": "7.2.*",
|
"symfony/messenger": "7.3.*",
|
||||||
"symfony/runtime": "7.2.*",
|
"symfony/runtime": "7.3.*",
|
||||||
"symfony/scheduler": "7.2.*",
|
"symfony/scheduler": "7.3.*",
|
||||||
"symfony/security-bundle": "7.2.*",
|
"symfony/security-bundle": "7.3.*",
|
||||||
"symfony/stimulus-bundle": "^2.24",
|
"symfony/stimulus-bundle": "^2.24",
|
||||||
"symfony/twig-bundle": "7.2.*",
|
"symfony/twig-bundle": "7.3.*",
|
||||||
"symfony/ux-icons": "^2.24",
|
"symfony/ux-icons": "^2.24",
|
||||||
"symfony/ux-live-component": "^2.24",
|
"symfony/ux-live-component": "^2.24",
|
||||||
"symfony/ux-turbo": "^2.24",
|
"symfony/ux-turbo": "^2.24",
|
||||||
"symfony/ux-twig-component": "^2.24",
|
"symfony/ux-twig-component": "^2.24",
|
||||||
"symfony/yaml": "7.2.*",
|
"symfony/yaml": "7.3.*",
|
||||||
"symfonycasts/tailwind-bundle": "^0.10.0",
|
"symfonycasts/tailwind-bundle": "^0.10.0",
|
||||||
"twig/extra-bundle": "^2.12|^3.0",
|
"twig/extra-bundle": "^2.12|^3.0",
|
||||||
"twig/twig": "^2.12|^3.0"
|
"twig/twig": "^2.12|^3.0"
|
||||||
@@ -54,6 +58,9 @@
|
|||||||
"symfony/flex": true,
|
"symfony/flex": true,
|
||||||
"symfony/runtime": true
|
"symfony/runtime": true
|
||||||
},
|
},
|
||||||
|
"platform": {
|
||||||
|
"php": "8.4"
|
||||||
|
},
|
||||||
"bump-after-update": true,
|
"bump-after-update": true,
|
||||||
"sort-packages": true
|
"sort-packages": true
|
||||||
},
|
},
|
||||||
@@ -97,13 +104,13 @@
|
|||||||
"extra": {
|
"extra": {
|
||||||
"symfony": {
|
"symfony": {
|
||||||
"allow-contrib": false,
|
"allow-contrib": false,
|
||||||
"require": "7.2.*"
|
"require": "7.3.*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpstan/phpstan": "^2.1",
|
"phpstan/phpstan": "^2.1",
|
||||||
"symfony/maker-bundle": "^1.62",
|
"symfony/maker-bundle": "^1.62",
|
||||||
"symfony/stopwatch": "7.2.*",
|
"symfony/stopwatch": "7.3.*",
|
||||||
"symfony/web-profiler-bundle": "7.2.*"
|
"symfony/web-profiler-bundle": "7.3.*"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
1590
composer.lock
generated
1590
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -18,4 +18,5 @@ return [
|
|||||||
Symfony\UX\Turbo\TurboBundle::class => ['all' => true],
|
Symfony\UX\Turbo\TurboBundle::class => ['all' => true],
|
||||||
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
|
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
|
||||||
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
|
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
|
||||||
|
Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ framework:
|
|||||||
trusted_headers: [ 'x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port', 'x-forwarded-prefix' ]
|
trusted_headers: [ 'x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port', 'x-forwarded-prefix' ]
|
||||||
|
|
||||||
session:
|
session:
|
||||||
handler_id: Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler
|
handler_id: '%env(REDIS_HOST)%'
|
||||||
|
|
||||||
#esi: true
|
#esi: true
|
||||||
#fragments: true
|
#fragments: true
|
||||||
|
|||||||
@@ -10,10 +10,22 @@ framework:
|
|||||||
options:
|
options:
|
||||||
use_notify: true
|
use_notify: true
|
||||||
check_delayed_interval: 60000
|
check_delayed_interval: 60000
|
||||||
|
queue_name: default
|
||||||
retry_strategy:
|
retry_strategy:
|
||||||
max_retries: 1
|
max_retries: 1
|
||||||
multiplier: 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'
|
failed: 'doctrine://default?queue_name=failed'
|
||||||
|
|
||||||
default_bus: messenger.bus.default
|
default_bus: messenger.bus.default
|
||||||
@@ -29,6 +41,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': media_cache
|
||||||
|
|
||||||
# when@test:
|
# when@test:
|
||||||
# framework:
|
# framework:
|
||||||
|
|||||||
3
config/packages/property_info.yaml
Normal file
3
config/packages/property_info.yaml
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
framework:
|
||||||
|
property_info:
|
||||||
|
with_constructor_extractor: true
|
||||||
7
config/packages/stof_doctrine_extensions.yaml
Normal file
7
config/packages/stof_doctrine_extensions.yaml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
# Read the documentation: https://symfony.com/doc/current/bundles/StofDoctrineExtensionsBundle/index.html
|
||||||
|
# See the official DoctrineExtensions documentation for more details: https://github.com/doctrine-extensions/DoctrineExtensions/tree/main/doc
|
||||||
|
stof_doctrine_extensions:
|
||||||
|
default_locale: en_US
|
||||||
|
orm:
|
||||||
|
default:
|
||||||
|
timestampable: true
|
||||||
@@ -1,5 +1,10 @@
|
|||||||
twig:
|
twig:
|
||||||
|
globals:
|
||||||
|
version: '%app.version%'
|
||||||
file_name_pattern: '*.twig'
|
file_name_pattern: '*.twig'
|
||||||
|
date:
|
||||||
|
format: 'm/d/Y'
|
||||||
|
timezone: '%env(default:app.default.timezone:TZ)%'
|
||||||
|
|
||||||
when@test:
|
when@test:
|
||||||
twig:
|
twig:
|
||||||
|
|||||||
@@ -5,14 +5,15 @@
|
|||||||
# https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
|
# https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
|
||||||
parameters:
|
parameters:
|
||||||
# Media
|
# Media
|
||||||
|
media.base_path: '/var/download'
|
||||||
media.default_movies_dir: movies
|
media.default_movies_dir: movies
|
||||||
media.default_tvshows_dir: tvshows
|
media.default_tvshows_dir: tvshows
|
||||||
media.movies_path: '%env(default:media.default_movies_dir:MOVIES_PATH)%'
|
media.movies_path: '/var/download/%env(default:media.default_movies_dir:MOVIES_PATH)%'
|
||||||
media.tvshows_path: '/var/download/%env(default:media.default_tvshows_dir:TVSHOWS_PATH)%'
|
media.tvshows_path: '/var/download/%env(default:media.default_tvshows_dir:TVSHOWS_PATH)%'
|
||||||
|
|
||||||
# Mercure
|
# Mercure
|
||||||
app.mercure.url: 'http://mercure/.well-known/mercure'
|
app.mercure.url: 'http://app/.well-known/mercure'
|
||||||
app.mercure.public_url: '%env(APP_URL)%/hub/.well-known/mercure'
|
app.mercure.public_url: '%env(APP_URL)%/.well-known/mercure'
|
||||||
|
|
||||||
# Cache
|
# Cache
|
||||||
app.cache.adapter: '%env(default:app.cache.adapter.default:CACHE_ADAPTER)%'
|
app.cache.adapter: '%env(default:app.cache.adapter.default:CACHE_ADAPTER)%'
|
||||||
@@ -20,6 +21,12 @@ parameters:
|
|||||||
app.cache.adapter.default: 'filesystem'
|
app.cache.adapter.default: 'filesystem'
|
||||||
app.cache.redis.host.default: 'redis://redis'
|
app.cache.redis.host.default: 'redis://redis'
|
||||||
|
|
||||||
|
# Various configs
|
||||||
|
app.default.version: '0.dev'
|
||||||
|
app.default.timezone: 'America/Chicago'
|
||||||
|
|
||||||
|
app.version: '%env(default:app.default.version:APP_VERSION)%'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
# default configuration for services in *this* file
|
# default configuration for services in *this* file
|
||||||
_defaults:
|
_defaults:
|
||||||
|
|||||||
@@ -1,50 +1,58 @@
|
|||||||
services:
|
services:
|
||||||
web:
|
app:
|
||||||
image: code.caldwell.digital/home/torsearch/web:latest
|
image: registry.caldwell.digital/home/torsearch-app:${TAG}
|
||||||
ports:
|
ports:
|
||||||
- '8001:80'
|
- '8001:80'
|
||||||
volumes:
|
|
||||||
- $PWD/bash/nginx.conf:/etc/nginx/conf.d/default.conf
|
|
||||||
depends_on:
|
|
||||||
app:
|
|
||||||
condition: service_healthy
|
|
||||||
|
|
||||||
app:
|
|
||||||
image: code.caldwell.digital/home/torsearch/app:${TAG}
|
|
||||||
deploy:
|
|
||||||
replicas: 2
|
|
||||||
|
|
||||||
worker:
|
|
||||||
image: code.caldwell.digital/home/torsearch/app:${TAG}
|
|
||||||
volumes:
|
|
||||||
- /mnt/media/downloads:/var/download
|
|
||||||
command: php ./bin/console messenger:consume async -v --time-limit=3600 --limit=10
|
|
||||||
deploy:
|
|
||||||
replicas: 2
|
|
||||||
|
|
||||||
scheduler:
|
|
||||||
image: code.caldwell.digital/home/torsearch/app:${TAG}
|
|
||||||
volumes:
|
|
||||||
- /mnt/media/downloads:/var/download
|
|
||||||
command: php ./bin/console messenger:consume scheduler_monitor -vv --time-limit=3600
|
|
||||||
|
|
||||||
mercure:
|
|
||||||
image: dunglas/mercure
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- "3000:80"
|
|
||||||
environment:
|
environment:
|
||||||
SERVER_NAME: ':80'
|
|
||||||
MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
|
MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
|
||||||
MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
|
MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
|
||||||
MERCURE_EXTRA_DIRECTIVES: |
|
tty: true
|
||||||
cors_origins *
|
deploy:
|
||||||
anonymous
|
replicas: 2
|
||||||
command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
|
|
||||||
volumes:
|
volumes:
|
||||||
|
- /mnt/media/downloads/movies:/var/download/movies
|
||||||
|
- /mnt/media/downloads/tvshows:/var/download/tvshows
|
||||||
- mercure_data:/data
|
- mercure_data:/data
|
||||||
- mercure_config:/config
|
- mercure_config:/config
|
||||||
|
depends_on:
|
||||||
|
- database
|
||||||
|
|
||||||
|
|
||||||
|
worker:
|
||||||
|
image: registry.caldwell.digital/home/torsearch-worker:${TAG}
|
||||||
|
volumes:
|
||||||
|
- /mnt/media/downloads/movies:/var/download/movies
|
||||||
|
- /mnt/media/downloads/tvshows:/var/download/tvshows
|
||||||
|
restart: always
|
||||||
|
command: -vv --time-limit=3600 --limit=10
|
||||||
|
deploy:
|
||||||
|
replicas: 2
|
||||||
|
depends_on:
|
||||||
|
- app
|
||||||
|
|
||||||
|
|
||||||
|
scheduler:
|
||||||
|
image: registry.caldwell.digital/home/torsearch-scheduler:${TAG}
|
||||||
|
volumes:
|
||||||
|
- /mnt/media/downloads/movies:/var/download/movies
|
||||||
|
- /mnt/media/downloads/tvshows:/var/download/tvshows
|
||||||
|
restart: always
|
||||||
|
command: -vv
|
||||||
|
depends_on:
|
||||||
|
- app
|
||||||
|
|
||||||
|
|
||||||
|
redis:
|
||||||
|
image: redis:latest
|
||||||
|
volumes:
|
||||||
|
- redis_data:/data
|
||||||
|
command: redis-server --maxmemory 512MB
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
|
mysql:
|
||||||
mercure_config:
|
mercure_config:
|
||||||
mercure_data:
|
mercure_data:
|
||||||
|
redis_data:
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,25 @@
|
|||||||
FROM php:8.4-fpm-alpine3.21
|
FROM dunglas/frankenphp
|
||||||
|
|
||||||
RUN docker-php-ext-install pdo_mysql
|
ENV SERVER_NAME=":80"
|
||||||
|
ENV CADDY_GLOBAL_OPTIONS="auto_https off"
|
||||||
|
ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
|
||||||
|
|
||||||
# SETUP PHP-FPM CONFIG SETTINGS (max_children / max_requests)
|
ARG APP_VERSION="0.dev"
|
||||||
RUN echo 'pm = dynamic' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
|
ENV APP_VERSION="${APP_VERSION}"
|
||||||
echo 'pm.max_children = 75' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
|
|
||||||
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
|
RUN install-php-extensions \
|
||||||
COPY --chmod=0775 ./bash/entrypoint.sh /usr/local/bin/
|
pdo_mysql \
|
||||||
|
gd \
|
||||||
|
intl \
|
||||||
|
zip \
|
||||||
|
opcache
|
||||||
|
|
||||||
HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ]
|
COPY . /app
|
||||||
|
COPY --chmod=775 docker/app/entrypoint.sh /usr/local/bin/docker-entrypoint
|
||||||
|
COPY docker/app/Caddyfile /etc/frankenphp/Caddyfile
|
||||||
|
|
||||||
ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
|
ENTRYPOINT [ "/usr/local/bin/docker-entrypoint" ]
|
||||||
|
|
||||||
WORKDIR /var/www
|
CMD [ "frankenphp", "run", "--config", "/etc/frankenphp/Caddyfile" ]
|
||||||
|
|
||||||
|
HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]
|
||||||
|
|||||||
@@ -1,7 +1,21 @@
|
|||||||
FROM php:8.4-cli-alpine3.21
|
FROM dunglas/frankenphp:php8.4-alpine
|
||||||
|
|
||||||
RUN docker-php-ext-install pdo_mysql
|
ENV SERVER_NAME=":80"
|
||||||
|
ENV CADDY_GLOBAL_OPTIONS="auto_https off"
|
||||||
|
ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
|
||||||
|
|
||||||
COPY --chown=www-data:www-data . /app
|
ARG APP_VERSION="0.dev"
|
||||||
|
ENV APP_VERSION="${APP_VERSION}"
|
||||||
|
|
||||||
ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "scheduler_monitor" ]
|
RUN install-php-extensions \
|
||||||
|
pdo_mysql \
|
||||||
|
gd \
|
||||||
|
intl \
|
||||||
|
zip \
|
||||||
|
opcache
|
||||||
|
|
||||||
|
COPY . /app
|
||||||
|
|
||||||
|
ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "scheduler_monitor" ]
|
||||||
|
|
||||||
|
HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
FROM nginx:1.28-alpine
|
|
||||||
|
|
||||||
COPY bash/nginx.conf /etc/nginx/conf.d/default.conf
|
|
||||||
@@ -1,7 +1,23 @@
|
|||||||
FROM php:8.4-cli-alpine3.21
|
FROM dunglas/frankenphp:php8.4-alpine
|
||||||
|
|
||||||
RUN docker-php-ext-install pdo_mysql
|
ENV SERVER_NAME=":80"
|
||||||
|
ENV CADDY_GLOBAL_OPTIONS="auto_https off"
|
||||||
|
ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
|
||||||
|
|
||||||
COPY --chown=www-data:www-data . /app
|
ARG APP_VERSION="0.dev"
|
||||||
|
ENV APP_VERSION="${APP_VERSION}"
|
||||||
|
|
||||||
ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "async" ]
|
RUN install-php-extensions \
|
||||||
|
pdo_mysql \
|
||||||
|
gd \
|
||||||
|
intl \
|
||||||
|
zip \
|
||||||
|
opcache
|
||||||
|
|
||||||
|
RUN apk add --no-cache wget
|
||||||
|
|
||||||
|
COPY . /app
|
||||||
|
|
||||||
|
ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "async" ]
|
||||||
|
|
||||||
|
HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0
|
||||||
|
|||||||
59
docker/app/Caddyfile
Normal file
59
docker/app/Caddyfile
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
{
|
||||||
|
{$CADDY_GLOBAL_OPTIONS}
|
||||||
|
|
||||||
|
frankenphp {
|
||||||
|
{$FRANKENPHP_CONFIG}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{$CADDY_EXTRA_CONFIG}
|
||||||
|
|
||||||
|
{$SERVER_NAME:localhost} {
|
||||||
|
log {
|
||||||
|
{$CADDY_SERVER_LOG_OPTIONS}
|
||||||
|
# Redact the authorization query parameter that can be set by Mercure
|
||||||
|
format filter {
|
||||||
|
request>uri query {
|
||||||
|
replace authorization REDACTED
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
root /app/public
|
||||||
|
encode zstd br gzip
|
||||||
|
|
||||||
|
mercure {
|
||||||
|
# Publisher JWT key
|
||||||
|
publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} {env.MERCURE_PUBLISHER_JWT_ALG}
|
||||||
|
# Subscriber JWT key
|
||||||
|
subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} {env.MERCURE_SUBSCRIBER_JWT_ALG}
|
||||||
|
# Allow anonymous subscribers (double-check that it's what you want)
|
||||||
|
anonymous
|
||||||
|
# Enable the subscription API (double-check that it's what you want)
|
||||||
|
subscriptions
|
||||||
|
# Custmo cors
|
||||||
|
cors_origins *
|
||||||
|
# Extra directives
|
||||||
|
{$MERCURE_EXTRA_DIRECTIVES}
|
||||||
|
}
|
||||||
|
|
||||||
|
vulcain
|
||||||
|
|
||||||
|
{$CADDY_SERVER_EXTRA_DIRECTIVES}
|
||||||
|
|
||||||
|
# Disable Topics tracking if not enabled explicitly: https://github.com/jkarlin/topics
|
||||||
|
header ?Permissions-Policy "browsing-topics=()"
|
||||||
|
|
||||||
|
@phpRoute {
|
||||||
|
not path /.well-known/mercure*
|
||||||
|
not file {path}
|
||||||
|
}
|
||||||
|
rewrite @phpRoute index.php
|
||||||
|
|
||||||
|
@frontController path index.php
|
||||||
|
php @frontController
|
||||||
|
|
||||||
|
file_server {
|
||||||
|
hide *.php
|
||||||
|
}
|
||||||
|
}
|
||||||
12
docker/app/entrypoint.sh
Normal file
12
docker/app/entrypoint.sh
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Sleep for a second to ensure DB is awake and ready
|
||||||
|
SLEEP_TIME=$(shuf -i 2-4 -n 1)
|
||||||
|
echo "> Sleeping for ${SLEEP_TIME} seconds to wait for the database"
|
||||||
|
sleep $SLEEP_TIME
|
||||||
|
|
||||||
|
# Provision database
|
||||||
|
php /app/bin/console doctrine:migrations:migrate --no-interaction
|
||||||
|
php /app/bin/console db:seed
|
||||||
|
|
||||||
|
exec docker-php-entrypoint "$@"
|
||||||
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
|
||||||
@@ -19,13 +19,17 @@ DATABASE_URL="mysql://root:password@database:3306/app?serverVersion=10.6.19.2-Ma
|
|||||||
# This key is never saved anywhere
|
# This key is never saved anywhere
|
||||||
# else and is passed to Torrentio
|
# else and is passed to Torrentio
|
||||||
# to retrieve download options
|
# to retrieve download options
|
||||||
REAL_DEBRID_KEY=""
|
#REAL_DEBRID_KEY=""
|
||||||
|
|
||||||
# Enter you TMDB API key
|
# Enter you TMDB API key
|
||||||
# This is used to provide rich search results
|
# This is used to provide rich search results
|
||||||
# when searching for media and rendering the
|
# when searching for media and rendering the
|
||||||
# Popular Movies and TV Shows section.
|
# Popular Movies and TV Shows section.
|
||||||
TMDB_API=
|
#TMDB_API=
|
||||||
|
|
||||||
|
REAL_DEBRID_KEY="QYYBR7OSQ4VEFKWASDEZ2B4VO67KHUJY6IWOT7HHA7ATXO7QCYDQ"
|
||||||
|
TMDB_API=eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiI0ZTJjYjJhOGUzOGJhNjdiNjVhOGU1NGM0ZWI1MzhmOCIsIm5iZiI6MTczNzkyNjA0NC41NjQsInN1YiI6IjY3OTZhNTljYzdiMDFiNzJjNzIzZWM5YiIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.e8DbNe9qrSBC1y-ANRv-VWBAtls-ZS2r7aNCiI68mpw
|
||||||
|
|
||||||
|
|
||||||
MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
|
MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
|
||||||
|
|
||||||
|
|||||||
@@ -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:
|
||||||
@@ -33,9 +27,10 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- /mnt/media/downloads/movies:/var/download/movies
|
- /mnt/media/downloads/movies:/var/download/movies
|
||||||
- /mnt/media/downloads/tvshows:/var/download/tvshows
|
- /mnt/media/downloads/tvshows:/var/download/tvshows
|
||||||
command: -v --time-limit=3600 --limit=10
|
command: -vvv
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
app:
|
app:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
@@ -49,9 +44,9 @@ services:
|
|||||||
image: code.caldwell.digital/home/torsearch-scheduler:latest
|
image: code.caldwell.digital/home/torsearch-scheduler:latest
|
||||||
volumes:
|
volumes:
|
||||||
- ./downloads:/var/download
|
- ./downloads:/var/download
|
||||||
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
|
||||||
@@ -88,7 +83,8 @@ services:
|
|||||||
MYSQL_ROOT_PASSWORD: password
|
MYSQL_ROOT_PASSWORD: password
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
|
test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
|
||||||
timeout: 10s
|
interval: 5s
|
||||||
|
timeout: 5s
|
||||||
retries: 10
|
retries: 10
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
|
|||||||
115
docs/examples/swarm.compose.yml
Normal file
115
docs/examples/swarm.compose.yml
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
services:
|
||||||
|
# The "entrypoint" into the application. This reverse proxy
|
||||||
|
# proxies traffic back to their respective services. If not
|
||||||
|
# running behind a reverse proxy inject your SSL certificates
|
||||||
|
# into this container.
|
||||||
|
# This container runs the actual web app in a php:8.4-fpm
|
||||||
|
# base container.
|
||||||
|
app:
|
||||||
|
image: code.caldwell.digital/home/torsearch-app:latest
|
||||||
|
ports:
|
||||||
|
- '8006:80'
|
||||||
|
configs:
|
||||||
|
- env_file
|
||||||
|
deploy:
|
||||||
|
replicas: 2
|
||||||
|
depends_on:
|
||||||
|
- database
|
||||||
|
|
||||||
|
# Downloads happen in this container. Replicate this
|
||||||
|
# container to run multiple downloads simultaneously.
|
||||||
|
# Map your "movies" folder to /var/download/movies
|
||||||
|
# Map your "TV shows" folder to /var/download/tvshows
|
||||||
|
# If your folders are on another machine, use an NFS volume.
|
||||||
|
# This container runs a Symfony worker process.
|
||||||
|
# See: https://symfony.com/doc/current/messenger.html
|
||||||
|
worker:
|
||||||
|
image: code.caldwell.digital/home/torsearch-worker:latest
|
||||||
|
configs:
|
||||||
|
- source: env_file
|
||||||
|
target: /app/bin/.env.local
|
||||||
|
volumes:
|
||||||
|
- /mnt/media/downloads/movies:/var/download/movies
|
||||||
|
- /mnt/media/downloads/tvshows:/var/download/tvshows
|
||||||
|
restart: always
|
||||||
|
command: -vv
|
||||||
|
deploy:
|
||||||
|
replicas: 4
|
||||||
|
depends_on:
|
||||||
|
- app
|
||||||
|
|
||||||
|
# This container handles the monitoring for new media. When new
|
||||||
|
# monitors are added, jobs are periodically dispatched to this
|
||||||
|
# container, and the desired media is searched for and downloaded.
|
||||||
|
# This container runs a Symfony worker process.
|
||||||
|
# See: https://symfony.com/doc/current/messenger.html
|
||||||
|
scheduler:
|
||||||
|
image: code.caldwell.digital/home/torsearch-scheduler:latest
|
||||||
|
configs:
|
||||||
|
- env_file
|
||||||
|
volumes:
|
||||||
|
- ./downloads:/var/download
|
||||||
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- app
|
||||||
|
|
||||||
|
# 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:
|
||||||
|
- mysql:/var/lib/mysql
|
||||||
|
environment:
|
||||||
|
MYSQL_DATABASE: app
|
||||||
|
MYSQL_USERNAME: app
|
||||||
|
MYSQL_PASSWORD: password
|
||||||
|
MYSQL_ROOT_PASSWORD: password
|
||||||
|
healthcheck:
|
||||||
|
test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 10
|
||||||
|
|
||||||
|
redis:
|
||||||
|
image: redis:latest
|
||||||
|
volumes:
|
||||||
|
- redis_data:/data
|
||||||
|
command: redis-server --maxmemory 512MB
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
# **Optional**
|
||||||
|
# Provides a simple method of viewing the database
|
||||||
|
adminer:
|
||||||
|
image: adminer
|
||||||
|
ports:
|
||||||
|
- "8081:8080"
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
mysql:
|
||||||
|
mercure_config:
|
||||||
|
mercure_data:
|
||||||
|
redis_data:
|
||||||
|
|
||||||
|
configs:
|
||||||
|
env_file:
|
||||||
|
file: $PWD/.env
|
||||||
|
|
||||||
@@ -28,4 +28,19 @@ return [
|
|||||||
'@hotwired/turbo' => [
|
'@hotwired/turbo' => [
|
||||||
'version' => '7.3.0',
|
'version' => '7.3.0',
|
||||||
],
|
],
|
||||||
|
'@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',
|
||||||
|
],
|
||||||
|
'hls.js' => [
|
||||||
|
'version' => '1.6.5',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|||||||
35
migrations/Version20250610195448.php
Normal file
35
migrations/Version20250610195448.php
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Auto-generated Migration: Please modify to your needs!
|
||||||
|
*/
|
||||||
|
final class Version20250610195448 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this up() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
ALTER TABLE download ADD created_at DATETIME NULL, ADD updated_at DATETIME NULL
|
||||||
|
SQL);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
ALTER TABLE download DROP created_at, DROP updated_at
|
||||||
|
SQL);
|
||||||
|
}
|
||||||
|
}
|
||||||
50
migrations/Version20250610222503.php
Normal file
50
migrations/Version20250610222503.php
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Auto-generated Migration: Please modify to your needs!
|
||||||
|
*/
|
||||||
|
final class Version20250610222503 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this up() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
ALTER TABLE monitor ADD parent_id INT DEFAULT NULL
|
||||||
|
SQL);
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
ALTER TABLE monitor ADD CONSTRAINT FK_E1159985727ACA70 FOREIGN KEY (parent_id) REFERENCES monitor (id)
|
||||||
|
SQL);
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
CREATE INDEX IDX_E1159985727ACA70 ON monitor (parent_id)
|
||||||
|
SQL);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
ALTER TABLE monitor DROP FOREIGN KEY FK_E1159985727ACA70
|
||||||
|
SQL);
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
DROP INDEX IDX_E1159985727ACA70 ON monitor
|
||||||
|
SQL);
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
ALTER TABLE monitor DROP parent_id
|
||||||
|
SQL);
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
ALTER TABLE download CHANGE created_at created_at DATETIME DEFAULT NULL, CHANGE updated_at updated_at DATETIME DEFAULT NULL
|
||||||
|
SQL);
|
||||||
|
}
|
||||||
|
}
|
||||||
129
nomad.deploy.hcl
Normal file
129
nomad.deploy.hcl
Normal file
@@ -0,0 +1,129 @@
|
|||||||
|
variable "image_tag" {
|
||||||
|
type = string
|
||||||
|
description = "Docker image tag to deploy."
|
||||||
|
default = "latest"
|
||||||
|
}
|
||||||
|
|
||||||
|
job "torsearch" {
|
||||||
|
datacenters = [ "home" ]
|
||||||
|
type = "service"
|
||||||
|
|
||||||
|
group "app" {
|
||||||
|
count = 2
|
||||||
|
|
||||||
|
update {
|
||||||
|
max_parallel = 4
|
||||||
|
min_healthy_time = "30s"
|
||||||
|
healthy_deadline = "3m"
|
||||||
|
auto_revert = true
|
||||||
|
}
|
||||||
|
|
||||||
|
network {
|
||||||
|
port "app" {
|
||||||
|
to = 80
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
task "app" {
|
||||||
|
driver = "docker"
|
||||||
|
|
||||||
|
config {
|
||||||
|
image = "registry.caldwell.digital/home/torsearch-app:${var.image_tag}"
|
||||||
|
ports = ["app"]
|
||||||
|
}
|
||||||
|
|
||||||
|
env {
|
||||||
|
MERCURE_PUBLISHER_JWT_KEY = "!ChangeThisMercureHubJWTSecretKey!"
|
||||||
|
MERCURE_SUBSCRIBER_JWT_KEY = "!ChangeThisMercureHubJWTSecretKey!"
|
||||||
|
}
|
||||||
|
|
||||||
|
service {
|
||||||
|
name = "torsearch-app"
|
||||||
|
provider = "nomad"
|
||||||
|
port = "app"
|
||||||
|
|
||||||
|
meta {
|
||||||
|
nomad_ingress_enabled = true
|
||||||
|
nomad_ingress_hostname = "torsearch-nomad.caldwell.digital"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
group "worker" {
|
||||||
|
count = 2
|
||||||
|
update {
|
||||||
|
max_parallel = 4
|
||||||
|
min_healthy_time = "30s"
|
||||||
|
healthy_deadline = "3m"
|
||||||
|
auto_revert = true
|
||||||
|
}
|
||||||
|
|
||||||
|
volume "media" {
|
||||||
|
type = "host"
|
||||||
|
source = "media"
|
||||||
|
read_only = false
|
||||||
|
}
|
||||||
|
|
||||||
|
task "worker" {
|
||||||
|
driver = "docker"
|
||||||
|
|
||||||
|
volume_mount {
|
||||||
|
volume = "media"
|
||||||
|
destination = "/var/download"
|
||||||
|
read_only = false
|
||||||
|
}
|
||||||
|
|
||||||
|
config {
|
||||||
|
image = "registry.caldwell.digital/home/torsearch-worker:${var.image_tag}"
|
||||||
|
args = [
|
||||||
|
"-vv"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
service {
|
||||||
|
name = "torsearch-worker"
|
||||||
|
provider = "nomad"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
group "scheduler" {
|
||||||
|
count = 1
|
||||||
|
|
||||||
|
update {
|
||||||
|
max_parallel = 2
|
||||||
|
min_healthy_time = "30s"
|
||||||
|
healthy_deadline = "3m"
|
||||||
|
auto_revert = true
|
||||||
|
}
|
||||||
|
|
||||||
|
volume "media" {
|
||||||
|
type = "host"
|
||||||
|
source = "media"
|
||||||
|
read_only = false
|
||||||
|
}
|
||||||
|
|
||||||
|
task "scheduler" {
|
||||||
|
driver = "docker"
|
||||||
|
|
||||||
|
volume_mount {
|
||||||
|
volume = "media"
|
||||||
|
destination = "/var/download"
|
||||||
|
read_only = false
|
||||||
|
}
|
||||||
|
|
||||||
|
config {
|
||||||
|
image = "registry.caldwell.digital/home/torsearch-scheduler:${var.image_tag}"
|
||||||
|
args = [
|
||||||
|
"-vv"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
service {
|
||||||
|
name = "torsearch-scheduler"
|
||||||
|
provider = "nomad"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,34 +2,25 @@
|
|||||||
|
|
||||||
namespace App\Controller;
|
namespace App\Controller;
|
||||||
|
|
||||||
|
use App\Util\Broadcaster;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\Mercure\HubInterface;
|
|
||||||
use Symfony\Component\Mercure\Update;
|
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
use Twig\Environment;
|
|
||||||
|
|
||||||
final class AlertController extends AbstractController
|
final class AlertController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
#[Autowire(service: 'twig')] private readonly Environment $renderer,
|
private readonly Broadcaster $broadcaster,
|
||||||
private readonly HubInterface $hub,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[Route('/alert', name: 'app_alert')]
|
#[Route('/alert', name: 'app_alert')]
|
||||||
public function index(): Response
|
public function index(): Response
|
||||||
{
|
{
|
||||||
$update = new Update(
|
$this->broadcaster->alert(
|
||||||
'alerts',
|
'Added to queue',
|
||||||
$this->renderer->render('Alert.stream.html.twig', [
|
'This is a testy test!'
|
||||||
'alert_id' => 1,
|
|
||||||
'title' => 'Added to queue',
|
|
||||||
'message' => 'This is a testy test!',
|
|
||||||
])
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->hub->publish($update);
|
|
||||||
return $this->json([
|
return $this->json([
|
||||||
'Success' => 'Published'
|
'Success' => 'Published'
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
namespace App\Controller;
|
namespace App\Controller;
|
||||||
|
|
||||||
use App\Download\Framework\Repository\DownloadRepository;
|
use App\Download\Framework\Repository\DownloadRepository;
|
||||||
|
use App\Monitor\Action\Command\MonitorTvShowCommand;
|
||||||
|
use App\Monitor\Action\Handler\MonitorTvShowHandler;
|
||||||
use App\Tmdb\Tmdb;
|
use App\Tmdb\Tmdb;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
@@ -12,15 +14,13 @@ use Symfony\Component\Routing\Attribute\Route;
|
|||||||
final class IndexController extends AbstractController
|
final class IndexController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly DownloadRepository $downloadRepository,
|
|
||||||
private readonly Tmdb $tmdb,
|
private readonly Tmdb $tmdb,
|
||||||
|
private readonly MonitorTvShowHandler $monitorTvShowHandler,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[Route('/', name: 'app_index')]
|
#[Route('/', name: 'app_index')]
|
||||||
public function index(Request $request): Response
|
public function index(Request $request): Response
|
||||||
{
|
{
|
||||||
$request->getSession()->set('mercure_alert_topic', 'alerts_' . uniqid());
|
|
||||||
|
|
||||||
return $this->render('index/index.html.twig', [
|
return $this->render('index/index.html.twig', [
|
||||||
'active_downloads' => $this->getUser()->getActiveDownloads(),
|
'active_downloads' => $this->getUser()->getActiveDownloads(),
|
||||||
'recent_downloads' => $this->getUser()->getDownloads(),
|
'recent_downloads' => $this->getUser()->getDownloads(),
|
||||||
@@ -28,4 +28,11 @@ final class IndexController extends AbstractController
|
|||||||
'popular_tvshows' => $this->tmdb->popularTvShows(1, 6),
|
'popular_tvshows' => $this->tmdb->popularTvShows(1, 6),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[Route('/test', name: 'app_test')]
|
||||||
|
public function test()
|
||||||
|
{
|
||||||
|
$result = $this->monitorTvShowHandler->handle(new MonitorTvShowCommand(355));
|
||||||
|
return $this->json($result);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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'])]
|
||||||
@@ -31,11 +33,15 @@ final class SearchController extends AbstractController
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[Route('/result/{mediaType}/{tmdbId}', name: 'app_search_result')]
|
#[Route('/result/{mediaType}/{imdbId}/{season}', name: 'app_search_result')]
|
||||||
public function result(
|
public function result(
|
||||||
GetMediaInfoInput $input,
|
GetMediaInfoInput $input,
|
||||||
|
?int $season = null,
|
||||||
): 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 +54,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,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,12 +6,12 @@ use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
|
|||||||
use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
|
use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
|
||||||
use App\Torrentio\Action\Input\GetMovieOptionsInput;
|
use App\Torrentio\Action\Input\GetMovieOptionsInput;
|
||||||
use App\Torrentio\Action\Input\GetTvShowOptionsInput;
|
use App\Torrentio\Action\Input\GetTvShowOptionsInput;
|
||||||
|
use App\Torrentio\Exception\TorrentioRateLimitException;
|
||||||
|
use App\Util\Broadcaster;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\Mercure\HubInterface;
|
|
||||||
use Symfony\Component\Mercure\Update;
|
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
use Symfony\Contracts\Cache\CacheInterface;
|
use Symfony\Contracts\Cache\CacheInterface;
|
||||||
use Symfony\Contracts\Cache\ItemInterface;
|
use Symfony\Contracts\Cache\ItemInterface;
|
||||||
@@ -21,8 +21,7 @@ final class TorrentioController extends AbstractController
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly GetMovieOptionsHandler $getMovieOptionsHandler,
|
private readonly GetMovieOptionsHandler $getMovieOptionsHandler,
|
||||||
private readonly GetTvShowOptionsHandler $getTvShowOptionsHandler,
|
private readonly GetTvShowOptionsHandler $getTvShowOptionsHandler,
|
||||||
private readonly HubInterface $hub,
|
private readonly Broadcaster $broadcaster,
|
||||||
private readonly \Twig\Environment $renderer,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[Route('/torrentio/movies/{tmdbId}/{imdbId}', name: 'app_torrentio_movies')]
|
#[Route('/torrentio/movies/{tmdbId}/{imdbId}', name: 'app_torrentio_movies')]
|
||||||
@@ -54,13 +53,24 @@ final class TorrentioController extends AbstractController
|
|||||||
$input->episode,
|
$input->episode,
|
||||||
);
|
);
|
||||||
|
|
||||||
return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
|
try {
|
||||||
$item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
|
return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
|
||||||
$results = $this->getTvShowOptionsHandler->handle($input->toCommand());
|
$item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
|
||||||
return $this->render('torrentio/tvshows.html.twig', [
|
$results = $this->getTvShowOptionsHandler->handle($input->toCommand());
|
||||||
'results' => $results,
|
return $this->render('torrentio/tvshows.html.twig', [
|
||||||
]);
|
'results' => $results,
|
||||||
});
|
]);
|
||||||
|
});
|
||||||
|
} catch (TorrentioRateLimitException $exception) {
|
||||||
|
$this->broadcaster->alert('Warning', 'Torrentio has rate limited your requests. Please wait a few minutes before trying again.', 'warning');
|
||||||
|
return $this->render('bare.html.twig',
|
||||||
|
[],
|
||||||
|
new Response('Too many requests',
|
||||||
|
Response::HTTP_TOO_MANY_REQUESTS,
|
||||||
|
['Retry-After' => 4000]
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[Route('/torrentio/tvshows/clear/{tmdbId}/{imdbId}/{season?}/{episode?}', name: 'app_clear_torrentio_tvshows')]
|
#[Route('/torrentio/tvshows/clear/{tmdbId}/{imdbId}/{season?}/{episode?}', name: 'app_clear_torrentio_tvshows')]
|
||||||
@@ -75,14 +85,10 @@ final class TorrentioController extends AbstractController
|
|||||||
);
|
);
|
||||||
$cache->delete($cacheId);
|
$cache->delete($cacheId);
|
||||||
|
|
||||||
$this->hub->publish(new Update(
|
$this->broadcaster->alert(
|
||||||
$request->getSession()->get('mercure_alert_topic'),
|
title: 'Success',
|
||||||
$this->renderer->render('Alert.stream.html.twig', [
|
message: 'Torrentio cache Cleared.'
|
||||||
'alert_id' => uniqid(),
|
);
|
||||||
'title' => 'Success',
|
|
||||||
'message' => 'Torrentio cache Cleared.',
|
|
||||||
])
|
|
||||||
));
|
|
||||||
|
|
||||||
return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
|
return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
|
||||||
$item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
|
$item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
|
||||||
|
|||||||
15
src/Download/Action/Command/DeleteDownloadCommand.php
Normal file
15
src/Download/Action/Command/DeleteDownloadCommand.php
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Download\Action\Command;
|
||||||
|
|
||||||
|
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @implements CommandInterface<DeleteDownloadCommand>
|
||||||
|
*/
|
||||||
|
class DeleteDownloadCommand implements CommandInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
public int $downloadId,
|
||||||
|
) {}
|
||||||
|
}
|
||||||
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,
|
||||||
|
) {}
|
||||||
|
}
|
||||||
26
src/Download/Action/Handler/DeleteDownloadHandler.php
Normal file
26
src/Download/Action/Handler/DeleteDownloadHandler.php
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Download\Action\Handler;
|
||||||
|
|
||||||
|
use App\Download\Action\Command\DeleteDownloadCommand;
|
||||||
|
use App\Download\Action\Result\DeleteDownloadResult;
|
||||||
|
use App\Download\Framework\Repository\DownloadRepository;
|
||||||
|
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||||
|
use OneToMany\RichBundle\Contract\HandlerInterface;
|
||||||
|
use OneToMany\RichBundle\Contract\ResultInterface;
|
||||||
|
|
||||||
|
/** @implements HandlerInterface<DeleteDownloadCommand, DeleteDownloadResult> */
|
||||||
|
readonly class DeleteDownloadHandler implements HandlerInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private DownloadRepository $downloadRepository,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function handle(CommandInterface $command): ResultInterface
|
||||||
|
{
|
||||||
|
$download = $this->downloadRepository->find($command->downloadId);
|
||||||
|
$this->downloadRepository->delete($command->downloadId);
|
||||||
|
|
||||||
|
return new DeleteDownloadResult(200, 'Success', $download);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -38,7 +38,9 @@ readonly class DownloadMediaHandler implements HandlerInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$this->downloadRepository->updateStatus($download->getId(), 'In Progress');
|
if ($download->getStatus() !== 'Paused') {
|
||||||
|
$this->downloadRepository->updateStatus($download->getId(), 'In Progress');
|
||||||
|
}
|
||||||
|
|
||||||
$this->downloader->download(
|
$this->downloader->download(
|
||||||
$command->mediaType,
|
$command->mediaType,
|
||||||
@@ -47,7 +49,9 @@ readonly class DownloadMediaHandler implements HandlerInterface
|
|||||||
$download->getId()
|
$download->getId()
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->downloadRepository->updateStatus($download->getId(), 'Complete');
|
if ($download->getStatus() !== 'Paused') {
|
||||||
|
$this->downloadRepository->updateStatus($download->getId(), 'Complete');
|
||||||
|
}
|
||||||
|
|
||||||
} catch (\Throwable $exception) {
|
} catch (\Throwable $exception) {
|
||||||
throw new UnrecoverableMessageHandlingException($exception->getMessage(), 500);
|
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/DeleteDownloadInput.php
Normal file
24
src/Download/Action/Input/DeleteDownloadInput.php
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Download\Action\Input;
|
||||||
|
|
||||||
|
use App\Download\Action\Command\DeleteDownloadCommand;
|
||||||
|
use OneToMany\RichBundle\Attribute\SourceRoute;
|
||||||
|
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||||
|
use OneToMany\RichBundle\Contract\InputInterface;
|
||||||
|
|
||||||
|
/** @implements InputInterface<DeleteDownloadInput> */
|
||||||
|
class DeleteDownloadInput implements InputInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
#[SourceRoute('downloadId')]
|
||||||
|
public int $downloadId,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function toCommand(): CommandInterface
|
||||||
|
{
|
||||||
|
return new DeleteDownloadCommand(
|
||||||
|
$this->downloadId,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
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/DeleteDownloadResult.php
Normal file
16
src/Download/Action/Result/DeleteDownloadResult.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<DownloadMediaResult> */
|
||||||
|
class DeleteDownloadResult implements ResultInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
public int $status,
|
||||||
|
public string $message,
|
||||||
|
public Download $download,
|
||||||
|
) {}
|
||||||
|
}
|
||||||
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\Download\Framework\Entity\Download;
|
||||||
use App\Monitor\Service\MediaFiles;
|
use App\Monitor\Service\MediaFiles;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Symfony\Component\Cache\Adapter\RedisAdapter;
|
||||||
use Symfony\Component\Process\Exception\ProcessFailedException;
|
use Symfony\Component\Process\Exception\ProcessFailedException;
|
||||||
use Symfony\Component\Process\Process;
|
use Symfony\Component\Process\Process;
|
||||||
|
use Symfony\Contracts\Cache\CacheInterface;
|
||||||
|
|
||||||
class ProcessDownloader implements DownloaderInterface
|
class ProcessDownloader implements DownloaderInterface
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var RedisAdapter $cache
|
||||||
|
*/
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private EntityManagerInterface $entityManager,
|
private EntityManagerInterface $entityManager,
|
||||||
private MediaFiles $mediaFiles,
|
private MediaFiles $mediaFiles,
|
||||||
|
private CacheInterface $cache,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -22,16 +29,23 @@ class ProcessDownloader implements DownloaderInterface
|
|||||||
{
|
{
|
||||||
/** @var Download $downloadEntity */
|
/** @var Download $downloadEntity */
|
||||||
$downloadEntity = $this->entityManager->getRepository(Download::class)->find($downloadId);
|
$downloadEntity = $this->entityManager->getRepository(Download::class)->find($downloadId);
|
||||||
$downloadEntity->setProgress(0);
|
|
||||||
$this->entityManager->flush();
|
$this->entityManager->flush();
|
||||||
|
|
||||||
$downloadPreferences = $downloadEntity->getUser()->getDownloadPreferences();
|
$downloadPreferences = $downloadEntity->getUser()->getDownloadPreferences();
|
||||||
$path = $this->getDownloadPath($mediaType, $title, $downloadPreferences);
|
$path = $this->getDownloadPath($mediaType, $title, $downloadPreferences);
|
||||||
|
|
||||||
$process = (new Process([
|
$processArgs = ['wget', $url];
|
||||||
'wget',
|
|
||||||
$url
|
if ($downloadEntity->getStatus() === 'Paused') {
|
||||||
]))->setWorkingDirectory($path);
|
$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->setTimeout(1800); // 30 min
|
||||||
$process->setIdleTimeout(600); // 10 min
|
$process->setIdleTimeout(600); // 10 min
|
||||||
@@ -41,7 +55,18 @@ class ProcessDownloader implements DownloaderInterface
|
|||||||
try {
|
try {
|
||||||
$progress = 0;
|
$progress = 0;
|
||||||
$this->entityManager->flush();
|
$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) {
|
if (Process::ERR === $type) {
|
||||||
$pregMatchOutput = [];
|
$pregMatchOutput = [];
|
||||||
preg_match('/[\d]+%/', $buffer, $pregMatchOutput);
|
preg_match('/[\d]+%/', $buffer, $pregMatchOutput);
|
||||||
@@ -56,7 +81,9 @@ class ProcessDownloader implements DownloaderInterface
|
|||||||
}
|
}
|
||||||
fwrite(STDOUT, $buffer);
|
fwrite(STDOUT, $buffer);
|
||||||
});
|
});
|
||||||
$downloadEntity->setProgress(100);
|
if ($downloadEntity->getStatus() !== 'Paused') {
|
||||||
|
$downloadEntity->setProgress(100);
|
||||||
|
}
|
||||||
} catch (ProcessFailedException $exception) {
|
} catch (ProcessFailedException $exception) {
|
||||||
$downloadEntity->setStatus('Failed');
|
$downloadEntity->setStatus('Failed');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,13 +2,17 @@
|
|||||||
|
|
||||||
namespace App\Download\Framework\Controller;
|
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\DownloadMediaInput;
|
||||||
|
use App\Download\Action\Input\PauseDownloadInput;
|
||||||
|
use App\Download\Action\Input\ResumeDownloadInput;
|
||||||
use App\Download\Framework\Repository\DownloadRepository;
|
use App\Download\Framework\Repository\DownloadRepository;
|
||||||
|
use App\Util\Broadcaster;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\Mercure\HubInterface;
|
|
||||||
use Symfony\Component\Mercure\Update;
|
|
||||||
use Symfony\Component\Messenger\MessageBusInterface;
|
use Symfony\Component\Messenger\MessageBusInterface;
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
|
|
||||||
@@ -17,12 +21,11 @@ class ApiController extends AbstractController
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
private DownloadRepository $downloadRepository,
|
private DownloadRepository $downloadRepository,
|
||||||
private MessageBusInterface $bus,
|
private MessageBusInterface $bus,
|
||||||
private readonly HubInterface $hub,
|
private readonly Broadcaster $broadcaster,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[Route('/api/download', name: 'api_download', methods: ['POST'])]
|
#[Route('/api/download', name: 'api_download', methods: ['POST'])]
|
||||||
public function download(
|
public function download(
|
||||||
Request $request,
|
|
||||||
DownloadMediaInput $input,
|
DownloadMediaInput $input,
|
||||||
): Response {
|
): Response {
|
||||||
$download = $this->downloadRepository->insert(
|
$download = $this->downloadRepository->insert(
|
||||||
@@ -45,15 +48,53 @@ class ApiController extends AbstractController
|
|||||||
return $this->json(['error' => $exception->getMessage()], Response::HTTP_INTERNAL_SERVER_ERROR);
|
return $this->json(['error' => $exception->getMessage()], Response::HTTP_INTERNAL_SERVER_ERROR);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->hub->publish(new Update(
|
$this->broadcaster->alert(
|
||||||
$request->getSession()->get('mercure_alert_topic'),
|
title: 'Success',
|
||||||
$this->renderView('broadcast/Alert.stream.html.twig', [
|
message: "$input->title added to Queue."
|
||||||
'alert_id' => uniqid(),
|
);
|
||||||
'title' => 'Success',
|
|
||||||
'message' => '"' . $input->title . '" added to Queue',
|
|
||||||
])
|
|
||||||
));
|
|
||||||
|
|
||||||
return $this->json(['status' => 200, 'message' => 'Added to Queue']);
|
return $this->json(['status' => 200, 'message' => 'Added to Queue']);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
#[Route('/api/download/{downloadId}', name: 'api_download_delete', methods: ['DELETE'])]
|
||||||
|
public function deleteDownload(
|
||||||
|
DeleteDownloadInput $input,
|
||||||
|
DeleteDownloadHandler $handler,
|
||||||
|
): Response {
|
||||||
|
$result = $handler->handle($input->toCommand());
|
||||||
|
$this->broadcaster->alert(
|
||||||
|
title: 'Success',
|
||||||
|
message: "{$result->download->getTitle()} has been deleted.",
|
||||||
|
);
|
||||||
|
|
||||||
|
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']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -5,12 +5,16 @@ namespace App\Download\Framework\Entity;
|
|||||||
use App\Download\Framework\Repository\DownloadRepository;
|
use App\Download\Framework\Repository\DownloadRepository;
|
||||||
use App\User\Framework\Entity\User;
|
use App\User\Framework\Entity\User;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Gedmo\Timestampable\Traits\TimestampableEntity;
|
||||||
|
use Nihilarr\PTN;
|
||||||
use Symfony\UX\Turbo\Attribute\Broadcast;
|
use Symfony\UX\Turbo\Attribute\Broadcast;
|
||||||
|
|
||||||
#[ORM\Entity(repositoryClass: DownloadRepository::class)]
|
#[ORM\Entity(repositoryClass: DownloadRepository::class)]
|
||||||
#[Broadcast(template: 'broadcast/Download.stream.html.twig')]
|
#[Broadcast(template: 'broadcast/Download.stream.html.twig')]
|
||||||
class Download
|
class Download
|
||||||
{
|
{
|
||||||
|
use TimestampableEntity;
|
||||||
|
|
||||||
#[ORM\Id]
|
#[ORM\Id]
|
||||||
#[ORM\GeneratedValue]
|
#[ORM\GeneratedValue]
|
||||||
#[ORM\Column]
|
#[ORM\Column]
|
||||||
@@ -162,4 +166,16 @@ class Download
|
|||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getPtn(): object
|
||||||
|
{
|
||||||
|
$ptn = (object) (new PTN())->parse($this->filename);
|
||||||
|
|
||||||
|
if ($this->mediaType === "tvshows") {
|
||||||
|
$ptn->season = str_pad($ptn->season, 2, "0", STR_PAD_LEFT);
|
||||||
|
$ptn->episode = str_pad($ptn->episode, 2, "0", STR_PAD_LEFT);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $ptn;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,27 +25,31 @@ class DownloadRepository extends ServiceEntityRepository
|
|||||||
$this->paginator = $paginator;
|
$this->paginator = $paginator;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getCompletePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 10)
|
public function getCompletePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 10, string $term = ""): Paginator
|
||||||
{
|
{
|
||||||
$query = $this->createQueryBuilder('d')
|
$query = $this->createQueryBuilder('d')
|
||||||
->andWhere('d.status IN (:statuses)')
|
->andWhere('d.status IN (:statuses)')
|
||||||
->andWhere('d.user = :user')
|
->andWhere('d.user = :user')
|
||||||
|
->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')
|
->orderBy('d.id', 'DESC')
|
||||||
->setParameter('statuses', ['Complete'])
|
->setParameter('statuses', ['Complete'])
|
||||||
->setParameter('user', $user)
|
->setParameter('user', $user)
|
||||||
|
->setParameter('term', '%' . $term . '%')
|
||||||
->getQuery();
|
->getQuery();
|
||||||
|
|
||||||
return $this->paginator->paginate($query, $pageNumber, $perPage);
|
return $this->paginator->paginate($query, $pageNumber, $perPage);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getActivePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 5)
|
public function getActivePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 5, string $term = ""): Paginator
|
||||||
{
|
{
|
||||||
$query = $this->createQueryBuilder('d')
|
$query = $this->createQueryBuilder('d')
|
||||||
->andWhere('d.status IN (:statuses)')
|
->andWhere('d.status IN (:statuses)')
|
||||||
->andWhere('d.user = :user')
|
->andWhere('d.user = :user')
|
||||||
|
->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')
|
->orderBy('d.id', 'ASC')
|
||||||
->setParameter('statuses', ['New', 'In Progress'])
|
->setParameter('statuses', ['New', 'In Progress', 'Paused'])
|
||||||
->setParameter('user', $user)
|
->setParameter('user', $user)
|
||||||
|
->setParameter('term', '%' . $term . '%')
|
||||||
->getQuery();
|
->getQuery();
|
||||||
|
|
||||||
return $this->paginator->paginate($query, $pageNumber, $perPage);
|
return $this->paginator->paginate($query, $pageNumber, $perPage);
|
||||||
|
|||||||
13
src/Monitor/Action/Command/DeleteMonitorCommand.php
Normal file
13
src/Monitor/Action/Command/DeleteMonitorCommand.php
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Monitor\Action\Command;
|
||||||
|
|
||||||
|
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||||
|
|
||||||
|
/** @implements CommandInterface<DeleteMonitorCommand> */
|
||||||
|
class DeleteMonitorCommand implements CommandInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
public string $monitorId,
|
||||||
|
) {}
|
||||||
|
}
|
||||||
36
src/Monitor/Action/Handler/DeleteMonitorHandler.php
Normal file
36
src/Monitor/Action/Handler/DeleteMonitorHandler.php
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Monitor\Action\Handler;
|
||||||
|
|
||||||
|
use App\Monitor\Action\Command\AddMonitorCommand;
|
||||||
|
use App\Monitor\Action\Command\DeleteMonitorCommand;
|
||||||
|
use App\Monitor\Action\Result\AddMonitorResult;
|
||||||
|
use App\Monitor\Action\Result\DeleteMonitorResult;
|
||||||
|
use App\Monitor\Framework\Entity\Monitor;
|
||||||
|
use App\Monitor\Framework\Repository\MonitorRepository;
|
||||||
|
use App\User\Framework\Repository\UserRepository;
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||||
|
use OneToMany\RichBundle\Contract\HandlerInterface;
|
||||||
|
use OneToMany\RichBundle\Contract\ResultInterface;
|
||||||
|
|
||||||
|
/** @implements HandlerInterface<DeleteMonitorCommand, DeleteMonitorResult> */
|
||||||
|
readonly class DeleteMonitorHandler implements HandlerInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private MonitorRepository $monitorRepository,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function handle(CommandInterface $command): ResultInterface
|
||||||
|
{
|
||||||
|
$monitor = $this->monitorRepository->find($command->monitorId);
|
||||||
|
$this->monitorRepository->getEntityManager()->remove($monitor);
|
||||||
|
$this->monitorRepository->getEntityManager()->flush();
|
||||||
|
|
||||||
|
return new DeleteMonitorResult(
|
||||||
|
status: 'OK',
|
||||||
|
result: [],
|
||||||
|
monitor: $monitor
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,10 +5,13 @@ namespace App\Monitor\Action\Handler;
|
|||||||
use App\Download\Action\Command\DownloadMediaCommand;
|
use App\Download\Action\Command\DownloadMediaCommand;
|
||||||
use App\Monitor\Action\Command\MonitorMovieCommand;
|
use App\Monitor\Action\Command\MonitorMovieCommand;
|
||||||
use App\Monitor\Action\Result\MonitorMovieResult;
|
use App\Monitor\Action\Result\MonitorMovieResult;
|
||||||
|
use App\Monitor\Action\Result\MonitorTvEpisodeResult;
|
||||||
use App\Monitor\Framework\Repository\MonitorRepository;
|
use App\Monitor\Framework\Repository\MonitorRepository;
|
||||||
use App\Monitor\Service\MonitorOptionEvaluator;
|
use App\Monitor\Service\MonitorOptionEvaluator;
|
||||||
|
use App\Tmdb\Tmdb;
|
||||||
use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
|
use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
|
||||||
use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
|
use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
|
||||||
|
use Carbon\Carbon;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use OneToMany\RichBundle\Contract\CommandInterface;
|
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||||
@@ -27,12 +30,26 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
|
|||||||
private MessageBusInterface $bus,
|
private MessageBusInterface $bus,
|
||||||
private LoggerInterface $logger,
|
private LoggerInterface $logger,
|
||||||
private MonitorRepository $monitorRepository,
|
private MonitorRepository $monitorRepository,
|
||||||
|
private Tmdb $tmdb,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function handle(CommandInterface $command): ResultInterface
|
public function handle(CommandInterface $command): ResultInterface
|
||||||
{
|
{
|
||||||
$this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler');
|
$this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler');
|
||||||
$monitor = $this->monitorRepository->find($command->movieMonitorId);
|
$monitor = $this->monitorRepository->find($command->movieMonitorId);
|
||||||
|
|
||||||
|
$episodeData = $this->tmdb->episodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
|
||||||
|
if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::now()) {
|
||||||
|
$this->logger->info('> [MonitorTvEpisodeHandler] Episode has not aired yet, skipping for now');
|
||||||
|
return new MonitorTvEpisodeResult(
|
||||||
|
status: 'OK',
|
||||||
|
result: [
|
||||||
|
'message' => 'No change',
|
||||||
|
'monitor' => $monitor,
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
$monitor->setStatus('In Progress');
|
$monitor->setStatus('In Progress');
|
||||||
$this->monitorRepository->getEntityManager()->flush();
|
$this->monitorRepository->getEntityManager()->flush();
|
||||||
|
|
||||||
@@ -71,7 +88,7 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
|
|||||||
$monitor->setSearchCount($monitor->getSearchCount() + 1);
|
$monitor->setSearchCount($monitor->getSearchCount() + 1);
|
||||||
$this->entityManager->flush();
|
$this->entityManager->flush();
|
||||||
|
|
||||||
return new MonitorMovieResult(
|
return new MonitorTvEpisodeResult(
|
||||||
status: 'OK',
|
status: 'OK',
|
||||||
result: [
|
result: [
|
||||||
'monitor' => $monitor,
|
'monitor' => $monitor,
|
||||||
|
|||||||
@@ -3,9 +3,9 @@
|
|||||||
namespace App\Monitor\Action\Handler;
|
namespace App\Monitor\Action\Handler;
|
||||||
|
|
||||||
use Aimeos\Map;
|
use Aimeos\Map;
|
||||||
use App\Monitor\Action\Command\MonitorMovieCommand;
|
|
||||||
use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
|
use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
|
||||||
use App\Monitor\Action\Result\MonitorMovieResult;
|
use App\Monitor\Action\Command\MonitorTvSeasonCommand;
|
||||||
|
use App\Monitor\Action\Result\MonitorTvSeasonResult;
|
||||||
use App\Monitor\Framework\Entity\Monitor;
|
use App\Monitor\Framework\Entity\Monitor;
|
||||||
use App\Monitor\Framework\Repository\MonitorRepository;
|
use App\Monitor\Framework\Repository\MonitorRepository;
|
||||||
use App\Monitor\Service\MediaFiles;
|
use App\Monitor\Service\MediaFiles;
|
||||||
@@ -17,16 +17,14 @@ use OneToMany\RichBundle\Contract\CommandInterface;
|
|||||||
use OneToMany\RichBundle\Contract\HandlerInterface;
|
use OneToMany\RichBundle\Contract\HandlerInterface;
|
||||||
use OneToMany\RichBundle\Contract\ResultInterface;
|
use OneToMany\RichBundle\Contract\ResultInterface;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Component\Messenger\MessageBusInterface;
|
|
||||||
|
|
||||||
/** @implements HandlerInterface<MonitorMovieCommand> */
|
/** @implements HandlerInterface<MonitorTvSeasonCommand> */
|
||||||
readonly class MonitorTvSeasonHandler implements HandlerInterface
|
readonly class MonitorTvSeasonHandler implements HandlerInterface
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private MonitorRepository $monitorRepository,
|
private MonitorRepository $monitorRepository,
|
||||||
private EntityManagerInterface $entityManager,
|
private EntityManagerInterface $entityManager,
|
||||||
private MediaFiles $mediaFiles,
|
private MediaFiles $mediaFiles,
|
||||||
private MessageBusInterface $bus,
|
|
||||||
private LoggerInterface $logger,
|
private LoggerInterface $logger,
|
||||||
private Tmdb $tmdb,
|
private Tmdb $tmdb,
|
||||||
private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
|
private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
|
||||||
@@ -41,33 +39,42 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
|
|||||||
$downloadedEpisodes = $this->mediaFiles
|
$downloadedEpisodes = $this->mediaFiles
|
||||||
->getEpisodes($monitor->getTitle())
|
->getEpisodes($monitor->getTitle())
|
||||||
->map(fn($episode) => (object) (new PTN())->parse($episode))
|
->map(fn($episode) => (object) (new PTN())->parse($episode))
|
||||||
|
->filter(fn ($episode) =>
|
||||||
|
property_exists($episode, 'episode')
|
||||||
|
&& property_exists($episode, 'season')
|
||||||
|
&& null !== $episode->episode
|
||||||
|
&& null !== $episode->season
|
||||||
|
)
|
||||||
->rekey(fn($episode) => $episode->episode);
|
->rekey(fn($episode) => $episode->episode);
|
||||||
$this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
|
$this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
|
||||||
|
|
||||||
// Compare against list from TMDB
|
// Compare against list from TMDB
|
||||||
$episodesInSeason = Map::from(
|
$episodesInSeason = Map::from(
|
||||||
$this->tmdb->tvDetails($monitor->getTmdbId())
|
$this->tmdb->tvDetails($monitor->getTmdbId())->episodes[$monitor->getSeason()]
|
||||||
->episodes[$monitor->getSeason()]
|
|
||||||
)->rekey(fn($episode) => $episode['episode_number']);
|
)->rekey(fn($episode) => $episode['episode_number']);
|
||||||
$this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($episodesInSeason) . ' episodes in season ' . $monitor->getSeason() . ' for title: ' . $monitor->getTitle());
|
$this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($episodesInSeason) . ' episodes in season ' . $monitor->getSeason() . ' for title: ' . $monitor->getTitle());
|
||||||
|
|
||||||
// Dispatch Episode commands for each missing Episode
|
if ($downloadedEpisodes->count() !== $episodesInSeason->count()) {
|
||||||
foreach ($episodesInSeason as $episode) {
|
// Dispatch Episode commands for each missing Episode
|
||||||
$monitorCheck = $this->monitorRepository->findOneBy([
|
foreach ($episodesInSeason as $episode) {
|
||||||
'imdbId' => $monitor->getImdbId(),
|
// Check if the episode is already downloaded
|
||||||
'title' => $monitor->getTitle(),
|
$episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
|
||||||
'monitorType' => 'tvepisode',
|
$this->logger->info('> [MonitorTvSeasonHandler] Episode exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeExists ? 'YES' : 'NO'));
|
||||||
'season' => $monitor->getSeason(),
|
if (true === $episodeExists) {
|
||||||
'episode' => $episode['episode_number'],
|
$this->logger->info('> [MonitorTvSeasonHandler] Episode exists for title: ' . $monitor->getTitle() . ', skipping');
|
||||||
'status' => ['New', 'Active', 'In Progress']
|
continue;
|
||||||
]);
|
}
|
||||||
|
|
||||||
$this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for season ' . $monitor->getSeason() . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (null !== $monitorCheck ? 'YES' : 'NO'));
|
// Check for existing monitors
|
||||||
|
$monitorExists = $this->monitorExists($monitor, $episode);
|
||||||
|
$this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $monitorExists ? 'YES' : 'NO'));
|
||||||
|
if (true === $monitorExists) {
|
||||||
|
$this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for title: ' . $monitor->getTitle() . ', skipping');
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (!array_key_exists($episode['episode_number'], $downloadedEpisodes->toArray())
|
|
||||||
&& null === $monitorCheck
|
|
||||||
) {
|
|
||||||
$episodeMonitor = (new Monitor())
|
$episodeMonitor = (new Monitor())
|
||||||
|
->setParent($monitor)
|
||||||
->setUser($monitor->getUser())
|
->setUser($monitor->getUser())
|
||||||
->setTmdbId($monitor->getTmdbId())
|
->setTmdbId($monitor->getTmdbId())
|
||||||
->setImdbId($monitor->getImdbId())
|
->setImdbId($monitor->getImdbId())
|
||||||
@@ -88,16 +95,38 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set the status to Active, so it will be re-executed.
|
||||||
|
$monitor->setStatus('Active');
|
||||||
$monitor->setLastSearch(new DateTimeImmutable());
|
$monitor->setLastSearch(new DateTimeImmutable());
|
||||||
$monitor->setSearchCount($monitor->getSearchCount() + 1);
|
$monitor->setSearchCount($monitor->getSearchCount() + 1);
|
||||||
$monitor->setStatus('Complete');
|
|
||||||
$this->entityManager->flush();
|
$this->entityManager->flush();
|
||||||
|
|
||||||
return new MonitorMovieResult(
|
return new MonitorTvSeasonResult(
|
||||||
status: 'OK',
|
status: 'OK',
|
||||||
result: [
|
result: [
|
||||||
'monitor' => $monitor,
|
'monitor' => $monitor,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool
|
||||||
|
{
|
||||||
|
return $downloadedEpisodes->filter(
|
||||||
|
fn (object $episode) => $episode->episode === $episodeInShow['episode_number']
|
||||||
|
&& $episode->season === $episodeInShow['season_number']
|
||||||
|
)->count() > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function monitorExists(Monitor $monitor, array $episode): bool
|
||||||
|
{
|
||||||
|
return $this->monitorRepository->findOneBy([
|
||||||
|
'imdbId' => $monitor->getImdbId(),
|
||||||
|
'title' => $monitor->getTitle(),
|
||||||
|
'monitorType' => 'tvepisode',
|
||||||
|
'season' => $episode['season_number'],
|
||||||
|
'episode' => $episode['episode_number'],
|
||||||
|
'status' => ['New', 'Active', 'In Progress']
|
||||||
|
]) !== null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,11 +5,12 @@ namespace App\Monitor\Action\Handler;
|
|||||||
use Aimeos\Map;
|
use Aimeos\Map;
|
||||||
use App\Monitor\Action\Command\MonitorMovieCommand;
|
use App\Monitor\Action\Command\MonitorMovieCommand;
|
||||||
use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
|
use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
|
||||||
use App\Monitor\Action\Result\MonitorTvEpisodeResult;
|
use App\Monitor\Action\Result\MonitorTvShowResult;
|
||||||
use App\Monitor\Framework\Entity\Monitor;
|
use App\Monitor\Framework\Entity\Monitor;
|
||||||
use App\Monitor\Framework\Repository\MonitorRepository;
|
use App\Monitor\Framework\Repository\MonitorRepository;
|
||||||
use App\Monitor\Service\MediaFiles;
|
use App\Monitor\Service\MediaFiles;
|
||||||
use App\Tmdb\Tmdb;
|
use App\Tmdb\Tmdb;
|
||||||
|
use Carbon\Carbon;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Nihilarr\PTN;
|
use Nihilarr\PTN;
|
||||||
@@ -17,7 +18,6 @@ use OneToMany\RichBundle\Contract\CommandInterface;
|
|||||||
use OneToMany\RichBundle\Contract\HandlerInterface;
|
use OneToMany\RichBundle\Contract\HandlerInterface;
|
||||||
use OneToMany\RichBundle\Contract\ResultInterface;
|
use OneToMany\RichBundle\Contract\ResultInterface;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Component\Messenger\MessageBusInterface;
|
|
||||||
|
|
||||||
/** @implements HandlerInterface<MonitorMovieCommand> */
|
/** @implements HandlerInterface<MonitorMovieCommand> */
|
||||||
readonly class MonitorTvShowHandler implements HandlerInterface
|
readonly class MonitorTvShowHandler implements HandlerInterface
|
||||||
@@ -25,8 +25,8 @@ readonly class MonitorTvShowHandler implements HandlerInterface
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
private MonitorRepository $monitorRepository,
|
private MonitorRepository $monitorRepository,
|
||||||
private EntityManagerInterface $entityManager,
|
private EntityManagerInterface $entityManager,
|
||||||
|
private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
|
||||||
private MediaFiles $mediaFiles,
|
private MediaFiles $mediaFiles,
|
||||||
private MessageBusInterface $bus,
|
|
||||||
private LoggerInterface $logger,
|
private LoggerInterface $logger,
|
||||||
private Tmdb $tmdb,
|
private Tmdb $tmdb,
|
||||||
) {}
|
) {}
|
||||||
@@ -39,55 +39,116 @@ readonly class MonitorTvShowHandler implements HandlerInterface
|
|||||||
// Check current episodes
|
// Check current episodes
|
||||||
$downloadedEpisodes = $this->mediaFiles
|
$downloadedEpisodes = $this->mediaFiles
|
||||||
->getEpisodes($monitor->getTitle())
|
->getEpisodes($monitor->getTitle())
|
||||||
->map(fn($episode) => (object) (new PTN())->parse($episode));
|
->map(fn($episode) => (object) (new PTN())->parse($episode))
|
||||||
|
->filter(fn ($episode) =>
|
||||||
|
property_exists($episode, 'episode')
|
||||||
|
&& property_exists($episode, 'season')
|
||||||
|
&& null !== $episode->episode
|
||||||
|
&& null !== $episode->season
|
||||||
|
)
|
||||||
|
;
|
||||||
$this->logger->info('> [MonitorTvShowHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
|
$this->logger->info('> [MonitorTvShowHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
|
||||||
|
|
||||||
// Compare against list from TMDB
|
// Compare against list from TMDB
|
||||||
$episodesInShow = Map::from(
|
$episodesInShow = Map::from(
|
||||||
$this->tmdb->tvDetails($monitor->getTmdbId())
|
$this->tmdb->tvDetails($monitor->getTmdbId())->episodes
|
||||||
->episodes
|
|
||||||
)->flat(1);
|
)->flat(1);
|
||||||
$this->logger->info('> [MonitorTvShowHandler] Found ' . count($episodesInShow) . ' episodes in season ' . $monitor->getSeason() . ' for title: ' . $monitor->getTitle());
|
|
||||||
|
|
||||||
// Dispatch Episode commands for each missing Episode
|
$this->logger->info('> [MonitorTvShowHandler] Found ' . count($episodesInShow) . ' episodes for title: ' . $monitor->getTitle());
|
||||||
foreach ($episodesInShow as $episode) {
|
|
||||||
$episodeAlreadyDownloaded = $downloadedEpisodes->find(
|
|
||||||
fn($ep) => $ep->episode === $episode['episode_number'] && $ep->season === $episode['season_number']
|
|
||||||
);
|
|
||||||
$episodeAlreadyDownloaded = !is_null($episodeAlreadyDownloaded);
|
|
||||||
|
|
||||||
if (false === $episodeAlreadyDownloaded) {
|
$episodeMonitors = [];
|
||||||
$monitor = (new Monitor())
|
if ($downloadedEpisodes->count() !== $episodesInShow->count()) {
|
||||||
|
// Dispatch Episode commands for each missing Episode
|
||||||
|
foreach ($episodesInShow as $episode) {
|
||||||
|
// Only monitor future episodes
|
||||||
|
$episodeInFuture = $this->episodeReleasedAfterMonitorCreated($monitor->getCreatedAt(), $episode);
|
||||||
|
$this->logger->info('> [MonitorTvShowHandler] Episode released after monitor started for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
|
||||||
|
if (false === $episodeInFuture) {
|
||||||
|
$this->logger->info('> [MonitorTvShowHandler] Episode released after monitor started for title: ' . 'for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ', skipping');
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if the episode is already downloaded
|
||||||
|
$episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
|
||||||
|
$this->logger->info('> [MonitorTvShowHandler] Episode exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeExists ? 'YES' : 'NO'));
|
||||||
|
if (true === $episodeExists) {
|
||||||
|
$this->logger->info('> [MonitorTvShowHandler] Episode exists for title: ' . $monitor->getTitle() . ', skipping');
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for existing monitors
|
||||||
|
$monitorExists = $this->monitorExists($monitor, $episode);
|
||||||
|
$this->logger->info('> [MonitorTvShowHandler] Monitor exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $monitorExists ? 'YES' : 'NO'));
|
||||||
|
if (true === $monitorExists) {
|
||||||
|
$this->logger->info('> [MonitorTvShowHandler] Monitor exists for title: ' . $monitor->getTitle() . ', skipping');
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create the monitor
|
||||||
|
$episodeMonitor = (new Monitor())
|
||||||
|
->setParent($monitor)
|
||||||
->setUser($monitor->getUser())
|
->setUser($monitor->getUser())
|
||||||
->setTmdbId($monitor->getTmdbId())
|
->setTmdbId($monitor->getTmdbId())
|
||||||
->setImdbId($monitor->getImdbId())
|
->setImdbId($monitor->getImdbId())
|
||||||
->setTitle($monitor->getTitle())
|
->setTitle($monitor->getTitle())
|
||||||
->setMonitorType('tvshow')
|
->setMonitorType('tvepisode')
|
||||||
->setSeason($episode['season_number'])
|
->setSeason($episode['season_number'])
|
||||||
->setEpisode($episode['episode_number'])
|
->setEpisode($episode['episode_number'])
|
||||||
->setCreatedAt(new DateTimeImmutable())
|
->setCreatedAt(new DateTimeImmutable())
|
||||||
->setSearchCount(0)
|
->setSearchCount(0)
|
||||||
->setStatus('New');
|
->setStatus('New');
|
||||||
|
|
||||||
$this->monitorRepository->getEntityManager()->persist($monitor);
|
$this->monitorRepository->getEntityManager()->persist($episodeMonitor);
|
||||||
$this->monitorRepository->getEntityManager()->flush();
|
$this->monitorRepository->getEntityManager()->flush();
|
||||||
|
|
||||||
$command = new MonitorTvEpisodeCommand($monitor->getId());
|
$episodeMonitors[] = $episodeMonitor;
|
||||||
$this->bus->dispatch($command);
|
|
||||||
$this->logger->info('> [MonitorTvShowHandler] Dispatching MonitorTvEpisodeCommand for season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode() . ' for title: ' . $monitor->getTitle());
|
// Immediately run the monitor
|
||||||
|
$command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
|
||||||
|
$this->monitorTvEpisodeHandler->handle($command);
|
||||||
|
$this->logger->info('> [MonitorTvShowHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set the status to Active, so it will be re-executed.
|
||||||
|
$monitor->setStatus('Active');
|
||||||
$monitor->setLastSearch(new DateTimeImmutable());
|
$monitor->setLastSearch(new DateTimeImmutable());
|
||||||
$monitor->setSearchCount($monitor->getSearchCount() + 1);
|
$monitor->setSearchCount($monitor->getSearchCount() + 1);
|
||||||
$monitor->setStatus('Complete');
|
|
||||||
$this->entityManager->flush();
|
$this->entityManager->flush();
|
||||||
|
|
||||||
return new MonitorTvEpisodeResult(
|
return new MonitorTvShowResult(
|
||||||
status: 'OK',
|
status: 'OK',
|
||||||
result: [
|
result: [
|
||||||
'monitor' => $monitor,
|
'monitor' => $monitor,
|
||||||
|
'new_monitors' => $episodeMonitors,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function episodeReleasedAfterMonitorCreated(string|DateTimeImmutable $monitorStartDate, array $episodeInShow): bool
|
||||||
|
{
|
||||||
|
$monitorStartDate = Carbon::parse($monitorStartDate)->setTime(0, 0);
|
||||||
|
$episodeAirDate = Carbon::parse($episodeInShow['air_date']);
|
||||||
|
return $episodeAirDate >= $monitorStartDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool
|
||||||
|
{
|
||||||
|
return $downloadedEpisodes->filter(
|
||||||
|
fn (object $episode) => $episode->episode === $episodeInShow['episode_number']
|
||||||
|
&& $episode->season === $episodeInShow['season_number']
|
||||||
|
)->count() > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function monitorExists(Monitor $monitor, array $episode): bool
|
||||||
|
{
|
||||||
|
return $this->monitorRepository->findOneBy([
|
||||||
|
'imdbId' => $monitor->getImdbId(),
|
||||||
|
'title' => $monitor->getTitle(),
|
||||||
|
'monitorType' => 'tvepisode',
|
||||||
|
'season' => $episode['season_number'],
|
||||||
|
'episode' => $episode['episode_number'],
|
||||||
|
'status' => ['New', 'Active', 'In Progress']
|
||||||
|
]) !== null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
24
src/Monitor/Action/Input/DeleteMonitorInput.php
Normal file
24
src/Monitor/Action/Input/DeleteMonitorInput.php
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Monitor\Action\Input;
|
||||||
|
|
||||||
|
use App\Monitor\Action\Command\DeleteMonitorCommand;
|
||||||
|
use OneToMany\RichBundle\Attribute\SourceRoute;
|
||||||
|
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||||
|
use OneToMany\RichBundle\Contract\InputInterface;
|
||||||
|
|
||||||
|
/** @implements InputInterface<DeleteMonitorInput, DeleteMonitorCommand> */
|
||||||
|
class DeleteMonitorInput implements InputInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
#[SourceRoute('monitorId')]
|
||||||
|
public int $monitorId,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function toCommand(): CommandInterface
|
||||||
|
{
|
||||||
|
return new DeleteMonitorCommand(
|
||||||
|
$this->monitorId
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
15
src/Monitor/Action/Result/DeleteMonitorResult.php
Normal file
15
src/Monitor/Action/Result/DeleteMonitorResult.php
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Monitor\Action\Result;
|
||||||
|
|
||||||
|
use App\Monitor\Framework\Entity\Monitor;
|
||||||
|
use OneToMany\RichBundle\Contract\ResultInterface;
|
||||||
|
|
||||||
|
class DeleteMonitorResult implements ResultInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
public string $status,
|
||||||
|
public array $result,
|
||||||
|
public Monitor $monitor,
|
||||||
|
) {}
|
||||||
|
}
|
||||||
13
src/Monitor/Action/Result/MonitorTvSeasonResult.php
Normal file
13
src/Monitor/Action/Result/MonitorTvSeasonResult.php
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Monitor\Action\Result;
|
||||||
|
|
||||||
|
use OneToMany\RichBundle\Contract\ResultInterface;
|
||||||
|
|
||||||
|
class MonitorTvSeasonResult implements ResultInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
public string $status,
|
||||||
|
public array $result,
|
||||||
|
) {}
|
||||||
|
}
|
||||||
13
src/Monitor/Action/Result/MonitorTvShowResult.php
Normal file
13
src/Monitor/Action/Result/MonitorTvShowResult.php
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Monitor\Action\Result;
|
||||||
|
|
||||||
|
use OneToMany\RichBundle\Contract\ResultInterface;
|
||||||
|
|
||||||
|
class MonitorTvShowResult implements ResultInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
public string $status,
|
||||||
|
public array $result,
|
||||||
|
) {}
|
||||||
|
}
|
||||||
17
src/Monitor/Dto/UpcomingEpisode.php
Normal file
17
src/Monitor/Dto/UpcomingEpisode.php
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Monitor\Dto;
|
||||||
|
|
||||||
|
use Carbon\Carbon;
|
||||||
|
|
||||||
|
class UpcomingEpisode
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
public string $title,
|
||||||
|
public string $airDate {
|
||||||
|
get => Carbon::parse($this->airDate)->format('m/d/Y');
|
||||||
|
},
|
||||||
|
public string $episodeTitle,
|
||||||
|
public int $episodeNumber,
|
||||||
|
) {}
|
||||||
|
}
|
||||||
@@ -2,21 +2,23 @@
|
|||||||
|
|
||||||
namespace App\Monitor\Framework\Controller;
|
namespace App\Monitor\Framework\Controller;
|
||||||
|
|
||||||
|
use App\Download\Action\Input\DeleteDownloadInput;
|
||||||
use App\Monitor\Action\Handler\AddMonitorHandler;
|
use App\Monitor\Action\Handler\AddMonitorHandler;
|
||||||
|
use App\Monitor\Action\Handler\DeleteMonitorHandler;
|
||||||
use App\Monitor\Action\Input\AddMonitorInput;
|
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\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||||
use Symfony\Component\Mercure\HubInterface;
|
use Symfony\Component\Mercure\HubInterface;
|
||||||
use Symfony\Component\Mercure\Update;
|
use Symfony\Component\Mercure\Update;
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
use Twig\Environment;
|
|
||||||
|
|
||||||
class ApiController extends AbstractController
|
class ApiController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
#[Autowire(service: 'twig')]
|
private readonly Broadcaster $broadcaster,
|
||||||
private readonly Environment $renderer,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[Route('/api/monitor', name: 'api_monitor', methods: ['POST'])]
|
#[Route('/api/monitor', name: 'api_monitor', methods: ['POST'])]
|
||||||
@@ -29,12 +31,31 @@ class ApiController extends AbstractController
|
|||||||
$command->userId = $this->getUser()->getId();
|
$command->userId = $this->getUser()->getId();
|
||||||
$response = $handler->handle($command);
|
$response = $handler->handle($command);
|
||||||
|
|
||||||
|
$this->broadcaster->alert(
|
||||||
|
title: 'Success',
|
||||||
|
message: "New monitor added for {$input->title}",
|
||||||
|
);
|
||||||
|
|
||||||
|
return $this->json([
|
||||||
|
'status' => 200,
|
||||||
|
'message' => $response
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Route('/api/monitor/{monitorId}', name: 'api_monitor_delete', methods: ['DELETE'])]
|
||||||
|
public function deleteMonitor(
|
||||||
|
DeleteMonitorInput $input,
|
||||||
|
DeleteMonitorHandler $handler,
|
||||||
|
HubInterface $hub,
|
||||||
|
) {
|
||||||
|
$response = $handler->handle($input->toCommand());
|
||||||
|
|
||||||
$hub->publish(new Update(
|
$hub->publish(new Update(
|
||||||
'alerts',
|
'alerts',
|
||||||
$this->renderer->render('broadcast/Alert.stream.html.twig', [
|
$this->renderer->render('broadcast/Alert.stream.html.twig', [
|
||||||
'alert_id' => uniqid(),
|
'alert_id' => uniqid(),
|
||||||
'title' => 'Success',
|
'title' => 'Success',
|
||||||
'message' => "New monitor added for {$input->title}",
|
'message' => "New monitor added for {$response->monitor->getTitle()}",
|
||||||
])
|
])
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
31
src/Monitor/Framework/Controller/WebController.php
Normal file
31
src/Monitor/Framework/Controller/WebController.php
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
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\Monitor\Framework\Repository\MonitorRepository;
|
||||||
|
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;
|
||||||
|
use Twig\Environment;
|
||||||
|
|
||||||
|
class WebController extends AbstractController
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
#[Autowire(service: 'twig')]
|
||||||
|
private readonly Environment $renderer,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
#[Route('/monitors', name: 'app_monitors', methods: ['GET'])]
|
||||||
|
public function addMonitor()
|
||||||
|
{
|
||||||
|
return $this->render('monitor/index.html.twig');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,10 +4,14 @@ namespace App\Monitor\Framework\Entity;
|
|||||||
|
|
||||||
use App\Monitor\Framework\Repository\MonitorRepository;
|
use App\Monitor\Framework\Repository\MonitorRepository;
|
||||||
use App\User\Framework\Entity\User;
|
use App\User\Framework\Entity\User;
|
||||||
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
|
use Doctrine\Common\Collections\Collection;
|
||||||
use Doctrine\DBAL\Types\Types;
|
use Doctrine\DBAL\Types\Types;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Symfony\Component\Serializer\Attribute\Ignore;
|
use Symfony\Component\Serializer\Attribute\Ignore;
|
||||||
|
use Symfony\UX\Turbo\Attribute\Broadcast;
|
||||||
|
|
||||||
|
#[Broadcast(template: 'broadcast/Monitor.stream.html.twig')]
|
||||||
#[ORM\Entity(repositoryClass: MonitorRepository::class)]
|
#[ORM\Entity(repositoryClass: MonitorRepository::class)]
|
||||||
class Monitor
|
class Monitor
|
||||||
{
|
{
|
||||||
@@ -54,6 +58,17 @@ class Monitor
|
|||||||
#[ORM\Column(nullable: true)]
|
#[ORM\Column(nullable: true)]
|
||||||
private ?\DateTimeImmutable $downloadedAt = null;
|
private ?\DateTimeImmutable $downloadedAt = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
|
||||||
|
private ?self $parent = null;
|
||||||
|
|
||||||
|
#[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent')]
|
||||||
|
private Collection $children;
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->children = new ArrayCollection();
|
||||||
|
}
|
||||||
|
|
||||||
public function getId(): ?int
|
public function getId(): ?int
|
||||||
{
|
{
|
||||||
return $this->id;
|
return $this->id;
|
||||||
@@ -202,4 +217,51 @@ class Monitor
|
|||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getParent(): ?self
|
||||||
|
{
|
||||||
|
return $this->parent;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setParent(?self $parent): static
|
||||||
|
{
|
||||||
|
$this->parent = $parent;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, self>
|
||||||
|
*/
|
||||||
|
public function getChildren(): Collection
|
||||||
|
{
|
||||||
|
return $this->children;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addChild(self $child): static
|
||||||
|
{
|
||||||
|
if (!$this->children->contains($child)) {
|
||||||
|
$this->children->add($child);
|
||||||
|
$child->setParent($this);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function removeChild(self $child): static
|
||||||
|
{
|
||||||
|
if ($this->children->removeElement($child)) {
|
||||||
|
// set the owning side to null (unless already changed)
|
||||||
|
if ($child->getParent() === $this) {
|
||||||
|
$child->setParent(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function isActive(): bool
|
||||||
|
{
|
||||||
|
return in_array($this->status, ['New', 'Active', 'In Progress']);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ class MonitorRepository extends ServiceEntityRepository
|
|||||||
$this->paginator = $paginator;
|
$this->paginator = $paginator;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getUserMonitorsPaginated(UserInterface $user, int $page, int $perPage)
|
public function getUserMonitorsPaginated(UserInterface $user, int $page, int $perPage, string $searchTerm): Paginator
|
||||||
{
|
{
|
||||||
$query = $this->createQueryBuilder('m')
|
$query = $this->createQueryBuilder('m')
|
||||||
->andWhere('m.status IN (:statuses)')
|
->andWhere('m.status IN (:statuses)')
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ use Psr\Log\LoggerInterface;
|
|||||||
use Symfony\Component\Messenger\MessageBusInterface;
|
use Symfony\Component\Messenger\MessageBusInterface;
|
||||||
use Symfony\Component\Scheduler\Attribute\AsCronTask;
|
use Symfony\Component\Scheduler\Attribute\AsCronTask;
|
||||||
|
|
||||||
#[AsCronTask('* * * * *', schedule: 'monitor')]
|
#[AsCronTask('0 * * * *', schedule: 'monitor')]
|
||||||
class MonitorDispatcher
|
class MonitorDispatcher
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
|
|||||||
@@ -3,14 +3,19 @@
|
|||||||
namespace App\Monitor\Service;
|
namespace App\Monitor\Service;
|
||||||
|
|
||||||
use Aimeos\Map;
|
use Aimeos\Map;
|
||||||
|
use App\Download\Framework\Entity\Download;
|
||||||
|
use Nihilarr\PTN;
|
||||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||||
use Symfony\Component\Filesystem\Filesystem;
|
use Symfony\Component\Filesystem\Filesystem;
|
||||||
use Symfony\Component\Finder\Finder;
|
use Symfony\Component\Finder\Finder;
|
||||||
|
use Symfony\Component\Finder\SplFileInfo;
|
||||||
|
|
||||||
class MediaFiles
|
class MediaFiles
|
||||||
{
|
{
|
||||||
private Finder $finder;
|
private Finder $finder;
|
||||||
|
|
||||||
|
private string $basePath;
|
||||||
|
|
||||||
private string $moviesPath;
|
private string $moviesPath;
|
||||||
|
|
||||||
private string $tvShowsPath;
|
private string $tvShowsPath;
|
||||||
@@ -18,6 +23,9 @@ class MediaFiles
|
|||||||
private Filesystem $filesystem;
|
private Filesystem $filesystem;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
|
#[Autowire(param: 'media.base_path')]
|
||||||
|
string $basePath,
|
||||||
|
|
||||||
#[Autowire(param: 'media.movies_path')]
|
#[Autowire(param: 'media.movies_path')]
|
||||||
string $moviesPath,
|
string $moviesPath,
|
||||||
|
|
||||||
@@ -27,6 +35,7 @@ class MediaFiles
|
|||||||
Filesystem $filesystem,
|
Filesystem $filesystem,
|
||||||
) {
|
) {
|
||||||
$this->finder = new Finder();
|
$this->finder = new Finder();
|
||||||
|
$this->basePath = $basePath;
|
||||||
$this->moviesPath = $moviesPath;
|
$this->moviesPath = $moviesPath;
|
||||||
$this->tvShowsPath = $tvShowsPath;
|
$this->tvShowsPath = $tvShowsPath;
|
||||||
$this->filesystem = $filesystem;
|
$this->filesystem = $filesystem;
|
||||||
@@ -43,6 +52,11 @@ class MediaFiles
|
|||||||
throw new \Exception(sprintf('A path for media type %s does not exist.', $mediaType));
|
throw new \Exception(sprintf('A path for media type %s does not exist.', $mediaType));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getBasePath(): string
|
||||||
|
{
|
||||||
|
return $this->basePath;
|
||||||
|
}
|
||||||
|
|
||||||
public function getMoviesPath(): string
|
public function getMoviesPath(): string
|
||||||
{
|
{
|
||||||
return $this->moviesPath;
|
return $this->moviesPath;
|
||||||
@@ -125,4 +139,85 @@ class MediaFiles
|
|||||||
|
|
||||||
return $path;
|
return $path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function episodeExists(string $tvshowTitle, int $seasonNumber, int $episodeNumber)
|
||||||
|
{
|
||||||
|
$existingEpisodes = $this->getEpisodes($tvshowTitle, false);
|
||||||
|
|
||||||
|
if ($existingEpisodes->isEmpty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @var SplFileInfo $episode */
|
||||||
|
foreach ($existingEpisodes as $episode) {
|
||||||
|
$ptn = (object) (new PTN())->parse($episode->getFilename());
|
||||||
|
|
||||||
|
if (!property_exists($ptn, 'season') || !property_exists($ptn, 'episode')) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($ptn->season === $seasonNumber && $ptn->episode === $episodeNumber) {
|
||||||
|
return $episode;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function movieExists(string $title)
|
||||||
|
{
|
||||||
|
$filepath = $this->moviesPath . DIRECTORY_SEPARATOR . $title;
|
||||||
|
$directoryExists = $this->filesystem->exists($filepath);
|
||||||
|
|
||||||
|
if (false === $directoryExists) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (false === $this->finder->in($filepath)->files()->hasResults()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$files = Map::from($this->finder->in($filepath)->files())->filter(function (SplFileInfo $file) {
|
||||||
|
$validExtensions = ['mkv', 'mp4', 'mpeg'];
|
||||||
|
return in_array($file->getExtension(), $validExtensions);
|
||||||
|
})->values();
|
||||||
|
|
||||||
|
if (false === $files->isEmpty()) {
|
||||||
|
return $files[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ use OneToMany\RichBundle\Contract\CommandInterface;
|
|||||||
class GetMediaInfoCommand implements CommandInterface
|
class GetMediaInfoCommand implements CommandInterface
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public string $tmdbId,
|
public string $imdbId,
|
||||||
public string $mediaType,
|
public string $mediaType,
|
||||||
|
public ?int $season = null,
|
||||||
) {}
|
) {}
|
||||||
}
|
}
|
||||||
@@ -18,8 +18,8 @@ class GetMediaInfoHandler implements HandlerInterface
|
|||||||
|
|
||||||
public function handle(CommandInterface $command): ResultInterface
|
public function handle(CommandInterface $command): ResultInterface
|
||||||
{
|
{
|
||||||
$media = $this->tmdb->mediaDetails($command->tmdbId, $command->mediaType);
|
$media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
|
||||||
|
|
||||||
return new GetMediaInfoResult($media);
|
return new GetMediaInfoResult($media, $command->season);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
namespace App\Search\Action\Input;
|
namespace App\Search\Action\Input;
|
||||||
|
|
||||||
use App\Download\Action\Command\DownloadMediaCommand;
|
use App\Download\Action\Command\DownloadMediaCommand;
|
||||||
|
use App\Enum\MediaType;
|
||||||
use App\Search\Action\Command\GetMediaInfoCommand;
|
use App\Search\Action\Command\GetMediaInfoCommand;
|
||||||
use OneToMany\RichBundle\Attribute\SourceRoute;
|
use OneToMany\RichBundle\Attribute\SourceRoute;
|
||||||
use OneToMany\RichBundle\Contract\CommandInterface;
|
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||||
@@ -12,15 +13,21 @@ use OneToMany\RichBundle\Contract\InputInterface;
|
|||||||
class GetMediaInfoInput implements InputInterface
|
class GetMediaInfoInput implements InputInterface
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
#[SourceRoute('tmdbId')]
|
#[SourceRoute('imdbId')]
|
||||||
public string $tmdbId,
|
public string $imdbId,
|
||||||
|
|
||||||
#[SourceRoute('mediaType')]
|
#[SourceRoute('mediaType')]
|
||||||
public string $mediaType,
|
public string $mediaType,
|
||||||
|
|
||||||
|
#[SourceRoute('season', nullify: true)]
|
||||||
|
public ?int $season,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function toCommand(): CommandInterface
|
public function toCommand(): CommandInterface
|
||||||
{
|
{
|
||||||
return new GetMediaInfoCommand($this->tmdbId, $this->mediaType);
|
if ("tvshows" === $this->mediaType && null === $this->season) {
|
||||||
|
$this->season = 1;
|
||||||
|
}
|
||||||
|
return new GetMediaInfoCommand($this->imdbId, $this->mediaType, $this->season);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -10,5 +10,6 @@ class GetMediaInfoResult implements ResultInterface
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public TmdbResult $media,
|
public TmdbResult $media,
|
||||||
|
public ?int $season,
|
||||||
) {}
|
) {}
|
||||||
}
|
}
|
||||||
|
|||||||
65
src/Search/TvEpisodePaginator.php
Normal file
65
src/Search/TvEpisodePaginator.php
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Search;
|
||||||
|
|
||||||
|
use App\Search\Action\Command\GetMediaInfoCommand;
|
||||||
|
use App\Search\Action\Handler\GetMediaInfoHandler;
|
||||||
|
use App\Search\Action\Result\GetMediaInfoResult;
|
||||||
|
use stdClass;
|
||||||
|
|
||||||
|
class TvEpisodePaginator
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var integer
|
||||||
|
*/
|
||||||
|
private $total;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var integer
|
||||||
|
*/
|
||||||
|
private $lastPage;
|
||||||
|
|
||||||
|
private $items;
|
||||||
|
|
||||||
|
public $limit = 20;
|
||||||
|
|
||||||
|
public $currentPage = 1;
|
||||||
|
|
||||||
|
public function paginate(GetMediaInfoResult $results, int $page = 1, int $limit = 20): static
|
||||||
|
{
|
||||||
|
$this->total = count($results->media->episodes[$results->season]);
|
||||||
|
$this->lastPage = (int) ceil($this->total / $limit);
|
||||||
|
$this->items = array_slice($results->media->episodes[$results->season], ($page - 1) * $limit, $limit);
|
||||||
|
$this->currentPage = $page;
|
||||||
|
$this->limit = $limit;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getTotal(): int
|
||||||
|
{
|
||||||
|
return $this->total;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getLastPage(): int
|
||||||
|
{
|
||||||
|
return $this->lastPage;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getItems()
|
||||||
|
{
|
||||||
|
return $this->items;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getShowing()
|
||||||
|
{
|
||||||
|
$showingStart = (($this->currentPage - 1) * $this->limit) + 1;
|
||||||
|
$showingEnd = (($this->currentPage - 1) * $this->limit) + $this->limit;
|
||||||
|
|
||||||
|
if ($showingEnd > $this->total) {
|
||||||
|
$showingEnd = $this->total;
|
||||||
|
}
|
||||||
|
|
||||||
|
return sprintf("Showing %d - %d of %d results.", $showingStart, $showingEnd, $this->total);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,8 +2,10 @@
|
|||||||
|
|
||||||
namespace App\Tmdb;
|
namespace App\Tmdb;
|
||||||
|
|
||||||
|
use Aimeos\Map;
|
||||||
use App\Enum\MediaType;
|
use App\Enum\MediaType;
|
||||||
use App\ValueObject\ResultFactory;
|
use App\ValueObject\ResultFactory;
|
||||||
|
use Carbon\Carbon;
|
||||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||||
use Symfony\Contracts\Cache\CacheInterface;
|
use Symfony\Contracts\Cache\CacheInterface;
|
||||||
@@ -97,6 +99,16 @@ class Tmdb
|
|||||||
return $this->parseResult($movies[$movie], "movie");
|
return $this->parseResult($movies[$movie], "movie");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$movies = Map::from($movies->toArray())->filter(function ($movie) {
|
||||||
|
return $movie !== null
|
||||||
|
&& $movie->imdbId !== null
|
||||||
|
&& $movie->tmdbId !== null
|
||||||
|
&& $movie->title !== null
|
||||||
|
&& $movie->poster !== null
|
||||||
|
&& $movie->description !== null
|
||||||
|
&& $movie->mediaType !== null;
|
||||||
|
});
|
||||||
|
|
||||||
$movies = array_values($movies->toArray());
|
$movies = array_values($movies->toArray());
|
||||||
|
|
||||||
if (null !== $limit) {
|
if (null !== $limit) {
|
||||||
@@ -114,6 +126,16 @@ class Tmdb
|
|||||||
return $this->parseResult($movies[$movie], "movie");
|
return $this->parseResult($movies[$movie], "movie");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$movies = Map::from($movies->toArray())->filter(function ($movie) {
|
||||||
|
return $movie !== null
|
||||||
|
&& $movie->imdbId !== null
|
||||||
|
&& $movie->tmdbId !== null
|
||||||
|
&& $movie->title !== null
|
||||||
|
&& $movie->poster !== null
|
||||||
|
&& $movie->description !== null
|
||||||
|
&& $movie->mediaType !== null;
|
||||||
|
});
|
||||||
|
|
||||||
$movies = array_values($movies->toArray());
|
$movies = array_values($movies->toArray());
|
||||||
|
|
||||||
if (null !== $limit) {
|
if (null !== $limit) {
|
||||||
@@ -133,9 +155,12 @@ class Tmdb
|
|||||||
if (!$result instanceof Movie && !$result instanceof Tv) {
|
if (!$result instanceof Movie && !$result instanceof Tv) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$results[] = $this->parseResult($result);
|
$results[] = $this->parseResult($result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$results = array_filter($results, fn ($result) => null !== $result->imdbId);
|
||||||
|
|
||||||
return $results;
|
return $results;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,7 +168,16 @@ class Tmdb
|
|||||||
{
|
{
|
||||||
$finder = new Find($this->client);
|
$finder = new Find($this->client);
|
||||||
$result = $finder->findBy($id, ['external_source' => 'imdb_id']);
|
$result = $finder->findBy($id, ['external_source' => 'imdb_id']);
|
||||||
return $this->parseResult($result);
|
|
||||||
|
if (count($result['movie_results']) > 0) {
|
||||||
|
return $result['movie_results'][0]['id'];
|
||||||
|
} elseif (count($result['tv_results']) > 0) {
|
||||||
|
return $result['tv_results'][0]['id'];
|
||||||
|
} elseif (count($result['tv_episode_results']) > 0) {
|
||||||
|
return $result['tv_episode_results'][0]['show_id'];
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new \Exception("No results found for $id");
|
||||||
}
|
}
|
||||||
|
|
||||||
public function movieDetails(string $id)
|
public function movieDetails(string $id)
|
||||||
@@ -176,13 +210,20 @@ class Tmdb
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$series['episodes'][$season['season_number']] = $client->getApi()->getSeason($series['id'], $season['season_number'])['episodes'];
|
$series['episodes'][$season['season_number']] = Map::from(
|
||||||
|
$client->getApi()->getSeason($series['id'], $season['season_number'])['episodes']
|
||||||
|
)->map(function ($data) {
|
||||||
|
$data['poster'] = (null !== $data['still_path']) ? self::POSTER_IMG_PATH . $data['still_path'] : null;
|
||||||
|
return $data;
|
||||||
|
})->toArray();
|
||||||
}
|
}
|
||||||
return $series;
|
return $series;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function mediaDetails(string $id, string $type)
|
public function mediaDetails(string $id, string $type)
|
||||||
{
|
{
|
||||||
|
$id = $this->find($id);
|
||||||
|
|
||||||
if ($type === "movies") {
|
if ($type === "movies") {
|
||||||
return $this->movieDetails($id);
|
return $this->movieDetails($id);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Torrentio\Action\Handler;
|
namespace App\Torrentio\Action\Handler;
|
||||||
|
|
||||||
|
use App\Monitor\Service\MediaFiles;
|
||||||
use App\Tmdb\Tmdb;
|
use App\Tmdb\Tmdb;
|
||||||
use App\Torrentio\Action\Result\GetMovieOptionsResult;
|
use App\Torrentio\Action\Result\GetMovieOptionsResult;
|
||||||
use App\Torrentio\Client\Torrentio;
|
use App\Torrentio\Client\Torrentio;
|
||||||
@@ -14,12 +15,15 @@ class GetMovieOptionsHandler implements HandlerInterface
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly Tmdb $tmdb,
|
private readonly Tmdb $tmdb,
|
||||||
private readonly Torrentio $torrentio,
|
private readonly Torrentio $torrentio,
|
||||||
|
private readonly MediaFiles $mediaFiles
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function handle(CommandInterface $command): ResultInterface
|
public function handle(CommandInterface $command): ResultInterface
|
||||||
{
|
{
|
||||||
|
$media = $this->tmdb->mediaDetails($command->imdbId, 'movies');
|
||||||
return new GetMovieOptionsResult(
|
return new GetMovieOptionsResult(
|
||||||
media: $this->tmdb->mediaDetails($command->tmdbId, 'movies'),
|
media: $media,
|
||||||
|
file: $this->mediaFiles->movieExists($media->title),
|
||||||
results: $this->torrentio->search($command->imdbId, 'movies'),
|
results: $this->torrentio->search($command->imdbId, 'movies'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Torrentio\Action\Handler;
|
namespace App\Torrentio\Action\Handler;
|
||||||
|
|
||||||
|
use App\Monitor\Service\MediaFiles;
|
||||||
use App\Tmdb\Tmdb;
|
use App\Tmdb\Tmdb;
|
||||||
use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
|
use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
|
||||||
use App\Torrentio\Action\Result\GetTvShowOptionsResult;
|
use App\Torrentio\Action\Result\GetTvShowOptionsResult;
|
||||||
@@ -16,12 +17,18 @@ class GetTvShowOptionsHandler implements HandlerInterface
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly Tmdb $tmdb,
|
private readonly Tmdb $tmdb,
|
||||||
private readonly Torrentio $torrentio,
|
private readonly Torrentio $torrentio,
|
||||||
|
private readonly MediaFiles $mediaFiles,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function handle(CommandInterface $command): ResultInterface
|
public function handle(CommandInterface $command): ResultInterface
|
||||||
{
|
{
|
||||||
|
$media = $this->tmdb->episodeDetails($command->tmdbId, $command->season, $command->episode);
|
||||||
|
$parentShow = $this->tmdb->mediaDetails($command->imdbId, 'tvshows');
|
||||||
|
$file = $this->mediaFiles->episodeExists($parentShow->title, $command->season, $command->episode);
|
||||||
|
|
||||||
return new GetTvShowOptionsResult(
|
return new GetTvShowOptionsResult(
|
||||||
media: $this->tmdb->episodeDetails($command->tmdbId, $command->season, $command->episode),
|
media: $media,
|
||||||
|
file: $file,
|
||||||
season: $command->season,
|
season: $command->season,
|
||||||
episode: $command->episode,
|
episode: $command->episode,
|
||||||
results: $this->torrentio->fetchEpisodeResults(
|
results: $this->torrentio->fetchEpisodeResults(
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ class GetMovieOptionsResult implements ResultInterface
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public TmdbResult $media,
|
public TmdbResult $media,
|
||||||
|
public bool|\SplFileInfo $file,
|
||||||
public array $results
|
public array $results
|
||||||
) {}
|
) {}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,11 +4,13 @@ namespace App\Torrentio\Action\Result;
|
|||||||
|
|
||||||
use App\Tmdb\TmdbResult;
|
use App\Tmdb\TmdbResult;
|
||||||
use OneToMany\RichBundle\Contract\ResultInterface;
|
use OneToMany\RichBundle\Contract\ResultInterface;
|
||||||
|
use Symfony\Component\Finder\SplFileInfo;
|
||||||
|
|
||||||
class GetTvShowOptionsResult implements ResultInterface
|
class GetTvShowOptionsResult implements ResultInterface
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public TmdbResult $media,
|
public TmdbResult $media,
|
||||||
|
public bool|SplFileInfo $file,
|
||||||
public string $season,
|
public string $season,
|
||||||
public string $episode,
|
public string $episode,
|
||||||
public array $results
|
public array $results
|
||||||
|
|||||||
@@ -6,21 +6,30 @@ use App\Torrentio\Client\Rule\DownloadOptionFilter\Resolution;
|
|||||||
use App\Torrentio\Client\Rule\RuleEngine;
|
use App\Torrentio\Client\Rule\RuleEngine;
|
||||||
use App\Torrentio\Result\ResultFactory;
|
use App\Torrentio\Result\ResultFactory;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
use App\Torrentio\Exception\TorrentioRateLimitException;
|
||||||
|
use GuzzleHttp\Client;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||||
use Symfony\Contracts\Cache\CacheInterface;
|
use Symfony\Contracts\Cache\CacheInterface;
|
||||||
use Symfony\Contracts\Cache\ItemInterface;
|
use Symfony\Contracts\Cache\ItemInterface;
|
||||||
|
|
||||||
class Torrentio
|
class Torrentio
|
||||||
{
|
{
|
||||||
private string $baseUrl = 'https://torrentio.strem.fun/providers%253Dyts%252Ceztv%252Crarbg%252C1337x%252Cthepiratebay%252Ckickasstorrents%252Ctorrentgalaxy%252Cmagnetdl%252Chorriblesubs%252Cnyaasi%7Csort%253Dqualitysize%7Cqualityfilter%253D480p%252Cscr%252Ccam%7Crealdebrid={realDebridKey}/stream/movie/{imdbCode}.json';
|
private string $baseUrl = 'https://torrentio.strem.fun/providers%253Dyts%252Ceztv%252Crarbg%252C1337x%252Cthepiratebay%252Ckickasstorrents%252Ctorrentgalaxy%252Cmagnetdl%252Chorriblesubs%252Cnyaasi%7Csort%253Dqualitysize%7Cqualityfilter%253D480p%252Cscr%252Ccam%7Crealdebrid={realDebridKey}/stream/movie';
|
||||||
|
|
||||||
private string $searchUrl;
|
private string $searchUrl;
|
||||||
|
|
||||||
|
private Client $client;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
#[Autowire(env: 'REAL_DEBRID_KEY')] private string $realDebridKey,
|
#[Autowire(env: 'REAL_DEBRID_KEY')] private string $realDebridKey,
|
||||||
private CacheInterface $cache,
|
private CacheInterface $cache,
|
||||||
|
private LoggerInterface $logger,
|
||||||
) {
|
) {
|
||||||
$this->searchUrl = str_replace('{realDebridKey}', $this->realDebridKey, $this->baseUrl);
|
$this->searchUrl = str_replace('{realDebridKey}', $this->realDebridKey, $this->baseUrl);
|
||||||
|
$this->client = new Client([
|
||||||
|
'base_uri' => $this->searchUrl,
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function search(string $imdbCode, string $type, array $filter = []): array
|
public function search(string $imdbCode, string $type, array $filter = []): array
|
||||||
@@ -29,11 +38,21 @@ class Torrentio
|
|||||||
|
|
||||||
$results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode) {
|
$results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode) {
|
||||||
$item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
|
$item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
|
||||||
$response = file_get_contents(str_replace('{imdbCode}', $imdbCode, $this->searchUrl));
|
try {
|
||||||
return json_decode(
|
$response = $this->client->get("$this->searchUrl/$imdbCode.json");
|
||||||
$response,
|
return json_decode(
|
||||||
true
|
$response->getBody()->getContents(),
|
||||||
);
|
true
|
||||||
|
);
|
||||||
|
} catch (\Throwable $exception) {
|
||||||
|
if ($exception->getCode() === 429) {
|
||||||
|
$this->logger->warning("> [TorrentioClient] Rate limit exceeded");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->logger->error("> [TorrentioClient] Request error: " . $response->getStatusCode() . " - " . $response->getBody()->getContents());
|
||||||
|
return [];
|
||||||
});
|
});
|
||||||
|
|
||||||
return $this->parse($results, $filter);
|
return $this->parse($results, $filter);
|
||||||
@@ -44,13 +63,27 @@ class Torrentio
|
|||||||
$cacheKey = "torrentio.$imdbId.$season.$episode";
|
$cacheKey = "torrentio.$imdbId.$season.$episode";
|
||||||
$results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($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->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
|
||||||
$response = file_get_contents(str_replace('{imdbCode}', "$imdbId:$season:$episode", $this->searchUrl));
|
try {
|
||||||
return json_decode(
|
$response = $this->client->get("$this->searchUrl/$imdbId:$season:$episode.json");
|
||||||
$response,
|
return json_decode(
|
||||||
true
|
$response->getBody()->getContents(),
|
||||||
);
|
true
|
||||||
|
);
|
||||||
|
} catch (\Throwable $exception) {
|
||||||
|
if ($exception->getCode() === 429) {
|
||||||
|
$this->logger->warning("> [TorrentioClient] Rate limit exceeded");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->logger->error("> [TorrentioClient] Request error: " . $response->getStatusCode() . " - " . $response->getBody()->getContents());
|
||||||
|
return [];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (null === $results) {
|
||||||
|
throw new TorrentioRateLimitException();
|
||||||
|
}
|
||||||
|
|
||||||
return $this->parse($results, []);
|
return $this->parse($results, []);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
11
src/Torrentio/Exception/TorrentioRateLimitException.php
Normal file
11
src/Torrentio/Exception/TorrentioRateLimitException.php
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Torrentio\Exception;
|
||||||
|
|
||||||
|
class TorrentioRateLimitException extends \Exception
|
||||||
|
{
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
parent::__construct(sprintf("[TorrentioClient] Rate limit exceeded"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,15 +16,14 @@ final class DownloadList extends AbstractController
|
|||||||
{
|
{
|
||||||
use DefaultActionTrait;
|
use DefaultActionTrait;
|
||||||
|
|
||||||
|
use PaginateTrait;
|
||||||
|
|
||||||
|
#[LiveProp(writable: true)]
|
||||||
|
public string $term = "";
|
||||||
|
|
||||||
#[LiveProp(writable: true)]
|
#[LiveProp(writable: true)]
|
||||||
public string $type;
|
public string $type;
|
||||||
|
|
||||||
#[LiveProp(writable: true)]
|
|
||||||
public int $pageNumber = 1;
|
|
||||||
|
|
||||||
#[LiveProp(writable: true)]
|
|
||||||
public int $perPage = 5;
|
|
||||||
|
|
||||||
#[LiveProp(writable: true)]
|
#[LiveProp(writable: true)]
|
||||||
public bool $isWidget = true;
|
public bool $isWidget = true;
|
||||||
|
|
||||||
@@ -35,17 +34,11 @@ final class DownloadList extends AbstractController
|
|||||||
public function getDownloads()
|
public function getDownloads()
|
||||||
{
|
{
|
||||||
if ($this->type === "active") {
|
if ($this->type === "active") {
|
||||||
return $this->downloadRepository->getActivePaginated($this->getUser(), $this->pageNumber, $this->perPage);
|
return $this->downloadRepository->getActivePaginated($this->getUser(), $this->pageNumber, $this->perPage, $this->term);
|
||||||
} elseif ($this->type === "complete") {
|
} elseif ($this->type === "complete") {
|
||||||
return $this->downloadRepository->getCompletePaginated($this->getUser(), $this->pageNumber, $this->perPage);
|
return $this->downloadRepository->getCompletePaginated($this->getUser(), $this->pageNumber, $this->perPage, $this->term);
|
||||||
}
|
}
|
||||||
|
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
#[LiveAction]
|
|
||||||
public function paginate(#[LiveArg] int $page)
|
|
||||||
{
|
|
||||||
$this->pageNumber = $page;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
14
src/Twig/Components/DownloadListRow.php
Normal file
14
src/Twig/Components/DownloadListRow.php
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Twig\Components;
|
||||||
|
|
||||||
|
use App\Download\Framework\Entity\Download;
|
||||||
|
use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
|
||||||
|
|
||||||
|
#[AsTwigComponent]
|
||||||
|
final class DownloadListRow
|
||||||
|
{
|
||||||
|
public Download $download;
|
||||||
|
|
||||||
|
public bool $isWidget = true;
|
||||||
|
}
|
||||||
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
|
||||||
|
{
|
||||||
|
}
|
||||||
@@ -3,14 +3,27 @@
|
|||||||
namespace App\Twig\Components;
|
namespace App\Twig\Components;
|
||||||
|
|
||||||
use App\Monitor\Framework\Repository\MonitorRepository;
|
use App\Monitor\Framework\Repository\MonitorRepository;
|
||||||
|
use Doctrine\ORM\Query\Expr\OrderBy;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
|
use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
|
||||||
use Symfony\UX\LiveComponent\Attribute\LiveAction;
|
use Symfony\UX\LiveComponent\Attribute\LiveAction;
|
||||||
use Symfony\UX\LiveComponent\Attribute\LiveArg;
|
use Symfony\UX\LiveComponent\Attribute\LiveProp;
|
||||||
use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
|
use Symfony\UX\LiveComponent\DefaultActionTrait;
|
||||||
|
|
||||||
#[AsTwigComponent]
|
#[AsLiveComponent]
|
||||||
final class MonitorList extends AbstractController
|
final class MonitorList extends AbstractController
|
||||||
{
|
{
|
||||||
|
use DefaultActionTrait;
|
||||||
|
|
||||||
|
use PaginateTrait;
|
||||||
|
|
||||||
|
#[LiveProp(writable: true)]
|
||||||
|
public string $term = "";
|
||||||
|
|
||||||
|
#[LiveProp(writable: true)]
|
||||||
|
public string $type;
|
||||||
|
|
||||||
|
#[LiveProp(writable: true)]
|
||||||
public bool $isWidget = true;
|
public bool $isWidget = true;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
@@ -18,8 +31,40 @@ final class MonitorList extends AbstractController
|
|||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[LiveAction]
|
#[LiveAction]
|
||||||
public function getUserMonitors(#[LiveArg] int $page = 1, #[LiveArg] int $perPage = 5)
|
public function getMonitors()
|
||||||
{
|
{
|
||||||
return $this->monitorRepository->getUserMonitorsPaginated($this->getUser(), $page, $perPage);
|
if ($this->type === "active") {
|
||||||
|
return $this->getActiveUserMonitors();
|
||||||
|
} elseif ($this->type === "complete") {
|
||||||
|
return $this->getCompleteUserMonitors();
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
#[LiveAction]
|
||||||
|
public function getActiveUserMonitors()
|
||||||
|
{
|
||||||
|
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', 'Active'])
|
||||||
|
->setParameter('term', '%'.$this->term.'%')
|
||||||
|
->orderBy('m.id', 'DESC')
|
||||||
|
->getQuery()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[LiveAction]
|
||||||
|
public function getCompleteUserMonitors()
|
||||||
|
{
|
||||||
|
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()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
12
src/Twig/Components/MonitorListRow.php
Normal file
12
src/Twig/Components/MonitorListRow.php
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Twig\Components;
|
||||||
|
|
||||||
|
use App\Monitor\Framework\Entity\Monitor;
|
||||||
|
use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
|
||||||
|
|
||||||
|
#[AsTwigComponent]
|
||||||
|
final class MonitorListRow
|
||||||
|
{
|
||||||
|
public Monitor $monitor;
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user