diff --git a/composer.json b/composer.json index a4518510367..291544747f5 100644 --- a/composer.json +++ b/composer.json @@ -35,9 +35,9 @@ "laravel/framework": "^8.83.14", "livewire/livewire": "^2.7", "lychee-org/nestedset": "^6", - "lychee-org/php-exif": "^0.7.5", + "lychee-org/php-exif": "^0.7.6", "maennchen/zipstream-php": "^2.1", - "php-ffmpeg/php-ffmpeg": "^0.17.0", + "php-ffmpeg/php-ffmpeg": "^1.0", "php-http/guzzle7-adapter": "^1.0", "php-http/message": "^1.12", "spatie/guzzle-rate-limiter-middleware": "^2.0", diff --git a/composer.lock b/composer.lock index 328a5d417c0..08fee70c6e2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,74 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "93c954131cadb1075d6759c1e38eedcd", + "content-hash": "56abd5675f170ae6e6a54467da1cacf4", "packages": [ - { - "name": "alchemy/binary-driver", - "version": "v5.2.0", - "source": { - "type": "git", - "url": "https://github.com/alchemy-fr/BinaryDriver.git", - "reference": "e0615cdff315e6b4b05ada67906df6262a020d22" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/BinaryDriver/zipball/e0615cdff315e6b4b05ada67906df6262a020d22", - "reference": "e0615cdff315e6b4b05ada67906df6262a020d22", - "shasum": "" - }, - "require": { - "evenement/evenement": "^3.0|^2.0|^1.0", - "php": ">=5.5", - "psr/log": "^1.0", - "symfony/process": "^2.3|^3.0|^4.0|^5.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "Alchemy": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Le Goff", - "email": "legoff.n@gmail.com" - }, - { - "name": "Romain Neutron", - "email": "imprec@gmail.com", - "homepage": "http://www.lickmychip.com/" - }, - { - "name": "Phraseanet Team", - "email": "info@alchemy.fr", - "homepage": "http://www.phraseanet.com/" - }, - { - "name": "Jens Hausdorf", - "email": "mail@jens-hausdorf.de", - "homepage": "https://jens-hausdorf.de", - "role": "Maintainer" - } - ], - "description": "A set of tools to build binary drivers", - "keywords": [ - "binary", - "driver" - ], - "support": { - "issues": "https://github.com/alchemy-fr/BinaryDriver/issues", - "source": "https://github.com/alchemy-fr/BinaryDriver/tree/master" - }, - "time": "2020-02-12T19:35:11+00:00" - }, { "name": "beberlei/assert", "version": "v3.3.2", @@ -2772,23 +2706,23 @@ }, { "name": "lychee-org/php-exif", - "version": "v0.7.5", + "version": "v0.7.6", "source": { "type": "git", "url": "https://github.com/LycheeOrg/php-exif.git", - "reference": "568b56c6b33cca87dcb56103d1d1eb0609091def" + "reference": "baf5c7759d56e7be37746f4d3da60c438a9bd151" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LycheeOrg/php-exif/zipball/568b56c6b33cca87dcb56103d1d1eb0609091def", - "reference": "568b56c6b33cca87dcb56103d1d1eb0609091def", + "url": "https://api.github.com/repos/LycheeOrg/php-exif/zipball/baf5c7759d56e7be37746f4d3da60c438a9bd151", + "reference": "baf5c7759d56e7be37746f4d3da60c438a9bd151", "shasum": "" }, "require": { "ext-fileinfo": "*", "neitanod/forceutf8": "^2.0.4", "php": "^8.0", - "php-ffmpeg/php-ffmpeg": "^0.17.0" + "php-ffmpeg/php-ffmpeg": "^1.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.3", @@ -2835,9 +2769,9 @@ ], "support": { "issues": "https://github.com/LycheeOrg/php-exif/issues", - "source": "https://github.com/LycheeOrg/php-exif/tree/v0.7.5" + "source": "https://github.com/LycheeOrg/php-exif/tree/v0.7.6" }, - "time": "2022-04-29T17:58:43+00:00" + "time": "2022-06-05T17:27:25+00:00" }, { "name": "maennchen/zipstream-php", @@ -3361,50 +3295,6 @@ }, "time": "2022-01-24T11:29:14+00:00" }, - { - "name": "neutron/temporary-filesystem", - "version": "3.0.1", - "source": { - "type": "git", - "url": "https://github.com/romainneutron/Temporary-Filesystem.git", - "reference": "55f3d4896eff3bf070e491916e6c564db5e640b5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/romainneutron/Temporary-Filesystem/zipball/55f3d4896eff3bf070e491916e6c564db5e640b5", - "reference": "55f3d4896eff3bf070e491916e6c564db5e640b5", - "shasum": "" - }, - "require": { - "php": ">=5.6", - "symfony/filesystem": "^2.3 || ^3.0 || ^4.0 || ^5.0 || ^6.0" - }, - "require-dev": { - "symfony/phpunit-bridge": "^5.0.4 || ^6.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "Neutron": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Romain Neutron", - "email": "imprec@gmail.com" - } - ], - "description": "Symfony filesystem extension to handle temporary files", - "support": { - "issues": "https://github.com/romainneutron/Temporary-Filesystem/issues", - "source": "https://github.com/romainneutron/Temporary-Filesystem/tree/3.0.1" - }, - "time": "2021-12-14T07:30:33+00:00" - }, { "name": "nyholm/psr7", "version": "1.5.0", @@ -3549,42 +3439,38 @@ }, { "name": "php-ffmpeg/php-ffmpeg", - "version": "v0.17.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/PHP-FFMpeg/PHP-FFMpeg.git", - "reference": "a5147d1ae041e78e7870bf2443d4e2dfa7635856" + "reference": "bda300b69acecf791d2934cd5ed43a8ba24febf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-FFMpeg/PHP-FFMpeg/zipball/a5147d1ae041e78e7870bf2443d4e2dfa7635856", - "reference": "a5147d1ae041e78e7870bf2443d4e2dfa7635856", + "url": "https://api.github.com/repos/PHP-FFMpeg/PHP-FFMpeg/zipball/bda300b69acecf791d2934cd5ed43a8ba24febf6", + "reference": "bda300b69acecf791d2934cd5ed43a8ba24febf6", "shasum": "" }, "require": { - "alchemy/binary-driver": "^1.5 || ~2.0.0 || ^5.0", - "doctrine/cache": "^1.0", - "evenement/evenement": "^3.0 || ^2.0 || ^1.0", - "neutron/temporary-filesystem": "^2.1.1 || ^3.0", - "php": ">=5.3.9" + "evenement/evenement": "^3.0", + "php": "^8.0 || ^8.1", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "spatie/temporary-directory": "^2.0", + "symfony/cache": "^5.4 || ^6.0", + "symfony/process": "^5.4 || ^6.0" }, "require-dev": { - "silex/silex": "~1.0", - "symfony/phpunit-bridge": "^5.0.4", - "symfony/process": "2.8 || 3.3" + "mockery/mockery": "^1.5", + "phpunit/phpunit": "^9.5.10" }, "suggest": { "php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.x-dev" - } - }, "autoload": { - "psr-0": { - "FFMpeg": "src" + "psr-4": { + "FFMpeg\\": "src/FFMpeg", + "Alchemy\\BinaryDriver\\": "src/Alchemy/BinaryDriver" } }, "notification-url": "https://packagist.org/downloads/", @@ -3616,6 +3502,11 @@ "name": "Jens Hausdorf", "email": "hello@jens-hausdorf.de", "homepage": "https://jens-hausdorf.de" + }, + { + "name": "Pascal Baljet", + "email": "pascal@protone.media", + "homepage": "https://protone.media" } ], "description": "FFMpeg PHP, an Object Oriented library to communicate with AVconv / ffmpeg", @@ -3631,9 +3522,9 @@ ], "support": { "issues": "https://github.com/PHP-FFMpeg/PHP-FFMpeg/issues", - "source": "https://github.com/PHP-FFMpeg/PHP-FFMpeg/tree/v0.17.0" + "source": "https://github.com/PHP-FFMpeg/PHP-FFMpeg/tree/v1.0.1" }, - "time": "2020-12-18T14:31:34+00:00" + "time": "2022-02-22T15:54:06+00:00" }, { "name": "php-http/discovery", @@ -5033,6 +4924,67 @@ ], "time": "2022-03-15T20:01:36+00:00" }, + { + "name": "spatie/temporary-directory", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://github.com/spatie/temporary-directory.git", + "reference": "79f138f2b81adae583d04d3727a4538dd394023f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/79f138f2b81adae583d04d3727a4538dd394023f", + "reference": "79f138f2b81adae583d04d3727a4538dd394023f", + "shasum": "" + }, + "require": { + "php": "^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\TemporaryDirectory\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alex Vanderbist", + "email": "alex@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Easily create, use and destroy temporary directories", + "homepage": "https://github.com/spatie/temporary-directory", + "keywords": [ + "php", + "spatie", + "temporary-directory" + ], + "support": { + "issues": "https://github.com/spatie/temporary-directory/issues", + "source": "https://github.com/spatie/temporary-directory/tree/2.1.0" + }, + "funding": [ + { + "url": "https://spatie.be/open-source/support-us", + "type": "custom" + }, + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2022-03-11T08:16:01+00:00" + }, { "name": "spomky-labs/base64url", "version": "v2.0.4", @@ -5890,69 +5842,6 @@ ], "time": "2022-01-02T09:55:41+00:00" }, - { - "name": "symfony/filesystem", - "version": "v6.0.9", - "source": { - "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "bf7b9d2ee692b6df2a41017d6023a2fe732d240c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/bf7b9d2ee692b6df2a41017d6023a2fe732d240c", - "reference": "bf7b9d2ee692b6df2a41017d6023a2fe732d240c", - "shasum": "" - }, - "require": { - "php": ">=8.0.2", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Filesystem\\": "" - }, - "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 basic utilities for the filesystem", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.0.9" - }, - "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": "2022-05-21T13:33:31+00:00" - }, { "name": "symfony/finder", "version": "v5.4.8", @@ -11749,6 +11638,69 @@ ], "time": "2022-04-12T15:19:55+00:00" }, + { + "name": "symfony/filesystem", + "version": "v6.0.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "bf7b9d2ee692b6df2a41017d6023a2fe732d240c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/bf7b9d2ee692b6df2a41017d6023a2fe732d240c", + "reference": "bf7b9d2ee692b6df2a41017d6023a2fe732d240c", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "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 basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v6.0.9" + }, + "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": "2022-05-21T13:33:31+00:00" + }, { "name": "symfony/options-resolver", "version": "v6.0.3", @@ -12028,5 +11980,5 @@ "platform-dev": { "ext-imagick": "*" }, - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.3.0" } diff --git a/public/Lychee-front b/public/Lychee-front index 5245abaee62..ec2635551e3 160000 --- a/public/Lychee-front +++ b/public/Lychee-front @@ -1 +1 @@ -Subproject commit 5245abaee62a803028e155fdcf23fa0ad07c84a3 +Subproject commit ec2635551e347fa1c3d34103b8dd362c6ca5d181 diff --git a/public/dist/main.js b/public/dist/main.js index b29602a4ba9..a2782973c86 100644 --- a/public/dist/main.js +++ b/public/dist/main.js @@ -5726,7 +5726,8 @@ lychee.parsePublicInitializationData = function (data) { lychee.sorting_albums = data.config.sorting_albums; lychee.album_subtitle_type = data.config.album_subtitle_type || "oldstyle"; lychee.checkForUpdates = data.config.check_for_updates; - lychee.layout = Number.parseInt(data.config.layout, 10) || 1; + lychee.layout = Number.parseInt(data.config.layout, 10); + if (Number.isNaN(lychee.layout)) lychee.layout = 1; lychee.landing_page_enable = data.config.landing_page_enable === "1"; lychee.public_search = data.config.public_search === "1"; lychee.image_overlay_type = data.config.image_overlay_type || "exif";