gOdoo-cli 0.11.6__tar.gz → 0.11.7__tar.gz

{godoo_cli-0.11.6 → godoo_cli-0.11.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gOdoo-cli
-Version: 0.11.6
+Version: 0.11.7
 Summary: Wrapper around Odoo-Bin with some convinience RPC functions.
 Home-page: https://github.com/OpenJKSoftware/gOdoo
 License: LGPL-3

{godoo_cli-0.11.6 → godoo_cli-0.11.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gOdoo-cli"
-version = "0.11.6"
+version = "0.11.7"
 description = "Wrapper around Odoo-Bin with some convinience RPC functions."
 authors = ["Joshua Kreuder <Joshua_Kreuder@outlook.com>"]
 license = "LGPL-3"

{godoo_cli-0.11.6 → godoo_cli-0.11.7}/src/godoo_cli/commands/db/query.py

@@ -104,12 +104,15 @@ def is_bootstrapped(
     raise typer.Exit(boot.value)
 
 
-def _get_installed_modules(db_connection: DBConnection):
-    """Get list of installed modules in database"""
+def _get_installed_modules(db_connection: DBConnection, to_install=False):
+    """Get list of installed modules in database (to_install includes the modules marked for installation)"""
     if boot := _is_bootstrapped(db_connection=db_connection) != DB_BOOTSTRAP_STATUS.BOOTSTRAPPED:
         return boot.value
+    lookup_states = ["installed", "to upgrade"]
+    if to_install:
+        lookup_states.append("to install")
     with db_connection.connect() as cursor:
-        cursor.execute("SELECT name FROM ir_module_module WHERE state = 'installed';")
+        cursor.execute("SELECT name FROM ir_module_module WHERE state IN %s;", [tuple(lookup_states)])
         sql_res = cursor.fetchall()
         return [r[0] for r in sql_res]
 
@@ -121,6 +124,11 @@ def get_installed_modules(
     db_name=CLI.database.db_name,
     db_user=CLI.database.db_user,
     db_password=CLI.database.db_password,
+    to_install: bool = typer.Option(
+        False,
+        "--to-install",
+        help="Include modules marked for installation",
+    ),
 ):
     """Returns Modules Marked as installed by Odoo in the database"""
     db_connection = DBConnection(
@@ -130,7 +138,7 @@ def get_installed_modules(
         password=db_password,
         db_name=db_name,
     )
-    installed_modules = _get_installed_modules(db_connection=db_connection)
+    installed_modules = _get_installed_modules(db_connection=db_connection, to_install=to_install)
     if isinstance(installed_modules, int):
         raise typer.Exit(installed_modules)
     for module in sorted(installed_modules):

{godoo_cli-0.11.6 → godoo_cli-0.11.7}/src/godoo_cli/commands/shell.py

@@ -37,11 +37,27 @@ def odoo_shell(
     pipe_in_command: str = typer.Argument("", help="Python command, that will be piped into odoo-bin shell"),
     odoo_main_path=CLI.odoo_paths.bin_path,
     odoo_conf_path=CLI.odoo_paths.conf_path,
+    db_host=CLI.database.db_host,
+    db_port=CLI.database.db_port,
+    db_name=CLI.database.db_name,
+    db_user=CLI.database.db_user,
+    db_password=CLI.database.db_password,
 ):
     """
     Start Odoo session in an Interactive shell.
+
+    Odoo Conf is Preferred, but if not found, Database Options are used.
     """
-    shell_cmd = f"{str(odoo_main_path.absolute())}/odoo-bin shell -c {str(odoo_conf_path.absolute())} --no-http"
+    shell_cmd = f"{str(odoo_main_path.absolute())}/odoo-bin shell --no-http"
+    if odoo_conf_path.exists():
+        shell_cmd += f" -c {str(odoo_conf_path.absolute())}"
+    else:
+        LOGGER.warning("No Odoo Config File found at %s", odoo_conf_path)
+        if not all([db_host, db_port, db_name, db_user, db_password]):
+            LOGGER.error("Missing database options and Config File. Aborting.")
+            return CLI.returner(1)
+        shell_cmd += f" --db_host={db_host} --db_port={db_port} --database={db_name} --db_user={db_user} --db_password={db_password}"
+
     if pipe_in_command:
         pipe_in_command = pipe_in_command.replace('"', '\\"')  # Escape Double Quotes
         shell_cmd = f'echo "{pipe_in_command}" |' + shell_cmd

godoo_cli-0.11.7/src/godoo_cli/version.py

@@ -0,0 +1 @@
+__version__ = "0.11.7"

godoo_cli-0.11.6/src/godoo_cli/version.py

@@ -1 +0,0 @@
-__version__ = "0.11.6"