diff --git a/Blacklight/libraries/Forking.php b/Blacklight/libraries/Forking.php index 7e0e63c05..1e84d52a1 100755 --- a/Blacklight/libraries/Forking.php +++ b/Blacklight/libraries/Forking.php @@ -493,7 +493,9 @@ class Forking $pool->add(function () use ($queue) { $this->_executeCommand($this->dnr_path.$queue.'"'); })->then(function () use ($match) { - $this->colorCli->primary('Updated group '.$match[0]); + if (! empty($match)) { + $this->colorCli->primary('Updated group '.$match[0]); + } })->catch(function (Throwable $exception) { // Handle exception }); @@ -732,10 +734,10 @@ class Forking $this->work = DB::select( sprintf( ' - SELECT id AS releaseId, leftguid AS id - FROM releases + SELECT r.id AS releaseId, r.leftguid AS id + FROM releases r WHERE 1=1 %s - GROUP BY leftguid + GROUP BY r.leftguid LIMIT 16', $this->nfoQueryString ) diff --git a/composer.json b/composer.json index d2b8fbbd8..aa75dec8f 100755 --- a/composer.json +++ b/composer.json @@ -95,7 +95,6 @@ "aharen/omdbapi": "^2.0", "anhskohbo/no-captcha": "^3.0", "b3rs3rk/steamfront": "dev-master", - "barracudanetworks/forkdaemon-php": "~1.0", "bhuvidya/laravel-countries": "^1.0", "canihavesomecoffee/thetvdbapi": "^1.0", "chumper/zipper": "^1.0", diff --git a/composer.lock b/composer.lock index 7f1f204c1..8dc43cf53 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "9f20db5e7752e093b517a3f941d72279", + "content-hash": "81ed623ed34b3238606d6ae04bf4accf", "packages": [ { "name": "aharen/omdbapi", @@ -208,42 +208,6 @@ "description": "PHP Wrapper for Accessing the Steam Storefront API", "time": "2017-08-27T15:14:06+00:00" }, - { - "name": "barracudanetworks/forkdaemon-php", - "version": "v1.1.1", - "source": { - "type": "git", - "url": "https://github.com/barracudanetworks/forkdaemon-php.git", - "reference": "16c068748ce170ab167f288b116ac0d105f6185d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/barracudanetworks/forkdaemon-php/zipball/16c068748ce170ab167f288b116ac0d105f6185d", - "reference": "16c068748ce170ab167f288b116ac0d105f6185d", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "fork_daemon.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "A library to make setup and management of forking daemons in PHP easy.", - "homepage": "https://github.com/barracudanetworks/forkdaemon-php", - "keywords": [ - "daemons", - "forking", - "php" - ], - "time": "2018-09-11T14:29:03+00:00" - }, { "name": "bhuvidya/laravel-countries", "version": "v1.0.4",