From f0aeec49b486fa2eef413332e43e35429e7b19ac Mon Sep 17 00:00:00 2001
From: karnem <mikhail.karnevskiy@desy.de>
Date: Thu, 6 Jun 2019 16:16:36 +0200
Subject: [PATCH] Order modules in the report
---
cal_tools/cal_tools/tools.py | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/cal_tools/cal_tools/tools.py b/cal_tools/cal_tools/tools.py
index 681c3e254..dd37dad93 100644
--- a/cal_tools/cal_tools/tools.py
+++ b/cal_tools/cal_tools/tools.py
@@ -15,10 +15,29 @@ import time
from uuid import uuid4
+def atoi(text):
+ '''
+ Convert string to integer is possible
+
+ :param text: string to be converted
+ :return: integer value or input string
+ '''
+
+ return int(text) if text.isdigit() else text
+
+
+def natural_keys(text):
+ '''
+ Decompose string to list of integers and sub-strings
+ '''
+ return [ atoi(c) for c in re.split(r'(\d+)', text) ]
+
+
def combine_report(run_path, calibration):
sphinx_path = "{}/sphinx_rep".format(os.path.abspath(run_path))
os.makedirs(sphinx_path)
direntries = os.listdir(run_path)
+ direntries.sort(key=natural_keys)
for entry in direntries:
--
GitLab