From fdcfc8884b07925276cf91f2122e382813f686dd Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Wed, 21 Aug 2019 15:26:09 +0200
Subject: [PATCH] Move bad release removal to console command

---
 .../processing/post/ProcessAdditional.php     | 20 --------
 .../Commands/NntmuxRemoveBadReleases.php      | 51 +++++++++++++++++++
 app/Console/Kernel.php                        |  1 +
 3 files changed, 52 insertions(+), 20 deletions(-)
 create mode 100644 app/Console/Commands/NntmuxRemoveBadReleases.php

diff --git a/Blacklight/processing/post/ProcessAdditional.php b/Blacklight/processing/post/ProcessAdditional.php
index 0b9d0c7db..02f08de42 100755
--- a/Blacklight/processing/post/ProcessAdditional.php
+++ b/Blacklight/processing/post/ProcessAdditional.php
@@ -1226,7 +1226,6 @@ class ProcessAdditional
                 }
             }
         }
-        $this->_updatePassworded();
     }
 
     /**
@@ -1621,7 +1620,6 @@ class ProcessAdditional
         }
 
         Release::fromQuery($query);
-        $this->_removeBadReleases();
     }
 
     /**
@@ -2333,22 +2331,4 @@ class ProcessAdditional
     {
         $this->_echo('DEBUG: '.$string, 'debug');
     }
-
-    protected function _removeBadReleases(): void
-    {
-        $releases = Release::query()->where('passwordstatus', '=', -2)->get();
-
-        foreach ($releases as $release) {
-            $release->delete();
-        }
-    }
-
-    protected function _updatePassworded(): void
-    {
-        $passReleases = ReleaseFile::query()->where('passworded', '=', 1)->groupBy('releases_id')->get();
-
-        foreach ($passReleases as $passRelease) {
-            Release::whereId($passRelease->releases_id)->update(['passwordstatus' => 1]);
-        }
-    }
 }
diff --git a/app/Console/Commands/NntmuxRemoveBadReleases.php b/app/Console/Commands/NntmuxRemoveBadReleases.php
new file mode 100644
index 000000000..a04f74347
--- /dev/null
+++ b/app/Console/Commands/NntmuxRemoveBadReleases.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Release;
+use App\Models\ReleaseFile;
+use Illuminate\Console\Command;
+
+class NntmuxRemoveBadReleases extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'nntmux:remove-bad';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update releases that have passworded files inside archives and remove releases that cannot be PPA\'d properly';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        Release::query()->where('passwordstatus', '=', -2)->delete();
+
+        $passReleases = ReleaseFile::query()->where('passworded', '=', 1)->groupBy('releases_id')->get();
+
+        foreach ($passReleases as $passRelease) {
+            Release::whereId($passRelease->releases_id)->update(['passwordstatus' => 1]);
+        }
+
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 75c8b0129..34480a4a6 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -29,6 +29,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('clean:directories')->hourly();
         $schedule->command('nntmux:delete-unverified-users')->twiceDaily(1, 13);
         $schedule->command('nntmux:update-expired-roles')->daily();
+        $schedule->command('nntmux:remove-bad')->hourly();
         $schedule->command('telescope:prune')->daily();
         $schedule->command('horizon:snapshot')->everyFiveMinutes();
         if (config('nntmux.purge_inactive_users') === true) {