A free open source IT asset/license management system
Better file cleanup on seeders
snipe3fc91ed2e97c
diff --git a/database/seeders/AccessorySeeder.php b/database/seeders/AccessorySeeder.phpindex 355a9ef83b..38299bc261 100644--- a/database/seeders/AccessorySeeder.php+++ b/database/seeders/AccessorySeeder.php@@ -110,14 +110,24 @@ class AccessorySeeder extends Seeder}$src = public_path('/img/demo/accessories/');- $dst = 'accessories'.'/';- $del_files = Storage::files($dst);+ $dst = 'accessories/';- foreach ($del_files as $del_file) { // iterate files- $file_to_delete = str_replace($src, '', $del_file);- Log::debug('Deleting: '.$file_to_delete);+ // Wipe every item file in the public uploads dir.+ $disk = Storage::disk('public');+ foreach ($disk->files(rtrim($dst, '/')) as $del_file) {+ Log::debug('Deleting: ' . $del_file);try {- Storage::disk('public')->delete($dst.$del_file);+ $disk->delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }++ // Attached files on the private (default) disk.+ foreach (Storage::files('private_uploads/accessories') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ Storage::delete($del_file);} catch (\Exception $e) {Log::debug($e);}diff --git a/database/seeders/AssetModelSeeder.php b/database/seeders/AssetModelSeeder.phpindex 0d4172229e..155a86c8c4 100755--- a/database/seeders/AssetModelSeeder.php+++ b/database/seeders/AssetModelSeeder.php@@ -54,12 +54,22 @@ class AssetModelSeeder extends SeederAssetModel::factory()->count(1)->ultrasharp()->create(['created_by' => $admin->id]);$src = public_path('/img/demo/models/');- $dst = 'models'.'/';- $del_files = Storage::files($dst);+ $dst = 'models/';- foreach ($del_files as $del_file) { // iterate files+ // Wipe every item file in the public uploads dir.+ $disk = Storage::disk('public');+ foreach ($disk->files(rtrim($dst, '/')) as $del_file) {try {- Storage::disk('public')->delete($dst.$del_file);+ $disk->delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }++ // Attached files on the private (default) disk.+ foreach (Storage::files('private_uploads/models') as $del_file) {+ try {+ Storage::delete($del_file);} catch (\Exception $e) {Log::debug($e);}diff --git a/database/seeders/AssetSeeder.php b/database/seeders/AssetSeeder.phpindex 9c24cb96a6..b3a92c2d68 100644--- a/database/seeders/AssetSeeder.php+++ b/database/seeders/AssetSeeder.php@@ -72,11 +72,22 @@ class AssetSeeder extends SeederAsset::factory()->count(20)->ultrafine()->state(new Sequence($this->getState()))->create();Asset::factory()->count(20)->ultrasharp()->state(new Sequence($this->getState()))->create();- $del_files = Storage::files('assets');- foreach ($del_files as $del_file) { // iterate files- Log::debug('Deleting: '.$del_files);+ // Wipe every item file in the public uploads dir.+ $disk = Storage::disk('public');+ foreach ($disk->files('assets') as $del_file) {+ Log::debug('Deleting: ' . $del_file);try {- Storage::disk('public')->delete('assets'.'/'.$del_files);+ $disk->delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }++ // Attached files on the private (default) disk.+ foreach (Storage::files('private_uploads/assets') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ Storage::delete($del_file);} catch (\Exception $e) {Log::debug($e);}diff --git a/database/seeders/CategorySeeder.php b/database/seeders/CategorySeeder.phpindex 137dea2aba..364cc544dd 100755--- a/database/seeders/CategorySeeder.php+++ b/database/seeders/CategorySeeder.php@@ -5,6 +5,8 @@ namespace Database\Seeders;use App\Models\Category;use App\Models\User;use Illuminate\Database\Seeder;+use Illuminate\Support\Facades\Log;+use Illuminate\Support\Facades\Storage;class CategorySeeder extends Seeder{@@ -12,6 +14,17 @@ class CategorySeeder extends Seeder{Category::truncate();+ // Wipe every item file in the public uploads dir.+ $disk = Storage::disk('public');+ foreach ($disk->files('categories') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ $disk->delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }+$admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();Category::factory()->count(1)->assetLaptopCategory()->create(['created_by' => $admin->id]);diff --git a/database/seeders/CompanySeeder.php b/database/seeders/CompanySeeder.phpindex 04f9190f7c..8908bce8d8 100644--- a/database/seeders/CompanySeeder.php+++ b/database/seeders/CompanySeeder.php@@ -21,14 +21,24 @@ class CompanySeeder extends SeederCompany::factory()->count(4)->create();$src = public_path('/img/demo/companies/');- $dst = 'companies'.'/';- $del_files = Storage::files('companies/'.$dst);+ $dst = 'companies/';- foreach ($del_files as $del_file) { // iterate files- $file_to_delete = str_replace($src, '', $del_file);- Log::debug('Deleting: '.$file_to_delete);+ // Wipe every item file in the public uploads dir.+ $disk = Storage::disk('public');+ foreach ($disk->files(rtrim($dst, '/')) as $del_file) {+ Log::debug('Deleting: ' . $del_file);try {- Storage::disk('public')->delete($dst.$del_file);+ $disk->delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }++ // Attached files on the private (default) disk.+ foreach (Storage::files('private_uploads/companies') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ Storage::delete($del_file);} catch (\Exception $e) {Log::debug($e);}diff --git a/database/seeders/ComponentSeeder.php b/database/seeders/ComponentSeeder.phpindex 73d6dcfeb0..5b9c01f980 100644--- a/database/seeders/ComponentSeeder.php+++ b/database/seeders/ComponentSeeder.php@@ -12,6 +12,8 @@ use App\Models\User;use Carbon\Carbon;use Illuminate\Database\Seeder;use Illuminate\Support\Facades\DB;+use Illuminate\Support\Facades\Log;+use Illuminate\Support\Facades\Storage;class ComponentSeeder extends Seeder{@@ -22,6 +24,27 @@ class ComponentSeeder extends SeederComponent::truncate();DB::table('components_assets')->truncate();+ // Wipe every item file in the public uploads dir.+ $disk = Storage::disk('public');+ foreach ($disk->files('components') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ $disk->delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }++ // Attached files on the private (default) disk.+ foreach (Storage::files('private_uploads/components') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ Storage::delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }+if (! Company::count()) {$this->call(CompanySeeder::class);}diff --git a/database/seeders/ConsumableSeeder.php b/database/seeders/ConsumableSeeder.phpindex b5d9a6132a..f8a4181434 100644--- a/database/seeders/ConsumableSeeder.php+++ b/database/seeders/ConsumableSeeder.php@@ -9,6 +9,8 @@ use App\Models\User;use Carbon\Carbon;use Illuminate\Database\Seeder;use Illuminate\Support\Facades\DB;+use Illuminate\Support\Facades\Log;+use Illuminate\Support\Facades\Storage;class ConsumableSeeder extends Seeder{@@ -19,6 +21,27 @@ class ConsumableSeeder extends SeederConsumable::truncate();DB::table('consumables_users')->truncate();+ // Wipe every item file in the public uploads dir.+ $disk = Storage::disk('public');+ foreach ($disk->files('consumables') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ $disk->delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }++ // Attached files on the private (default) disk.+ foreach (Storage::files('private_uploads/consumables') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ Storage::delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }+if (! Supplier::count()) {$this->call(SupplierSeeder::class);}diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.phpindex 0e52b89c23..3b9f364d48 100644--- a/database/seeders/DatabaseSeeder.php+++ b/database/seeders/DatabaseSeeder.php@@ -7,6 +7,7 @@ use Database\Seeders\Concerns\ReportsMemory;use Illuminate\Database\Eloquent\Model;use Illuminate\Database\Seeder;use Illuminate\Support\Facades\DB;+use Illuminate\Support\Facades\Storage;class DatabaseSeeder extends Seeder{@@ -24,6 +25,27 @@ class DatabaseSeeder extends Seeder$this->reportMemory('DatabaseSeeder start');+ // Wipe every item file in the public uploads dir.+ // The entity seeders (Asset, User, Location, etc.) already clear+ // their own image dirs, but these four are one-per-event dirs+ // that grow indefinitely.+ foreach ([+ 'private_uploads/eula-pdfs',+ 'private_uploads/audits',+ 'private_uploads/signatures',+ 'private_uploads/imports',+ ] as $accumulatorDir) {+ if (Storage::exists($accumulatorDir)) {+ Storage::deleteDirectory($accumulatorDir);+ }+ }++ // Not clearing backups here on purpose. spatie/laravel-backup+ // ships its own age + size cleanup strategy that the scheduler+ // fires on its own cadence (see config/backup.php cleanup+ // section), so wiping them on re-seed would fight with the+ // production garbage-collection path.+// Only create default settings if they do not exist in the db.if (! Setting::first()) {// factory(Setting::class)->create();diff --git a/database/seeders/DepartmentSeeder.php b/database/seeders/DepartmentSeeder.phpindex d60facafa7..aadd46b260 100644--- a/database/seeders/DepartmentSeeder.php+++ b/database/seeders/DepartmentSeeder.php@@ -6,6 +6,8 @@ use App\Models\Department;use App\Models\Location;use App\Models\User;use Illuminate\Database\Seeder;+use Illuminate\Support\Facades\Log;+use Illuminate\Support\Facades\Storage;class DepartmentSeeder extends Seeder{@@ -13,6 +15,27 @@ class DepartmentSeeder extends Seeder{Department::truncate();+ // Wipe every item file in the public uploads dir.+ $disk = Storage::disk('public');+ foreach ($disk->files('departments') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ $disk->delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }++ // Attached files on the private (default) disk.+ foreach (Storage::files('private_uploads/departments') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ Storage::delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }+if (! Location::count()) {$this->call(LocationSeeder::class);}diff --git a/database/seeders/LicenseSeeder.php b/database/seeders/LicenseSeeder.phpindex 8d7308f23a..a4799de288 100644--- a/database/seeders/LicenseSeeder.php+++ b/database/seeders/LicenseSeeder.php@@ -9,6 +9,7 @@ use App\Models\Supplier;use App\Models\User;use Illuminate\Database\Seeder;use Illuminate\Support\Facades\Log;+use Illuminate\Support\Facades\Storage;class LicenseSeeder extends Seeder{@@ -17,6 +18,27 @@ class LicenseSeeder extends SeederLicense::truncate();LicenseSeat::truncate();+ // Wipe every item file in the public uploads dir.+ $disk = Storage::disk('public');+ foreach ($disk->files('licenses') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ $disk->delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }++ // Attached files on the private (default) disk.+ foreach (Storage::files('private_uploads/licenses') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ Storage::delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }+if (! Category::count()) {$this->call(CategorySeeder::class);}diff --git a/database/seeders/LocationSeeder.php b/database/seeders/LocationSeeder.phpindex 4a98ecb9e8..667d976ff3 100644--- a/database/seeders/LocationSeeder.php+++ b/database/seeders/LocationSeeder.php@@ -15,14 +15,24 @@ class LocationSeeder extends SeederLocation::factory()->count(10)->create();$src = public_path('/img/demo/locations/');- $dst = 'locations'.'/';- $del_files = Storage::files($dst);+ $dst = 'locations/';- foreach ($del_files as $del_file) { // iterate files- $file_to_delete = str_replace($src, '', $del_file);- Log::debug('Deleting: '.$file_to_delete);+ // Wipe every item file in the public uploads dir.+ $disk = Storage::disk('public');+ foreach ($disk->files(rtrim($dst, '/')) as $del_file) {+ Log::debug('Deleting: ' . $del_file);try {- Storage::disk('public')->delete($dst.$del_file);+ $disk->delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }++ // Attached files on the private (default) disk.+ foreach (Storage::files('private_uploads/locations') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ Storage::delete($del_file);} catch (\Exception $e) {Log::debug($e);}diff --git a/database/seeders/MaintenanceSeeder.php b/database/seeders/MaintenanceSeeder.phpindex 2757653093..de913f45ce 100644--- a/database/seeders/MaintenanceSeeder.php+++ b/database/seeders/MaintenanceSeeder.php@@ -25,14 +25,26 @@ class MaintenanceSeeder extends SeederMaintenance::factory()->realistic()->create(['image' => '11.png']);$src = public_path('/img/demo/maintenances/');- $dst = 'maintenances'.'/';- $del_files = Storage::files($dst);+ $dst = 'maintenances/';- foreach ($del_files as $del_file) { // iterate files- $file_to_delete = str_replace($src, '', $del_file);- Log::debug('Deleting: '.$file_to_delete);+ // See AssetSeeder for why this reads and deletes on the same+ // public disk using Storage::files()'s already-prefixed paths.+ $disk = Storage::disk('public');+ foreach ($disk->files(rtrim($dst, '/')) as $del_file) {+ Log::debug('Deleting: '.$del_file);try {- Storage::disk('public')->delete($dst.$del_file);+ $disk->delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }++ // Attached files on the private (default) disk. Same reset+ // rationale as the public dir above.+ foreach (Storage::files('private_uploads/maintenances') as $del_file) {+ Log::debug('Deleting: '.$del_file);+ try {+ Storage::delete($del_file);} catch (\Exception $e) {Log::debug($e);}diff --git a/database/seeders/ManufacturerSeeder.php b/database/seeders/ManufacturerSeeder.phpindex cdf7596d45..db8b0d71e7 100644--- a/database/seeders/ManufacturerSeeder.php+++ b/database/seeders/ManufacturerSeeder.php@@ -33,14 +33,14 @@ class ManufacturerSeeder extends SeederManufacturer::factory()->count(1)->sony()->create(['created_by' => $admin->id]);$src = public_path('/img/demo/manufacturers/');- $dst = 'manufacturers'.'/';- $del_files = Storage::files($dst);+ $dst = 'manufacturers/';- foreach ($del_files as $del_file) { // iterate files- $file_to_delete = str_replace($src, '', $del_file);- Log::debug('Deleting: '.$file_to_delete);+ // Wipe every item file in the public uploads dir.+ $disk = Storage::disk('public');+ foreach ($disk->files(rtrim($dst, '/')) as $del_file) {+ Log::debug('Deleting: ' . $del_file);try {- Storage::disk('public')->delete($dst.$del_file);+ $disk->delete($del_file);} catch (\Exception $e) {Log::debug($e);}diff --git a/database/seeders/SupplierSeeder.php b/database/seeders/SupplierSeeder.phpindex dc012e9b7f..d666c13b8d 100644--- a/database/seeders/SupplierSeeder.php+++ b/database/seeders/SupplierSeeder.php@@ -4,12 +4,36 @@ namespace Database\Seeders;use App\Models\Supplier;use Illuminate\Database\Seeder;+use Illuminate\Support\Facades\Log;+use Illuminate\Support\Facades\Storage;class SupplierSeeder extends Seeder{public function run(){Supplier::truncate();++ // Wipe every item file in the public uploads dir.+ $disk = Storage::disk('public');+ foreach ($disk->files('suppliers') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ $disk->delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }++ // Attached files on the private (default) disk.+ foreach (Storage::files('private_uploads/suppliers') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ Storage::delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }+Supplier::factory()->count(5)->create();}}diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.phpindex 55df838f07..8cfc8122c2 100644--- a/database/seeders/UserSeeder.php+++ b/database/seeders/UserSeeder.php@@ -26,7 +26,7 @@ class UserSeeder extends SeederUser::truncate();// Truncate the company_user pivot too. Truncating users alone leaves- // orphaned pivot rows referencing the old user_ids; on the next reseed+ // orphaned pivot rows referencing the old user_ids. On the next reseed// AUTO_INCREMENT hands out those same ids again, and any attempt to// reattach a re-created user to the same company hits the// (company_id, user_id) unique constraint.@@ -147,14 +147,24 @@ class UserSeeder extends Seeder$this->reportMemory('UserSeeder after 400 multi-company users (chunked)');$src = public_path('/img/demo/avatars/');- $dst = 'avatars'.'/';- $del_files = Storage::files($dst);+ $dst = 'avatars/';- foreach ($del_files as $del_file) { // iterate files- $file_to_delete = str_replace($src, '', $del_file);- Log::debug('Deleting: '.$file_to_delete);+ // Wipe every item file in the public uploads dir.+ $disk = Storage::disk('public');+ foreach ($disk->files(rtrim($dst, '/')) as $del_file) {+ Log::debug('Deleting: ' . $del_file);try {- Storage::disk('public')->delete($dst.$del_file);+ $disk->delete($del_file);+ } catch (\Exception $e) {+ Log::debug($e);+ }+ }++ // Attached files on the private (default) disk.+ foreach (Storage::files('private_uploads/users') as $del_file) {+ Log::debug('Deleting: ' . $del_file);+ try {+ Storage::delete($del_file);} catch (\Exception $e) {Log::debug($e);}