removed pyclassinformer dir from module path

Author: herosi

pyclassinformer/dirtree_utils.py

@@ -2,7 +2,8 @@
 import ida_funcs
 import ida_idaapi
 
-ida_idaapi.require("qtutils")
+ida_idaapi.require("pyclassinformer")
+ida_idaapi.require("pyclassinformer.qtutils")
 
 
 def get_chooser_data(chooser="Functions"):
@@ -60,7 +61,7 @@ def get_gen_lib_func_colors():
         dark = False
         # check if dark mode is enabled or not
         try:
-            dark = qtutils.dark_mode_checker_t.is_dark_mode()
+            dark = pyclassinformer.qtutils.dark_mode_checker_t.is_dark_mode()
         except:
             pass
         # set the default dark mode color on IDA

pyclassinformer/get_func_colors.py

@@ -6,8 +6,9 @@
 import idautils
 import ida_funcs
 
-ida_idaapi.require("pci_utils")
-ida_idaapi.require("dirtree_utils")
+ida_idaapi.require("pyclassinformer")
+ida_idaapi.require("pyclassinformer.pci_utils")
+ida_idaapi.require("pyclassinformer.dirtree_utils")
 
 # dirspec for the dirtree
 class my_dirspec_t(ida_dirtree.dirspec_t):
@@ -116,7 +117,7 @@ def process_data(self):
             self.dirtree.mkdir(dp)
 
             # if the class has multiple vftables, create a nested folder
-            col_offs = pci_utils.utils.get_col_offs(col, self.data)
+            col_offs = pyclassinformer.pci_utils.utils.get_col_offs(col, self.data)
             if len(col_offs) > 1:
                 # if the class has multiple vftables, create a nested folder with the actual class name
                 if class_name != actual_class_name:
@@ -201,8 +202,8 @@ def OnSelectionChange(self, sel):
         # get inode and get the current dir and the cached entry
         inode = self.OnIndexToInode(sel)
         curr_dir, name = self.dirspec.get_name_idx(inode)
-        abs_path = dirtree_utils.get_abs_path_by_inode(self.dirtree, inode)
-        parent_dir = dirtree_utils.get_parent_dir_by_inode(self.dirtree, inode) + "/" # add slash at the end
+        abs_path = pyclassinformer.dirtree_utils.get_abs_path_by_inode(self.dirtree, inode)
+        parent_dir = pyclassinformer.dirtree_utils.get_parent_dir_by_inode(self.dirtree, inode) + "/" # add slash at the end
 
         # need to update the directory in the cached inodes if the current dir and the parent dir of the selection are not matched.
         #print("OnSelectionChange", sel, inode, curr_dir, name, abs_path, parent_dir)

pyclassinformer/lib_classes.json

@@ -19,12 +19,12 @@
 except AttributeError:
     tree_categorize = False
 
-ida_idaapi.require("pci_utils")
-ida_idaapi.require("pci_config")
-ida_idaapi.require("lib_classes_checker")
+ida_idaapi.require("pyclassinformer")
+ida_idaapi.require("pyclassinformer.pci_utils")
+ida_idaapi.require("pyclassinformer.pci_config")
 if tree_categorize:
-    ida_idaapi.require("mc_tree")
-    ida_idaapi.require("dirtree_utils")
+    ida_idaapi.require("pyclassinformer.mc_tree")
+    ida_idaapi.require("pyclassinformer.dirtree_utils")
 
 def change_dir_of_ctors_dtors(paths, data, dirtree):
     path_prefix = "/classes/"
@@ -48,7 +48,7 @@ def change_dir_of_ctors_dtors(paths, data, dirtree):
                 func_path = "/" + func_name
 
                 # get the func path in the dir tree.
-                dirtree_path = dirtree_utils.get_abs_path_by_inode(dirtree, f.start_ea)
+                dirtree_path = pyclassinformer.dirtree_utils.get_abs_path_by_inode(dirtree, f.start_ea)
 
                 # check if the function is at the top level or not.
                 # and rename it.
@@ -90,7 +90,7 @@ def change_dir_of_vfuncs(paths, data, dirtree):
             func_path = "/" + func_name
 
             # get the func path in the dir tree.
