Merge pull request #194 from ISISComputingGroup/Walk_all_files_in_sensor_folder_AND_specify_num_of_header_lines

Changed to convert all files in a list of sensors and allow specifying of number of header lines for temperature files

Author: LowriJenkins

workflow_support_scripts/convert_temp_calib_files.py

@@ -12,7 +12,7 @@
 dir_path = os.path.dirname(os.path.realpath(__file__))
 
 
-def convert(original_file_name, output_folder, root):
+def convert(original_file_name, output_folder, root, num_of_header_lines=1):
     """
     Converts .dat calibration files to .txt files and writes them to the output file
     :param original_file_name (str): The name of the file to be converted
@@ -24,6 +24,6 @@ def convert(original_file_name, output_folder, root):
     with open(os.path.join(root, original_file_name), mode='r', encoding='utf-8') as original_file, \
             open(os.path.join(output_folder, output_file_name), mode='w+', encoding='utf-8') as output_file:
         # Strip first 3 lines from file
-        utility.strip_header(3, original_file)
+        utility.strip_header(num_of_header_lines, original_file)
         # Go through rest of lines and add correct format to output file
         utility.format_output_file(original_file, output_file, 0, 1)

workflow_support_scripts/file_converter.py

@@ -10,16 +10,17 @@
 dir_path = os.path.dirname(os.path.realpath(__file__))
 
 
-def get_input_output_folders() -> Tuple[str, str]:
+def get_arguments() -> Tuple[str, str, int]:
     """
     Get the input and output folders from the command line
     :return: input_folder, output_folder
     """
     parser = argparse.ArgumentParser(description='Get the input and output folder')
     parser.add_argument('-i', "--input", dest="input_folder", type=str, help='The input folder', required=True)
     parser.add_argument('-o', "--output", dest="output_folder", type=str, help='The output folder', required=True)
+    parser.add_argument('-thl', "--temp_header_lines", dest="num_of_temp_header_lines", type=int, help='The number of header lines to strip from temp files', required=False, default=1)
     args = parser.parse_args()
-    return os.path.join(dir_path, args.input_folder), os.path.join(dir_path, args.output_folder)
+    return os.path.join(dir_path, args.input_folder), os.path.join(dir_path, args.output_folder), args.num_of_temp_header_lines
 
 
 class FileConverter:
@@ -109,7 +110,7 @@ def convert_file(root, original_file_name) -> None:
             convert_curve_files.convert(original_file_name, output_folder, root)
         # If the file is in .dat format
         if original_file_name.endswith(FileTypes.ORIGINAL_DAT_FILE_EXTENSION):
-            convert_temp_calib_files.convert(original_file_name, output_folder, root)
+            convert_temp_calib_files.convert(original_file_name, output_folder, root, num_of_temp_header_lines)
 
     def convert_all_files(self) -> None:
         """
@@ -119,15 +120,11 @@ def convert_all_files(self) -> None:
         for root, _, files in os.walk(self.input_dir):
             for original_file_name in files:
                 self.convert_file(root, original_file_name)
-                # We've found the file to convert so don't need to look at any other in the directory
-                break
-            else:
-                print(f"Could not find file to convert in {root}")
 
 
 if __name__ == "__main__":
     # Get the input and output folders from the command line
-    input_folder, output_folder = get_input_output_folders()
+    input_folder, output_folder, num_of_temp_header_lines = get_arguments()
     # Create Instance of FileConverter
     file_converter = FileConverter(input_folder, output_folder)
     # Check input folder exists