From 5a3e82a4d961f0a327a01491dbaaf7e4db45f078 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Fri, 26 Jan 2024 20:17:30 +0100 Subject: [PATCH] Import from folders inside selected folder --- app/Console/Commands/ImportNzbs.php | 30 ++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/app/Console/Commands/ImportNzbs.php b/app/Console/Commands/ImportNzbs.php index 3cba16de0..adc5e0443 100644 --- a/app/Console/Commands/ImportNzbs.php +++ b/app/Console/Commands/ImportNzbs.php @@ -48,14 +48,30 @@ class ImportNzbs extends Command } else { $deleteFailedNZB = false; } - $folder = $this->option('folder'); - $files = File::allFiles($folder); - $NZBImport = new NZBImport(); + $importFolder = $this->option('folder'); + $folders = File::directories($importFolder); + if (empty($folders)) { + $this->info('Importing NZB files from '.$importFolder); + $files = File::allFiles($importFolder); + $NZBImport = new NZBImport(); - try { - $NZBImport->beginImport($files, $useNzbName, $deleteNZB, $deleteFailedNZB); - } catch (FileNotFoundException $e) { - $this->error($e->getMessage()); + try { + $NZBImport->beginImport($files, $useNzbName, $deleteNZB, $deleteFailedNZB); + } catch (FileNotFoundException $e) { + $this->error($e->getMessage()); + } + } else { + foreach ($folders as $folder) { + $this->info('Importing NZB files from '.$folder); + $files = File::allFiles($folder); + $NZBImport = new NZBImport(); + + try { + $NZBImport->beginImport($files, $useNzbName, $deleteNZB, $deleteFailedNZB); + } catch (FileNotFoundException $e) { + $this->error($e->getMessage()); + } + } } } else { $this->error('Folder path must not be empty');