Merge pull request #13 from aanil/master

Fix quote bugs in fstring
NationalGenomicsInfrastructure · Sep 16, 2024 · 953da87 · 953da87
2 parents 7956ec0 + a297923
commit 953da87
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/multiqc_ngi/multiqc_ngi.py b/multiqc_ngi/multiqc_ngi.py
@@ -236,8 +236,15 @@ def get_ngi_project_metadata(self, pid):
             infix = 'qc'
         else:
             infix = 'pipeline'
-        config.output_fn_name = f'{p_summary["project_name"]}_{infix}_{config.output_fn_name}'
-        config.data_dir_name = f'{p_summary['project_name']}_{config.data_dir_name}'
+        #If a filename is provided
+        if config.filename:
+            infix = f"{infix}_{config.filename}"
+            config.data_dir_name = f"{config.filename}_{config.data_dir_name}"
+            config.nondefault_config['data_dir_name'] = config.data_dir_name
+            config.plot_dir_name = f"{config.filename}_plots"
+            config.nondefault_config['plot_dir_name'] = config.plot_dir_name
+        config.output_fn_name = f"{p_summary['project_name']}_{infix}_{config.output_fn_name}"
+        config.data_dir_name = f"{p_summary['project_name']}_{config.data_dir_name}"
         log.debug(f"Renaming report filename to '{config.output_fn_name}'")
         log.debug(f"Renaming data directory to '{config.data_dir_name}'")
 
@@ -395,7 +402,7 @@ def general_stats_sample_meta(self):
                 log.warning(f"Mixture of library_validation concentration units! Found: {', '.join(formats_set)}")
                 for s_name in gsdata:
                     try:
-                        gsdata[s_name]['lp_concentration'] = f'{gsdata[s_name]['lp_concentration']} {formats[s_name]}'
+                        gsdata[s_name]['lp_concentration'] = f"{gsdata[s_name]['lp_concentration']} {formats[s_name]}"
                     except KeyError:
                         pass
             elif len(formats_set) == 1: