fix: avoiding unnecessary processing of folders

NFDI4Chem · Oct 19, 2023 · ff42756 · ff42756
1 parent 2917b02
commit ff42756
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/app/Http/Controllers/DraftController.php b/app/Http/Controllers/DraftController.php
@@ -433,22 +433,26 @@ public function processFolder($folders)
     {
         foreach ($folders as $folder) {
             if ($folder->type == 'directory') {
-                if ($this->isBruker($folder)) {
-                    $this->saveInstrumentType($folder, 'bruker');
-                    $this->saveModelType($folder->parent);
-                } elseif ($this->isVarian($folder)) {
-                    $this->saveInstrumentType($folder, 'varian');
-                    $this->saveModelType($folder->parent);
-                } else {
-                    $this->processFolder($folder->children);
+                if ($folder->instrument_type != null) {
+                    if ($this->isBruker($folder)) {
+                        $this->saveInstrumentType($folder, 'bruker');
+                        $this->saveModelType($folder->parent);
+                    } elseif ($this->isVarian($folder)) {
+                        $this->saveInstrumentType($folder, 'varian');
+                        $this->saveModelType($folder->parent);
+                    } else {
+                        $this->processFolder($folder->children);
+                    }
                 }
             } else {
-                if ($this->isJOEL($folder)) {
-                    $this->saveInstrumentType($folder, 'joel');
-                    $this->saveModelType($folder->parent);
-                } elseif ($this->isJcampDX($folder)) {
-                    $this->saveInstrumentType($folder, 'jcamp');
-                    $this->saveModelType($folder->parent);
+                if ($folder->instrument_type != null) {
+                    if ($this->isJOEL($folder)) {
+                        $this->saveInstrumentType($folder, 'joel');
+                        $this->saveModelType($folder->parent);
+                    } elseif ($this->isJcampDX($folder)) {
+                        $this->saveInstrumentType($folder, 'jcamp');
+                        $this->saveModelType($folder->parent);
+                    }
                 }
             }
         }