Compare commits

...

24 Commits

Author SHA1 Message Date
12aaf8e737 fix: animates episode toggle list button 2025-06-19 14:49:58 -05:00
2e468dd9b0 fix: cleans up paginator 2025-06-19 14:30:26 -05:00
e070b95a36 wip: working episode pagination, season switcher, monitor only new content 2025-06-19 13:30:22 -05:00
20d397589a fix: undoes num_threads 2025-06-14 15:14:53 -05:00
6c7a35005e fix: sets num_threads=10 2025-06-13 23:44:49 -05:00
0f16423f66 feat: upcoming episodes component 2025-06-12 23:39:06 -05:00
937313fe59 fix: links to series from monitor list row 2025-06-12 19:57:39 -05:00
9b3506ab17 fix: adds hover style on monitor list row 2025-06-12 10:48:23 -05:00
6e0eed8b4e fix: adds default timezone, supports TZ environment variable for changing TZ, renders dates based on TZ 2025-06-12 10:45:28 -05:00
38a5baa17e fix: sets tv show/season monitor status to Active after executing 2025-06-11 20:06:49 -05:00
1d573c09e7 fix: media files -> episodeExists() 2025-06-11 19:40:06 -05:00
7989e2abd2 fix: prevents show & season monitors from completing, forcing them to keep checking for new episodes until removed 2025-06-11 13:06:21 -05:00
df6c68aa46 fix: alert z-index, hover effects on download list row 2025-06-11 12:46:03 -05:00
6cd9a9b18e fix: refactors tv season monitor 2025-06-11 10:30:53 -05:00
b95e8f3794 fix: tvshow monitor 2025-06-11 10:24:58 -05:00
8cc81fea19 wip: working tv season & episode monitors 2025-06-10 21:19:13 -05:00
15648e711b fix: rounded-ms class on download search button 2025-06-10 15:30:41 -05:00
f855aabd69 fix: copy update 2025-06-10 15:17:07 -05:00
55a866170e fix: copy update 2025-06-10 15:15:40 -05:00
9ab4f6cf57 fix: adds timestamps to download entity 2025-06-10 15:10:00 -05:00
d40a4764eb fix: adds loading indicator to download search component 2025-06-10 14:26:37 -05:00
0119830ea7 fix: adds hover styles to download action buttons 2025-06-10 13:45:17 -05:00
7ffa927d55 fix: missing session item for mercure alert topic 2025-06-10 13:39:19 -05:00
0b80779975 fix: entrypoint 2025-06-09 21:39:16 -05:00
58 changed files with 1278 additions and 215 deletions

View File

@@ -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;
} }

View 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)
}
}

View File

