From 28362559277be532e3073ae6c536e311c11b2e9f Mon Sep 17 00:00:00 2001 From: Lucas Verleyen Date: Tue, 3 Sep 2024 11:00:03 +0200 Subject: [PATCH 1/2] remove old code --- IDEAS/Resources/Scripts/mergeAnnex60Script.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/IDEAS/Resources/Scripts/mergeAnnex60Script.py b/IDEAS/Resources/Scripts/mergeAnnex60Script.py index 5dc49b36d..706243a16 100644 --- a/IDEAS/Resources/Scripts/mergeAnnex60Script.py +++ b/IDEAS/Resources/Scripts/mergeAnnex60Script.py @@ -10,12 +10,8 @@ dest_dir = data['dest_dir'] else: - print(fileName + " could not be found in your current working directory, please enter source and destination paths. \nThey will be saved for next time. Remove " + fileName + " to reset the paths.") - annex60_dir = raw_input("Enter annex60 directory path: \n") - dest_dir = raw_input("Enter destination directory path: \n") - data = {"annex60_dir":annex60_dir, "dest_dir":dest_dir} - with open(fileName, 'w') as dataFile: - json.dump(data, dataFile) + print(fileName + " could not be found in your current working directory, please enter source and destination paths." + "\nThey will be saved for next time. Remove " + fileName + " to reset the paths.") mer = m.IBPSA(annex60_dir, dest_dir) mer.set_excluded_directories(["Experimental", "Obsolete"]) From 6931b6dbe9af0d4ad0cab2fa471ac036891edc64 Mon Sep 17 00:00:00 2001 From: Lucas Verleyen Date: Fri, 6 Sep 2024 15:21:53 +0200 Subject: [PATCH 2/2] update output string --- IDEAS/Resources/Scripts/mergeAnnex60Script.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/IDEAS/Resources/Scripts/mergeAnnex60Script.py b/IDEAS/Resources/Scripts/mergeAnnex60Script.py index 706243a16..b908e3780 100644 --- a/IDEAS/Resources/Scripts/mergeAnnex60Script.py +++ b/IDEAS/Resources/Scripts/mergeAnnex60Script.py @@ -10,8 +10,7 @@ dest_dir = data['dest_dir'] else: - print(fileName + " could not be found in your current working directory, please enter source and destination paths." - "\nThey will be saved for next time. Remove " + fileName + " to reset the paths.") + print(fileName + " could not be found in your current working directory. Please check the path and file name.") mer = m.IBPSA(annex60_dir, dest_dir) mer.set_excluded_directories(["Experimental", "Obsolete"])