From 22bb8d04fa12c8c8a1e85b2cda005a4f526019dd Mon Sep 17 00:00:00 2001
From: Marko Mecina <marko.mecina@univie.ac.at>
Date: Tue, 28 Nov 2023 17:51:14 +0100
Subject: [PATCH] fix CSV to JSON import
---
Tst/spec_to_json.py | 21 +++++++++++++++------
Tst/tst/tst.py | 2 +-
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/Tst/spec_to_json.py b/Tst/spec_to_json.py
index da02255..ca874e3 100755
--- a/Tst/spec_to_json.py
+++ b/Tst/spec_to_json.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
import json
+import os
import sys
sys.path.append('../Ccs')
@@ -8,18 +9,26 @@ import ccs_function_lib as cfl
def run(specfile, gen_cmd, save_json):
- tmp = json.load(open('tst_template_empty.json', 'r'))
+ tmp = json.load(open(os.path.join(cfl.cfg.get('paths', 'tst'), 'tst_template_empty.json'), 'r'))
jspec = tmp.copy()
specs = open(specfile, 'r').read().split('\n')
- name, descr, spec_version_entry, _ = specs[1].split('|')
- spec_version = spec_version_entry.split(': ')[-1]
- sw_version = spec_version_entry.split('-')[1]
+ name, descr, spec_version_entry, sw_version_entry = specs[1].split('|')
+
+ try:
+ spec_version = spec_version_entry.split(': ')[-1]
+ except IndexError:
+ spec_version = ''
+
+ try:
+ sw_version = sw_version_entry.split('-')[1]
+ except IndexError:
+ sw_version = ''
jspec['_name'] = name
jspec['_description'] = descr.replace('\\_', '_')
- jspec['_spec_version'] = spec_version
- jspec['_iasw_version'] = sw_version
+ jspec['_spec_version'] = spec_version.strip()
+ jspec['_iasw_version'] = sw_version.strip()
jspec['_primary_counter_locked'] = False
steps = jspec['sequences'][0]['steps']
diff --git a/Tst/tst/tst.py b/Tst/tst/tst.py
index f823017..c57f5b8 100755
--- a/Tst/tst/tst.py
+++ b/Tst/tst/tst.py
@@ -752,7 +752,7 @@ class TstAppWindow(Gtk.ApplicationWindow):
# self.on_open_create_tab(data_from_file, filename, json_type=False)
dialog.destroy()
- self.save_as_file_dialog()
+ # self.save_as_file_dialog()
else:
dialog.destroy()
--
GitLab