@@ -18,18 +18,19 @@ export default class extends Controller {
active: Boolean, active: Boolean,
}; };
static targets = ['list', 'count', 'episodeSelector'] static targets = ['list', 'count', 'episodeSelector', 'toggleButton']
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}`) await fetch(`/torrentio/tvshows/${this.tmdbIdValue}/${this.imdbIdValue}/${this.seasonValue}/${this.episodeValue}`)
.then(res => res.text()) .then(res => res.text())
@@ -55,19 +56,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 +80,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() {

View File

@@ -10,6 +10,9 @@
h2 { h2 {
font-size: var(--text-xl); font-size: var(--text-xl);
} }
.rounded-ms {
border-radius: 0.275rem;
}
} }
/* Prevent scrolling while dialog is open */ /* Prevent scrolling while dialog is open */

View File

@@ -23,6 +23,7 @@ services:
- mercure_config:/config - mercure_config:/config
tty: true tty: true
environment: environment:
TZ: America/Chicago
MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!' MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!' MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
depends_on: depends_on:
@@ -37,7 +38,9 @@ services:
- $PWD:/app - $PWD:/app
- $PWD/var/download:/var/download - $PWD/var/download:/var/download
tty: true tty: true
command: php /app/bin/console messenger:consume async -vv --time-limit=3600 --limit=10 environment:
TZ: America/Chicago
command: php /app/bin/console messenger:consume media_cache -vv --time-limit=3600
scheduler: scheduler:
@@ -45,6 +48,8 @@ services:
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- $PWD:/app - $PWD:/app
environment:
TZ: America/Chicago
command: php /app/bin/console messenger:consume scheduler_monitor -vv command: php /app/bin/console messenger:consume scheduler_monitor -vv
tty: true tty: true
@@ -55,6 +60,8 @@ services:
- redis_data:/data - redis_data:/data
command: redis-server --maxmemory 512MB command: redis-server --maxmemory 512MB
restart: unless-stopped restart: unless-stopped
environment:
TZ: America/Chicago
database: database:
@@ -64,6 +71,7 @@ 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

View File

@@ -4,7 +4,7 @@
"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",
@@ -24,6 +24,7 @@
"php-tmdb/api": "^4.1", "php-tmdb/api": "^4.1",
"predis/predis": "^2.4", "predis/predis": "^2.4",
"runtime/frankenphp-symfony": "^0.2.0", "runtime/frankenphp-symfony": "^0.2.0",
"stof/doctrine-extensions-bundle": "^1.14",
"symfony/asset": "7.3.*", "symfony/asset": "7.3.*",
"symfony/console": "7.3.*", "symfony/console": "7.3.*",
"symfony/doctrine-messenger": "7.3.*", "symfony/doctrine-messenger": "7.3.*",
@@ -56,6 +57,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
}, },

409
composer.lock generated
View File

@@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "c519733202d45f8fb3a4f5b8e7dfb95b", "content-hash": "e8b5e39f9d73a6ace2b9e39240186b4f",
"packages": [ "packages": [
{ {
"name": "1tomany/rich-bundle", "name": "1tomany/rich-bundle",
"version": "v1.9.5", "version": "v1.10.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/1tomany/rich-bundle.git", "url": "https://github.com/1tomany/rich-bundle.git",
"reference": "434c0fa70aefa11a23342006a10221360beb0f71" "reference": "63a728e22632082d6db07e158bf1f5a4e5854d01"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/1tomany/rich-bundle/zipball/434c0fa70aefa11a23342006a10221360beb0f71", "url": "https://api.github.com/repos/1tomany/rich-bundle/zipball/63a728e22632082d6db07e158bf1f5a4e5854d01",
"reference": "434c0fa70aefa11a23342006a10221360beb0f71", "reference": "63a728e22632082d6db07e158bf1f5a4e5854d01",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -60,9 +60,9 @@
"description": "Symfony bundle that provides easy scaffolding to build RICH applications", "description": "Symfony bundle that provides easy scaffolding to build RICH applications",
"support": { "support": {
"issues": "https://github.com/1tomany/rich-bundle/issues", "issues": "https://github.com/1tomany/rich-bundle/issues",
"source": "https://github.com/1tomany/rich-bundle/tree/v1.9.5" "source": "https://github.com/1tomany/rich-bundle/tree/v1.10.4"
}, },
"time": "2025-05-01T16:54:44+00:00" "time": "2025-06-05T00:20:20+00:00"
}, },
{ {
"name": "aimeos/map", "name": "aimeos/map",
@@ -117,6 +117,56 @@
}, },
"time": "2025-03-05T09:16:18+00:00" "time": "2025-03-05T09:16:18+00:00"
}, },
{
"name": "behat/transliterator",
"version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/Behat/Transliterator.git",
"reference": "baac5873bac3749887d28ab68e2f74db3a4408af"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Behat/Transliterator/zipball/baac5873bac3749887d28ab68e2f74db3a4408af",
"reference": "baac5873bac3749887d28ab68e2f74db3a4408af",
"shasum": ""
},
"require": {
"php": ">=7.2"
},
"require-dev": {
"chuyskywalker/rolling-curl": "^3.1",
"php-yaoi/php-yaoi": "^1.0",
"phpunit/phpunit": "^8.5.25 || ^9.5.19"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Behat\\Transliterator\\": "src/Behat/Transliterator"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Artistic-1.0"
],
"description": "String transliterator",
"keywords": [
"i18n",
"slug",
"transliterator"
],
"support": {
"issues": "https://github.com/Behat/Transliterator/issues",
"source": "https://github.com/Behat/Transliterator/tree/v1.5.0"
},
"abandoned": true,
"time": "2022-03-30T09:27:43+00:00"
},
{ {
"name": "carbonphp/carbon-doctrine-types", "name": "carbonphp/carbon-doctrine-types",
"version": "2.1.0", "version": "2.1.0",
@@ -947,16 +997,16 @@
}, },
{ {
"name": "doctrine/doctrine-migrations-bundle", "name": "doctrine/doctrine-migrations-bundle",
"version": "3.4.1", "version": "3.4.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git",
"reference": "e858ce0f5c12b266dce7dce24834448355155da7" "reference": "5a6ac7120c2924c4c070a869d08b11ccf9e277b9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/e858ce0f5c12b266dce7dce24834448355155da7", "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/5a6ac7120c2924c4c070a869d08b11ccf9e277b9",
"reference": "e858ce0f5c12b266dce7dce24834448355155da7", "reference": "5a6ac7120c2924c4c070a869d08b11ccf9e277b9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -970,7 +1020,6 @@
"composer/semver": "^3.0", "composer/semver": "^3.0",
"doctrine/coding-standard": "^12", "doctrine/coding-standard": "^12",
"doctrine/orm": "^2.6 || ^3", "doctrine/orm": "^2.6 || ^3",
"doctrine/persistence": "^2.0 || ^3",
"phpstan/phpstan": "^1.4 || ^2", "phpstan/phpstan": "^1.4 || ^2",
"phpstan/phpstan-deprecation-rules": "^1 || ^2", "phpstan/phpstan-deprecation-rules": "^1 || ^2",
"phpstan/phpstan-phpunit": "^1 || ^2", "phpstan/phpstan-phpunit": "^1 || ^2",
@@ -1013,7 +1062,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/DoctrineMigrationsBundle/issues", "issues": "https://github.com/doctrine/DoctrineMigrationsBundle/issues",
"source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/3.4.1" "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/3.4.2"
}, },
"funding": [ "funding": [
{ {
@@ -1029,7 +1078,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2025-01-27T22:48:22+00:00" "time": "2025-03-11T17:36:26+00:00"
}, },
{ {
"name": "doctrine/event-manager", "name": "doctrine/event-manager",
@@ -1768,6 +1817,136 @@
], ],
"time": "2024-10-09T13:47:03+00:00" "time": "2024-10-09T13:47:03+00:00"
}, },
{
"name": "gedmo/doctrine-extensions",
"version": "v3.20.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine-extensions/DoctrineExtensions.git",
"reference": "ea1d37586b8e4bae2a815feb38b177894b12c44c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine-extensions/DoctrineExtensions/zipball/ea1d37586b8e4bae2a815feb38b177894b12c44c",
"reference": "ea1d37586b8e4bae2a815feb38b177894b12c44c",
"shasum": ""
},
"require": {
"behat/transliterator": "^1.2",
"doctrine/collections": "^1.2 || ^2.0",
"doctrine/deprecations": "^1.0",
"doctrine/event-manager": "^1.2 || ^2.0",
"doctrine/persistence": "^2.2 || ^3.0 || ^4.0",
"php": "^7.4 || ^8.0",
"psr/cache": "^1 || ^2 || ^3",
"psr/clock": "^1",
"symfony/cache": "^5.4 || ^6.0 || ^7.0"
},
"conflict": {
"doctrine/annotations": "<1.13 || >=3.0",
"doctrine/common": "<2.13 || >=4.0",
"doctrine/dbal": "<3.7 || >=5.0",
"doctrine/mongodb-odm": "<2.3 || >=3.0",
"doctrine/orm": "<2.20 || >=3.0 <3.3 || >=4.0"
},
"require-dev": {
"doctrine/annotations": "^1.13 || ^2.0",
"doctrine/cache": "^1.11 || ^2.0",
"doctrine/common": "^2.13 || ^3.0",
"doctrine/dbal": "^3.7 || ^4.0",
"doctrine/doctrine-bundle": "^2.3",
"doctrine/mongodb-odm": "^2.3",
"doctrine/orm": "^2.20 || ^3.3",
"friendsofphp/php-cs-fixer": "^3.70",
"nesbot/carbon": "^2.71 || ^3.0",
"phpstan/phpstan": "^2.1.1",
"phpstan/phpstan-doctrine": "^2.0.1",
"phpstan/phpstan-phpunit": "^2.0.3",
"phpunit/phpunit": "^9.6",
"rector/rector": "^2.0.6",
"symfony/console": "^5.4 || ^6.0 || ^7.0",
"symfony/doctrine-bridge": "^5.4 || ^6.0 || ^7.0",
"symfony/phpunit-bridge": "^6.0 || ^7.0",
"symfony/uid": "^5.4 || ^6.0 || ^7.0",
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
},
"suggest": {
"doctrine/mongodb-odm": "to use the extensions with the MongoDB ODM",
"doctrine/orm": "to use the extensions with the ORM"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "3.x-dev"
}
},
"autoload": {
"psr-4": {
"Gedmo\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Gediminas Morkevicius",
"email": "gediminas.morkevicius@gmail.com"
},
{
"name": "Gustavo Falco",
"email": "comfortablynumb84@gmail.com"
},
{
"name": "David Buchmann",
"email": "david@liip.ch"
}
],
"description": "Doctrine behavioral extensions",
"homepage": "http://gediminasm.org/",
"keywords": [
"Blameable",
"behaviors",
"doctrine",
"extensions",
"gedmo",
"loggable",
"nestedset",
"odm",
"orm",
"sluggable",
"sortable",
"timestampable",
"translatable",
"tree",
"uploadable"
],
"support": {
"docs": "https://github.com/doctrine-extensions/DoctrineExtensions/tree/main/doc",
"issues": "https://github.com/doctrine-extensions/DoctrineExtensions/issues",
"source": "https://github.com/doctrine-extensions/DoctrineExtensions/tree/v3.20.0"
},
"funding": [
{
"url": "https://github.com/l3pp4rd",
"type": "github"
},
{
"url": "https://github.com/mbabker",
"type": "github"
},
{
"url": "https://github.com/phansys",
"type": "github"
},
{
"url": "https://github.com/stof",
"type": "github"
}
],
"time": "2025-04-04T17:19:27+00:00"
},
{ {
"name": "lcobucci/jwt", "name": "lcobucci/jwt",
"version": "5.5.0", "version": "5.5.0",
@@ -1899,16 +2078,16 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "3.9.1", "version": "3.10.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/CarbonPHP/carbon.git", "url": "https://github.com/CarbonPHP/carbon.git",
"reference": "ced71f79398ece168e24f7f7710462f462310d4d" "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ced71f79398ece168e24f7f7710462f462310d4d", "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
"reference": "ced71f79398ece168e24f7f7710462f462310d4d", "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1916,9 +2095,9 @@
"ext-json": "*", "ext-json": "*",
"php": "^8.1", "php": "^8.1",
"psr/clock": "^1.0", "psr/clock": "^1.0",
"symfony/clock": "^6.3 || ^7.0", "symfony/clock": "^6.3.12 || ^7.0",
"symfony/polyfill-mbstring": "^1.0", "symfony/polyfill-mbstring": "^1.0",
"symfony/translation": "^4.4.18 || ^5.2.1|| ^6.0 || ^7.0" "symfony/translation": "^4.4.18 || ^5.2.1 || ^6.0 || ^7.0"
}, },
"provide": { "provide": {
"psr/clock-implementation": "1.0" "psr/clock-implementation": "1.0"
@@ -1926,14 +2105,13 @@
"require-dev": { "require-dev": {
"doctrine/dbal": "^3.6.3 || ^4.0", "doctrine/dbal": "^3.6.3 || ^4.0",
"doctrine/orm": "^2.15.2 || ^3.0", "doctrine/orm": "^2.15.2 || ^3.0",
"friendsofphp/php-cs-fixer": "^3.57.2", "friendsofphp/php-cs-fixer": "^3.75.0",
"kylekatarnls/multi-tester": "^2.5.3", "kylekatarnls/multi-tester": "^2.5.3",
"ondrejmirtes/better-reflection": "^6.25.0.4",
"phpmd/phpmd": "^2.15.0", "phpmd/phpmd": "^2.15.0",
"phpstan/extension-installer": "^1.3.1", "phpstan/extension-installer": "^1.4.3",
"phpstan/phpstan": "^1.11.2", "phpstan/phpstan": "^2.1.17",
"phpunit/phpunit": "^10.5.20", "phpunit/phpunit": "^10.5.46",
"squizlabs/php_codesniffer": "^3.9.0" "squizlabs/php_codesniffer": "^3.13.0"
}, },
"bin": [ "bin": [
"bin/carbon" "bin/carbon"
@@ -2001,7 +2179,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2025-05-01T19:51:51+00:00" "time": "2025-06-12T10:24:28+00:00"
}, },
{ {
"name": "nihilarr/parse-torrent-name", "name": "nihilarr/parse-torrent-name",
@@ -3401,6 +3579,87 @@
], ],
"time": "2023-12-12T12:06:11+00:00" "time": "2023-12-12T12:06:11+00:00"
}, },
{
"name": "stof/doctrine-extensions-bundle",
"version": "v1.14.0",
"source": {
"type": "git",
"url": "https://github.com/stof/StofDoctrineExtensionsBundle.git",
"reference": "bdf3eb10baeb497ac5985b8f78a6cf55862c2662"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/bdf3eb10baeb497ac5985b8f78a6cf55862c2662",
"reference": "bdf3eb10baeb497ac5985b8f78a6cf55862c2662",
"shasum": ""
},
"require": {
"gedmo/doctrine-extensions": "^3.20.0",
"php": "^8.1",
"symfony/cache": "^6.4 || ^7.0",
"symfony/config": "^6.4 || ^7.0",
"symfony/dependency-injection": "^6.4 || ^7.0",
"symfony/event-dispatcher": "^6.4 || ^7.0",
"symfony/http-kernel": "^6.4 || ^7.0",
"symfony/translation-contracts": "^2.5 || ^3.5"
},
"require-dev": {
"phpstan/phpstan": "^2.1",
"phpstan/phpstan-deprecation-rules": "^2.0",
"phpstan/phpstan-phpunit": "^2.0",
"phpstan/phpstan-strict-rules": "^2.0",
"phpstan/phpstan-symfony": "^2.0",
"symfony/mime": "^6.4 || ^7.0",
"symfony/phpunit-bridge": "^v6.4.1 || ^7.0.1",
"symfony/security-core": "^6.4 || ^7.0"
},
"suggest": {
"doctrine/doctrine-bundle": "to use the ORM extensions",
"doctrine/mongodb-odm-bundle": "to use the MongoDB ODM extensions",
"symfony/mime": "To use the Mime component integration for Uploadable"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-main": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Stof\\DoctrineExtensionsBundle\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Christophe Coevoet",
"email": "stof@notk.org"
}
],
"description": "Integration of the gedmo/doctrine-extensions with Symfony",
"homepage": "https://github.com/stof/StofDoctrineExtensionsBundle",
"keywords": [
"behaviors",
"doctrine2",
"extensions",
"gedmo",
"loggable",
"nestedset",
"sluggable",
"sortable",
"timestampable",
"translatable",
"tree"
],
"support": {
"issues": "https://github.com/stof/StofDoctrineExtensionsBundle/issues",
"source": "https://github.com/stof/StofDoctrineExtensionsBundle/tree/v1.14.0"
},
"time": "2025-05-01T08:00:32+00:00"
},
{ {
"name": "symfony/asset", "name": "symfony/asset",
"version": "v7.3.0", "version": "v7.3.0",
@@ -7411,16 +7670,16 @@
}, },
{ {
"name": "symfony/stimulus-bundle", "name": "symfony/stimulus-bundle",
"version": "v2.25.2", "version": "v2.26.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/stimulus-bundle.git", "url": "https://github.com/symfony/stimulus-bundle.git",
"reference": "5a6aef0646119530da862d5afa1386ade3b9ed43" "reference": "82c174ebe564e6ecc1412974b6380b86d450675f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/stimulus-bundle/zipball/5a6aef0646119530da862d5afa1386ade3b9ed43", "url": "https://api.github.com/repos/symfony/stimulus-bundle/zipball/82c174ebe564e6ecc1412974b6380b86d450675f",
"reference": "5a6aef0646119530da862d5afa1386ade3b9ed43", "reference": "82c174ebe564e6ecc1412974b6380b86d450675f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -7460,7 +7719,7 @@
"symfony-ux" "symfony-ux"
], ],
"support": { "support": {
"source": "https://github.com/symfony/stimulus-bundle/tree/v2.25.2" "source": "https://github.com/symfony/stimulus-bundle/tree/v2.26.1"
}, },
"funding": [ "funding": [
{ {
@@ -7476,7 +7735,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2025-05-19T11:54:27+00:00" "time": "2025-06-05T17:25:17+00:00"
}, },
{ {
"name": "symfony/stopwatch", "name": "symfony/stopwatch",
@@ -8077,16 +8336,16 @@
}, },
{ {
"name": "symfony/ux-icons", "name": "symfony/ux-icons",
"version": "v2.25.0", "version": "v2.26.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/ux-icons.git", "url": "https://github.com/symfony/ux-icons.git",
"reference": "430b2753aa55a46baa001055bf7976b62bc96942" "reference": "e5c1e5b5093ae26dba45d0f3390a1e21f305c47a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/ux-icons/zipball/430b2753aa55a46baa001055bf7976b62bc96942", "url": "https://api.github.com/repos/symfony/ux-icons/zipball/e5c1e5b5093ae26dba45d0f3390a1e21f305c47a",
"reference": "430b2753aa55a46baa001055bf7976b62bc96942", "reference": "e5c1e5b5093ae26dba45d0f3390a1e21f305c47a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -8146,7 +8405,7 @@
"twig" "twig"
], ],
"support": { "support": {
"source": "https://github.com/symfony/ux-icons/tree/v2.25.0" "source": "https://github.com/symfony/ux-icons/tree/v2.26.0"
}, },
"funding": [ "funding": [
{ {
@@ -8162,20 +8421,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2025-04-07T13:54:07+00:00" "time": "2025-05-30T02:07:34+00:00"
}, },
{ {
"name": "symfony/ux-live-component", "name": "symfony/ux-live-component",
"version": "v2.25.2", "version": "v2.26.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/ux-live-component.git", "url": "https://github.com/symfony/ux-live-component.git",
"reference": "79e8cc179eb21119547c492ae21e4bf529ac1a15" "reference": "92b300bb90d87f14aeae47b0f5c9e058b15f5c2f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/ux-live-component/zipball/79e8cc179eb21119547c492ae21e4bf529ac1a15", "url": "https://api.github.com/repos/symfony/ux-live-component/zipball/92b300bb90d87f14aeae47b0f5c9e058b15f5c2f",
"reference": "79e8cc179eb21119547c492ae21e4bf529ac1a15", "reference": "92b300bb90d87f14aeae47b0f5c9e058b15f5c2f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -8188,7 +8447,9 @@
"twig/twig": "^3.10.3" "twig/twig": "^3.10.3"
}, },
"conflict": { "conflict": {
"symfony/config": "<5.4.0" "symfony/config": "<5.4.0",
"symfony/property-info": "~7.0.0",
"symfony/type-info": "<7.2"
}, },
"require-dev": { "require-dev": {
"doctrine/annotations": "^1.0", "doctrine/annotations": "^1.0",
@@ -8241,7 +8502,7 @@
"twig" "twig"
], ],
"support": { "support": {
"source": "https://github.com/symfony/ux-live-component/tree/v2.25.2" "source": "https://github.com/symfony/ux-live-component/tree/v2.26.1"
}, },
"funding": [ "funding": [
{ {
@@ -8257,20 +8518,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2025-05-19T11:54:27+00:00" "time": "2025-06-06T19:57:53+00:00"
}, },
{ {
"name": "symfony/ux-turbo", "name": "symfony/ux-turbo",
"version": "v2.25.2", "version": "v2.26.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/ux-turbo.git", "url": "https://github.com/symfony/ux-turbo.git",
"reference": "11ebca138005c7e25678c3f98a07ddf718a0480c" "reference": "3754ac2b41220127e58c62f7599eaf7834b69a55"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/ux-turbo/zipball/11ebca138005c7e25678c3f98a07ddf718a0480c", "url": "https://api.github.com/repos/symfony/ux-turbo/zipball/3754ac2b41220127e58c62f7599eaf7834b69a55",
"reference": "11ebca138005c7e25678c3f98a07ddf718a0480c", "reference": "3754ac2b41220127e58c62f7599eaf7834b69a55",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -8284,7 +8545,8 @@
"dbrekelmans/bdi": "dev-main", "dbrekelmans/bdi": "dev-main",
"doctrine/doctrine-bundle": "^2.4.3", "doctrine/doctrine-bundle": "^2.4.3",
"doctrine/orm": "^2.8 | 3.0", "doctrine/orm": "^2.8 | 3.0",
"phpstan/phpstan": "^1.10", "php-webdriver/webdriver": "^1.15",
"phpstan/phpstan": "^2.1.17",
"symfony/asset-mapper": "^6.4|^7.0", "symfony/asset-mapper": "^6.4|^7.0",
"symfony/debug-bundle": "^5.4|^6.0|^7.0", "symfony/debug-bundle": "^5.4|^6.0|^7.0",
"symfony/expression-language": "^5.4|^6.0|^7.0", "symfony/expression-language": "^5.4|^6.0|^7.0",
@@ -8292,7 +8554,7 @@
"symfony/framework-bundle": "^6.4|^7.0", "symfony/framework-bundle": "^6.4|^7.0",
"symfony/mercure-bundle": "^0.3.7", "symfony/mercure-bundle": "^0.3.7",
"symfony/messenger": "^5.4|^6.0|^7.0", "symfony/messenger": "^5.4|^6.0|^7.0",
"symfony/panther": "^2.1", "symfony/panther": "^2.2",
"symfony/phpunit-bridge": "^5.4|^6.0|^7.0", "symfony/phpunit-bridge": "^5.4|^6.0|^7.0",
"symfony/process": "^5.4|6.3.*|^7.0", "symfony/process": "^5.4|6.3.*|^7.0",
"symfony/property-access": "^5.4|^6.0|^7.0", "symfony/property-access": "^5.4|^6.0|^7.0",
@@ -8339,7 +8601,7 @@
"turbo-stream" "turbo-stream"
], ],
"support": { "support": {
"source": "https://github.com/symfony/ux-turbo/tree/v2.25.2" "source": "https://github.com/symfony/ux-turbo/tree/v2.26.1"
}, },
"funding": [ "funding": [
{ {
@@ -8355,20 +8617,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2025-05-19T11:54:27+00:00" "time": "2025-06-05T17:25:17+00:00"
}, },
{ {
"name": "symfony/ux-twig-component", "name": "symfony/ux-twig-component",
"version": "v2.25.2", "version": "v2.26.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/ux-twig-component.git", "url": "https://github.com/symfony/ux-twig-component.git",
"reference": "d20da25517fc09d147897d02819a046f0a0f6735" "reference": "825e653b34fb48ed2198913c603d80f7632fe9c1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/ux-twig-component/zipball/d20da25517fc09d147897d02819a046f0a0f6735", "url": "https://api.github.com/repos/symfony/ux-twig-component/zipball/825e653b34fb48ed2198913c603d80f7632fe9c1",
"reference": "d20da25517fc09d147897d02819a046f0a0f6735", "reference": "825e653b34fb48ed2198913c603d80f7632fe9c1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -8422,7 +8684,7 @@
"twig" "twig"
], ],
"support": { "support": {
"source": "https://github.com/symfony/ux-twig-component/tree/v2.25.2" "source": "https://github.com/symfony/ux-twig-component/tree/v2.26.0"
}, },
"funding": [ "funding": [
{ {
@@ -8438,7 +8700,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2025-05-20T13:06:01+00:00" "time": "2025-05-26T06:21:54+00:00"
}, },
{ {
"name": "symfony/validator", "name": "symfony/validator",
@@ -9125,16 +9387,16 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v5.4.0", "version": "v5.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "447a020a1f875a434d62f2a401f53b82a396e494" "reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
"reference": "447a020a1f875a434d62f2a401f53b82a396e494", "reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -9177,22 +9439,22 @@
], ],
"support": { "support": {
"issues": "https://github.com/nikic/PHP-Parser/issues", "issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0" "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
}, },
"time": "2024-12-30T11:07:19+00:00" "time": "2025-05-31T08:24:38+00:00"
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "2.1.14", "version": "2.1.17",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "8f2e03099cac24ff3b379864d171c5acbfc6b9a2" "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/8f2e03099cac24ff3b379864d171c5acbfc6b9a2", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/89b5ef665716fa2a52ecd2633f21007a6a349053",
"reference": "8f2e03099cac24ff3b379864d171c5acbfc6b9a2", "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -9237,7 +9499,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2025-05-02T15:32:28+00:00" "time": "2025-05-21T20:55:28+00:00"
}, },
{ {
"name": "symfony/maker-bundle", "name": "symfony/maker-bundle",
@@ -9423,10 +9685,13 @@
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": ">=8.2", "php": ">=8.4",
"ext-ctype": "*", "ext-ctype": "*",
"ext-iconv": "*" "ext-iconv": "*"
}, },
"platform-dev": [], "platform-dev": [],
"platform-overrides": {
"php": "8.4"
},
"plugin-api-version": "2.3.0" "plugin-api-version": "2.3.0"
} }

View File

@@ -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],
]; ];

View 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

View File

@@ -1,5 +1,7 @@
twig: twig:
file_name_pattern: '*.twig' file_name_pattern: '*.twig'
date:
timezone: '%env(default:app.default.timezone:TZ)%'
when@test: when@test:
twig: twig:

View File

@@ -21,6 +21,9 @@ 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.timezone: 'America/Chicago'
services: services:
# default configuration for services in *this* file # default configuration for services in *this* file
_defaults: _defaults:

View File

@@ -6,6 +6,7 @@ services:
environment: environment:
MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!' MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!' MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
tty: true
deploy: deploy:
replicas: 2 replicas: 2
volumes: volumes:

View File

@@ -9,8 +9,4 @@ sleep $SLEEP_TIME
php /app/bin/console doctrine:migrations:migrate --no-interaction php /app/bin/console doctrine:migrations:migrate --no-interaction
php /app/bin/console db:seed php /app/bin/console db:seed
# Start the media cache warming services exec docker-php-entrypoint "$@"
systemctl --user enable messenger-worker.service
systemctl --user start messenger-worker.service
frankenphp php-server /etc/frankenphp/Caddyfile

View 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);
}
}

View 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);
}
}

View File

@@ -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);
}
} }

View File

@@ -33,13 +33,14 @@ final class SearchController extends AbstractController
]); ]);
} }
#[Route('/result/{mediaType}/{imdbId}', 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); // $this->warmDownloadOptionCache($result->media);
return $this->render('search/result.html.twig', [ return $this->render('search/result.html.twig', [
'results' => $result, 'results' => $result,

View File

@@ -52,13 +52,13 @@ final class TorrentioController extends AbstractController
$input->episode, $input->episode,
); );
// 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));
$results = $this->getTvShowOptionsHandler->handle($input->toCommand()); $results = $this->getTvShowOptionsHandler->handle($input->toCommand());
return $this->render('torrentio/tvshows.html.twig', [ return $this->render('torrentio/tvshows.html.twig', [
'results' => $results, 'results' => $results,
]); ]);
// }); });
} }
#[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')]

View File

@@ -3,10 +3,9 @@
namespace App\Download\Framework\Entity; namespace App\Download\Framework\Entity;
use App\Download\Framework\Repository\DownloadRepository; use App\Download\Framework\Repository\DownloadRepository;
use App\Torrentio\Result\ResultFactory;
use App\Torrentio\Result\TorrentioResult;
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 Nihilarr\PTN;
use Symfony\UX\Turbo\Attribute\Broadcast; use Symfony\UX\Turbo\Attribute\Broadcast;
@@ -14,6 +13,8 @@ use Symfony\UX\Turbo\Attribute\Broadcast;
#[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]

View File

@@ -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,

View File

@@ -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;
}
} }

View File

@@ -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->episodeInFuture($episode);
$this->logger->info('> [MonitorTvShowHandler] Episode is in future 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 not in future 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 episodeInFuture(array $episodeInShow): bool
{
static $today = Carbon::today();
$episodeAirDate = Carbon::parse($episodeInShow['air_date']);
return $episodeAirDate > $today;
}
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;
}
} }

View 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,
) {}
}

View 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,
) {}
}

View 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,
) {}
}

View File

@@ -4,6 +4,8 @@ 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;
@@ -56,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;
@@ -204,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']);
}
} }

View File

@@ -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(

View File

@@ -152,7 +152,7 @@ class MediaFiles
foreach ($existingEpisodes as $episode) { foreach ($existingEpisodes as $episode) {
$ptn = (object) (new PTN())->parse($episode->getFilename()); $ptn = (object) (new PTN())->parse($episode->getFilename());
if (!property_exists($episode, 'season') || !property_exists($episode, 'episode')) { if (!property_exists($ptn, 'season') || !property_exists($ptn, 'episode')) {
continue; continue;
} }

View File

@@ -10,5 +10,6 @@ class GetMediaInfoCommand implements CommandInterface
public function __construct( public function __construct(
public string $imdbId, public string $imdbId,
public string $mediaType, public string $mediaType,
public ?int $season = null,
) {} ) {}
} }

View File

@@ -20,6 +20,6 @@ class GetMediaInfoHandler implements HandlerInterface
{ {
$media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType); $media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
return new GetMediaInfoResult($media); return new GetMediaInfoResult($media, $command->season);
} }
} }

View File

@@ -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;
@@ -17,10 +18,16 @@ class GetMediaInfoInput implements InputInterface
#[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->imdbId, $this->mediaType); if ("tvshows" === $this->mediaType && null === $this->season) {
$this->season = 1;
}
return new GetMediaInfoCommand($this->imdbId, $this->mediaType, $this->season);
} }
} }

View File

@@ -10,5 +10,6 @@ class GetMediaInfoResult implements ResultInterface
{ {
public function __construct( public function __construct(
public TmdbResult $media, public TmdbResult $media,
public ?int $season,
) {} ) {}
} }

View 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);
}
}

View File

@@ -2,6 +2,7 @@
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 Symfony\Component\DependencyInjection\Attribute\Autowire; use Symfony\Component\DependencyInjection\Attribute\Autowire;
@@ -97,6 +98,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 +125,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) {

View File

@@ -48,7 +48,7 @@ final class MonitorList extends AbstractController
return $this->asPaginator($this->monitorRepository->createQueryBuilder('m') return $this->asPaginator($this->monitorRepository->createQueryBuilder('m')
->andWhere('m.status IN (:statuses)') ->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)') ->andWhere('(m.title LIKE :term OR m.imdbId LIKE :term OR m.monitorType LIKE :term OR m.status LIKE :term)')
->setParameter('statuses', ['New', 'In Progress']) ->setParameter('statuses', ['New', 'In Progress', 'Active'])
->setParameter('term', '%'.$this->term.'%') ->setParameter('term', '%'.$this->term.'%')
->orderBy('m.id', 'DESC') ->orderBy('m.id', 'DESC')
->getQuery() ->getQuery()

View File

@@ -0,0 +1,44 @@
<?php
namespace App\Twig\Components;
use App\Search\Action\Command\GetMediaInfoCommand;
use App\Search\Action\Handler\GetMediaInfoHandler;
use App\Search\TvEpisodePaginator;
use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
use Symfony\UX\LiveComponent\Attribute\LiveProp;
use Symfony\UX\LiveComponent\DefaultActionTrait;
#[AsLiveComponent]
final class TvEpisodeList
{
use DefaultActionTrait;
use PaginateTrait;
#[LiveProp(writable: true)]
public string $title = "";
#[LiveProp(writable: true)]
public string $imdbId = "";
#[LiveProp(writable: true)]
public string $tmdbId = "";
#[LiveProp(writable: true)]
public int $season = 1;
public function __construct(
private GetMediaInfoHandler $getMediaInfoHandler,
) {}
public function getEpisodes()
{
$results = $this->getMediaInfoHandler->handle(new GetMediaInfoCommand($this->imdbId, "tvshows", $this->season));
return new TvEpisodePaginator()->paginate($results, $this->pageNumber, $this->perPage);
}
public function setPage(int $page)
{
$this->pageNumber = $page;
}
}

View File

@@ -0,0 +1,81 @@
<?php
namespace App\Twig\Components;
use Aimeos\Map;
use App\Monitor\Dto\UpcomingEpisode;
use App\Monitor\Framework\Entity\Monitor;
use App\Tmdb\Tmdb;
use Carbon\CarbonImmutable;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
use Tmdb\Model\Tv\Episode;
#[AsTwigComponent]
final class UpcomingEpisodes extends AbstractController
{
// Get active monitors
// Search TMDB for upcoming episodes
public function __construct(
private readonly Tmdb $tmdb,
) {}
public function getUpcomingEpisodes(int $limit = 5): array
{
$upcomingEpisodes = new Map();
$monitors = $this->getMonitors();
foreach ($monitors as $monitor) {
$upcomingEpisodes->merge($this->getNextEpisodes($monitor));
}
return $upcomingEpisodes->slice(0, $limit)->toArray();
}
private function getMonitors()
{
$user = $this->getUser();
return $user->getMonitors()->filter(
fn (Monitor $monitor) => null === $monitor->getParent() && $monitor->isActive()
) ?? [];
}
private function getNextEpisodes(Monitor $monitor): Map
{
$today = CarbonImmutable::now();
$seriesInfo = $this->tmdb->tvDetails($monitor->getTmdbId());
switch ($monitor->getMonitorType()) {
case "tvseason":
$episodes = Map::from($seriesInfo->episodes[$monitor->getSeason()])
->filter(function (array $episode) use ($today) {
$airDate = CarbonImmutable::parse($episode['air_date']);
return $airDate->lte($today);
})
;
break;
case "tvshows":
$episodes = [];
foreach ($seriesInfo->episodes as $season => $episodeList) {
$episodes = array_merge($episodes, $episodeList);
}
$episodes = Map::from($episodes)
->filter(function (array $episode) use ($today) {
$airDate = CarbonImmutable::parse($episode['air_date']);
return $airDate->gte($today);
})
;
break;
}
return $episodes->map(function (array $episode) use ($monitor) {
return new UpcomingEpisode(
$monitor->getTitle(),
$episode['air_date'],
$episode['name'],
$episode['episode_number'],
);
});
}
}

View File

@@ -19,6 +19,19 @@ class MonitorExtension
return $types[$type] ?? '-'; return $types[$type] ?? '-';
} }
#[AsTwigFilter('as_download_type')]
public function monitorTypeToDownloadType(string $type)
{
$types = [
'tvshows' => 'tvshows',
'tvseason' => 'tvshows',
'tvepisode' => 'tvshows',
'movie' => 'movies',
];
return $types[$type] ?? '-';
}
#[AsTwigFilter('monitor_media_id')] #[AsTwigFilter('monitor_media_id')]
public function mediaId(Monitor $monitor) public function mediaId(Monitor $monitor)
{ {

View File

@@ -6,6 +6,7 @@ use App\Monitor\Framework\Entity\Monitor;
use App\Monitor\Service\MediaFiles; use App\Monitor\Service\MediaFiles;
use ChrisUllyott\FileSize; use ChrisUllyott\FileSize;
use Twig\Attribute\AsTwigFilter; use Twig\Attribute\AsTwigFilter;
use Twig\Attribute\AsTwigFunction;
class UtilExtension class UtilExtension
{ {
@@ -14,6 +15,12 @@ class UtilExtension
private readonly MediaFiles $mediaFiles, private readonly MediaFiles $mediaFiles,
) {} ) {}
#[AsTwigFunction('uniqid')]
public function uniqid(): string
{
return uniqid();
}
#[AsTwigFilter('filesize')] #[AsTwigFilter('filesize')]
public function type(string|int $size) public function type(string|int $size)
{ {

View File

@@ -0,0 +1,21 @@
<?php
namespace App\User\Framework\EventListener;
use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent;
final class LoginSuccessListener
{
public function __construct(
private readonly RequestStack $requestStack,
) {}
#[AsEventListener(event: 'security.authentication.success')]
public function setMercureTopics(AuthenticationSuccessEvent $event): void
{
// Set the unique Mercure topic name for the User's alerts
$this->requestStack->getSession()->set('mercure_alert_topic', 'alerts_' . uniqid());
}
}

View File

@@ -22,6 +22,8 @@ class Paginator
public $currentPage = 1; public $currentPage = 1;
public $limit = 5;
/** /**
* @param QueryBuilder|Query $query * @param QueryBuilder|Query $query
* @param int $page * @param int $page
@@ -41,6 +43,7 @@ class Paginator
$this->lastPage = (int) ceil($paginator->count() / $paginator->getQuery()->getMaxResults()); $this->lastPage = (int) ceil($paginator->count() / $paginator->getQuery()->getMaxResults());
$this->items = $paginator; $this->items = $paginator;
$this->currentPage = $page; $this->currentPage = $page;
$this->limit = $limit;
return $this; return $this;
} }
@@ -59,4 +62,11 @@ class Paginator
{ {
return $this->items; return $this->items;
} }
public function getShowing()
{
$showingStart = ($this->currentPage - 1) * $this->limit;
$showingEnd = $showingStart + $this->limit;
return sprintf("Showing %d - %d of %d results.", $showingStart, $showingEnd, $this->total);
}
} }

View File

@@ -74,6 +74,18 @@
"phpstan.dist.neon" "phpstan.dist.neon"
] ]
}, },
"stof/doctrine-extensions-bundle": {
"version": "1.14",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
"branch": "main",
"version": "1.2",
"ref": "e805aba9eff5372e2d149a9ff56566769e22819d"
},
"files": [
"config/packages/stof_doctrine_extensions.yaml"
]
},
"symfony/asset-mapper": { "symfony/asset-mapper": {
"version": "7.2", "version": "7.2",
"recipe": { "recipe": {

View File

@@ -13,6 +13,9 @@ module.exports = {
"bg-orange-400", "bg-orange-400",
"bg-blue-600", "bg-blue-600",
"bg-rose-600", "bg-rose-600",
"min-w-64",
"rotate-180",
"-rotate-180",
"transition-opacity", "transition-opacity",
"ease-in", "ease-in",
"duration-700", "duration-700",

View File

@@ -1,7 +1,7 @@
<li {{ attributes }} id="alert_{{ alert_id }}" class=" <li {{ attributes }} id="alert_{{ alert_id }}" class="
text-white bg-green-950 text-sm min-w-[250px] text-white bg-green-950 text-sm min-w-[250px]
hover:bg-green-900 border border-green-500 px-4 py-3 hover:bg-green-900 border border-green-500 px-4 py-3
rounded-md z-40" rounded-md"
role="alert" role="alert"
> >
<div class="flex items-center"> <div class="flex items-center">

View File

@@ -3,7 +3,7 @@
{% if this.isWidget == false %} {% if this.isWidget == false %}
<div class="flex flex-row mb-2 justify-end"> <div class="flex flex-row mb-2 justify-end">
<twig:DownloadSearch search_path="app_search" placeholder="Find one of your downloads..." /> <twig:DownloadSearch search_path="app_search" placeholder="Find {{ type == "complete" ? "a" : "an" }} {{ type }} download..." />
</div> </div>
{% endif %} {% endif %}

View File

@@ -1,7 +1,7 @@
<tr{{ attributes }} id="ad_download_{{ download.id }}"> <tr{{ attributes }} class="hover:bg-gray-200" id="ad_download_{{ download.id }}">
<td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 truncate"> <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 truncate">
<a href="{{ path('app_search_result', {imdbId: download.imdbId, mediaType: download.mediaType}) }}" <a href="{{ path('app_search_result', {imdbId: download.imdbId, mediaType: download.mediaType}) }}"
class="hover:underline mr-1" class="mr-1 hover:underline rounded-md"
> >
{{ download.title }} {{ download.title }}
</a> </a>
@@ -34,16 +34,16 @@
</td> </td>
<td id="action_buttons_{{ download.id }}" class="px-6 py-4 flex flex-row items-center"> <td id="action_buttons_{{ download.id }}" class="px-6 py-4 flex flex-row items-center">
{% if download.status == 'In Progress' and download.progress < 100 %} {% if download.status == 'In Progress' and download.progress < 100 %}
<button id="pause_{{ download.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'pauseDownload', 'click', {id: download.id}) }}> <button id="pause_{{ download.id }}" class="text-orange-500 hover:text-orange-600 mr-1 self-start" {{ stimulus_action('download_list', 'pauseDownload', 'click', {id: download.id}) }}>
<twig:ux:icon name="icon-park-twotone:pause-one" width="16.75px" height="16.75px" class="rounded-full" /> <twig:ux:icon name="icon-park-twotone:pause-one" width="16.75px" height="16.75px" class="rounded-full" />
</button> </button>
{% elseif download.status == 'Paused' %} {% elseif download.status == 'Paused' %}
<button id="resume_{{ download.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'resumeDownload', 'click', {id: download.id}) }}> <button id="resume_{{ download.id }}" class="text-orange-500 hover:text-orange-600 mr-1 self-start" {{ stimulus_action('download_list', 'resumeDownload', 'click', {id: download.id}) }}>
<twig:ux:icon name="icon-park-twotone:play" width="16.75px" height="16.75px" class="rounded-full" /> <twig:ux:icon name="icon-park-twotone:play" width="16.75px" height="16.75px" class="rounded-full" />
</button> </button>
{% endif %} {% endif %}
{% set delete_button = component('ux:icon', {name: 'ic:twotone-cancel', height: '17.75px', width: '17.75px', class: 'rounded-full align-middle text-red-600' }) %} {% set delete_button = component('ux:icon', {name: 'ic:twotone-cancel', height: '17.75px', width: '17.75px', class: 'rounded-full align-middle text-red-600 hover:text-red-700' }) %}
<twig:Modal heading="But wait!" button_text="{{ delete_button }}" submit_action="{{ stimulus_action('download_list', 'deleteDownload', 'click', {id: download.id}) }}" show_cancel show_submit> <twig:Modal heading="But wait!" button_text="{{ delete_button }}" submit_action="{{ stimulus_action('download_list', 'deleteDownload', 'click', {id: download.id}) }}" show_cancel show_submit>
Are you sure you want to delete <span class="font-bold">{{ download.filename }}</span>? Are you sure you want to delete <span class="font-bold">{{ download.filename }}</span>?
</twig:Modal> </twig:Modal>

View File

@@ -10,6 +10,9 @@
shadow-sm focus:shadow" shadow-sm focus:shadow"
placeholder="{{ placeholder ?? 'TV Show, Movie...' }}" placeholder="{{ placeholder ?? 'TV Show, Movie...' }}"
/> />
<twig:ux:icon name="codex:loader" height="20" width="20" data-loading-icon-target="icon" data-loading="removeClass(hidden)" class="absolute top-2 right-16 text-orange-500 hidden text-end" />
<button <button
class="absolute top-1 right-1 flex items-center class="absolute top-1 right-1 flex items-center
bg-green-600 py-1 px-2 text-center bg-green-600 py-1 px-2 text-center
@@ -17,8 +20,7 @@
focus:bg-green-700 active:bg-green-700 hover:bg-green-700 focus:bg-green-700 active:bg-green-700 hover:bg-green-700
text-white bg-green-600 text-xs text-white bg-green-600 text-xs
rounded-sm rounded-ms bg-opacity-80
bg-opacity-80
" "
onclick="return false;" onclick="return false;"
> >

View File

@@ -4,6 +4,7 @@
data-result-filter-media-type-value="{{ results.media.mediaType }}" data-result-filter-media-type-value="{{ results.media.mediaType }}"
data-result-filter-movie-results-outlet=".results" data-result-filter-movie-results-outlet=".results"
data-result-filter-tv-results-outlet=".results" data-result-filter-tv-results-outlet=".results"
data-result-filter-tv-episode-list-outlet=".episode-list"
> >
<div class="w-full p-4 flex flex-row gap-4 bg-stone-500 text-md text-gray-500 dark:text-gray-50 rounded-lg"> <div class="w-full p-4 flex flex-row gap-4 bg-stone-500 text-md text-gray-500 dark:text-gray-50 rounded-lg">
<label for="resolution"> <label for="resolution">
@@ -58,7 +59,9 @@
<label for="season"> <label for="season">
Season Season
<select id="season" name="season" value="1" data-result-filter-target="season" class="px-1 py-0.5 bg-stone-100 text-gray-800 rounded-md" <select id="season" name="season" value="1" data-result-filter-target="season" class="px-1 py-0.5 bg-stone-100 text-gray-800 rounded-md"
{{ stimulus_action('result_filter', 'uncheckSelectAllBtn', 'change') }}> {{ stimulus_action('result_filter', 'setSeason', 'change') }}
{{ stimulus_action('result_filter', 'uncheckSelectAllBtn', 'change') }}
>
<option selected value="1">1</option> <option selected value="1">1</option>
{% for season in range(2, results.media.episodes|length) %} {% for season in range(2, results.media.episodes|length) %}
<option value="{{ season }}">{{ season }}</option> <option value="{{ season }}">{{ season }}</option>
@@ -73,8 +76,7 @@
{# </label>#} {# </label>#}
{% endif %} {% endif %}
<span {{ stimulus_controller('loading_icon', {total: (results.media.mediaType == "tvshows") ? results.media.episodes[1]|length : 1, count: 0}) }} <span {{ stimulus_controller('loading_icon', {total: (results.media.mediaType == "tvshows") ? results.media.episodes[1]|length : 1, count: 0}) }}
class="loading-icon" class="loading-icon">
>
<twig:ux:icon name="codex:loader" height="20" width="20" data-loading-icon-target="icon" class="text-end" /> <twig:ux:icon name="codex:loader" height="20" width="20" data-loading-icon-target="icon" class="text-end" />
</span> </span>
</div> </div>

View File

@@ -16,8 +16,8 @@
</div> </div>
</div> </div>
</div> </div>
<div {{ turbo_stream_listen(app.session.get('mercure_alert_topic')) }} class="absolute top-10 right-10"> <div {{ turbo_stream_listen(app.session.get('mercure_alert_topic')) }} class="fixed z-40 top-10 right-10">
<div > <div class="z-40">
<ul id="alert_list"> <ul id="alert_list">
</ul> </ul>
</div> </div>

View File

@@ -1,7 +1,7 @@
<div{{ attributes.defaults(stimulus_controller('monitor_list')) }}> <div{{ attributes.defaults(stimulus_controller('monitor_list')) }}>
{% if this.isWidget == false %} {% if this.isWidget == false %}
<div class="flex flex-row mb-2 justify-end"> <div class="flex flex-row mb-2 justify-end">
<twig:DownloadSearch search_path="app_search" placeholder="Find one of your monitors..." /> <twig:DownloadSearch search_path="app_search" placeholder="Find {{ type == "complete" ? "a" : "an" }} {{ type }} monitor..." />
</div> </div>
{% endif %} {% endif %}
<table id="monitor_list" class="divide-y divide-gray-200 bg-gray-50 overflow-hidden rounded-lg table-auto w-full" {{ turbo_stream_listen('App\\Monitor\\Framework\\Entity\\Monitor') }}> <table id="monitor_list" class="divide-y divide-gray-200 bg-gray-50 overflow-hidden rounded-lg table-auto w-full" {{ turbo_stream_listen('App\\Monitor\\Framework\\Entity\\Monitor') }}>

View File

@@ -1,6 +1,10 @@
<tr{{ attributes }} id="monitor_{{ monitor.id }}"> <tr{{ attributes }} id="monitor_{{ monitor.id }}" class="hover:bg-gray-200">
<td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-stone-800 truncate"> <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-stone-800 truncate">
{{ monitor.title }} <a href="{{ path('app_search_result', {imdbId: monitor.imdbId, mediaType: monitor.monitorType|as_download_type}) }}"
class="mr-1 hover:underline rounded-md"
>
{{ monitor.title }}
</a>
</td> </td>
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800"> <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800">
{{ monitor|monitor_media_id }} {{ monitor|monitor_media_id }}

View File

@@ -0,0 +1,27 @@
<div{{ attributes.defaults(stimulus_controller('tv_episode_list')) }}
class="episode-list flex flex-col gap-4"
>
<div data-live-id="{{ uniqid() }}" class="episode-container flex flex-col gap-4">
{% for episode in this.episodes.items %}
<div id="episode_{{ episode['season_number'] }}_{{ episode['episode_number'] }}" class="results"
data-tv-results-loading-icon-outlet=".loading-icon"
data-download-button-outlet=".download-btn"
{{ stimulus_controller('tv_results', {
title: this.title,
tmdbId: this.tmdbId,
imdbId: this.imdbId,
season: episode['season_number'],
episode: episode['episode_number'],
active: 'true',
}) }}></div>
{% endfor %}
</div>
{% set paginator = this.episodes %}
{% include 'partial/tv-episode-list-paginator.html.twig' %}
</div>
{% macro placeholder(props) %}
<span>
<twig:ux:icon name="codex:loader" height="40" width="40" data-loading-icon-target="icon" class="text-end" />
</span>
{% endmacro %}

View File

@@ -0,0 +1,11 @@
<div{{ attributes }}>
<ul class="text-white flex flex-col gap-2">
{% for episode in this.upcomingEpisodes %}
<li class="flex flex-col">
<span class="bg-[#f98e44] bg-filter bg-blur-lg bg-opacity-100 text-gray-950 w-full p-[.1rem] pl-[.3rem] rounded-ms">{{ episode.title }}</span>
<span>{{ episode.episodeTitle }}</span>
<span>{{ episode.airDate }}</span>
</li>
{% endfor %}
</ul>
</div>

View File

@@ -4,15 +4,22 @@
{% block h2 %}Monitors{% endblock %} {% block h2 %}Monitors{% endblock %}
{% block body %} {% block body %}
<div class="p-4"> <div class="flex flex-row">
<twig:Card title="Active Monitors">
<twig:MonitorList :type="'active'" :isWidget="false" :perPage="10"></twig:MonitorList> <div class="p-2 flex flex-col gap-4">
</twig:Card> <twig:Card title="Active Monitors">
</div> <twig:MonitorList :type="'active'" :isWidget="false" :perPage="10"></twig:MonitorList>
</twig:Card>
<twig:Card title="Complete Monitors">
<twig:MonitorList :type="'complete'" :isWidget="false" :perPage="10"></twig:MonitorList>
</twig:Card>
</div>
<div class="p-2">
<twig:Card title="Upcoming Episodes" >
<twig:UpcomingEpisodes />
</twig:Card>
</div>
<div class="p-4">
<twig:Card title="Complete Monitors">
<twig:MonitorList :type="'complete'" :isWidget="false" :perPage="10"></twig:MonitorList>
</twig:Card>
</div> </div>
{% endblock %} {% endblock %}

View File

@@ -1,6 +1,6 @@
{% set _currentPage = paginator.currentPage ?: 1 %} {% set _currentPage = paginator.currentPage ?: 1 %}
{% set _lastPage = paginator.lastPage %} {% set _lastPage = paginator.lastPage %}
{% set _showingPerPage = (_currentPage == _lastPage) ? paginator.total - (this.perPage * (_lastPage - 1)) : paginator.items.query.maxResults %} {% set _showingPerPage = (_currentPage == _lastPage) ? paginator.total - (this.perPage * (_lastPage - 1)) : ("query" in paginator.items) ? paginator.items.query.maxResults %}
<p class="text-white mt-1">Showing {{ _showingPerPage }} of {{ paginator.total }} total results</p> <p class="text-white mt-1">Showing {{ _showingPerPage }} of {{ paginator.total }} total results</p>
@@ -8,75 +8,74 @@
<nav> <nav>
<ul class="mt-2 flex flex-row justify-content-center gap-1 py-1 text-white text-sm"> <ul class="mt-2 flex flex-row justify-content-center gap-1 py-1 text-white text-sm">
<li class="page-item{{ _currentPage <= 1 ? ' disabled' : '' }}"> <li class="page-item{{ _currentPage <= 1 ? ' disabled' : '' }}">
<a {% if _currentPage > 1 %} <button {% if _currentPage > 1 %}
data-action="click->live#action" data-action="click->live#action"
data-live-action-param="paginate" data-live-action-param="paginate"
data-live-page-param="{{ _currentPage - 1 }}" data-live-page-param="{{ _currentPage - 1 }}"
{% endif %} {% endif %}
class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle" class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
aria-label="Previous" aria-label="Previous"
href="#"
> >
&laquo; &laquo;
</a> </button>
</li> </li>
{% set startPage = max(1, _currentPage - 2) %} {% set startPage = max(1, _currentPage - 2) %}
{% set endPage = min(_lastPage, startPage + 4) %} {% set endPage = min(_lastPage, startPage + 4) %}
{% if startPage > 1 %} {% if startPage > 1 %}
<li class="page-item"> <li class="page-item">
<a data-action="click->live#action" <button data-action="click->live#action"
data-live-action-param="paginate" data-live-action-param="paginate"
data-live-page-param="{{ "1"|number_format }}" data-live-page-param="{{ "1"|number_format }}"
class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle" class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
aria-label="Next" aria-label="Next"
href="#"
>1</a> >1</button>
</li> </li>
{% if startPage > 2 %} {% if startPage > 2 %}
<li class="page-item disabled"> <li class="page-item disabled">
<span class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle">...</span> <span class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle inline-flex items-stretch">...</span>
</li> </li>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% for i in startPage..endPage %} {% for i in startPage..endPage %}
<li class="page-item}"> <li class="page-item">
<a data-action="click->live#action" <button data-action="click->live#action"
data-live-action-param="paginate" data-live-action-param="paginate"
data-live-page-param="{{ i|number_format }}" data-live-page-param="{{ i|number_format }}"
class="page-link px-2.5 py-1 rounded-lg bg-orange-500 text-white align-middle" class="page-link px-2.5 py-1 rounded-lg bg-orange-500 text-white align-middle"
{% if i == _currentPage %}style="background-color: #fff; color: darkorange; border: 2px solid darkorange;"{% endif %} {% if i == _currentPage %}style="background-color: #fff; color: darkorange; font-weight: bold;"{% endif %}
href="#" >{{ i }}</button>
>{{ i }}</a>
</li> </li>
{% endfor %} {% endfor %}
{% if endPage < _lastPage %} {% if endPage < _lastPage %}
{% if endPage < _lastPage - 1 %} {% if endPage < _lastPage - 1 %}
<li class="page-item disabled"> <li class="page-item disabled">
<span class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle">...</span> <span class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle inline-flex items-stretch">...</span>
</li> </li>
{% endif %} {% endif %}
<li class="page-item"> <li class="page-item">
<a data-action="click->live#action" <button data-action="click->live#action"
data-live-action-param="paginate" data-live-action-param="paginate"
data-live-page-param="{{ _lastPage }}" data-live-page-param="{{ _lastPage }}"
class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle" class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
aria-label="Next" aria-label="Next"
href="#"
>{{ _lastPage }}</a> >{{ _lastPage }}</button>
</li> </li>
{% endif %} {% endif %}
<li class="page-item {{ _currentPage >= paginator.lastPage ? ' disabled' : '' }}"> <li class="page-item {{ _currentPage >= paginator.lastPage ? ' disabled' : '' }}">
<a {% if _currentPage < _lastPage %} <button {% if _currentPage < _lastPage %}
data-action="click->live#action" data-action="click->live#action"
data-live-action-param="paginate" data-live-action-param="paginate"
data-live-page-param="{{ _currentPage + 1 }}" data-live-page-param="{{ _currentPage + 1 }}"
{% endif %} {% endif %}
class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle" class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
aria-label="Next" aria-label="Next"
href="#"
> >
&raquo; &raquo;
</a> </button>
</li> </li>
</ul> </ul>
</nav> </nav>

View File

@@ -0,0 +1,74 @@
{% set _currentPage = paginator.currentPage ?: 1 %}
{% set _lastPage = paginator.lastPage %}
{% set _showingPerPage = (_currentPage == _lastPage) ? paginator.total - (this.perPage * (_lastPage - 1)) : ("query" in paginator.items) ? paginator.items.query.maxResults %}
<p class="text-white mt-1">{{ paginator.getShowing() }}</p>
{% if paginator.lastPage > 1 %}
<nav>
<ul class="mt-2 flex flex-row justify-content-center gap-1 py-1 text-white text-sm">
<li class="page-item{{ _currentPage <= 1 ? ' disabled' : '' }}">
<button
{% if _currentPage > 1 %}
{{ stimulus_action('tv-episode-list', 'paginate', 'click', {page: _currentPage - 1}) }}
{% endif %}
class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
aria-label="Previous"
>
&laquo;
</button>
</li>
{% set startPage = max(1, _currentPage - 2) %}
{% set endPage = min(_lastPage, startPage + 4) %}
{% if startPage > 1 %}
<li class="page-item">
<button
{{ stimulus_action('tv-episode-list', 'paginate', 'click', {page: 1}) }}
class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
aria-label="Next"
>1</button>
</li>
{% if startPage > 2 %}
<li class="page-item disabled">
<span class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle inline-flex items-stretch">...</span>
</li>
{% endif %}
{% endif %}
{% for i in startPage..endPage %}
<li class="page-item">
<button
{{ stimulus_action('tv-episode-list', 'paginate', 'click', {page: i}) }}
class="page-link px-2.5 py-1 rounded-lg bg-orange-500 text-white align-middle"
{% if i == _currentPage %}style="background-color: #fff; color: darkorange; font-weight: bold;"{% endif %}
>{{ i }}</button>
</li>
{% endfor %}
{% if endPage < _lastPage %}
{% if endPage < _lastPage - 1 %}
<li class="page-item disabled">
<span class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle inline-flex items-stretch">...</span>
</li>
{% endif %}
<li class="page-item">
<button
{{ stimulus_action('tv-episode-list', 'paginate', 'click', {page: _lastPage}) }}
class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
aria-label="Next"
>{{ _lastPage }}</button>
</li>
{% endif %}
<li class="page-item {{ _currentPage >= paginator.lastPage ? ' disabled' : '' }}">
<button
{% if _currentPage < _lastPage %}
{{ stimulus_action('tv-episode-list', 'paginate', 'click', {page: _currentPage + 1}) }}
{% endif %}
class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
aria-label="Next"
>
&raquo;
</button>
</li>
</ul>
</nav>
{% endif %}

View File

@@ -118,22 +118,10 @@
<div class="results" {{ stimulus_controller('movie_results', {title: results.media.title, tmdbId: results.media.tmdbId, imdbId: results.media.imdbId}) }}> <div class="results" {{ stimulus_controller('movie_results', {title: results.media.title, tmdbId: results.media.tmdbId, imdbId: results.media.imdbId}) }}>
</div> </div>
{% elseif "tvshows" == results.media.mediaType %} {% elseif "tvshows" == results.media.mediaType %}
{% for season, episodes in results.media.episodes %} <twig:TvEpisodeList
{% set active = (season == '1') ? true : false %} :imdbId="results.media.imdbId" :season="results.season" :perPage="20" :pageNumber="1"
{% for episode in episodes %} :tmdbId="results.media.tmdbId" :title="results.media.title" loading="defer"
<div class="results {{ (active == false) ? 'hidden' }}" />
data-tv-results-loading-icon-outlet=".loading-icon"
data-download-button-outlet=".download-btn"
{{ stimulus_controller('tv_results', {
title: results.media.title,
tmdbId: results.media.tmdbId,
imdbId: results.media.imdbId,
season: season,
episode: episode['episode_number'],
active: active,
}) }}></div>
{% endfor %}
{% endfor %}
{% endif %} {% endif %}
</twig:Card> </twig:Card>
</div> </div>

View File

@@ -3,7 +3,7 @@
{% if results.media.poster != null %} {% if results.media.poster != null %}
<img class="w-64 rounded-lg" src="{{ results.media.poster }}" /> <img class="w-64 rounded-lg" src="{{ results.media.poster }}" />
{% else %} {% else %}
<div class="w-64 h-[144px] rounded-lg bg-gray-700 flex items-center justify-center"> <div class="w-64 min-w-64 sticky h-[144px] rounded-lg bg-gray-700 flex items-center justify-center">
<twig:ux:icon width="32" name="hugeicons:loading-01" /> <twig:ux:icon width="32" name="hugeicons:loading-01" />
</div> </div>
{% endif %} {% endif %}
@@ -58,10 +58,20 @@
{{ stimulus_target('tv-results', 'episodeSelector') }} {{ stimulus_target('tv-results', 'episodeSelector') }}
/> />
</div> </div>
<button class="flex flex-col items-end" <button class="flex flex-col items-end transition-transform duration-300 ease-in-out rotate-90"
{{ stimulus_target('tv-results', 'toggleButton') }}
{{ stimulus_action('tv-results', 'toggleList', 'click') }}> {{ stimulus_action('tv-results', 'toggleList', 'click') }}>
<svg xmlns="http://www.w3.org/2000/svg" width="2em" height="2em" viewBox="0 0 32 32"> {# <svg xmlns="http://www.w3.org/2000/svg" width="2em" height="2em" viewBox="0 0 32 32">#}
<path fill="currentColor" d="m16 10l10 10l-1.4 1.4l-8.6-8.6l-8.6 8.6L6 20z"/> {# <path fill="currentColor" d="m16 10l10 10l-1.4 1.4l-8.6-8.6l-8.6 8.6L6 20z"/>#}
{# </svg>#}
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="32">
<path
fill="none"
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M20 6L10 16l10 10" />
</svg> </svg>
</button> </button>
</div> </div>