check dirs are safe for removal

Author: nichollsh

src/AGNI.jl

@@ -584,6 +584,10 @@ module AGNI
         # Frame dir
         if plt_ani
             @debug "Will animate"
+            if !paths.is_safe_dir(atmos.FRAMES_DIR)
+                @error "Frame directory is unsafe! Got: $(atmos.FRAMES_DIR)"
+                return false
+            end
             rm(atmos.FRAMES_DIR,force=true,recursive=true)
             mkdir(atmos.FRAMES_DIR)
         end
@@ -862,6 +866,9 @@ module AGNI
         output_dir = abspath(cfg["files"]["output_dir"])
         clean_output = Bool(cfg["execution"]["clean_output"])
         if clean_output || !isdir(output_dir)
+            if !paths.is_safe_dir(output_dir)
+                error("Output directory is unsafe! Got: $output_dir")
+            end
             rm(output_dir,force=true,recursive=true)
             mkdir(output_dir)
         end

src/interface/load.jl

@@ -5,12 +5,12 @@
 """
 module load
 
-    import ..atmosphere
-
     using NCDatasets
     using LoggingExtras
     using Printf
 
+    import ..atmosphere
+
     """
     **Load atmosphere data from a NetCDF file.**
 
@@ -101,7 +101,7 @@ module load
             end
 
             # recalculate remaining layer properties
-            calc_layer_props!(atmos)
+            atmosphere.calc_layer_props!(atmos)
 
             close(ds)
 

src/state/atmosphere.jl

@@ -619,7 +619,7 @@ module atmosphere
         atmos.OUT_DIR = abspath(OUT_DIR)
         if !paths.is_safe_dir(atmos.OUT_DIR)
             @error "Output directory is not safe to write to!"
-            @error "    OUT_DIR=$(atmos.OUT_DIR)"
+            @error "    Got: $(atmos.OUT_DIR)"
             return false
         end
         if !isdir(atmos.OUT_DIR) && !isfile(atmos.OUT_DIR)
@@ -1233,6 +1233,10 @@ module atmosphere
             end
 
             # re-make FC working directory
+            if !paths.is_safe_dir(atmos.fastchem_work)
+                @error "Cannot use FastChem working directory! Got: $(atmos.fastchem_work)"
+                return false
+            end
             rm(atmos.fastchem_work,force=true,recursive=true)
             mkdir(atmos.fastchem_work)
         else
@@ -1276,6 +1280,10 @@ module atmosphere
             end
 
             # re-make working directory
+            if !paths.is_safe_dir(atmos.rfm_work)
+                @error "Cannot use RFM working directory! Got: $(atmos.rfm_work)"
+                return false
+            end
             rm(atmos.rfm_work,force=true,recursive=true)
             mkdir(atmos.rfm_work)
         end