Correct PyPi install (#16)

* Correct PyPi * Fix string
mahaloz · Apr 16, 2023 · 5491001 · 5491001
1 parent 9d5573d
commit 5491001
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Utilize OpenAI to improve your decompilation experience in most modern decompile
 ## Installation
 Clone down this repo and pip install and use the daila installer:
 ```bash
-pip3 install -e . && daila --install 
+pip3 install -e . && dailalib --install 
 ```
 
 Depending on your decompiler, this will attempt to copy the script files into your decompiler and install

diff --git a/daila/__init__.py b/daila/__init__.py
diff --git a/dailalib/__init__.py b/dailalib/__init__.py
@@ -0,0 +1 @@
+__version__ = "1.1.0"
diff --git a/daila/__main__.py → dailalib/__main__.py b/daila/__main__.py → dailalib/__main__.py
diff --git a/daila/controller_server.py → dailalib/controller_server.py b/daila/controller_server.py → dailalib/controller_server.py
@@ -1,4 +1,4 @@
-from daila.interfaces.openai_interface import OpenAIInterface
+from dailalib.interfaces.openai_interface import OpenAIInterface
 from xmlrpc.server import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler
 from functools import wraps
 

diff --git a/daila/installer.py → dailalib/installer.py b/daila/installer.py → dailalib/installer.py
@@ -9,7 +9,7 @@ class DAILAInstaller(Installer):
     def __init__(self):
         super().__init__(targets=("ida", "ghidra", "binja"))
         self.plugins_path = Path(
-            pkg_resources.resource_filename("daila", f"plugins")
+            pkg_resources.resource_filename("dailalib", f"plugins")
         )
 
     def display_prologue(self):

diff --git a/daila/interfaces/__init__.py → dailalib/interfaces/__init__.py b/daila/interfaces/__init__.py → dailalib/interfaces/__init__.py
diff --git a/daila/interfaces/generic_ai_interface.py → dailalib/interfaces/generic_ai_interface.py b/daila/interfaces/generic_ai_interface.py → dailalib/interfaces/generic_ai_interface.py
diff --git a/daila/interfaces/openai_interface.py → dailalib/interfaces/openai_interface.py b/daila/interfaces/openai_interface.py → dailalib/interfaces/openai_interface.py
diff --git a/daila/utils.py → dailalib/utils.py b/daila/utils.py → dailalib/utils.py
diff --git a/plugins/daila_binja.py b/plugins/daila_binja.py
@@ -8,7 +8,7 @@
 from PySide6.QtWidgets import QProgressDialog
 
 
-from daila.interfaces.openai_interface import OpenAIInterface, addr_ctx_when_none
+from dailalib.interfaces.openai_interface import OpenAIInterface, addr_ctx_when_none
 
 
 def with_loading_popup(func):

diff --git a/plugins/daila_ghidra.py b/plugins/daila_ghidra.py
@@ -64,7 +64,7 @@ def __exit__(self, *args, **kwargs):
         self._stop_server()
 
     def _start_server(self):
-        self.server_proc = subprocess.Popen(["python3", "-m", "daila", "-server"])
+        self.server_proc = subprocess.Popen(["python3", "-m", "dailalib", "-server"])
         sleep(3)
         self.server = xmlrpclib.ServerProxy(self.proxy_host)
 

diff --git a/plugins/daila_ida.py b/plugins/daila_ida.py
@@ -7,7 +7,7 @@
 import idc
 from PyQt5.QtWidgets import QProgressDialog
 
-from daila.interfaces.openai_interface import OpenAIInterface
+from dailalib.interfaces.openai_interface import OpenAIInterface
 
 controller: Optional["IDADAILAController"] = None
 
@@ -80,7 +80,7 @@ class DAILAPlugin(idaapi.plugin_t):
     help = "DAILA Help"
     wanted_name = "Identify the current function you are looking at!"
 
-    id_action_name = "daila:identify_function"
+    id_action_name = "dailalib:identify_function"
     id_menu_path = "Edit/DAILA/Explain function"
 
     def __init__(self, *args, **kwargs):
@@ -226,4 +226,4 @@ def identify_current_function(self):
 
     @execute_write
     def explain_current_function(self, **kwargs):
-        return super().explain_current_function(**kwargs)
+        return super().explain_current_function(**kwargs)
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = DAILA
-version = attr: daila.__version__
+version = attr: dailalib.__version__
 url = https://github.com/mahaloz/DAILA
 classifiers =
     License :: OSI Approved :: BSD License
@@ -28,4 +28,4 @@ daila =
 
 [options.entry_points]
 console_scripts =
-    daila = daila.__main__:main
+    daila = dailalib.__main__:main
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 def _copy_plugins():
     local_plugins = Path("plugins").absolute()
-    daila_loc = Path("daila").absolute()
+    daila_loc = Path("dailalib").absolute()
     pip_e_plugins = daila_loc.joinpath("plugins").absolute()
 
     # clean the install location of symlink or folder
@@ -32,7 +32,7 @@ def _copy_plugins():
 
     # copy if symlinking is not available on target system
     try:
-        shutil.copytree("plugins", "daila/plugins")
+        shutil.copytree("plugins", "dailalib/plugins")
     except:
         pass