More consiustenc upload anf wak method

Signed-off-by: Cédric Foellmi <cedric@onekiloparsec.dev>

oort/app/helpers/calibrations.py

@@ -31,7 +31,14 @@ def walk(self):
                 if self.context.debug or self.context.verbose: print(f' >> Found a {name} folder.')
                 self.flats_folders.append(FiltersFolder(self.context, self.astronomer, path, '[Flats]'))
 
-    def upload_biases_darks_flats(self, telescope_key):
+        for bias_folder in self.biases_folders:
+            bias_folder.walk()
+        for darks_folder in self.darks_folders:
+            darks_folder.walk()
+        for flats_folder in self.flats_folders:
+            flats_folder.walk()
+
+    def upload(self, telescope_key):
         if self.context.verbose:
             print(f'Syncing calibrations for telescope {telescope_key}')
 

oort/app/helpers/filters.py

@@ -19,6 +19,8 @@ def walk(self):
             if os.path.isdir(path):
                 if self.context.debug: print(f' >>> Found a [{self.prefix}] {name} folder.')
                 self.filter_folders.append(FilesSyncer(self.context, self.astronomer, path, self.prefix))
+        for filter_folder in self.filter_folders:
+            filter_folder.walk()
 
     def upload_filters(self, telescope_key, resources_key, **kwargs):
         if self.context.verbose:

oort/app/helpers/root.py

@@ -87,12 +87,13 @@ def read_remote_telescopes(self):
 
     def walk_telescope_folders(self):
         for telescope_folder in self.telescope_folders:
-            telescope_folder.walk()
+            telescope_folder.reset_obscal_folders()
+            telescope_folder.walk_telescope_folder()
 
-    def upload_telescopes_calibrations(self):
+    def upload_telescopes_calibrations_folders(self):
         for telescope_folder in self.telescope_folders:
             telescope_folder.uploads_calibrations_folders()
 
-    def upload_telescopes_observations(self):
+    def upload_telescopes_observations_folders(self):
         for telescope_folder in self.telescope_folders:
             telescope_folder.uploads_observations_folders()

oort/app/helpers/telescopes.py

@@ -20,8 +20,7 @@ def reset_obscal_folders(self):
         self.observations_folders = []
         self.calibrations_folders = []
 
-    def walk(self):
-        self.reset()
+    def walk_telescope_folder(self):
         for name, path in self._walk_folder():
             if not os.path.isdir(path):
                 # If not a directory, skip it. Will skip __oort__.ini files too.
@@ -34,6 +33,11 @@ def walk(self):
                 if self.context.debug: print(f' > Found a {self.prefix} {name} folder.')
                 self.observations_folders.append(FiltersFolder(self.context, self.astronomer, path, f'[{name}]'))
 
+        for calibrations_folder in self.calibrations_folders:
+            calibrations_folder.walk()
+        for observations_folder in self.observations_folders:
+            observations_folder.walk()
+
     @property
     def telescope_key(self):
         return f'telescope_{self.uuid}'
@@ -55,7 +59,7 @@ def read_remote_telescope(self):
 
     def uploads_calibrations_folders(self):
         for calibrations_folder in self.calibrations_folders:
-            calibrations_folder.upload_biases_darks_flats(self.telescope_key)
+            calibrations_folder.upload(self.telescope_key)
 
     def uploads_observations_folders(self):
         for observations_folder in self.observations_folders:

oort/app/uploads.py

@@ -20,13 +20,13 @@ def sync_telescopes(self):
     def sync_calibrations_uploads(self):
         if self.context.can_upload:
             self.context.state['showTables'] = True
-            self.root_folder.upload_telescopes_calibrations()
+            self.root_folder.upload_telescopes_calibrations_folders()
 
         return self.context.get_yield_string()
 
     def sync_observations_uploads(self):
         if self.context.can_upload:
             self.context.state['showTables'] = True
-            self.root_folder.upload_telescopes_observations()
+            self.root_folder.upload_telescopes_observations_folders()
 
         return self.context.get_yield_string()