Merge pull request #622 from bigbio/dev

Update some minor changes for the DIANN report

Author: ypriverol

pmultiqc/modules/diann/diann.py

@@ -13,7 +13,11 @@
     parse_mzml,
     aggregate_general_stats
 )
-from pmultiqc.modules.common.dia_utils import parse_diann_report, parse_diann_version, draw_diann_metadata_table
+from pmultiqc.modules.common.dia_utils import (
+    parse_diann_report,
+    parse_diann_version,
+    draw_diann_metadata_table
+)
 from pmultiqc.modules.common.plots.general import draw_exp_design
 from pmultiqc.modules.common.plots.id import (
     draw_summary_protein_ident_table,

pmultiqc/modules/quantms/quantms.py

@@ -29,7 +29,11 @@
 from . import sparklines
 
 from pmultiqc.modules.base import BasePMultiqcModule
-from pmultiqc.modules.common.dia_utils import parse_diann_report, parse_diann_version, draw_diann_metadata_table
+from pmultiqc.modules.common.dia_utils import (
+    parse_diann_report,
+    parse_diann_version,
+    draw_diann_metadata_table
+)
 from pmultiqc.modules.common.common_utils import (
     parse_sdrf,
     get_ms_path,
@@ -257,11 +261,16 @@ def get_data(self):
 
         # DIA-NN log file for version extraction
         self.diann_version = None
-        for f in self.find_log_files("pmultiqc/diann_log", filecontents=False):
-            log_path = os.path.join(f["root"], f["fn"])
-            self.diann_version = parse_diann_version(log_path)
+        for key in ["pmultiqc/diann_log_txt", "pmultiqc/diann_log"]:
+            for f in self.find_log_files(key, filecontents=False):
+                log_path = os.path.join(f["root"], f["fn"])
+                self.diann_version = parse_diann_version(log_path)
+
+                if self.diann_version:
+                    log.info(f"DIA-NN version detected: {self.diann_version}")
+                    break
+
             if self.diann_version:
-                log.info(f"DIA-NN version detected: {self.diann_version}")
                 break
 
         if not self.enable_dia: