From cb3d2badd36cd0353e9cd9331b0175beee17e45f Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 27 Aug 2018 22:55:33 +0200 Subject: [PATCH 01/10] Fix failed releases returned responses --- Changelog | 1 + app/Http/Controllers/FailedReleasesController.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index bf5e70e2a6..6df2eaa59a 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-08-27 DariusIII + * Fix: Fix failed releases returned responses * Chg: Update yab/laravel-scout-mysql-driver to version 2.0.5 * Fix: Fix array to string conversion in ReleaseExtra addAudio function * Fix: Fix display of movie covers on release details page diff --git a/app/Http/Controllers/FailedReleasesController.php b/app/Http/Controllers/FailedReleasesController.php index fcd73bbc23..5a28e598c6 100644 --- a/app/Http/Controllers/FailedReleasesController.php +++ b/app/Http/Controllers/FailedReleasesController.php @@ -42,7 +42,7 @@ public function show(Request $request) return response('Error!', 404)->withHeaders(['X-DNZB-RCode' => 404, 'X-DNZB-RText' => 'No NZB found for alternate match.']); } - return response('Success', 200)->header('Location:'.$this->serverurl.'getnzb?id='.$alt['guid'].'&i='.$uid.'&r='.$rssToken); + return response('Success', 200)->withHeaders(['Location' => $this->serverurl.'getnzb?id='.$alt['guid'].'&i='.$uid.'&r='.$rssToken]); } } } From dc1d2ec428c7189eba55e17ba9c1fd15fe7759d1 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 27 Aug 2018 23:20:18 +0200 Subject: [PATCH 02/10] Update font-awesome and laravel/framework to latest versions --- Changelog | 1 + composer.lock | 90 +++++++++++++++++++-------------------------------- 2 files changed, 34 insertions(+), 57 deletions(-) diff --git a/Changelog b/Changelog index 6df2eaa59a..723f5767b3 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-08-27 DariusIII + * Chg: Update font-awesome and laravel/framework to latest versions * Fix: Fix failed releases returned responses * Chg: Update yab/laravel-scout-mysql-driver to version 2.0.5 * Fix: Fix array to string conversion in ReleaseExtra addAudio function diff --git a/composer.lock b/composer.lock index 07b63e8777..677898ce6b 100644 --- a/composer.lock +++ b/composer.lock @@ -312,8 +312,7 @@ "Gemfile.lock", "*.md" ] - }, - "time": "2016-06-06T17:37:52+00:00" + } }, { "name": "bower-asset/autosize", @@ -342,8 +341,7 @@ "form", "textarea", "ui" - ], - "time": "2017-05-19T15:36:30+00:00" + ] }, { "name": "bower-asset/bootstrap", @@ -392,8 +390,7 @@ "mobile-first", "responsive", "web" - ], - "time": "2016-07-25T15:51:55+00:00" + ] }, { "name": "bower-asset/bootstrap-3.x", @@ -442,8 +439,7 @@ "mobile-first", "responsive", "web" - ], - "time": "2016-07-25T15:51:55+00:00" + ] }, { "name": "bower-asset/bootstrap-datepicker", @@ -472,8 +468,7 @@ }, "license": [ "Apache-2.0" - ], - "time": "2016-08-05T09:50:13+00:00" + ] }, { "name": "bower-asset/bootstrap-hover-dropdown", @@ -503,8 +498,7 @@ "dropdowns", "hover", "twitter" - ], - "time": "2015-12-01T23:35:57+00:00" + ] }, { "name": "bower-asset/bootstrap-progressbar", @@ -538,8 +532,7 @@ }, "license": [ "MIT" - ], - "time": "2015-05-15T18:56:17+00:00" + ] }, { "name": "bower-asset/bootswatch", @@ -670,8 +663,7 @@ "modal", "popup", "ui" - ], - "time": "2016-05-10T22:21:33+00:00" + ] }, { "name": "bower-asset/datatables", @@ -786,8 +778,7 @@ "tests", "examples" ] - }, - "time": "2015-01-26T21:19:01+00:00" + } }, { "name": "bower-asset/flexboxgrid", @@ -823,21 +814,20 @@ "css", "flexbox", "grid" - ], - "time": "2016-08-14T16:43:18+00:00" + ] }, { "name": "bower-asset/font-awesome", - "version": "5.2.0", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/FortAwesome/Font-Awesome.git", - "reference": "03bcd4dc0831f0651a3b5a7cd41153e8129fccf3" + "reference": "9fc64f7087e1088b30127ae24b3962204decaa2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/03bcd4dc0831f0651a3b5a7cd41153e8129fccf3", - "reference": "03bcd4dc0831f0651a3b5a7cd41153e8129fccf3", + "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/9fc64f7087e1088b30127ae24b3962204decaa2a", + "reference": "9fc64f7087e1088b30127ae24b3962204decaa2a", "shasum": "" }, "type": "bower-asset-library" @@ -869,8 +859,7 @@ "src", "build.xml" ] - }, - "time": "2015-07-20T20:04:00+00:00" + } }, { "name": "bower-asset/icheck", @@ -920,8 +909,7 @@ "replacement", "skins", "ui" - ], - "time": "2014-03-03T17:36:28+00:00" + ] }, { "name": "bower-asset/jquery", @@ -984,8 +972,7 @@ "javascript", "jquery", "library" - ], - "time": "2016-05-20T17:24:43+00:00" + ] }, { "name": "bower-asset/jquery-3.2.x", @@ -1052,8 +1039,7 @@ "scroll", "scrolltop", "scrolltotop" - ], - "time": "2017-08-31T15:51:29+00:00" + ] }, { "name": "bower-asset/jquery-migrate-1.4.x", @@ -1072,8 +1058,7 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - }, - "time": "2016-04-15T06:38:34+00:00" + } }, { "name": "bower-asset/jquery-migrate-3.0.x", @@ -1092,8 +1077,7 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - }, - "time": "2016-06-10T14:28:59+00:00" + } }, { "name": "bower-asset/jquery.nicescroll", @@ -1123,8 +1107,7 @@ "demo", "package.json" ] - }, - "time": "2016-03-01T20:38:24+00:00" + } }, { "name": "bower-asset/material-design-iconic-font", @@ -1163,8 +1146,7 @@ "font", "icons", "material" - ], - "time": "2015-11-08T04:50:28+00:00" + ] }, { "name": "bower-asset/materialize", @@ -1223,8 +1205,7 @@ "responsive", "sass", "ux" - ], - "time": "2017-04-15T01:39:28+00:00" + ] }, { "name": "bower-asset/pace", @@ -1270,8 +1251,7 @@ "progress", "progress", "spinner" - ], - "time": "2014-11-06T16:31:34+00:00" + ] }, { "name": "bower-asset/pnotify", @@ -1323,8 +1303,7 @@ "license": [ "Apache-2.0" ], - "description": "JavaScript notification plugin.", - "time": "2017-07-31T21:50:29+00:00" + "description": "JavaScript notification plugin." }, { "name": "bower-asset/respond", @@ -1348,8 +1327,7 @@ "test" ] }, - "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)", - "time": "2013-12-19T04:44:31+00:00" + "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)" }, { "name": "bower-asset/responsive-tables-js", @@ -1379,8 +1357,7 @@ "jquery", "responsive", "table" - ], - "time": "2015-10-08T14:18:04+00:00" + ] }, { "name": "bower-asset/select2", @@ -1448,8 +1425,7 @@ "scrolling", "slimscroll", "ui" - ], - "time": "2016-06-11T09:19:14+00:00" + ] }, { "name": "bower-asset/tinymce-dist", @@ -3687,16 +3663,16 @@ }, { "name": "laravel/framework", - "version": "v5.6.34", + "version": "v5.6.35", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "66c9cf8119b422b71273271db1f12e20d74ad49b" + "reference": "02abbe2091404ebe032a6d5a83075031b7072ebe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/66c9cf8119b422b71273271db1f12e20d74ad49b", - "reference": "66c9cf8119b422b71273271db1f12e20d74ad49b", + "url": "https://api.github.com/repos/laravel/framework/zipball/02abbe2091404ebe032a6d5a83075031b7072ebe", + "reference": "02abbe2091404ebe032a6d5a83075031b7072ebe", "shasum": "" }, "require": { @@ -3822,7 +3798,7 @@ "framework", "laravel" ], - "time": "2018-08-21T13:44:37+00:00" + "time": "2018-08-27T13:18:24+00:00" }, { "name": "laravel/scout", From 665b6e9038720fefb97d6ef735085e8b97e7e786 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Sun, 2 Sep 2018 23:10:56 +0200 Subject: [PATCH 03/10] Update symfony components, laravel/framework to their latest versions --- Changelog | 2 + composer.lock | 169 +++++++++++++++++++++++++------------------------- 2 files changed, 85 insertions(+), 86 deletions(-) diff --git a/Changelog b/Changelog index 723f5767b3..f4bb5fbb63 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2018-09-02 DariusIII + * Chg: Update symfony components, laravel/framework to their latest versions 2018-08-27 DariusIII * Chg: Update font-awesome and laravel/framework to latest versions * Fix: Fix failed releases returned responses diff --git a/composer.lock b/composer.lock index 677898ce6b..4d4539a511 100644 --- a/composer.lock +++ b/composer.lock @@ -716,16 +716,16 @@ }, { "name": "bower-asset/fancybox", - "version": "v3.3.5", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/fancyapps/fancybox.git", - "reference": "059c44062a033665cb635364320713cbc52de651" + "reference": "a829fabd0edf06ed711f3b5b201332b8164cc4ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fancyapps/fancybox/zipball/059c44062a033665cb635364320713cbc52de651", - "reference": "059c44062a033665cb635364320713cbc52de651", + "url": "https://api.github.com/repos/fancyapps/fancybox/zipball/a829fabd0edf06ed711f3b5b201332b8164cc4ff", + "reference": "a829fabd0edf06ed711f3b5b201332b8164cc4ff", "shasum": "" }, "require": { @@ -751,7 +751,7 @@ "responsive", "touch" ], - "time": "2018-04-12T06:18:49+00:00" + "time": "2018-08-31T12:53:24+00:00" }, { "name": "bower-asset/fastclick", @@ -818,16 +818,16 @@ }, { "name": "bower-asset/font-awesome", - "version": "5.3.0", + "version": "5.3.1", "source": { "type": "git", "url": "https://github.com/FortAwesome/Font-Awesome.git", - "reference": "9fc64f7087e1088b30127ae24b3962204decaa2a" + "reference": "ff2853acce00085b5830a050a2afa328fd212562" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/9fc64f7087e1088b30127ae24b3962204decaa2a", - "reference": "9fc64f7087e1088b30127ae24b3962204decaa2a", + "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/ff2853acce00085b5830a050a2afa328fd212562", + "reference": "ff2853acce00085b5830a050a2afa328fd212562", "shasum": "" }, "type": "bower-asset-library" @@ -3663,16 +3663,16 @@ }, { "name": "laravel/framework", - "version": "v5.6.35", + "version": "v5.6.37", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "02abbe2091404ebe032a6d5a83075031b7072ebe" + "reference": "975e182d42403b0efdf847c05f6bfb99144f95f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/02abbe2091404ebe032a6d5a83075031b7072ebe", - "reference": "02abbe2091404ebe032a6d5a83075031b7072ebe", + "url": "https://api.github.com/repos/laravel/framework/zipball/975e182d42403b0efdf847c05f6bfb99144f95f5", + "reference": "975e182d42403b0efdf847c05f6bfb99144f95f5", "shasum": "" }, "require": { @@ -3798,7 +3798,7 @@ "framework", "laravel" ], - "time": "2018-08-27T13:18:24+00:00" + "time": "2018-09-02T13:51:42+00:00" }, { "name": "laravel/scout", @@ -5846,23 +5846,20 @@ }, { "name": "spatie/laravel-permission", - "version": "2.17.0", + "version": "2.17.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-permission.git", - "reference": "32d1b2a8e3cd2d68e0bc572be3d9d416b56fa07f" + "reference": "a0e05fd4f5729d96be20dfc768c5b1a4d2586838" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/32d1b2a8e3cd2d68e0bc572be3d9d416b56fa07f", - "reference": "32d1b2a8e3cd2d68e0bc572be3d9d416b56fa07f", + "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/a0e05fd4f5729d96be20dfc768c5b1a4d2586838", + "reference": "a0e05fd4f5729d96be20dfc768c5b1a4d2586838", "shasum": "" }, "require": { - "illuminate/auth": "~5.3.0|~5.4.0|~5.5.0|~5.6.0|~5.7.0", - "illuminate/container": "~5.3.0|~5.4.0|~5.5.0|~5.6.0|~5.7.0", - "illuminate/contracts": "~5.3.0|~5.4.0|~5.5.0|~5.6.0|~5.7.0", - "illuminate/database": "~5.4.0|~5.5.0|~5.6.0|~5.7.0", + "laravel/framework": "~5.4.0|~5.5.0|~5.6.0|~5.7.0", "php": ">=7.0" }, "require-dev": { @@ -5906,7 +5903,7 @@ "security", "spatie" ], - "time": "2018-08-24T13:39:52+00:00" + "time": "2018-08-28T14:20:07+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -5969,7 +5966,7 @@ }, { "name": "symfony/console", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", @@ -6037,7 +6034,7 @@ }, { "name": "symfony/css-selector", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -6090,16 +6087,16 @@ }, { "name": "symfony/debug", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "9316545571f079c4dd183e674721d9dc783ce196" + "reference": "47ead688f1f2877f3f14219670f52e4722ee7052" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/9316545571f079c4dd183e674721d9dc783ce196", - "reference": "9316545571f079c4dd183e674721d9dc783ce196", + "url": "https://api.github.com/repos/symfony/debug/zipball/47ead688f1f2877f3f14219670f52e4722ee7052", + "reference": "47ead688f1f2877f3f14219670f52e4722ee7052", "shasum": "" }, "require": { @@ -6142,11 +6139,11 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-03T11:13:38+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -6209,7 +6206,7 @@ }, { "name": "symfony/finder", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -6258,16 +6255,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "7d93e3547660ec7ee3dad1428ba42e8076a0e5f1" + "reference": "3a5c91e133b220bb882b3cd773ba91bf39989345" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7d93e3547660ec7ee3dad1428ba42e8076a0e5f1", - "reference": "7d93e3547660ec7ee3dad1428ba42e8076a0e5f1", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3a5c91e133b220bb882b3cd773ba91bf39989345", + "reference": "3a5c91e133b220bb882b3cd773ba91bf39989345", "shasum": "" }, "require": { @@ -6308,20 +6305,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-08-01T14:07:44+00:00" + "time": "2018-08-27T17:47:02+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6347be5110efb27fe45ea04bf213078b67a05036" + "reference": "33de0a1ff2e1720096189e3ced682d7a4e8f5e35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6347be5110efb27fe45ea04bf213078b67a05036", - "reference": "6347be5110efb27fe45ea04bf213078b67a05036", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/33de0a1ff2e1720096189e3ced682d7a4e8f5e35", + "reference": "33de0a1ff2e1720096189e3ced682d7a4e8f5e35", "shasum": "" }, "require": { @@ -6395,11 +6392,11 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-08-01T15:30:34+00:00" + "time": "2018-08-28T06:17:42+00:00" }, { "name": "symfony/options-resolver", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -6733,16 +6730,16 @@ }, { "name": "symfony/process", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "f01fc7a4493572f7f506c49dcb50ad01fb3a2f56" + "reference": "86cdb930a6a855b0ab35fb60c1504cb36184f843" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/f01fc7a4493572f7f506c49dcb50ad01fb3a2f56", - "reference": "f01fc7a4493572f7f506c49dcb50ad01fb3a2f56", + "url": "https://api.github.com/repos/symfony/process/zipball/86cdb930a6a855b0ab35fb60c1504cb36184f843", + "reference": "86cdb930a6a855b0ab35fb60c1504cb36184f843", "shasum": "" }, "require": { @@ -6778,20 +6775,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-03T11:13:38+00:00" }, { "name": "symfony/routing", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "6912cfebc0ea4e7a46fdd15c9bd1f427dd39ff1b" + "reference": "a5784c2ec4168018c87b38f0e4f39d2278499f51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/6912cfebc0ea4e7a46fdd15c9bd1f427dd39ff1b", - "reference": "6912cfebc0ea4e7a46fdd15c9bd1f427dd39ff1b", + "url": "https://api.github.com/repos/symfony/routing/zipball/a5784c2ec4168018c87b38f0e4f39d2278499f51", + "reference": "a5784c2ec4168018c87b38f0e4f39d2278499f51", "shasum": "" }, "require": { @@ -6855,11 +6852,11 @@ "uri", "url" ], - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-03T07:58:40+00:00" }, { "name": "symfony/serializer", - "version": "v3.4.14", + "version": "v3.4.15", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", @@ -6938,16 +6935,16 @@ }, { "name": "symfony/translation", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "6fcd1bd44fd6d7181e6ea57a6f4e08a09b29ef65" + "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/6fcd1bd44fd6d7181e6ea57a6f4e08a09b29ef65", - "reference": "6fcd1bd44fd6d7181e6ea57a6f4e08a09b29ef65", + "url": "https://api.github.com/repos/symfony/translation/zipball/fa2182669f7983b7aa5f1a770d053f79f0ef144f", + "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f", "shasum": "" }, "require": { @@ -7003,20 +7000,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-07T12:45:11+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "69e174f4c02ec43919380171c6f7550753299316" + "reference": "a05426e27294bba7b0226ffc17dd01a3c6ef9777" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/69e174f4c02ec43919380171c6f7550753299316", - "reference": "69e174f4c02ec43919380171c6f7550753299316", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a05426e27294bba7b0226ffc17dd01a3c6ef9777", + "reference": "a05426e27294bba7b0226ffc17dd01a3c6ef9777", "shasum": "" }, "require": { @@ -7078,20 +7075,20 @@ "debug", "dump" ], - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-02T09:24:26+00:00" }, { "name": "symfony/yaml", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "46bc69aa91fc4ab78a96ce67873a6b0c148fd48c" + "reference": "b832cc289608b6d305f62149df91529a2ab3c314" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/46bc69aa91fc4ab78a96ce67873a6b0c148fd48c", - "reference": "46bc69aa91fc4ab78a96ce67873a6b0c148fd48c", + "url": "https://api.github.com/repos/symfony/yaml/zipball/b832cc289608b6d305f62149df91529a2ab3c314", + "reference": "b832cc289608b6d305f62149df91529a2ab3c314", "shasum": "" }, "require": { @@ -7137,7 +7134,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-18T16:52:46+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -8976,16 +8973,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.3.2", + "version": "7.3.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "34705f81bddc3f505b9599a2ef96e2b4315ba9b8" + "reference": "1bd5629cccfb2c0a9ef5474b4ff772349e1ec898" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34705f81bddc3f505b9599a2ef96e2b4315ba9b8", - "reference": "34705f81bddc3f505b9599a2ef96e2b4315ba9b8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1bd5629cccfb2c0a9ef5474b4ff772349e1ec898", + "reference": "1bd5629cccfb2c0a9ef5474b4ff772349e1ec898", "shasum": "" }, "require": { @@ -9056,7 +9053,7 @@ "testing", "xunit" ], - "time": "2018-08-22T06:39:21+00:00" + "time": "2018-09-01T15:49:55+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -9623,7 +9620,7 @@ }, { "name": "symfony/class-loader", - "version": "v3.4.14", + "version": "v3.4.15", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", @@ -9679,16 +9676,16 @@ }, { "name": "symfony/config", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "c868972ac26e4e19860ce11b300bb74145246ff9" + "reference": "76015a3cc372b14d00040ff58e18e29f69eba717" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/c868972ac26e4e19860ce11b300bb74145246ff9", - "reference": "c868972ac26e4e19860ce11b300bb74145246ff9", + "url": "https://api.github.com/repos/symfony/config/zipball/76015a3cc372b14d00040ff58e18e29f69eba717", + "reference": "76015a3cc372b14d00040ff58e18e29f69eba717", "shasum": "" }, "require": { @@ -9738,20 +9735,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-08T06:37:38+00:00" }, { "name": "symfony/filesystem", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "2e30335e0aafeaa86645555959572fe7cea22b43" + "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/2e30335e0aafeaa86645555959572fe7cea22b43", - "reference": "2e30335e0aafeaa86645555959572fe7cea22b43", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e", + "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e", "shasum": "" }, "require": { @@ -9788,11 +9785,11 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-18T16:52:46+00:00" }, { "name": "symfony/stopwatch", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", From aaad317246f3f0c4aa977b16a8713f7ba712f74b Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 3 Sep 2018 10:30:24 +0200 Subject: [PATCH 04/10] Update handling of allAsMgr tables --- Blacklight/Binaries.php | 4 ++++ Changelog | 2 ++ app/Models/Group.php | 22 ++++++++++++++++------ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Blacklight/Binaries.php b/Blacklight/Binaries.php index 2cd5588a96..7b6d887903 100755 --- a/Blacklight/Binaries.php +++ b/Blacklight/Binaries.php @@ -272,6 +272,7 @@ public function __construct(array $options = []) * * @return void * @throws \Exception + * @throws \Throwable */ public function updateAllGroups($maxHeaders = 100000): void { @@ -329,6 +330,7 @@ public function logIndexerStart(): void * * @return void * @throws \Exception + * @throws \Throwable */ public function updateGroup($groupMySQL, $maxHeaders = 0): void { @@ -575,6 +577,7 @@ public function updateGroup($groupMySQL, $maxHeaders = 0): void * * @return array Empty on failure. * @throws \Exception + * @throws \Throwable */ public function scan($groupMySQL, $first, $last, $type = 'update', $missingParts = null): array { @@ -1084,6 +1087,7 @@ protected function outputHeaderDuration(): void * @param array $headers Array of headers containing sub-arrays with parts. * * @return array Array of article numbers to add to part repair. + * @throws \Exception */ protected function _rollbackAddToPartRepair(array $headers): array { diff --git a/Changelog b/Changelog index f4bb5fbb63..d3fb504ae2 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2018-09-03 DariusIII + * Chg: Update handling of allAsMgr tables 2018-09-02 DariusIII * Chg: Update symfony components, laravel/framework to their latest versions 2018-08-27 DariusIII diff --git a/app/Models/Group.php b/app/Models/Group.php index 3c664d40b4..2356313924 100644 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -534,15 +534,25 @@ public function getCBPTableNames($groupID): array return self::$cbppTableNames[$groupKey]; } - if (config('nntmux.echocli') && $this->allasmgr === false && self::createNewTPGTables($groupID) === false) { + if ($this->allasmgr === false && config('nntmux.echocli') && self::createNewTPGTables($groupID) === false) { exit('There is a problem creating new TPG tables for this group ID: '.$groupID.PHP_EOL); } - $tables = []; - $tables['cname'] = 'collections_'.$groupID; - $tables['bname'] = 'binaries_'.$groupID; - $tables['pname'] = 'parts_'.$groupID; - $tables['prname'] = 'missed_parts_'.$groupID; + if ($this->allasmgr === false) { + $tables = [ + 'cname' => 'collections_'.$groupID, + 'bname' => 'binaries_'.$groupID, + 'pname' => 'parts_'.$groupID, + 'prname' => 'missed_parts_'.$groupID, + ]; + } else { + $tables = [ + 'cname' => 'multigroup_collections', + 'bname' => 'multigroup_binaries', + 'pname' => 'multigroup_parts', + 'prname' => 'multigroup_missed_parts', + ]; + } // Buffer. self::$cbppTableNames[$groupKey] = $tables; From fd66348cc4ff41d152cddd5dedb51829459590b8 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 3 Sep 2018 10:49:24 +0200 Subject: [PATCH 05/10] Add checks before inserting audio data from mediainfo --- Blacklight/ReleaseExtra.php | 6 +++--- Changelog | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Blacklight/ReleaseExtra.php b/Blacklight/ReleaseExtra.php index 599de08b0c..4a87681a1b 100755 --- a/Blacklight/ReleaseExtra.php +++ b/Blacklight/ReleaseExtra.php @@ -458,11 +458,11 @@ private function addAudio($releaseID, $audioID, $audioFormat, $audioMode, $audio AudioData::query()->insert([ 'releases_id' => $releaseID, 'audioid' => $audioID, - 'audioformat' => $audioFormat, + 'audioformat' => ! empty($audioFormat) ? $audioFormat : '', 'audiomode' => ! empty($audioMode) ? $audioMode : '', 'audiobitratemode' => ! empty($audioBitRateMode) ? $audioBitRateMode : '', - 'audiobitrate' => $audioBitRate, - 'audiochannels' => $audioChannels, + 'audiobitrate' => ! empty($audioBitRate) ? $audioBitRate : '', + 'audiochannels' => ! empty($audioChannels) ? $audioChannels : '', 'audiosamplerate' => ! empty($audioSampleRate) ? $audioSampleRate : '', 'audiolibrary' => ! empty($audioLibrary) ? $audioLibrary : '', 'audiolanguage' => ! empty($audioLanguage) ? $audioLanguage : '', diff --git a/Changelog b/Changelog index d3fb504ae2..cf9a4b6d62 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-09-03 DariusIII + * Chg: Add checks before inserting audio data from mediainfo * Chg: Update handling of allAsMgr tables 2018-09-02 DariusIII * Chg: Update symfony components, laravel/framework to their latest versions From 52fa0477185902239e53208410dbd8130bedcb31 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 3 Sep 2018 11:00:47 +0200 Subject: [PATCH 06/10] Check for array before inserting audio data from mediainfo --- Blacklight/ReleaseExtra.php | 18 +++++++++--------- Changelog | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Blacklight/ReleaseExtra.php b/Blacklight/ReleaseExtra.php index 4a87681a1b..fc64b1665f 100755 --- a/Blacklight/ReleaseExtra.php +++ b/Blacklight/ReleaseExtra.php @@ -458,15 +458,15 @@ private function addAudio($releaseID, $audioID, $audioFormat, $audioMode, $audio AudioData::query()->insert([ 'releases_id' => $releaseID, 'audioid' => $audioID, - 'audioformat' => ! empty($audioFormat) ? $audioFormat : '', - 'audiomode' => ! empty($audioMode) ? $audioMode : '', - 'audiobitratemode' => ! empty($audioBitRateMode) ? $audioBitRateMode : '', - 'audiobitrate' => ! empty($audioBitRate) ? $audioBitRate : '', - 'audiochannels' => ! empty($audioChannels) ? $audioChannels : '', - 'audiosamplerate' => ! empty($audioSampleRate) ? $audioSampleRate : '', - 'audiolibrary' => ! empty($audioLibrary) ? $audioLibrary : '', - 'audiolanguage' => ! empty($audioLanguage) ? $audioLanguage : '', - 'audiotitle' => ! empty($audioTitle) ? $audioTitle : '', + 'audioformat' => \is_array($audioFormat) ? implode($audioFormat) : $audioFormat, + 'audiomode' => \is_array($audioMode) ? implode($audioMode) : $audioMode, + 'audiobitratemode' => \is_array($audioBitRateMode) ? implode($audioBitRateMode) : $audioBitRateMode, + 'audiobitrate' => \is_array($audioBitRate) ? implode($audioBitRate) : $audioBitRate, + 'audiochannels' => \is_array($audioChannels) ? implode($audioChannels) : $audioChannels, + 'audiosamplerate' => \is_array($audioSampleRate) ? implode($audioSampleRate) : $audioSampleRate, + 'audiolibrary' => \is_array($audioLibrary) ? implode($audioLibrary) : $audioLibrary, + 'audiolanguage' => \is_array($audioLanguage) ? implode($audioLanguage) : $audioLanguage, + 'audiotitle' => \is_array($audioTitle) ? implode($audioTitle) : $audioTitle, ]); } } diff --git a/Changelog b/Changelog index cf9a4b6d62..30a17cbe08 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-09-03 DariusIII + * Chg: Check for array before inserting audio data from mediainfo * Chg: Add checks before inserting audio data from mediainfo * Chg: Update handling of allAsMgr tables 2018-09-02 DariusIII From 535576625425a84798e91517a914c676942f700b Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 3 Sep 2018 09:25:25 +0000 Subject: [PATCH 07/10] Apply fixes from StyleCI [ci skip] [skip ci] --- Blacklight/ReleaseRemover.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Blacklight/ReleaseRemover.php b/Blacklight/ReleaseRemover.php index e628d2d3d8..9477586ca2 100755 --- a/Blacklight/ReleaseRemover.php +++ b/Blacklight/ReleaseRemover.php @@ -12,7 +12,6 @@ */ class ReleaseRemover { - /** * @var string */ From cf4f6a3579736eaedfc7e00517c254b2bd7e8f0a Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 3 Sep 2018 11:25:26 +0200 Subject: [PATCH 08/10] Update ReleaseRemover class --- Blacklight/ReleaseRemover.php | 26 ++++++++++++++------------ Changelog | 1 + 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Blacklight/ReleaseRemover.php b/Blacklight/ReleaseRemover.php index 8d08e78840..e628d2d3d8 100755 --- a/Blacklight/ReleaseRemover.php +++ b/Blacklight/ReleaseRemover.php @@ -12,10 +12,6 @@ */ class ReleaseRemover { - /** - * @const New line. - */ - private const N = PHP_EOL; /** * @var string @@ -150,7 +146,7 @@ public function __construct(array $options = []) * Remove releases using user criteria. * * @param array $arguments Array of criteria used to delete unwanted releases. - * Criteria muse look like this : columnName=modifier="content" + * Criteria must look like this : columnName=modifier="content" * columnName is a column name from the releases table. * modifiers are : equals,like,bigger,smaller * content is what to change the column content to @@ -492,7 +488,7 @@ protected function removePasswordURL() 'SELECT r.guid, r.searchname, r.id FROM releases r STRAIGHT_JOIN release_files rf ON r.id = rf.releases_id - WHERE rf.name LIKE %s ', + WHERE rf.name LIKE %s %s', $this->pdo->quote('%password.url%'), $this->crapTime ); @@ -857,8 +853,7 @@ protected function removeBlacklistFiles(): bool if (\count($allRegex) > 0) { foreach ($allRegex as $regex) { $regexSQL = sprintf( - 'STRAIGHT_JOIN release_files rf ON r.id = rf.releases_id - WHERE rf.name REGEXP %s ', + 'STRAIGHT_JOIN release_files rf ON r.id = rf.releases_id WHERE rf.name REGEXP %s', $this->pdo->quote($regex->regex) ); @@ -1014,8 +1009,10 @@ protected function removeCodecPoster() /** * Delete releases from the database. + * + * @return true */ - protected function deleteReleases() + protected function deleteReleases(): bool { $deletedCount = 0; foreach ($this->result as $release) { @@ -1040,7 +1037,7 @@ protected function deleteReleases() * * @return bool False on failure, true on success after setting a count of found releases. */ - protected function checkSelectQuery() + protected function checkSelectQuery(): bool { // Run the query, check if it picked up anything. $result = DB::select($this->cleanSpaces($this->query)); @@ -1073,7 +1070,7 @@ protected function formatCriteriaQuery($argument) return ''; } - $this->error = 'Invalid argument supplied: '.$argument.self::N; + $this->error = 'Invalid argument supplied: '.$argument.PHP_EOL; $args = explode('=', $argument); if (\count($args) === 3) { $args[0] = $this->cleanSpaces($args[0]); @@ -1244,7 +1241,7 @@ protected function checkUserResponse() // Print the query to the user, ask them if they want to continue using it. echo ColorCLI::primary( 'This is the query we have formatted using your criteria, you can run it in SQL to see if you like the results:'. - self::N.$this->query.';'.self::N. + PHP_EOL.$this->query.';'.PHP_EOL. 'If you are satisfied, type yes and press enter. Anything else will exit.' ); @@ -1308,6 +1305,11 @@ protected function returnError() return false; } + /** + * @param string $dbRegex + * + * @return bool|mixed|string + */ protected function extractSrchFromRegx($dbRegex = '') { $regexMatch = ''; diff --git a/Changelog b/Changelog index 30a17cbe08..1fc3e0066e 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-09-03 DariusIII + * Chg: Update ReleaseRemover class * Chg: Check for array before inserting audio data from mediainfo * Chg: Add checks before inserting audio data from mediainfo * Chg: Update handling of allAsMgr tables From 363d1c545e109bfae84fafb093a0a3af96b1a889 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 3 Sep 2018 14:35:20 +0200 Subject: [PATCH 09/10] Fix monitor counts and percentages displayed in main monitor pane --- Changelog | 1 + misc/update/tmux/monitor.php | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 1fc3e0066e..83a81d117d 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-09-03 DariusIII + * Fix: Fix monitor counts and percentages displayed in main monitor pane * Chg: Update ReleaseRemover class * Chg: Check for array before inserting audio data from mediainfo * Chg: Add checks before inserting audio data from mediainfo diff --git a/misc/update/tmux/monitor.php b/misc/update/tmux/monitor.php index 2bad6f2d15..70b7f21b08 100644 --- a/misc/update/tmux/monitor.php +++ b/misc/update/tmux/monitor.php @@ -113,8 +113,8 @@ echo ColorCLI::info("\nThe numbers(queries) above are currently being refreshed. \nNo pane(script) can be (re)started until these have completed.\n"); $timer02 = time(); - $splitqry = $tRun->proc_query(4, null, null, $db_name); - $newOldqry = $tRun->proc_query(6, null, null, null); + $splitqry = $tRun->proc_query(4, null, $db_name); + $newOldqry = $tRun->proc_query(6, null, null); $splitres = (array) array_first(DB::select($splitqry)); $runVar['timers']['newOld'] = (array) array_first(DB::select($newOldqry)); @@ -273,8 +273,8 @@ $runVar['counts']['diff'][$key] = number_format($proc - $runVar['counts']['start'][$key]); //calculate percentages -- if user has no releases, set 0 for each key or this will fail on divide by zero - $runVar['counts']['percent'][$key] = ($runVar['counts']['now']['releases'] > 0 - ? sprintf('%02s', floor(($proc / $runVar['counts']['now']['releases']) * 100)) : 0); + $runVar['counts']['percent'][$key] = $runVar['counts']['now']['releases'] > 0 + ? sprintf('%02s', floor(($proc / $runVar['counts']['now']['releases']) * 100)) : 0; } $runVar['counts']['now']['total_work'] += $runVar['counts']['now']['work']; From 6f6e1301339e88679662eadfa1f186d37096e045 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Tue, 4 Sep 2018 09:11:45 +0200 Subject: [PATCH 10/10] Add check for empty sharing table when running tmux --- Blacklight/TmuxRun.php | 2 +- Changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Blacklight/TmuxRun.php b/Blacklight/TmuxRun.php index 4de07a9b84..cb7d25dadd 100755 --- a/Blacklight/TmuxRun.php +++ b/Blacklight/TmuxRun.php @@ -770,7 +770,7 @@ protected function _runSharing($pane, &$runVar): void { $sharing = (array) array_first(DB::select('SELECT enabled, posting, fetching FROM sharing')); - if ((int) $sharing['enabled'] === 1 && (int) $runVar['settings']['run_sharing'] === 1 && ((int) $sharing['posting'] === 1 || (int) $sharing['fetching'] === 1) && shell_exec("tmux list-panes -t{$runVar['constants']['tmux_session']}:${pane} | grep ^0 | grep -c dead") == 1) { + if (! empty($sharing) && (int) $sharing['enabled'] === 1 && (int) $runVar['settings']['run_sharing'] === 1 && ((int) $sharing['posting'] === 1 || (int) $sharing['fetching'] === 1) && shell_exec("tmux list-panes -t{$runVar['constants']['tmux_session']}:${pane} | grep ^0 | grep -c dead") == 1) { shell_exec( "tmux respawnp -t{$runVar['constants']['tmux_session']}:${pane}.0 ' \ {$runVar['commands']['_php']} {$runVar['paths']['misc']}/update/multiprocessing/postprocess.php sha; \ diff --git a/Changelog b/Changelog index 83a81d117d..af0a5bf011 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2018-09-04 DariusIII + * Fix: Add check for empty sharing table when running tmux 2018-09-03 DariusIII * Fix: Fix monitor counts and percentages displayed in main monitor pane * Chg: Update ReleaseRemover class