From 5491001d2f8afaf815e91a3efaba9d2bc92b1d3a Mon Sep 17 00:00:00 2001 From: Zion Leonahenahe Basque Date: Sun, 16 Apr 2023 16:11:27 -0700 Subject: [PATCH] Correct PyPi install (#16) * Correct PyPi * Fix string --- README.md | 2 +- daila/__init__.py | 1 - dailalib/__init__.py | 1 + {daila => dailalib}/__main__.py | 0 {daila => dailalib}/controller_server.py | 2 +- {daila => dailalib}/installer.py | 2 +- {daila => dailalib}/interfaces/__init__.py | 0 {daila => dailalib}/interfaces/generic_ai_interface.py | 0 {daila => dailalib}/interfaces/openai_interface.py | 0 {daila => dailalib}/utils.py | 0 plugins/daila_binja.py | 2 +- plugins/daila_ghidra.py | 2 +- plugins/daila_ida.py | 6 +++--- setup.cfg | 4 ++-- setup.py | 4 ++-- 15 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 daila/__init__.py create mode 100644 dailalib/__init__.py rename {daila => dailalib}/__main__.py (100%) rename {daila => dailalib}/controller_server.py (98%) rename {daila => dailalib}/installer.py (98%) rename {daila => dailalib}/interfaces/__init__.py (100%) rename {daila => dailalib}/interfaces/generic_ai_interface.py (100%) rename {daila => dailalib}/interfaces/openai_interface.py (100%) rename {daila => dailalib}/utils.py (100%) diff --git a/README.md b/README.md index 1b23e28..e7c6e8f 100644 --- 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 deleted file mode 100644 index 5becc17..0000000 --- a/daila/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = "1.0.0" diff --git a/dailalib/__init__.py b/dailalib/__init__.py new file mode 100644 index 0000000..6849410 --- /dev/null +++ b/dailalib/__init__.py @@ -0,0 +1 @@ +__version__ = "1.1.0" diff --git a/daila/__main__.py b/dailalib/__main__.py similarity index 100% rename from daila/__main__.py rename to dailalib/__main__.py diff --git a/daila/controller_server.py b/dailalib/controller_server.py similarity index 98% rename from daila/controller_server.py rename to dailalib/controller_server.py index 08a228b..ab33525 100644 --- a/daila/controller_server.py +++ b/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 b/dailalib/installer.py similarity index 98% rename from daila/installer.py rename to dailalib/installer.py index 9f8410a..8b55820 100644 --- a/daila/installer.py +++ b/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 b/dailalib/interfaces/__init__.py similarity index 100% rename from daila/interfaces/__init__.py rename to dailalib/interfaces/__init__.py diff --git a/daila/interfaces/generic_ai_interface.py b/dailalib/interfaces/generic_ai_interface.py similarity index 100% rename from daila/interfaces/generic_ai_interface.py rename to dailalib/interfaces/generic_ai_interface.py diff --git a/daila/interfaces/openai_interface.py b/dailalib/interfaces/openai_interface.py similarity index 100% rename from daila/interfaces/openai_interface.py rename to dailalib/interfaces/openai_interface.py diff --git a/daila/utils.py b/dailalib/utils.py similarity index 100% rename from daila/utils.py rename to dailalib/utils.py diff --git a/plugins/daila_binja.py b/plugins/daila_binja.py index 1a83a17..28f0345 100644 --- 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 index f600e40..137dc0c 100644 --- 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 index a4057ff..54444df 100644 --- 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) \ No newline at end of file + return super().explain_current_function(**kwargs) diff --git a/setup.cfg b/setup.cfg index d5babf5..7bb8cf9 100644 --- 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 index dc97440..85c421d 100644 --- 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