-            dirtree_path = dirtree_utils.get_abs_path_by_inode(dirtree, vfea)
+            dirtree_path = pyclassinformer.dirtree_utils.get_abs_path_by_inode(dirtree, vfea)
 
             # check if the function is at the top level or not.
             # and rename it.
@@ -179,7 +179,7 @@ def get_base_classes(data):
         col = data[vftable_ea]
 
         # get relevant BCDs mainly for multiple inheritance
-        base_classes = pci_utils.utils.get_mdisp_bases(col, data)
+        base_classes = pyclassinformer.pci_utils.utils.get_mdisp_bases(col, data)
 
         # reverse the path because the path is reverse ordered.
         base_classes.reverse()
@@ -191,7 +191,7 @@ def get_base_classes(data):
 
 def method_classifier(data, config=None, icon=-1):
     if config is None:
-        config = pci_config.pci_confg()
+        config = pyclassinformer.pci_config.pci_confg()
 
     # check config values to execute or not
     if not config.exana and not config.mvvm and not config.mvcd and not config.rnvm and not config.rncd:
@@ -220,7 +220,7 @@ def method_classifier(data, config=None, icon=-1):
 
         # display dir tree
         if config.exana:
-            tree = mc_tree.show_mc_tree_t(data, paths, icon=icon)
+            tree = pyclassinformer.mc_tree.show_mc_tree_t(data, paths, icon=icon)
     else:
         print("Warning; Your IDA does not have ida_dirtree or find_entry in dirtree_t. Skip creating dirs for classes and moving functions into them.")
 

pyclassinformer/lib_classes_checker.py

@@ -29,9 +29,9 @@ def get_struc(struct_tid):
                 return tif
         return None
 
-
-ida_idaapi.require("pci_utils")
-u = pci_utils.utils()
+ida_idaapi.require("pyclassinformer")
+ida_idaapi.require("pyclassinformer.pci_utils")
+u = pyclassinformer.pci_utils.utils()
 
 
 class RTTIStruc(object):
@@ -384,7 +384,7 @@ def __init__(self, ea, vtable):
                 # parse relevant structures
                 self.td = td
                 self.chd = RTTIClassHierarchyDescriptor(self.chdea)
-                self.vfeas = [x for x in pci_utils.get_vtbl_methods(vtable)]
+                self.vfeas = [x for x in pyclassinformer.pci_utils.get_vtbl_methods(vtable)]
 
                 # set class name
                 self.name = strip(self.td.class_name)

pyclassinformer/mc_tree.py

@@ -2,8 +2,9 @@
 import ida_kernwin
 import ida_idaapi
 
-ida_idaapi.require("pci_utils")
-u = pci_utils.utils()
+ida_idaapi.require("pyclassinformer")
+ida_idaapi.require("pyclassinformer.pci_utils")
+u = pyclassinformer.pci_utils.utils()
 
 class pci_chooser_t(ida_kernwin.Choose):
 

pyclassinformer/method_classifier.py

@@ -65,14 +65,15 @@ def set_default_settings(self):
 
     @staticmethod
     def show():
-        ida_idaapi.require("pci_config")
-        pcic = pci_config.pci_config()
+        ida_idaapi.require("pyclassinformer")
+        ida_idaapi.require("pyclassinformer.pci_config")
+        pcic = pyclassinformer.pci_config.pci_config()
         f = pci_form_t(dirtree=pcic.dirtree)
 
         # Execute the form
         ok = f.Execute()
         if ok == 1:
-            pcic = pci_config.pci_config(alldata=f.alldata.selected, rtti=f.rtti.checked, exana=f.exana.checked, mvvm=f.mvvm.checked, mvcd=f.mvcd.checked, rnvm=f.rnvm.checked, rncd=f.rncd.checked)
+            pcic = pyclassinformer.pci_config.pci_config(alldata=f.alldata.selected, rtti=f.rtti.checked, exana=f.exana.checked, mvvm=f.mvvm.checked, mvcd=f.mvcd.checked, rnvm=f.rnvm.checked, rncd=f.rncd.checked)
         else:
             return None
 
@@ -81,6 +82,7 @@ def show():
         return pcic
 
 """
+ida_idaapi.require("pci_config")
 pcic = pci_form_t.show()
 if pcic is not None:
     print(pcic.alldata, pcic.exana, pcic.mvvm, pcic.mvcd, pcic.rnvm, pcic.rncd)