[cmake_frontend.py] remove Codemodel class and relevant changes

Author: diivm

clang_bind/cmake_frontend.py

@@ -35,79 +35,11 @@ def get_compilation_arguments(self, filename=None):
         }
 
 
-class Codemodel:
-    """Class to get information about the Codemodel generated by the CMake file API."""
-
-    def __init__(self, reply_dir):
-        self.reply_dir = reply_dir
-        self.codemodel = {}
-        self.codemodel_targets = {}
-
-    def set_codemodel(self, codemodel_file=None):
-        """Set the codemodel variable.
-
-        :param codemodel_file: codemodel file to read from, defaults to None
-        :type codemodel_file: str, optional
-        """
-        if not codemodel_file:
-            for file in Path(self.reply_dir).iterdir():
-                if file.name.startswith("codemodel"):
-                    codemodel_file = Path(self.reply_dir, file)
-        with open(codemodel_file) as f:
-            self.codemodel = json.load(f)
-
-    def get_codemodel(self):
-        """Get the codemodel.
-
-        :return: JSON codemodel object.
-        :rtype: dict
-        """
-        if not self.codemodel:
-            self.set_codemodel()
-        return self.codemodel
-
-    def set_codemodel_targets(self, codemodel=None):
-        """Set targets variable.
-
-        :param codemodel: Codemodel dict object, defaults to None
-        :type codemodel: dict, optional
-        """
-        if not codemodel:
-            codemodel = self.get_codemodel()
-        configurations = codemodel.get("configurations", [])
-        for configuration in configurations:
-            targets = configuration.get("targets", [])
-            for target in targets:
-                self.codemodel_targets.update({target["name"]: target["jsonFile"]})
-
-    def get_codemodel_targets(self):
-        """Get codemodel targets.
-
-        :return: dict of targets and the corresponding file
-        :rtype: dict
-        """
-        if not self.codemodel_targets:
-            self.set_codemodel_targets()
-        return self.codemodel_targets
-
-
 class Target:
     """Class to get information about targets found from the CMake file API."""
 
-    def __init__(self, reply_dir, target_name):
-        self.reply_dir = reply_dir
-        self.target_file = Codemodel(reply_dir).get_codemodel_targets().get(target_name)
-        self.target = {}
-
-    def set_target(self, target_file=None):
-        """Set target variable.
-
-        :param target_file: File to get target from, defaults to None
-        :type target_file: str, optional
-        """
-        if not target_file:
-            target_file = self.target_file
-        with open(Path(self.reply_dir, target_file)) as f:
+    def __init__(self, target_file):
+        with open(target_file) as f:
             self.target = json.load(f)
 
     def get_target(self):
@@ -280,11 +212,26 @@ class CMakeFileAPI:
     """CMake File API front end."""
 
     def __init__(self, build_dir):
-        reply_dir = Path(build_dir, ".cmake", "api", "v1", "reply")
+        self.reply_dir = Path(build_dir, ".cmake", "api", "v1", "reply")
         self.targets = {}
-        for codemodel_target in Codemodel(reply_dir).get_codemodel_targets():
-            target = Target(reply_dir, codemodel_target)
-            self.targets[target.get_name()] = target
+        self._set_targets_from_codemodel()
+
+    def _set_targets_from_codemodel(self):
+        """Populate targets dict by accessing values in the codemodel file."""
+
+        for file in Path(self.reply_dir).iterdir():  # iterate for all files
+            if file.name.startswith("codemodel"):  # find the codemodel file
+                codemodel_file = Path(self.reply_dir, file)
+                with open(codemodel_file) as f:
+                    codemodel = json.load(f)  # load the JSON codemodel
+
+        for configuration in codemodel.get(
+            "configurations", []
+        ):  # for each configuration
+            for target in configuration.get("targets", []):  # for each targets
+                target_file = target["jsonFile"]  # get the target file
+                target_obj = Target(Path(self.reply_dir, target_file))
+                self.targets[target_obj.get_name()] = target_obj
 
     def get_dependencies(self, target=None):
         """Get dependencies of the target(s).