Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
4ae70115b5 | ||
|
|
f4982af991 | ||
|
|
f253b33910 | ||
|
|
ec0d2a198c | ||
|
|
1f1c6f775f | ||
|
|
cd14a197aa | ||
|
|
a9031df3c3 | ||
|
|
55ab9d840e | ||
|
|
3001e85715 | ||
|
|
f4125cc37c | ||
|
|
a3408d9852 | ||
|
|
0048423a46 | ||
|
|
2468e4d5b6 | ||
|
|
445224d368 | ||
|
|
9a660279be | ||
|
|
c1adedf74d | ||
|
|
9a0e7fce26 | ||
|
|
d90b4d7863 | ||
|
|
2860d2e949 | ||
|
|
ad2bbfd48c |
4
.env
4
.env
@@ -58,3 +58,7 @@ OIDC_BYPASS_FORM_LOGIN=false
|
||||
|
||||
NOTIFICATION_TRANSPORT=
|
||||
NTFY_DSN=
|
||||
|
||||
###> sentry/sentry-symfony ###
|
||||
SENTRY_DSN=
|
||||
###< sentry/sentry-symfony ###
|
||||
|
||||
@@ -67,6 +67,9 @@ export default class MonitorListRow extends HTMLTableRowElement {
|
||||
<th class="px-4 py-2">
|
||||
<div class="dark:text-orange-500 text-right whitespace-nowrap ">Downloaded At</div>
|
||||
</th>
|
||||
<th class="px-4 py-2">
|
||||
<div class="dark:text-orange-500 text-right whitespace-nowrap ">Air Date</div>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -107,6 +110,9 @@ export default class MonitorListRow extends HTMLTableRowElement {
|
||||
<td class="px-4 py-2">
|
||||
<div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('downloaded-at') ?? "-"}</div>
|
||||
</td>
|
||||
<td class="px-4 py-2">
|
||||
<div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('air-date') ?? "-"}</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
@@ -28,6 +28,9 @@ export default class PreviewContentDialog extends HTMLDialogElement {
|
||||
}
|
||||
|
||||
display({ heading, content }) {
|
||||
if (this.hasAttribute('mdWidth')) {
|
||||
this.style.width = this.getAttribute('mdWidth');
|
||||
}
|
||||
this.setHeading(heading);
|
||||
this.setContent(content);
|
||||
this.showModal();
|
||||
|
||||
@@ -23,7 +23,12 @@ export default class extends Controller {
|
||||
}
|
||||
|
||||
if (null !== content && undefined !== content && "" !== content) {
|
||||
document.dispatchEvent(new CustomEvent('showPreviewContentModal', {detail: {heading: heading, content: content}}))
|
||||
if (['', null, undefined].includes(monitor.getAttribute('parent-id'))) {
|
||||
window.location.href = `/monitors/${monitor.getAttribute('monitor-id')}`;
|
||||
} else {
|
||||
document.dispatchEvent(new CustomEvent('showPreviewContentModal', {detail: {heading: heading, content: content}}))
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
"phpstan/phpdoc-parser": "^2.1",
|
||||
"predis/predis": "^2.4",
|
||||
"runtime/frankenphp-symfony": "^0.2.0",
|
||||
"sentry/sentry-symfony": "^5.6",
|
||||
"spatie/icalendar-generator": "^3.0",
|
||||
"spomky-labs/pwa-bundle": "^1.2",
|
||||
"stof/doctrine-extensions-bundle": "^1.14",
|
||||
@@ -46,6 +47,7 @@
|
||||
"symfony/mailer": "7.3.*",
|
||||
"symfony/mercure-bundle": "^0.3.9",
|
||||
"symfony/messenger": "7.3.*",
|
||||
"symfony/monolog-bundle": "^3.10",
|
||||
"symfony/notifier": "7.3.*",
|
||||
"symfony/ntfy-notifier": "7.3.*",
|
||||
"symfony/object-mapper": "7.3.*",
|
||||
|
||||
605
composer.lock
generated
605
composer.lock
generated
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "c133ccd27ac6a41256bdc69129c16546",
|
||||
"content-hash": "952def2c32d975032ac0061e5aa37319",
|
||||
"packages": [
|
||||
{
|
||||
"name": "1tomany/rich-bundle",
|
||||
@@ -2552,6 +2552,66 @@
|
||||
],
|
||||
"time": "2025-03-27T12:30:47+00:00"
|
||||
},
|
||||
{
|
||||
"name": "jean85/pretty-package-versions",
|
||||
"version": "2.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Jean85/pretty-package-versions.git",
|
||||
"reference": "4d7aa5dab42e2a76d99559706022885de0e18e1a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/4d7aa5dab42e2a76d99559706022885de0e18e1a",
|
||||
"reference": "4d7aa5dab42e2a76d99559706022885de0e18e1a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"composer-runtime-api": "^2.1.0",
|
||||
"php": "^7.4|^8.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"friendsofphp/php-cs-fixer": "^3.2",
|
||||
"jean85/composer-provided-replaced-stub-package": "^1.0",
|
||||
"phpstan/phpstan": "^2.0",
|
||||
"phpunit/phpunit": "^7.5|^8.5|^9.6",
|
||||
"rector/rector": "^2.0",
|
||||
"vimeo/psalm": "^4.3 || ^5.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Jean85\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Alessandro Lai",
|
||||
"email": "alessandro.lai85@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "A library to get pretty versions strings of installed dependencies",
|
||||
"keywords": [
|
||||
"composer",
|
||||
"package",
|
||||
"release",
|
||||
"versions"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/Jean85/pretty-package-versions/issues",
|
||||
"source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.1"
|
||||
},
|
||||
"time": "2025-03-19T14:43:43+00:00"
|
||||
},
|
||||
{
|
||||
"name": "lcobucci/jwt",
|
||||
"version": "5.5.0",
|
||||
@@ -2681,6 +2741,109 @@
|
||||
},
|
||||
"time": "2025-02-06T08:48:15+00:00"
|
||||
},
|
||||
{
|
||||
"name": "monolog/monolog",
|
||||
"version": "3.9.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Seldaek/monolog.git",
|
||||
"reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/10d85740180ecba7896c87e06a166e0c95a0e3b6",
|
||||
"reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=8.1",
|
||||
"psr/log": "^2.0 || ^3.0"
|
||||
},
|
||||
"provide": {
|
||||
"psr/log-implementation": "3.0.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"aws/aws-sdk-php": "^3.0",
|
||||
"doctrine/couchdb": "~1.0@dev",
|
||||
"elasticsearch/elasticsearch": "^7 || ^8",
|
||||
"ext-json": "*",
|
||||
"graylog2/gelf-php": "^1.4.2 || ^2.0",
|
||||
"guzzlehttp/guzzle": "^7.4.5",
|
||||
"guzzlehttp/psr7": "^2.2",
|
||||
"mongodb/mongodb": "^1.8",
|
||||
"php-amqplib/php-amqplib": "~2.4 || ^3",
|
||||
"php-console/php-console": "^3.1.8",
|
||||
"phpstan/phpstan": "^2",
|
||||
"phpstan/phpstan-deprecation-rules": "^2",
|
||||
"phpstan/phpstan-strict-rules": "^2",
|
||||
"phpunit/phpunit": "^10.5.17 || ^11.0.7",
|
||||
"predis/predis": "^1.1 || ^2",
|
||||
"rollbar/rollbar": "^4.0",
|
||||
"ruflin/elastica": "^7 || ^8",
|
||||
"symfony/mailer": "^5.4 || ^6",
|
||||
"symfony/mime": "^5.4 || ^6"
|
||||
},
|
||||
"suggest": {
|
||||
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
|
||||
"doctrine/couchdb": "Allow sending log messages to a CouchDB server",
|
||||
"elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client",
|
||||
"ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
|
||||
"ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler",
|
||||
"ext-mbstring": "Allow to work properly with unicode symbols",
|
||||
"ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)",
|
||||
"ext-openssl": "Required to send log messages using SSL",
|
||||
"ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)",
|
||||
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
|
||||
"mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
|
||||
"php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
|
||||
"rollbar/rollbar": "Allow sending log messages to Rollbar",
|
||||
"ruflin/elastica": "Allow sending log messages to an Elastic Search server"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-main": "3.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Monolog\\": "src/Monolog"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Jordi Boggiano",
|
||||
"email": "j.boggiano@seld.be",
|
||||
"homepage": "https://seld.be"
|
||||
}
|
||||
],
|
||||
"description": "Sends your logs to files, sockets, inboxes, databases and various web services",
|
||||
"homepage": "https://github.com/Seldaek/monolog",
|
||||
"keywords": [
|
||||
"log",
|
||||
"logging",
|
||||
"psr-3"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/Seldaek/monolog/issues",
|
||||
"source": "https://github.com/Seldaek/monolog/tree/3.9.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://github.com/Seldaek",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-03-24T10:02:05+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nesbot/carbon",
|
||||
"version": "3.10.0",
|
||||
@@ -4757,6 +4920,196 @@
|
||||
],
|
||||
"time": "2023-12-12T12:06:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sentry/sentry",
|
||||
"version": "4.17.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/getsentry/sentry-php.git",
|
||||
"reference": "5c696b8de57e841a2bf3b6f6eecfd99acfdda80c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/5c696b8de57e841a2bf3b6f6eecfd99acfdda80c",
|
||||
"reference": "5c696b8de57e841a2bf3b6f6eecfd99acfdda80c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-curl": "*",
|
||||
"ext-json": "*",
|
||||
"ext-mbstring": "*",
|
||||
"guzzlehttp/psr7": "^1.8.4|^2.1.1",
|
||||
"jean85/pretty-package-versions": "^1.5|^2.0.4",
|
||||
"php": "^7.2|^8.0",
|
||||
"psr/log": "^1.0|^2.0|^3.0",
|
||||
"symfony/options-resolver": "^4.4.30|^5.0.11|^6.0|^7.0"
|
||||
},
|
||||
"conflict": {
|
||||
"raven/raven": "*"
|
||||
},
|
||||
"require-dev": {
|
||||
"friendsofphp/php-cs-fixer": "^3.4",
|
||||
"guzzlehttp/promises": "^2.0.3",
|
||||
"guzzlehttp/psr7": "^1.8.4|^2.1.1",
|
||||
"monolog/monolog": "^1.6|^2.0|^3.0",
|
||||
"phpbench/phpbench": "^1.0",
|
||||
"phpstan/phpstan": "^1.3",
|
||||
"phpunit/phpunit": "^8.5|^9.6",
|
||||
"vimeo/psalm": "^4.17"
|
||||
},
|
||||
"suggest": {
|
||||
"monolog/monolog": "Allow sending log messages to Sentry by using the included Monolog handler."
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"files": [
|
||||
"src/functions.php"
|
||||
],
|
||||
"psr-4": {
|
||||
"Sentry\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Sentry",
|
||||
"email": "accounts@sentry.io"
|
||||
}
|
||||
],
|
||||
"description": "PHP SDK for Sentry (http://sentry.io)",
|
||||
"homepage": "http://sentry.io",
|
||||
"keywords": [
|
||||
"crash-reporting",
|
||||
"crash-reports",
|
||||
"error-handler",
|
||||
"error-monitoring",
|
||||
"log",
|
||||
"logging",
|
||||
"profiling",
|
||||
"sentry",
|
||||
"tracing"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/getsentry/sentry-php/issues",
|
||||
"source": "https://github.com/getsentry/sentry-php/tree/4.17.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://sentry.io/",
|
||||
"type": "custom"
|
||||
},
|
||||
{
|
||||
"url": "https://sentry.io/pricing/",
|
||||
"type": "custom"
|
||||
}
|
||||
],
|
||||
"time": "2025-10-23T15:19:24+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sentry/sentry-symfony",
|
||||
"version": "5.6.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/getsentry/sentry-symfony.git",
|
||||
"reference": "9867751f5091b55d7e3a223f48d88e228132e073"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/getsentry/sentry-symfony/zipball/9867751f5091b55d7e3a223f48d88e228132e073",
|
||||
"reference": "9867751f5091b55d7e3a223f48d88e228132e073",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"guzzlehttp/psr7": "^2.1.1",
|
||||
"jean85/pretty-package-versions": "^1.5||^2.0",
|
||||
"php": "^7.2||^8.0",
|
||||
"sentry/sentry": "^4.16.0",
|
||||
"symfony/cache-contracts": "^1.1||^2.4||^3.0",
|
||||
"symfony/config": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/console": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/dependency-injection": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/event-dispatcher": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/http-kernel": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/polyfill-php80": "^1.22",
|
||||
"symfony/psr-http-message-bridge": "^1.2||^2.0||^6.4||^7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/dbal": "^2.13||^3.3||^4.0",
|
||||
"doctrine/doctrine-bundle": "^2.6",
|
||||
"friendsofphp/php-cs-fixer": "^2.19||^3.40",
|
||||
"masterminds/html5": "^2.8",
|
||||
"phpstan/extension-installer": "^1.0",
|
||||
"phpstan/phpstan": "1.12.5",
|
||||
"phpstan/phpstan-phpunit": "1.4.0",
|
||||
"phpstan/phpstan-symfony": "1.4.10",
|
||||
"phpunit/phpunit": "^8.5.40||^9.6.21",
|
||||
"symfony/browser-kit": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/cache": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/dom-crawler": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/framework-bundle": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/http-client": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/messenger": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/monolog-bundle": "^3.4",
|
||||
"symfony/phpunit-bridge": "^5.2.6||^6.0||^7.0",
|
||||
"symfony/process": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/security-core": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/security-http": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/twig-bundle": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"symfony/yaml": "^4.4.20||^5.0.11||^6.0||^7.0",
|
||||
"vimeo/psalm": "^4.3||^5.16.0"
|
||||
},
|
||||
"suggest": {
|
||||
"doctrine/doctrine-bundle": "Allow distributed tracing of database queries using Sentry.",
|
||||
"monolog/monolog": "Allow sending log messages to Sentry by using the included Monolog handler.",
|
||||
"symfony/cache": "Allow distributed tracing of cache pools using Sentry.",
|
||||
"symfony/twig-bundle": "Allow distributed tracing of Twig template rendering using Sentry."
|
||||
},
|
||||
"type": "symfony-bundle",
|
||||
"autoload": {
|
||||
"files": [
|
||||
"src/aliases.php"
|
||||
],
|
||||
"psr-4": {
|
||||
"Sentry\\SentryBundle\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Sentry",
|
||||
"email": "accounts@sentry.io"
|
||||
}
|
||||
],
|
||||
"description": "Symfony integration for Sentry (http://getsentry.com)",
|
||||
"homepage": "http://getsentry.com",
|
||||
"keywords": [
|
||||
"errors",
|
||||
"logging",
|
||||
"sentry",
|
||||
"symfony"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/getsentry/sentry-symfony/issues",
|
||||
"source": "https://github.com/getsentry/sentry-symfony/tree/5.6.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://sentry.io/",
|
||||
"type": "custom"
|
||||
},
|
||||
{
|
||||
"url": "https://sentry.io/pricing/",
|
||||
"type": "custom"
|
||||
}
|
||||
],
|
||||
"time": "2025-09-24T13:41:01+00:00"
|
||||
},
|
||||
{
|
||||
"name": "spatie/icalendar-generator",
|
||||
"version": "3.0.0",
|
||||
@@ -7637,6 +7990,169 @@
|
||||
],
|
||||
"time": "2025-02-19T08:51:26+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/monolog-bridge",
|
||||
"version": "v7.3.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/monolog-bridge.git",
|
||||
"reference": "c66a65049c75f3ddf03d73c8c9ed61405779ce47"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/c66a65049c75f3ddf03d73c8c9ed61405779ce47",
|
||||
"reference": "c66a65049c75f3ddf03d73c8c9ed61405779ce47",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"monolog/monolog": "^3",
|
||||
"php": ">=8.2",
|
||||
"symfony/http-kernel": "^6.4|^7.0",
|
||||
"symfony/service-contracts": "^2.5|^3"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/console": "<6.4",
|
||||
"symfony/http-foundation": "<6.4",
|
||||
"symfony/security-core": "<6.4"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/console": "^6.4|^7.0",
|
||||
"symfony/http-client": "^6.4|^7.0",
|
||||
"symfony/mailer": "^6.4|^7.0",
|
||||
"symfony/messenger": "^6.4|^7.0",
|
||||
"symfony/mime": "^6.4|^7.0",
|
||||
"symfony/security-core": "^6.4|^7.0",
|
||||
"symfony/var-dumper": "^6.4|^7.0"
|
||||
},
|
||||
"type": "symfony-bridge",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Symfony\\Bridge\\Monolog\\": ""
|
||||
},
|
||||
"exclude-from-classmap": [
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
},
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
}
|
||||
],
|
||||
"description": "Provides integration for Monolog with various Symfony components",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/monolog-bridge/tree/v7.3.5"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://symfony.com/sponsor",
|
||||
"type": "custom"
|
||||
},
|
||||
{
|
||||
"url": "https://github.com/fabpot",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://github.com/nicolas-grekas",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-10-14T19:16:15+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/monolog-bundle",
|
||||
"version": "v3.10.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/monolog-bundle.git",
|
||||
"reference": "414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181",
|
||||
"reference": "414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"monolog/monolog": "^1.25.1 || ^2.0 || ^3.0",
|
||||
"php": ">=7.2.5",
|
||||
"symfony/config": "^5.4 || ^6.0 || ^7.0",
|
||||
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
|
||||
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
|
||||
"symfony/monolog-bridge": "^5.4 || ^6.0 || ^7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/console": "^5.4 || ^6.0 || ^7.0",
|
||||
"symfony/phpunit-bridge": "^6.3 || ^7.0",
|
||||
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
|
||||
},
|
||||
"type": "symfony-bundle",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Symfony\\Bundle\\MonologBundle\\": ""
|
||||
},
|
||||
"exclude-from-classmap": [
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
},
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
}
|
||||
],
|
||||
"description": "Symfony MonologBundle",
|
||||
"homepage": "https://symfony.com",
|
||||
"keywords": [
|
||||
"log",
|
||||
"logging"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/symfony/monolog-bundle/issues",
|
||||
"source": "https://github.com/symfony/monolog-bundle/tree/v3.10.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://symfony.com/sponsor",
|
||||
"type": "custom"
|
||||
},
|
||||
{
|
||||
"url": "https://github.com/fabpot",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2023-11-06T17:08:13+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/notifier",
|
||||
"version": "v7.3.0",
|
||||
@@ -8777,6 +9293,89 @@
|
||||
],
|
||||
"time": "2025-04-04T13:12:05+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/psr-http-message-bridge",
|
||||
"version": "v7.3.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/psr-http-message-bridge.git",
|
||||
"reference": "03f2f72319e7acaf2a9f6fcbe30ef17eec51594f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/03f2f72319e7acaf2a9f6fcbe30ef17eec51594f",
|
||||
"reference": "03f2f72319e7acaf2a9f6fcbe30ef17eec51594f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=8.2",
|
||||
"psr/http-message": "^1.0|^2.0",
|
||||
"symfony/http-foundation": "^6.4|^7.0"
|
||||
},
|
||||
"conflict": {
|
||||
"php-http/discovery": "<1.15",
|
||||
"symfony/http-kernel": "<6.4"
|
||||
},
|
||||
"require-dev": {
|
||||
"nyholm/psr7": "^1.1",
|
||||
"php-http/discovery": "^1.15",
|
||||
"psr/log": "^1.1.4|^2|^3",
|
||||
"symfony/browser-kit": "^6.4|^7.0",
|
||||
"symfony/config": "^6.4|^7.0",
|
||||
"symfony/event-dispatcher": "^6.4|^7.0",
|
||||
"symfony/framework-bundle": "^6.4|^7.0",
|
||||
"symfony/http-kernel": "^6.4|^7.0"
|
||||
},
|
||||
"type": "symfony-bridge",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Symfony\\Bridge\\PsrHttpMessage\\": ""
|
||||
},
|
||||
"exclude-from-classmap": [
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
},
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
}
|
||||
],
|
||||
"description": "PSR HTTP message bridge",
|
||||
"homepage": "https://symfony.com",
|
||||
"keywords": [
|
||||
"http",
|
||||
"http-message",
|
||||
"psr-17",
|
||||
"psr-7"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/psr-http-message-bridge/tree/v7.3.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://symfony.com/sponsor",
|
||||
"type": "custom"
|
||||
},
|
||||
{
|
||||
"url": "https://github.com/fabpot",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-09-26T08:57:56+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/routing",
|
||||
"version": "v7.3.0",
|
||||
@@ -13398,7 +13997,7 @@
|
||||
],
|
||||
"aliases": [],
|
||||
"minimum-stability": "stable",
|
||||
"stability-flags": [],
|
||||
"stability-flags": {},
|
||||
"prefer-stable": true,
|
||||
"prefer-lowest": false,
|
||||
"platform": {
|
||||
@@ -13406,7 +14005,7 @@
|
||||
"ext-ctype": "*",
|
||||
"ext-iconv": "*"
|
||||
},
|
||||
"platform-dev": [],
|
||||
"platform-dev": {},
|
||||
"platform-overrides": {
|
||||
"php": "8.4"
|
||||
},
|
||||
|
||||
@@ -23,4 +23,6 @@ return [
|
||||
SymfonyCasts\Bundle\ResetPassword\SymfonyCastsResetPasswordBundle::class => ['all' => true],
|
||||
Drenso\OidcBundle\DrensoOidcBundle::class => ['all' => true],
|
||||
SpomkyLabs\PwaBundle\SpomkyLabsPwaBundle::class => ['all' => true],
|
||||
Sentry\SentryBundle\SentryBundle::class => ['prod' => true],
|
||||
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
|
||||
];
|
||||
|
||||
63
config/packages/monolog.yaml
Normal file
63
config/packages/monolog.yaml
Normal file
@@ -0,0 +1,63 @@
|
||||
monolog:
|
||||
channels:
|
||||
- deprecation # Deprecations are logged in the dedicated "deprecation" channel when it exists
|
||||
|
||||
when@dev:
|
||||
monolog:
|
||||
handlers:
|
||||
main:
|
||||
type: stream
|
||||
path: "%kernel.logs_dir%/%kernel.environment%.log"
|
||||
level: debug
|
||||
channels: ["!event"]
|
||||
# uncomment to get logging in your browser
|
||||
# you may have to allow bigger header sizes in your Web server configuration
|
||||
#firephp:
|
||||
# type: firephp
|
||||
# level: info
|
||||
#chromephp:
|
||||
# type: chromephp
|
||||
# level: info
|
||||
console:
|
||||
type: console
|
||||
process_psr_3_messages: false
|
||||
channels: ["!event", "!doctrine", "!console"]
|
||||
|
||||
when@test:
|
||||
monolog:
|
||||
handlers:
|
||||
main:
|
||||
type: fingers_crossed
|
||||
action_level: error
|
||||
handler: nested
|
||||
excluded_http_codes: [404, 405]
|
||||
channels: ["!event"]
|
||||
nested:
|
||||
type: stream
|
||||
path: "%kernel.logs_dir%/%kernel.environment%.log"
|
||||
level: debug
|
||||
|
||||
when@prod:
|
||||
monolog:
|
||||
handlers:
|
||||
main:
|
||||
type: fingers_crossed
|
||||
action_level: error
|
||||
handler: nested
|
||||
excluded_http_codes: [404, 405]
|
||||
channels: ["!deprecation"]
|
||||
buffer_size: 50 # How many messages should be saved? Prevent memory leaks
|
||||
nested:
|
||||
type: stream
|
||||
path: php://stderr
|
||||
level: debug
|
||||
formatter: monolog.formatter.json
|
||||
console:
|
||||
type: console
|
||||
process_psr_3_messages: false
|
||||
channels: ["!event", "!doctrine"]
|
||||
deprecation:
|
||||
type: stream
|
||||
channels: [deprecation]
|
||||
path: php://stderr
|
||||
formatter: monolog.formatter.json
|
||||
40
config/packages/sentry.yaml
Normal file
40
config/packages/sentry.yaml
Normal file
@@ -0,0 +1,40 @@
|
||||
when@prod:
|
||||
sentry:
|
||||
register_error_listener: true # Disables the ErrorListener to avoid duplicated log in sentry
|
||||
register_error_handler: true # Disables the ErrorListener, ExceptionListener and FatalErrorListener integrations of the base PHP SDK
|
||||
|
||||
options:
|
||||
release: '%app.version%'
|
||||
traces_sample_rate: 1
|
||||
profiles_sample_rate: 1
|
||||
attach_stacktrace: true
|
||||
|
||||
tracing:
|
||||
enabled: true
|
||||
dbal: # DB queries
|
||||
enabled: true
|
||||
cache: # cache pools
|
||||
enabled: true
|
||||
twig: # templating engine
|
||||
enabled: true
|
||||
|
||||
services:
|
||||
# (Optionally) Configure the breadcrumb handler as a service (needed for the breadcrumb Monolog handler)
|
||||
Sentry\Monolog\BreadcrumbHandler:
|
||||
arguments:
|
||||
- '@Sentry\State\HubInterface'
|
||||
- !php/const Monolog\Logger::INFO # Configures the level of messages to capture as breadcrumbs
|
||||
monolog:
|
||||
handlers:
|
||||
# (Optionally) Register the breadcrumb handler as a Monolog handler
|
||||
sentry_breadcrumbs:
|
||||
type: service
|
||||
name: sentry_breadcrumbs
|
||||
id: Sentry\Monolog\BreadcrumbHandler
|
||||
# Register the handler as a Monolog handler to capture messages as events
|
||||
sentry:
|
||||
type: sentry
|
||||
level: !php/const Monolog\Logger::ERROR # Configures the level of messages to capture as events
|
||||
hub_id: Sentry\State\HubInterface
|
||||
fill_extra_context: true # Enables sending monolog context to Sentry
|
||||
process_psr_3_messages: false # Disables the resolution of PSR-3 placeholders in reported messages
|
||||
@@ -10,14 +10,18 @@ FROM alpine:${ALPINE_VERSION} AS build_stage
|
||||
RUN apk add --no-cache \
|
||||
curl \
|
||||
php84 \
|
||||
php84-ctype \
|
||||
php84-curl \
|
||||
php84-dom \
|
||||
php84-fileinfo \
|
||||
php84-fpm \
|
||||
php84-gd \
|
||||
php84-mbstring \
|
||||
php84-mysqli \
|
||||
php84-opcache \
|
||||
php84-openssl \
|
||||
php84-pdo_mysql \
|
||||
php84-tokenizer \
|
||||
php84-xml \
|
||||
supervisor
|
||||
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
# Default to latest, but should pass in a version
|
||||
ARG APP_VERSION="latest"
|
||||
|
||||
# Set aside the actual app image so we can copy the app from there
|
||||
FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION} AS app_image
|
||||
|
||||
# Start with our base worker image
|
||||
FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
|
||||
|
||||
@@ -15,7 +18,7 @@ FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
|
||||
ENV APP_VERSION=${APP_VERSION}
|
||||
|
||||
# Copy the actual application code from the previously built app
|
||||
COPY --chown=1000:1000 ./ /app
|
||||
COPY --chown=1000:1000 --from=app_image /app /app
|
||||
|
||||
# To retain backwards compatibility, default to async & download transports
|
||||
CMD [ "--monitor" ]
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
# Default to latest, but should pass in a version
|
||||
ARG APP_VERSION="latest"
|
||||
|
||||
# Set aside the actual app image so we can copy the app from there
|
||||
FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION} AS app_image
|
||||
|
||||
# Start with our base worker image
|
||||
FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
|
||||
|
||||
@@ -15,7 +18,7 @@ FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
|
||||
ENV APP_VERSION=${APP_VERSION}
|
||||
|
||||
# Copy the actual application code from the previously built app
|
||||
COPY --chown=1000:1000 ./ /app
|
||||
COPY --chown=1000:1000 --from=app_image /app /app
|
||||
|
||||
# To retain backwards compatibility, default to async & download transports
|
||||
CMD [ "--async", "--download" ]
|
||||
|
||||
34
migrations/Version20251106045808.php
Normal file
34
migrations/Version20251106045808.php
Normal file
@@ -0,0 +1,34 @@
|
||||
<?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 Version20251106045808 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return '';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql(<<<'SQL'
|
||||
ALTER TABLE monitor ADD poster VARCHAR(1024) DEFAULT 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 monitor DROP poster
|
||||
SQL);
|
||||
}
|
||||
}
|
||||
@@ -168,6 +168,37 @@ class MediaFiles
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $tvshowTitle
|
||||
* @return array<SplFileInfo>|false
|
||||
*/
|
||||
public function tvshowExists(string $tvshowTitle): Map|false
|
||||
{
|
||||
$existingEpisodes = $this->getEpisodes($tvshowTitle, false);
|
||||
|
||||
if ($existingEpisodes->isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$episodes = new Map;
|
||||
/** @var SplFileInfo $episode */
|
||||
foreach ($existingEpisodes as $episode) {
|
||||
$ptn = (object) (new PTN())->parse($episode->getFilename());
|
||||
|
||||
if (!property_exists($ptn, 'season') || !property_exists($ptn, 'episode')) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$episodes->push($episode);
|
||||
}
|
||||
|
||||
if ($episodes->count() > 0) {
|
||||
return $episodes;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public function movieExists(string $title)
|
||||
{
|
||||
$filepath = $this->moviesPath . DIRECTORY_SEPARATOR . $title;
|
||||
|
||||
@@ -33,7 +33,6 @@ class Paginator
|
||||
public function paginate($query, int $page = 1, int $limit = 5): Paginator
|
||||
{
|
||||
$paginator = new OrmPaginator($query);
|
||||
|
||||
$paginator
|
||||
->getQuery()
|
||||
->setFirstResult($limit * ($page - 1))
|
||||
|
||||
20
src/Library/Action/Command/GetMediaFromLibraryCommand.php
Normal file
20
src/Library/Action/Command/GetMediaFromLibraryCommand.php
Normal file
@@ -0,0 +1,20 @@
|
||||
<?php
|
||||
|
||||
namespace App\Library\Action\Command;
|
||||
|
||||
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||
|
||||
/**
|
||||
* @implements CommandInterface<GetMediaFromLibraryCommand>
|
||||
*/
|
||||
class GetMediaFromLibraryCommand implements CommandInterface
|
||||
{
|
||||
public function __construct(
|
||||
public ?int $userId = null,
|
||||
public ?string $mediaType = null,
|
||||
public ?string $imdbId = null,
|
||||
public ?string $title = null,
|
||||
public ?string $season = null,
|
||||
public ?string $episode = null,
|
||||
) {}
|
||||
}
|
||||
169
src/Library/Action/Handler/GetMediaInfoFromLibraryHandler.php
Normal file
169
src/Library/Action/Handler/GetMediaInfoFromLibraryHandler.php
Normal file
@@ -0,0 +1,169 @@
|
||||
<?php
|
||||
|
||||
namespace App\Library\Action\Handler;
|
||||
|
||||
use Aimeos\Map;
|
||||
use App\Base\Enum\MediaType;
|
||||
use App\Base\Service\MediaFiles;
|
||||
use App\Base\Util\PTN;
|
||||
use App\Library\Action\Command\GetMediaFromLibraryCommand;
|
||||
use App\Library\Action\Result\GetMediaFromLibraryResult;
|
||||
use App\Monitor\Framework\Repository\MonitorRepository;
|
||||
use App\Tmdb\TmdbClient;
|
||||
use App\Tmdb\TmdbResult;
|
||||
use OneToMany\RichBundle\Contract\CommandInterface as C;
|
||||
use OneToMany\RichBundle\Contract\HandlerInterface;
|
||||
use OneToMany\RichBundle\Contract\ResultInterface as R;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
/**
|
||||
* @implements HandlerInterface<GetMediaFromLibraryCommand,GetMediaFromLibraryResult>
|
||||
*/
|
||||
class GetMediaInfoFromLibraryHandler implements HandlerInterface
|
||||
{
|
||||
public function __construct(
|
||||
private readonly TmdbClient $tmdb,
|
||||
private readonly MediaFiles $mediaFiles,
|
||||
private readonly LoggerInterface $logger,
|
||||
private readonly MonitorRepository $monitorRepository,
|
||||
) {}
|
||||
|
||||
public function handle(C $command): R
|
||||
{
|
||||
$result = new GetMediaFromLibraryResult();
|
||||
$tmdbResult = $this->fetchTmdbData($command->imdbId, $command->mediaType);
|
||||
|
||||
if (null === $tmdbResult) {
|
||||
$this->logger->warning('[GetMediaInfoFromLibraryHandler] TMDb result was not found, this may lead to issues in the rest of the library search', (array) $command);
|
||||
}
|
||||
|
||||
$this->setResultExists($tmdbResult->mediaType, $tmdbResult->title, $result);
|
||||
if ($result->notExists()) {
|
||||
return $result;
|
||||
}
|
||||
|
||||
$this->parseFromTmdbResult($tmdbResult, $result);
|
||||
|
||||
if ($command->mediaType === MediaType::TvShow->value) {
|
||||
$this->setEpisodes($tmdbResult, $result);
|
||||
$this->setSeasons($tmdbResult, $result);
|
||||
$this->setMonitors($command->userId, $command->imdbId, $result);
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
private function fetchTmdbData(string $imdbId, string $mediaType): ?TmdbResult
|
||||
{
|
||||
return match($mediaType) {
|
||||
MediaType::Movie->value => $this->tmdb->movieDetails($imdbId),
|
||||
MediaType::TvShow->value => $this->tmdb->tvShowDetails($imdbId),
|
||||
default => null,
|
||||
};
|
||||
}
|
||||
|
||||
private function setResultExists(string $mediaType, string $title, GetMediaFromLibraryResult $result): void
|
||||
{
|
||||
$fsResult = match($mediaType) {
|
||||
MediaType::Movie->value => $this->mediaFiles->movieExists($title),
|
||||
MediaType::TvShow->value => $this->mediaFiles->tvShowExists($title),
|
||||
default => false,
|
||||
};
|
||||
if (false === $fsResult) {
|
||||
$result->setExists(false);
|
||||
} else {
|
||||
$result->setExists(true);
|
||||
}
|
||||
}
|
||||
|
||||
public function parseFromTmdbResult(TmdbResult $tmdbResult, GetMediaFromLibraryResult $result): void
|
||||
{
|
||||
$result->setTitle($tmdbResult->title);
|
||||
$result->setMediaType($tmdbResult->mediaType);
|
||||
$result->setImdbId($tmdbResult->imdbId);
|
||||
}
|
||||
|
||||
public function setEpisodes(TmdbResult $tmdbResult, GetMediaFromLibraryResult $result): void
|
||||
{
|
||||
$existingEpisodeFiles = $this->mediaFiles->tvshowExists($tmdbResult->title);
|
||||
|
||||
$existingEpisodeMap = [];
|
||||
foreach ($existingEpisodeFiles as $file) {
|
||||
/** @var \SplFileInfo $file */
|
||||
$ptn = (object) new PTN()->parse($file->getBasename());
|
||||
|
||||
if (!array_key_exists($ptn->season, $existingEpisodeMap)) {
|
||||
$existingEpisodeMap[$ptn->season] = [];
|
||||
}
|
||||
|
||||
if (!in_array($ptn->episode, $existingEpisodeMap[$ptn->season])) {
|
||||
$existingEpisodeMap[$ptn->season][] = $ptn->episode;
|
||||
}
|
||||
}
|
||||
|
||||
$existingEpisodes = [];
|
||||
$missingEpisodes = [];
|
||||
foreach ($tmdbResult->episodes as $season => $episodes) {
|
||||
foreach ($episodes as $episode) {
|
||||
if (array_key_exists($season, $existingEpisodeMap)) {
|
||||
if (in_array($episode->episodeNumber, $existingEpisodeMap[$season])) {
|
||||
$existingEpisodes[] = $episode;
|
||||
} else {
|
||||
$missingEpisodes[] = $episode;
|
||||
}
|
||||
} else {
|
||||
$missingEpisodes[] = $episode;
|
||||
}
|
||||
}
|
||||
}
|
||||
$result->setEpisodes($existingEpisodes);
|
||||
$result->setMissingEpisodes($missingEpisodes);
|
||||
}
|
||||
|
||||
public function setSeasons(TmdbResult $tmdbResult, GetMediaFromLibraryResult $result): void
|
||||
{
|
||||
$existingEpisodeFiles = $this->mediaFiles->tvshowExists($tmdbResult->title);
|
||||
|
||||
$existingEpisodeMap = [];
|
||||
foreach ($existingEpisodeFiles as $file) {
|
||||
/** @var \SplFileInfo $file */
|
||||
$ptn = (object) new PTN()->parse($file->getBasename());
|
||||
$existingEpisodeMap[$ptn->season][] = $ptn->episode;
|
||||
}
|
||||
|
||||
$existingFullSeasons = [];
|
||||
$existingPartialSeasons = [];
|
||||
$missingSeasons = [];
|
||||
foreach ($existingEpisodeMap as $season => $episodes) {
|
||||
if (count($tmdbResult->episodes[$season]) === count($episodes)) {
|
||||
$existingFullSeasons[] = $season;
|
||||
} elseif (count($episodes) > 0) {
|
||||
$existingPartialSeasons[] = $season;
|
||||
}
|
||||
}
|
||||
|
||||
$seasons = array_keys($tmdbResult->episodes);
|
||||
foreach ($seasons as $season) {
|
||||
if (!in_array($season, $existingFullSeasons) && !in_array($season, $existingPartialSeasons)) {
|
||||
$missingSeasons[] = $season;
|
||||
}
|
||||
}
|
||||
|
||||
$result->setSeasons($existingFullSeasons);
|
||||
$result->setPartialSeasons($existingPartialSeasons);
|
||||
$result->setMissingSeasons($missingSeasons);
|
||||
}
|
||||
|
||||
public function setMonitors(int $userId, string $imdbId, GetMediaFromLibraryResult $result)
|
||||
{
|
||||
$result->setMonitorCount(
|
||||
$this->monitorRepository->countUserChildrenByParentId($userId, $imdbId)
|
||||
);
|
||||
$result->setActiveMonitorCount(
|
||||
$this->monitorRepository->countUserActiveChildrenByParentId($userId, $imdbId)
|
||||
);
|
||||
$result->setCompleteMonitorCount(
|
||||
$this->monitorRepository->countUserCompleteChildrenByParentId($userId, $imdbId)
|
||||
);
|
||||
}
|
||||
}
|
||||
39
src/Library/Action/Input/GetMediaInfoFromLibraryInput.php
Normal file
39
src/Library/Action/Input/GetMediaInfoFromLibraryInput.php
Normal file
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
|
||||
namespace App\Library\Action\Input;
|
||||
|
||||
use App\Library\Action\Command\GetMediaFromLibraryCommand;
|
||||
use OneToMany\RichBundle\Attribute\SourceRequest;
|
||||
use OneToMany\RichBundle\Contract\CommandInterface as C;
|
||||
use OneToMany\RichBundle\Contract\InputInterface;
|
||||
|
||||
/**
|
||||
* @implements InputInterface<GetMediaInfoFromLibraryInput, GetMediaFromLibraryCommand>
|
||||
*/
|
||||
class GetMediaInfoFromLibraryInput implements InputInterface
|
||||
{
|
||||
public function __construct(
|
||||
#[SourceRequest('imdbId', nullify: true)]
|
||||
public ?string $imdbId = null,
|
||||
#[SourceRequest('title', nullify: true)]
|
||||
public ?string $title = null,
|
||||
#[SourceRequest('season', nullify: true)]
|
||||
public ?string $season = null,
|
||||
#[SourceRequest('episode', nullify: true)]
|
||||
public ?string $episode = null,
|
||||
) {}
|
||||
|
||||
public function toCommand(): C
|
||||
{
|
||||
if (null === $this->imdbId && null === $this->title) {
|
||||
throw new \InvalidArgumentException('Either imdbId or title must be set', 400);
|
||||
}
|
||||
|
||||
return new GetMediaFromLibraryCommand(
|
||||
imdbId: $this->imdbId,
|
||||
title: $this->title,
|
||||
season: $this->season,
|
||||
episode: $this->episode,
|
||||
);
|
||||
}
|
||||
}
|
||||
171
src/Library/Action/Result/GetMediaFromLibraryResult.php
Normal file
171
src/Library/Action/Result/GetMediaFromLibraryResult.php
Normal file
@@ -0,0 +1,171 @@
|
||||
<?php
|
||||
|
||||
namespace App\Library\Action\Result;
|
||||
|
||||
use OneToMany\RichBundle\Contract\ResultInterface;
|
||||
|
||||
class GetMediaFromLibraryResult implements ResultInterface
|
||||
{
|
||||
private bool $exists;
|
||||
private ?string $title = null;
|
||||
private ?string $imdbId = null;
|
||||
private ?string $mediaType = null;
|
||||
private ?array $episodes = null;
|
||||
private ?array $missingEpisodes = null;
|
||||
private ?array $seasons = null;
|
||||
private ?array $partialSeasons = null;
|
||||
private ?array $missingSeasons = null;
|
||||
private ?int $monitorCount = null; // Monitor Repo
|
||||
private ?int $activeMonitorCount = null; // Monitor Repo
|
||||
private ?int $completeMonitorCount = null; // Monitor Repo
|
||||
|
||||
public function exists(): bool
|
||||
{
|
||||
return $this->exists;
|
||||
}
|
||||
|
||||
public function notExists(): bool
|
||||
{
|
||||
return !$this->exists;
|
||||
}
|
||||
|
||||
public function setExists(bool $exists): void
|
||||
{
|
||||
$this->exists = $exists;
|
||||
}
|
||||
|
||||
public function getTitle(): ?string
|
||||
{
|
||||
return $this->title;
|
||||
}
|
||||
|
||||
public function setTitle(?string $title): void
|
||||
{
|
||||
$this->title = $title;
|
||||
}
|
||||
|
||||
public function getImdbId(): ?string
|
||||
{
|
||||
return $this->imdbId;
|
||||
}
|
||||
|
||||
public function setImdbId(?string $imdbId): void
|
||||
{
|
||||
$this->imdbId = $imdbId;
|
||||
}
|
||||
|
||||
public function getMediaType(): ?string
|
||||
{
|
||||
return $this->mediaType;
|
||||
}
|
||||
|
||||
public function setMediaType(?string $mediaType): void
|
||||
{
|
||||
$this->mediaType = $mediaType;
|
||||
}
|
||||
|
||||
public function getEpisodes(): ?array
|
||||
{
|
||||
return $this->episodes;
|
||||
}
|
||||
|
||||
public function setEpisodes(?array $episodes): void
|
||||
{
|
||||
$this->episodes = $episodes;
|
||||
}
|
||||
|
||||
public function getEpisodeCount(): ?int
|
||||
{
|
||||
return count($this->episodes);
|
||||
}
|
||||
|
||||
public function getMissingEpisodes(): ?array
|
||||
{
|
||||
return $this->missingEpisodes;
|
||||
}
|
||||
|
||||
public function setMissingEpisodes(?array $missingEpisodes): void
|
||||
{
|
||||
$this->missingEpisodes = $missingEpisodes;
|
||||
}
|
||||
|
||||
public function getMissingEpisodeCount(): ?int
|
||||
{
|
||||
return count($this->missingEpisodes);
|
||||
}
|
||||
|
||||
public function getSeasons(): ?array
|
||||
{
|
||||
return $this->seasons;
|
||||
}
|
||||
|
||||
public function setSeasons(?array $seasons): void
|
||||
{
|
||||
$this->seasons = $seasons;
|
||||
}
|
||||
|
||||
public function getSeasonCount(): ?int
|
||||
{
|
||||
return count($this->seasons);
|
||||
}
|
||||
|
||||
public function getPartialSeasons(): ?array
|
||||
{
|
||||
return $this->partialSeasons;
|
||||
}
|
||||
|
||||
public function setPartialSeasons(?array $partialSeasons): void
|
||||
{
|
||||
$this->partialSeasons = $partialSeasons;
|
||||
}
|
||||
|
||||
public function getPartialSeasonCount(): ?int
|
||||
{
|
||||
return count($this->partialSeasons);
|
||||
}
|
||||
|
||||
public function getMissingSeasons(): ?array
|
||||
{
|
||||
return $this->missingSeasons;
|
||||
}
|
||||
|
||||
public function setMissingSeasons(?array $missingSeasons): void
|
||||
{
|
||||
$this->missingSeasons = $missingSeasons;
|
||||
}
|
||||
|
||||
public function getMissingSeasonCount(): ?int
|
||||
{
|
||||
return count($this->missingSeasons);
|
||||
}
|
||||
|
||||
public function getMonitorCount(): ?int
|
||||
{
|
||||
return $this->monitorCount;
|
||||
}
|
||||
|
||||
public function setMonitorCount(?int $monitorCount): void
|
||||
{
|
||||
$this->monitorCount = $monitorCount;
|
||||
}
|
||||
|
||||
public function getActiveMonitorCount(): ?int
|
||||
{
|
||||
return $this->activeMonitorCount;
|
||||
}
|
||||
|
||||
public function setActiveMonitorCount(?int $activeMonitorCount): void
|
||||
{
|
||||
$this->activeMonitorCount = $activeMonitorCount;
|
||||
}
|
||||
|
||||
public function getCompleteMonitorCount(): ?int
|
||||
{
|
||||
return $this->completeMonitorCount;
|
||||
}
|
||||
|
||||
public function setCompleteMonitorCount(?int $completeMonitorCount): void
|
||||
{
|
||||
$this->completeMonitorCount = $completeMonitorCount;
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ use App\Monitor\Action\Result\AddMonitorResult;
|
||||
use App\Monitor\Framework\Entity\Monitor;
|
||||
use App\Monitor\Framework\Repository\MonitorRepository;
|
||||
use App\Monitor\MonitorEvents;
|
||||
use App\Tmdb\TmdbClient;
|
||||
use App\User\Framework\Repository\UserRepository;
|
||||
use DateTimeImmutable;
|
||||
use OneToMany\RichBundle\Contract\CommandInterface;
|
||||
@@ -22,13 +23,17 @@ readonly class AddMonitorHandler implements HandlerInterface
|
||||
private MessageBusInterface $bus,
|
||||
private MonitorRepository $movieMonitorRepository,
|
||||
private UserRepository $userRepository,
|
||||
private TmdbClient $tmdb,
|
||||
) {}
|
||||
|
||||
public function handle(CommandInterface $command): ResultInterface
|
||||
{
|
||||
$user = $this->userRepository->find($command->userId);
|
||||
$poster = $this->getPoster($command->imdbId);
|
||||
|
||||
$monitor = (new Monitor())
|
||||
->setUser($user)
|
||||
->setPoster($poster)
|
||||
->setTmdbId($command->tmdbId)
|
||||
->setImdbId($command->imdbId)
|
||||
->setTitle($command->title)
|
||||
@@ -56,4 +61,10 @@ readonly class AddMonitorHandler implements HandlerInterface
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
private function getPoster(string $imdbId): ?string
|
||||
{
|
||||
$data = $this->tmdb->tvShowDetails($imdbId);
|
||||
return $data->poster;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ use App\Download\Framework\Repository\DownloadRepository;
|
||||
use App\EventLog\Action\Command\AddEventLogCommand;
|
||||
use App\Monitor\Action\Command\MonitorMovieCommand;
|
||||
use App\Monitor\Action\Result\MonitorTvEpisodeResult;
|
||||
use App\Monitor\Framework\Entity\Monitor;
|
||||
use App\Monitor\Framework\Repository\MonitorRepository;
|
||||
use App\Monitor\MonitorEvents;
|
||||
use App\Tmdb\TmdbClient;
|
||||
@@ -43,6 +44,7 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
|
||||
try {
|
||||
$monitor = $this->monitorRepository->find($command->movieMonitorId);
|
||||
$this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler for ' . $monitor->getTitle() . ' season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode());
|
||||
$this->refreshData($monitor);
|
||||
|
||||
$this->bus->dispatch(new AddEventLogCommand(
|
||||
$monitor->getUser(),
|
||||
@@ -151,4 +153,15 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
private function refreshData(Monitor $monitor)
|
||||
{
|
||||
if (null === $monitor->getPoster()) {
|
||||
$this->logger->info('> [MonitorTvEpisodeHandler] Refreshing poster for "' . $monitor->getTitle() . '"');
|
||||
$poster = $monitor->getParent()->getPoster();
|
||||
if (null !== $poster && "" !== $poster) {
|
||||
$monitor->setPoster($poster);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,6 +37,7 @@ readonly class MonitorTvShowHandler implements HandlerInterface
|
||||
{
|
||||
$this->logger->info('> [MonitorTvShowHandler] Executing MonitorTvShowHandler');
|
||||
$monitor = $this->monitorRepository->find($command->monitorId);
|
||||
$this->refreshData($monitor);
|
||||
|
||||
// Check current episodes
|
||||
$downloadedEpisodes = $this->mediaFiles
|
||||
@@ -157,4 +158,15 @@ readonly class MonitorTvShowHandler implements HandlerInterface
|
||||
'status' => ['New', 'Active', 'In Progress']
|
||||
]) !== null;
|
||||
}
|
||||
|
||||
private function refreshData(Monitor $monitor)
|
||||
{
|
||||
if (null === $monitor->getPoster()) {
|
||||
$this->logger->info('> [MonitorTvShowHandler] Refreshing poster for "' . $monitor->getTitle() . '"');
|
||||
$poster = $this->tmdb->tvshowDetails($monitor->getImdbId())->poster;
|
||||
if (null !== $poster && "" !== $poster) {
|
||||
$monitor->setPoster($poster);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,6 +98,7 @@ class ApiController extends AbstractController
|
||||
'allDay' => true,
|
||||
'backgroundColor' => $eventColors[$monitor->getImdbId()],
|
||||
'borderColor' => $eventColors[$monitor->getImdbId()],
|
||||
'attachment' => $monitor->getPoster(),
|
||||
];
|
||||
});
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Monitor\Framework\Controller;
|
||||
|
||||
use Aimeos\Map;
|
||||
use App\Monitor\Framework\Entity\Monitor;
|
||||
use App\Monitor\Framework\Repository\MonitorRepository;
|
||||
use App\User\Framework\Entity\User;
|
||||
use Spatie\IcalendarGenerator\Components\Calendar;
|
||||
@@ -27,9 +28,10 @@ class CalendarController extends AbstractController
|
||||
->refreshInterval(10);
|
||||
|
||||
$monitors = $monitorRepository->whereAirDateNotNull();
|
||||
$calendar->event(Map::from($monitors)->map(function ($monitor) {
|
||||
$calendar->event(Map::from($monitors)->map(function (Monitor $monitor) {
|
||||
return new Event($monitor->getTitle())
|
||||
->startsAt($monitor->getAirDate())
|
||||
->attachment($monitor->getPoster())
|
||||
->fullDay();
|
||||
})->toArray());
|
||||
|
||||
|
||||
@@ -3,11 +3,17 @@
|
||||
namespace App\Monitor\Framework\Controller;
|
||||
|
||||
use App\Download\Action\Input\DeleteDownloadInput;
|
||||
use App\Library\Action\Command\GetMediaFromLibraryCommand;
|
||||
use App\Library\Action\Handler\GetMediaInfoFromLibraryHandler;
|
||||
use App\Monitor\Action\Handler\AddMonitorHandler;
|
||||
use App\Monitor\Action\Handler\DeleteMonitorHandler;
|
||||
use App\Monitor\Action\Input\AddMonitorInput;
|
||||
use App\Monitor\Action\Input\DeleteMonitorInput;
|
||||
use App\Monitor\Framework\Entity\Monitor;
|
||||
use App\Monitor\Framework\Repository\MonitorRepository;
|
||||
use App\Search\Action\Command\GetMediaInfoCommand;
|
||||
use App\Search\Action\Handler\GetMediaInfoHandler;
|
||||
use App\Tmdb\TmdbClient;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Bundle\SecurityBundle\Security;
|
||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||
@@ -34,4 +40,29 @@ class WebController extends AbstractController
|
||||
{
|
||||
return $this->render('monitor/upcoming-episodes.html.twig');
|
||||
}
|
||||
|
||||
#[Route('/monitors/{id}', name: 'app.monitor.view', methods: ['GET'])]
|
||||
public function viewMonitor(Monitor $monitor, GetMediaInfoHandler $getMediaInfoHandler, GetMediaInfoFromLibraryHandler $handler)
|
||||
{
|
||||
$media = $getMediaInfoHandler->handle(
|
||||
new GetMediaInfoCommand(
|
||||
imdbId: $monitor->getImdbId(),
|
||||
mediaType: 'tvshows',
|
||||
)
|
||||
);
|
||||
$libraryResult = $handler->handle(
|
||||
new GetMediaFromLibraryCommand(
|
||||
$this->getUser()->getId(),
|
||||
$media->media->mediaType,
|
||||
$media->media->imdbId,
|
||||
$media->media->title,
|
||||
)
|
||||
);
|
||||
|
||||
return $this->render('monitor/view.html.twig', [
|
||||
'monitor' => $monitor,
|
||||
'results' => $media,
|
||||
'library' => $libraryResult
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,6 +50,9 @@ class Monitor
|
||||
#[ORM\Column(nullable: true)]
|
||||
private ?int $searchCount = null;
|
||||
|
||||
#[ORM\Column(nullable: true)]
|
||||
private ?string $poster = null;
|
||||
|
||||
#[ORM\Column]
|
||||
private bool $onlyFuture = true;
|
||||
|
||||
@@ -230,6 +233,17 @@ class Monitor
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getPoster(): ?string
|
||||
{
|
||||
return $this->poster;
|
||||
}
|
||||
|
||||
public function setPoster(?string $poster): ?self
|
||||
{
|
||||
$this->poster = $poster;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getParent(): ?self
|
||||
{
|
||||
return $this->parent;
|
||||
|
||||
@@ -41,4 +41,83 @@ class MonitorRepository extends ServiceEntityRepository
|
||||
->getQuery();
|
||||
return $query->getResult();
|
||||
}
|
||||
|
||||
public function getActiveUserMonitors()
|
||||
{
|
||||
return $this->asPaginator($this->monitorRepository->createQueryBuilder('m')
|
||||
->andWhere('m.status IN (:statuses)')
|
||||
->andWhere('(m.title LIKE :term OR m.imdbId LIKE :term OR m.monitorType LIKE :term OR m.status LIKE :term)')
|
||||
->andWhere('m.parent IS NULL')
|
||||
->setParameter('statuses', ['New', 'In Progress', 'Active'])
|
||||
->setParameter('term', '%'.$this->term.'%')
|
||||
->orderBy('m.id', 'DESC')
|
||||
->getQuery()
|
||||
);
|
||||
}
|
||||
|
||||
public function getChildMonitorsByParentId(int $parentId)
|
||||
{
|
||||
return $this->asPaginator(
|
||||
$this->monitorRepository->createQueryBuilder('m')
|
||||
->andWhere("m.parent = :parentId")
|
||||
->setParameter('parentId', $parentId)
|
||||
->orderBy('m.id', 'DESC')
|
||||
->getQuery()
|
||||
);
|
||||
}
|
||||
|
||||
public function getCompleteUserMonitors()
|
||||
{
|
||||
return $this->asPaginator($this->monitorRepository->createQueryBuilder('m')
|
||||
->andWhere('m.status = :status')
|
||||
->andWhere('(m.title LIKE :term OR m.imdbId LIKE :term OR m.monitorType LIKE :term OR m.status LIKE :term)')
|
||||
->setParameter('status', 'Complete')
|
||||
->setParameter('term', '%'.$this->term.'%')
|
||||
->orderBy('m.id', 'DESC')
|
||||
->getQuery()
|
||||
);
|
||||
}
|
||||
|
||||
public function countUserChildrenByParentId(int $userId, string $imdbId): ?int
|
||||
{
|
||||
return $this->createQueryBuilder('m')
|
||||
->select('COUNT(m.id)')
|
||||
->andWhere('m.user = :user')
|
||||
->andWhere('m.imdbId = :imdbId')
|
||||
->setParameter('user', $userId)
|
||||
->setParameter('imdbId', $imdbId)
|
||||
->getQuery()
|
||||
->getSingleScalarResult()
|
||||
;
|
||||
}
|
||||
|
||||
public function countUserActiveChildrenByParentId(int $userId, string $imdbId): ?int
|
||||
{
|
||||
return $this->createQueryBuilder('m')
|
||||
->select('COUNT(m.id)')
|
||||
->andWhere('m.user = :user')
|
||||
->andWhere('m.imdbId = :imdbId')
|
||||
->andWhere('m.status IN (:statuses)')
|
||||
->setParameter('user', $userId)
|
||||
->setParameter('statuses', ['Active', 'New', 'In Progress'])
|
||||
->setParameter('imdbId', $imdbId)
|
||||
->getQuery()
|
||||
->getSingleScalarResult()
|
||||
;
|
||||
}
|
||||
|
||||
public function countUserCompleteChildrenByParentId(int $userId, string $imdbId): ?int
|
||||
{
|
||||
return $this->createQueryBuilder('m')
|
||||
->select('COUNT(m.id)')
|
||||
->andWhere('m.user = :user')
|
||||
->andWhere('m.imdbId = :imdbId')
|
||||
->andWhere('m.status IN (:statuses)')
|
||||
->setParameter('user', $userId)
|
||||
->setParameter('statuses', ['Complete'])
|
||||
->setParameter('imdbId', $imdbId)
|
||||
->getQuery()
|
||||
->getSingleScalarResult()
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,11 +17,14 @@ final class MonitorList extends AbstractController
|
||||
|
||||
use PaginateTrait;
|
||||
|
||||
#[LiveProp(writable: true)]
|
||||
public ?int $parentMonitorId = null;
|
||||
|
||||
#[LiveProp(writable: true)]
|
||||
public string $term = "";
|
||||
|
||||
#[LiveProp(writable: true)]
|
||||
public string $type;
|
||||
public string $type = "";
|
||||
|
||||
#[LiveProp(writable: true)]
|
||||
public bool $isWidget = true;
|
||||
@@ -33,7 +36,9 @@ final class MonitorList extends AbstractController
|
||||
#[LiveAction]
|
||||
public function getMonitors()
|
||||
{
|
||||
if ($this->type === "active") {
|
||||
if (null !== $this->parentMonitorId) {
|
||||
return $this->getChildMonitorsByParentId($this->parentMonitorId);
|
||||
} elseif ($this->type === "active") {
|
||||
return $this->getActiveUserMonitors();
|
||||
} elseif ($this->type === "complete") {
|
||||
return $this->getCompleteUserMonitors();
|
||||
@@ -48,6 +53,7 @@ final class MonitorList extends AbstractController
|
||||
return $this->asPaginator($this->monitorRepository->createQueryBuilder('m')
|
||||
->andWhere('m.status IN (:statuses)')
|
||||
->andWhere('(m.title LIKE :term OR m.imdbId LIKE :term OR m.monitorType LIKE :term OR m.status LIKE :term)')
|
||||
->andWhere('m.parent IS NULL')
|
||||
->setParameter('statuses', ['New', 'In Progress', 'Active'])
|
||||
->setParameter('term', '%'.$this->term.'%')
|
||||
->orderBy('m.id', 'DESC')
|
||||
@@ -67,4 +73,16 @@ final class MonitorList extends AbstractController
|
||||
->getQuery()
|
||||
);
|
||||
}
|
||||
|
||||
#[LiveAction]
|
||||
public function getChildMonitorsByParentId(int $parentId)
|
||||
{
|
||||
return $this->asPaginator(
|
||||
$this->monitorRepository->createQueryBuilder('m')
|
||||
->andWhere("m.parent = :parentId")
|
||||
->setParameter('parentId', $parentId)
|
||||
->orderBy('m.id', 'DESC')
|
||||
->getQuery()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
24
symfony.lock
24
symfony.lock
@@ -101,6 +101,18 @@
|
||||
"bin/phpunit"
|
||||
]
|
||||
},
|
||||
"sentry/sentry-symfony": {
|
||||
"version": "5.6",
|
||||
"recipe": {
|
||||
"repo": "github.com/symfony/recipes-contrib",
|
||||
"branch": "main",
|
||||
"version": "5.0",
|
||||
"ref": "b6cb4b34429dadecd7187852123be19d628fa37a"
|
||||
},
|
||||
"files": [
|
||||
"config/packages/sentry.yaml"
|
||||
]
|
||||
},
|
||||
"spomky-labs/pwa-bundle": {
|
||||
"version": "1.2.5"
|
||||
},
|
||||
@@ -232,6 +244,18 @@
|
||||
"config/packages/messenger.yaml"
|
||||
]
|
||||
},
|
||||
"symfony/monolog-bundle": {
|
||||
"version": "3.10",
|
||||
"recipe": {
|
||||
"repo": "github.com/symfony/recipes",
|
||||
"branch": "main",
|
||||
"version": "3.7",
|
||||
"ref": "f5f5f3e4c23f5349796b7de587f19c51e7104299"
|
||||
},
|
||||
"files": [
|
||||
"config/packages/monolog.yaml"
|
||||
]
|
||||
},
|
||||
"symfony/notifier": {
|
||||
"version": "7.3",
|
||||
"recipe": {
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
{% extends 'bare.html.twig' %}
|
||||
|
||||
{% block body %}
|
||||
<h2 class="px-4 py-4 text-3xl font-extrabold text-orange-500">{{ }}</h2>
|
||||
<h2 class="px-4 py-4 text-3xl font-extrabold text-orange-500">500</h2>
|
||||
<div class="flex flex-col bg-orange-500/50 p-4 rounded-lg gap-4 w-full md:w-[420px] border-orange-500 border-2 text-gray-50 animate-fade">
|
||||
<div class="flex flex-col m-0 text-center">
|
||||
<h3 class="text-2xl text-bold text-center text-gray-50">Oh crap!</h3>
|
||||
<small>(or is it?)</small>
|
||||
</div>
|
||||
<p class="mb-2">There are many things I'm capable of, but this ain't one of 'em!</p>
|
||||
<pre class="bg-gray-800 text-white p-4 rounded-md overflow-x-auto">
|
||||
|
||||
@@ -17,10 +17,17 @@
|
||||
class="px-6 py-3 text-start">
|
||||
ID
|
||||
</th>
|
||||
{% if null != parentMonitorId %}
|
||||
<th scope="col"
|
||||
class="hidden md:table-cell px-6 py-3 text-start">
|
||||
Search Count
|
||||
</th>
|
||||
{% else %}
|
||||
<th scope="col"
|
||||
class="hidden md:table-cell px-6 py-3 text-start">
|
||||
Episodes
|
||||
</th>
|
||||
{% endif %}
|
||||
<th scope="col"
|
||||
class="hidden md:table-cell px-6 py-3 text-start">
|
||||
Created at
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
<tr{{ attributes }} is="monitor-list-row" id="monitor_{{ monitor.id }}" class="dark:bg-gray-800 hover:bg-gray-200 dark:hover:bg-gray-900"
|
||||
<tr{{ attributes }} is="monitor-list-row" id="monitor_{{ monitor.id }}" class="dark:bg-gray-800 hover:bg-gray-200 dark:hover:bg-gray-900 cursor-pointer"
|
||||
monitor-id="{{ monitor.id }}"
|
||||
parent-id="{{ monitor.parent.id ?? null }}"
|
||||
imdb-id="{{ monitor.imdbId }}"
|
||||
media-title="{{ monitor.title }}"
|
||||
season="{{ monitor.season }}"
|
||||
episode="{{ monitor.episode }}"
|
||||
episode="{{ monitor.episode ?? '-' }}"
|
||||
status="{{ monitor.status }}"
|
||||
search-count="{{ monitor.searchCount }}"
|
||||
media-type="{{ monitor.monitorType|monitor_type }}"
|
||||
episode-id="{{ monitor|monitor_media_id }}"
|
||||
created-at="{{ monitor.createdAt|date('m/d/Y g:i a') }}"
|
||||
last-search="{{ monitor.lastSearch|date('m/d/Y g:i a') }}"
|
||||
downloaded-at="{{ monitor.downloadedAt|date('m/d/Y g:i a') }}"
|
||||
downloaded-at="{{null != monitor.downloadedAt ? monitor.downloadedAt|date('m/d/Y g:i a') : '-' }}"
|
||||
air-date="{{ null != monitor.airDate ? monitor.airDate|date('m/d/Y g:i a') : '-' }}"
|
||||
>
|
||||
<td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-stone-800 truncate">
|
||||
<a href="{{ path('app_search_result', {imdbId: monitor.imdbId, mediaType: monitor.monitorType|as_download_type}) }}"
|
||||
@@ -26,9 +28,17 @@
|
||||
<td class="px-6 py-4 whitespace-nowrap text-sm">
|
||||
{{ monitor|monitor_media_id }}
|
||||
</td>
|
||||
{# Monitor is a CHILD monitor #}
|
||||
{% if null != monitor.parent %}
|
||||
<td class="hidden md:table-cell px-6 py-4 whitespace-nowrap text-sm">
|
||||
{{ monitor.searchCount }}
|
||||
</td>
|
||||
{% else %}
|
||||
{# Monitor is a PARENT monitor #}
|
||||
<td class="hidden md:table-cell px-6 py-4 whitespace-nowrap text-sm">
|
||||
{{ monitor.children|length }}
|
||||
</td>
|
||||
{% endif %}
|
||||
<td class="hidden md:table-cell px-6 py-4 whitespace-nowrap text-sm">
|
||||
{{ monitor.createdAt|date('m/d/Y h:i a') }}
|
||||
</td>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<dialog{{ attributes }} is="preview-content-dialog" class="py-3 px-4 w-full md:w-[50rem] rounded-md dark:bg-gray-950/80 dark:border-2 dark:border-orange-500 dark:text-white backdrop-filter backdrop-blur-3xl">
|
||||
<dialog{{ attributes }} is="preview-content-dialog" class="py-3 px-4 w-full md:w-[{{ mdWidth|default('50rem') }}] rounded-md dark:bg-gray-950/80 dark:border-2 dark:border-orange-500 dark:text-white backdrop-filter backdrop-blur-3xl">
|
||||
<div class="flex flex-row justify-end">
|
||||
<twig:ux:icon name="ic:twotone-cancel" width="16.75px" height="16.75px" class="modal-close rounded-full align-middle text-red-600 hover:text-red-700" />
|
||||
</div>
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
}
|
||||
document.addEventListener('DOMContentLoaded', async function() {
|
||||
const modal = document.getElementById('previewModal');
|
||||
modal.setAttribute('mdWidth', '25rem');
|
||||
let data = await fetch('/api/monitor/upcoming-episodes');
|
||||
data = (await data.json())['data'];
|
||||
|
||||
@@ -47,7 +48,12 @@
|
||||
eventClick: function (data) {
|
||||
modal.display({
|
||||
heading: data.event.title,
|
||||
content: `<p>${data.event.startStr}</p>`
|
||||
content: `
|
||||
<div class="flex flex-col gap-4 justify-center items-center">
|
||||
<img src="${data.event.extendedProps.attachment}" class="w-[90%] rounded-md" />
|
||||
<p>${data.event.startStr}</p>
|
||||
</div>
|
||||
`
|
||||
})
|
||||
}
|
||||
});
|
||||
|
||||
147
templates/monitor/view.html.twig
Normal file
147
templates/monitor/view.html.twig
Normal file
@@ -0,0 +1,147 @@
|
||||
{% extends 'base.html.twig' %}
|
||||
|
||||
{% block title %}{{ monitor.title }} — Monitors — Torsearch{% endblock %}
|
||||
{% block h2 %}Monitors{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<div class="px-4 py-2">
|
||||
<twig:Card title="Viewing your monitors for {{ monitor.title }}">
|
||||
<div class="p-2 md:p-4 flex flex-col md:flex-row gap-6">
|
||||
{% if results.media.poster != null %}
|
||||
<img class="w-full md:w-[12.5rem] rounded-lg" src="{{ results.media.poster }}" />
|
||||
{% else %}
|
||||
<div class="w-full md:w-[12.5rem] h-[144px] rounded-lg bg-gray-700 flex items-center justify-center">
|
||||
<twig:ux:icon width="24" name="hugeicons:loading-01" />
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="w-full flex flex-col">
|
||||
<div class="mb-4 flex flex-row gap-2 justify-between">
|
||||
<h3 class="text-xl font-medium leading-tight font-bold text-gray-50">
|
||||
{{ results.media.title }} ({{ results.media.year }})
|
||||
</h3>
|
||||
</div>
|
||||
|
||||
<p class="text-gray-50 mb-4">
|
||||
{{ results.media.description }}
|
||||
</p>
|
||||
|
||||
<div class="text-gray-50 mb-2">
|
||||
<div id="people" class="mb-1">
|
||||
{% if results.media.stars != null %}
|
||||
<strong>Starring</strong>: {{ results.media.stars|join(', ') }} <br />
|
||||
{% endif %}
|
||||
|
||||
{% if results.media.directors != null %}
|
||||
<strong>Directors</strong>: {{ results.media.directors|join(', ') }} <br />
|
||||
{% endif %}
|
||||
|
||||
{% if results.media.producers != null %}
|
||||
<strong>Producers</strong>: {{ results.media.producers|join(', ') }} <br />
|
||||
{% endif %}
|
||||
|
||||
{% if results.media.creators != null %}
|
||||
<strong>Creators</strong>: {{ results.media.creators|join(', ') }} <br />
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div id="dates" class="mb-1">
|
||||
{% if results.media.premiereDate %}
|
||||
<strong>Premiered</strong>: {{ results.media.premiereDate|date('n/j/Y', 'UTC') }} <br />
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% if results.media.genres != null %}
|
||||
<div id="genres" class="text-gray-50 my-4">
|
||||
{# <strong>Genres</strong>: <br />#}
|
||||
{% for genre in results.media.genres %}
|
||||
<small class="px-2 py-1 border border-orange-500 rounded-full">{{ genre }}</small>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% if results.media.mediaType == "tvshows" %}
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex flex-col grow text-white">
|
||||
<strong class="mb-1">In Your Library</strong>
|
||||
<div class="flex flex-col md:flex-row border-t-orange-500 text-xs gap-2">
|
||||
<div class="flex flex-col">
|
||||
<span class="text-sm mb-1">Seasons</span>
|
||||
<div class="flex flex-col md:flex-row border p-2 border-orange-500 rounded-lg text-xs items-center">
|
||||
<span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-orange-500 rounded-lg text-white">
|
||||
<span>{{ library.seasonCount }}</span> full
|
||||
</span>
|
||||
<span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-orange-500 rounded-lg text-white">
|
||||
<span>{{ library.partialSeasonCount }}</span> partial
|
||||
</span>
|
||||
<span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-orange-500 rounded-lg text-white">
|
||||
<span>{{ library.missingSeasonCount }}</span> missing
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col">
|
||||
<span class="text-sm mb-1">Episodes</span>
|
||||
<div class="flex flex-col md:flex-row border p-2 border-orange-500 rounded-lg text-xs items-center">
|
||||
<span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-cyan-500 rounded-lg text-white">
|
||||
<span>{{ library.episodeCount }}</span> existing
|
||||
</span>
|
||||
<span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-cyan-500 rounded-lg text-white">
|
||||
<span>{{ library.missingEpisodeCount }}</span> missing
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col">
|
||||
<span class="text-sm mb-1">Monitors</span>
|
||||
<div class="flex flex-col md:flex-row border p-2 border-orange-500 rounded-lg text-xs items-center">
|
||||
<span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-pink-500 rounded-lg text-white">
|
||||
<span>{{ library.monitorCount }}</span> total
|
||||
</span>
|
||||
<span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-pink-500 rounded-lg text-white">
|
||||
<span>{{ library.activeMonitorCount }}</span> active
|
||||
</span>
|
||||
<span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-pink-500 rounded-lg text-white">
|
||||
<span>{{ library.completeMonitorCount }}</span> complete
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% if "movies" == results.media.mediaType %}
|
||||
<div class="flex flex-row justify-start items-end grow text-xs">
|
||||
<span class="results-count-badge py-1 px-1.5 mr-1 grow-0 font-bold text-xs bg-green-600 rounded-lg hover:cursor-pointer hover:bg-green-700 text-white">
|
||||
<span class="results-count-number" id="movie_results_count">-</span> results
|
||||
</span>
|
||||
|
||||
<twig:Turbo:Frame id="meb_{{ results.media.imdbId }}" src="{{ path('api.library.search', {
|
||||
title: results.media.title,
|
||||
block: 'media_exists_badge',
|
||||
target: "meb_" ~ results.media.imdbId
|
||||
}) }}">
|
||||
<span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-rose-600 rounded-lg text-white" title="Movie has not been downloaded yet.">
|
||||
missing
|
||||
</span>
|
||||
</twig:Turbo:Frame>
|
||||
|
||||
<span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-sky-700 rounded-lg text-white" title="Release date {{ results.media.episodeAirDate }}">
|
||||
{{ results.media.premiereDate|date('n/j/Y', 'UTC') }}
|
||||
</span>
|
||||
|
||||
<span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-orange-500 rounded-lg text-white" title="This movie has a runtime of {{ results.media.runtime }} minutes.">
|
||||
{{ results.media.runtime }} minutes
|
||||
</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<twig:MonitorList :parentMonitorId="monitor.id" :isWidget="false" :perPage="10"></twig:MonitorList>
|
||||
</twig:Card>
|
||||
</div>
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user