[RFR] adjust Intellij file path (#123)

* adjust Intellij file path Signed-off-by: nhamza <[email protected]> * remove unused import Signed-off-by: nhamza <[email protected]> * apply requested changes Signed-off-by: nhamza <[email protected]> * apply requested changes Signed-off-by: nhamza <[email protected]> --------- Signed-off-by: nhamza <[email protected]>
windup · Mar 3, 2024 · bdbec62 · bdbec62
1 parent 0705fb3
commit bdbec62
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/fixtures/ide.py b/src/fixtures/ide.py
@@ -82,8 +82,7 @@ def setup_intellij(intellij_config, config):
     """
     intellij = Intellij()
     ide_path = intellij_config["ide_path"]
-    ide_version = intellij.get_ide_version(ide_path)
-    path = ide_path + f"/{ide_version}/bin/idea.sh"
+    path = os.path.join(ide_path, "bin", "idea.sh")
     intellij.open_application(path)
     intellij.set_default_timeout(timeout=config["timeout_in_seconds"])
     time.sleep(5)

diff --git a/src/models/IDE/Intellij.py b/src/models/IDE/Intellij.py
@@ -1,11 +1,12 @@
+import json
 import logging
 import os
-import re
 import subprocess
 import time
 
 from src.models.application import Application
 from src.models.configuration.configurations_object import ConfigurationsObject
+from src.utils.general import read_file
 
 
 class Intellij(Application):
@@ -23,8 +24,12 @@ def __init__(self):
         self.configurations = []
 
     def get_ide_version(self, ide_directory):
-        pattern = re.compile(r"\d{3}\.\d{4}\.\d{2}")
-        return [name for name in os.listdir(ide_directory) if pattern.search(name) is not None][0]
+        info_file_path = os.path.join(ide_directory, "product-info.json")
+        file_contents = read_file(info_file_path)
+        if file_contents is not None:
+            info_data = json.loads(file_contents)
+            return info_data.get("version")
+        return None
 
     def close_ide(self):
         """

diff --git a/src/utils/general.py b/src/utils/general.py
@@ -32,9 +32,13 @@ def write_data_to_file(file_path, content):
 
 
 def read_file(filename):
-    with open(filename, "r") as file:
-        contents = file.read()
-    return contents
+    try:
+        with open(filename, "r") as file:
+            contents = file.read()
+        return contents
+    except FileNotFoundError:
+        print(f"File not found: {filename}")
+        return None
 
 
 def assert_valid_csv_file(file_path, **kwargs):