Skip to content

Commit 953da87

Browse files
authored
Merge pull request #13 from aanil/master
Fix quote bugs in fstring
2 parents 7956ec0 + a297923 commit 953da87

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

multiqc_ngi/multiqc_ngi.py

+10-3
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,15 @@ def get_ngi_project_metadata(self, pid):
236236
infix = 'qc'
237237
else:
238238
infix = 'pipeline'
239-
config.output_fn_name = f'{p_summary["project_name"]}_{infix}_{config.output_fn_name}'
240-
config.data_dir_name = f'{p_summary['project_name']}_{config.data_dir_name}'
239+
#If a filename is provided
240+
if config.filename:
241+
infix = f"{infix}_{config.filename}"
242+
config.data_dir_name = f"{config.filename}_{config.data_dir_name}"
243+
config.nondefault_config['data_dir_name'] = config.data_dir_name
244+
config.plot_dir_name = f"{config.filename}_plots"
245+
config.nondefault_config['plot_dir_name'] = config.plot_dir_name
246+
config.output_fn_name = f"{p_summary['project_name']}_{infix}_{config.output_fn_name}"
247+
config.data_dir_name = f"{p_summary['project_name']}_{config.data_dir_name}"
241248
log.debug(f"Renaming report filename to '{config.output_fn_name}'")
242249
log.debug(f"Renaming data directory to '{config.data_dir_name}'")
243250

@@ -395,7 +402,7 @@ def general_stats_sample_meta(self):
395402
log.warning(f"Mixture of library_validation concentration units! Found: {', '.join(formats_set)}")
396403
for s_name in gsdata:
397404
try:
398-
gsdata[s_name]['lp_concentration'] = f'{gsdata[s_name]['lp_concentration']} {formats[s_name]}'
405+
gsdata[s_name]['lp_concentration'] = f"{gsdata[s_name]['lp_concentration']} {formats[s_name]}"
399406
except KeyError:
400407
pass
401408
elif len(formats_set) == 1:

0 commit comments

Comments
 (0)