Outputs Update #2 - Run Gudrun in Temporary Directory

.github/workflows/test/action.yml

@@ -32,8 +32,7 @@ runs:
     shell: bash
     run: |
       cd gudpy
-      nose2 --with-coverage --coverage-report xml --plugin nose2.plugins.junitxml --junit-xml test
-
+      nose2 --with-coverage --coverage-report xml --plugin nose2.plugins.junitxml --junit-xml --verbose test
       mkdir ../results
       mv nose2-junit.xml ../results/nose2-junit-${{ runner.os }}.xml
 

gudpy/core/file_library.py

@@ -40,7 +40,6 @@ def __init__(self, gudrunFile):
 
         # Collect directories
         self.dirs = {
-            "Input file directory": gudrunFile.instrument.GudrunInputFileDir,
             "Data file directory": gudrunFile.instrument.dataFileDir,
             "Gudrun start folder": gudrunFile.instrument.GudrunStartFolder,
             "Startup file folder": gudrunFile.instrument.startupFileFolder,
@@ -172,14 +171,14 @@ def exportMintData(
     ):
         if not exportTo:
             exportTo = os.path.join(
-                self.gudrunFile.instrument.GudrunInputFileDir,
+                self.gudrunFile.projectDir,
                 Path(self.gudrunFile.path).stem + ".zip",
             )
         with ZipFile(exportTo, "w", ZIP_DEFLATED) as zipFile:
             for sample in samples:
                 if len(sample.dataFiles.dataFiles):
                     path = os.path.join(
-                        self.gudrunFile.instrument.GudrunInputFileDir,
+                        self.gudrunFile.projectDir,
                         sample.dataFiles.dataFiles[0].replace(
                             self.gudrunFile.instrument.dataFileType, "mint01"
                         ),
@@ -195,12 +194,12 @@ def exportMintData(
                     zipFile.write(path, arcname=os.path.basename(outpath))
                     if includeParams:
                         path = os.path.join(
-                            self.gudrunFile.instrument.GudrunInputFileDir,
+                            self.gudrunFile.projectDir,
                             safeSampleName + ".sample",
                         )
                         if not os.path.exists(path):
                             sample.write_out(
-                                self.gudrunFile.instrument.GudrunInputFileDir
+                                self.gudrunFile.projectDir
                             )
                         zipFile.write(path, arcname=os.path.basename(path))
 

gudpy/core/gud_file.py

@@ -1,7 +1,6 @@
 from core.exception import ParserException
 
 import os
-from os.path import isfile
 import re
 from decimal import Decimal, getcontext
 getcontext().prec = 5
@@ -80,6 +79,7 @@ class GudFile:
     write_out(overwrite=False)
         Writes out the string representation of the GudFile to a file.
     """
+
     def __init__(self, path):
         """
         Constructs all the necessary attributes for the GudFile object.
@@ -90,6 +90,18 @@ def __init__(self, path):
         path : str
             Path to the file.
         """
+
+        # Handle edge cases - invalid extensions and paths.
+        if not path:
+            raise ParserException("Please supply a valid path.")
+
+        if not path.endswith(".gud"):
+            raise ParserException(f"Attempted to parse {path}" +
+                                  "\nOnly .gud files can be parsed.")
+
+        if not os.path.isfile(path):
+            raise ParserException(f"{path} is not a valid path.")
+
         self.path = path
 
         # Construct the outpath
@@ -119,13 +131,6 @@ def __init__(self, path):
         self.stream = []
         self.output = ""
 
-        # Handle edge cases - invalid extensions and paths.
-        if not self.path.endswith(".gud"):
-            raise ParserException("Only .gud files can be parsed.")
-
-        if not isfile(self.path):
-            raise ParserException("Please provide a valid path.")
-
         # Parse the GudFile
         self.parse()
 
@@ -273,10 +278,10 @@ def parse(self):
             else:
                 percentage = float(re.findall(floatRegex, output)[0])
                 if percentage < 100:
-                    diff = float(Decimal(100.0)-Decimal(percentage))
+                    diff = float(Decimal(100.0) - Decimal(percentage))
                     self.output = f"-{diff}%"
                 elif percentage > 100:
-                    diff = float(Decimal(percentage)-Decimal(100.0))
+                    diff = float(Decimal(percentage) - Decimal(100.0))
                     self.output = f"+{diff}%"
                 else:
                     self.output = "0%"
@@ -288,10 +293,10 @@ def parse(self):
 
         except Exception as e:
             raise ParserException(
-                    f"Whilst parsing {self.path}, an exception occured."
-                    " It's likely gudrun_dcs failed, and invalid values"
-                    " were yielded. "
-                    f"{str(e)}"
+                f"Whilst parsing {self.path}, an exception occured."
+                " It's likely gudrun_dcs failed, and invalid values"
+                " were yielded. "
+                f"{str(e)}"
             ) from e
 
     def __str__(self):