gOdoo-cli 0.11.10__tar.gz → 0.11.12__tar.gz

{godoo_cli-0.11.10 → godoo_cli-0.11.12}/PKG-INFO

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

{godoo_cli-0.11.10 → godoo_cli-0.11.12}/pyproject.toml

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

{godoo_cli-0.11.10 → godoo_cli-0.11.12}/src/godoo_cli/cli_common.py

@@ -136,7 +136,7 @@ class DatabaseCLIArgs:
         help="db password",
         rich_help_panel="Database Options",
     )
-    db_port: str = Option(
+    db_port: int = Option(
         "",
         envvar="ODOO_DB_PORT",
         help="db host port (empty for socket)",

{godoo_cli-0.11.10 → godoo_cli-0.11.12}/src/godoo_cli/commands/backup/dump.py

@@ -1,5 +1,4 @@
 import logging
-import shutil
 from configparser import ConfigParser
 from datetime import datetime
 from pathlib import Path
@@ -9,6 +8,7 @@ import typer
 from ...cli_common import CommonCLI
 from ...helpers.odoo_files import odoo_bin_get_version
 from ..db.connection import DBConnection
+from .util import call_rsync
 
 LOGGER = logging.getLogger(__name__)
 CLI = CommonCLI()
@@ -41,33 +41,32 @@ def dump_instance(
         password=db_password,
         port=db_port,
     )
-    dump_path.mkdir(parents=True, exist_ok=True)
+    if not conf_path.exists():
+        raise typer.Exit("No Odoo Conf Path provided or doesnt exists: '%s'" % conf_path)
 
-    if not conf_path:
-        raise typer.Exit("No Odoo Conf Path provided. Cannot dump Filestore")
+    if not dump_path.exists():
+        raise typer.Exit("No Dump Path provided or doesnt exists: %s" % dump_path)
 
     # Read .conf value [options] datad_dir
-    conf_path = Path(conf_path)
     parser = ConfigParser()
     parser.read(conf_path)
     data_dir = parser["options"]["data_dir"]
     data_dir = Path(data_dir)
 
     # Copy Filestore
-    LOGGER.info("Dumping Filestore")
     filestore_target = dump_path / "odoo_filestore"
-    shutil.rmtree(filestore_target, ignore_errors=True)
-    shutil.copytree(data_dir, filestore_target)
+    LOGGER.info("Dumping Filestore -> %s", filestore_target)
+    call_rsync(source_folder=data_dir, target_folder=filestore_target)
 
     # Dump DB using pg_dump
-    LOGGER.info("Dumping DB")
     db_dump_target = dump_path / "odoo.dump"
+    LOGGER.info("Dumping DB -> %s", db_dump_target)
     db_dump_target.unlink(missing_ok=True)
     db_connection.run_psql_shell_command("pg_dump --format c {} > %s" % db_dump_target)
+    LOGGER.info("SQL Dump Completed with size -> %.2f MB", db_dump_target.stat().st_size / (1024 * 1024))
 
-    readme_path = Path(dump_path) / "README.md"
+    readme_path = dump_path / "README.md"
     readme_path.unlink(missing_ok=True)
-
     odoo_version = odoo_bin_get_version(odoo_main_path)
 
     readme_content = f"""
@@ -84,3 +83,4 @@ SQL Dump and Filestore of gOdoo Instance.
 
 """
     readme_path.write_text(readme_content)
+    LOGGER.info("Odoo Dump Completed -> %s", dump_path)

{godoo_cli-0.11.10 → godoo_cli-0.11.12}/src/godoo_cli/commands/backup/load.py

@@ -22,7 +22,7 @@ def load_pg_dump(
 ):
     """Drop and recreate db_name and restore dump_path into it."""
     if not dump_path.exists():
-        raise FileNotFoundError("Cannot find PG dump @ %s" % dump_path)
+        raise FileNotFoundError("Cannot find Odoo Dump @ %s" % dump_path)
 
     conn = DBConnection(
         db_name="postgres",

{godoo_cli-0.11.10 → godoo_cli-0.11.12}/src/godoo_cli/commands/backup/util.py

@@ -16,7 +16,6 @@ def call_rsync(source_folder: Path, target_folder: Path, rsync_delete: bool = Tr
         args += ["--delete"]
     args += [f"{source_folder}/", f"{target_folder}/"]
     command = " ".join(map(str, args))
-    LOGGER.info("Rysnc filestore to: %s", source_folder)
     LOGGER.debug("Running: %s", command)
     return subprocess.run(command, shell=True).returncode
 

{godoo_cli-0.11.10 → godoo_cli-0.11.12}/src/godoo_cli/commands/bootstrap.py

@@ -90,8 +90,8 @@ def _boostrap_command(
                 init_modules += [f.name for f in workspace_addons]
     init_cmd = "--init " + ",".join(init_modules) if init_modules else ""
 
-    addon_paths = [str(p.absolute()) for p in addon_paths]
-    addon_paths = ", ".join(list(filter(None, addon_paths)))
+    addon_paths_str_list = [str(p.absolute()) for p in addon_paths if p and p.exists()]
+    addon_paths_str = ", ".join(addon_paths_str_list)
 
     base_cmds = [
         str(odoo_main_path.absolute()) + "/odoo-bin",
@@ -100,7 +100,7 @@ def _boostrap_command(
         "--save",
         f"--load-language {languages}",
         "--stop-after-init",
-        f"--addons-path '{addon_paths}'",
+        f"--addons-path '{addon_paths_str}'",
     ]
     odoo_cmd = base_cmds + db_command
     if extra_cmd_args:
@@ -109,7 +109,7 @@ def _boostrap_command(
     _add_default_argument(cmd_list=odoo_cmd, arg="--data-dir", arg_val="/var/lib/odoo")
 
     if multithread_worker_count == -1:
-        multithread_worker_count = (os.cpu_count() or 2) / 2
+        multithread_worker_count = int(os.cpu_count() or 2 / 2)
 
     if multithread_worker_count > 0:
         odoo_cmd += [

{godoo_cli-0.11.10 → godoo_cli-0.11.12}/src/godoo_cli/commands/db/query.py

@@ -108,7 +108,7 @@ def is_bootstrapped(
 
 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:
+    if (boot := _is_bootstrapped(db_connection=db_connection)) != DB_BOOTSTRAP_STATUS.BOOTSTRAPPED:
         return boot.value
     lookup_states = ["installed", "to upgrade"]
     if to_install:

{godoo_cli-0.11.10 → godoo_cli-0.11.12}/src/godoo_cli/commands/launch.py

@@ -2,7 +2,7 @@ import logging
 import re
 import threading
 from pathlib import Path
-from typing import List
+from typing import List, Optional
 
 import typer
 
@@ -43,7 +43,9 @@ def _launch_command(
     upgrade_workspace_modules : bool, optional
         upgrade workspace addons, by default True
     """
-    upgrade_addons = [f.name for f in godooModules(workspace_addon_path)] if upgrade_workspace_modules else []
+    upgrade_addons = (
+        [f.name for f in godooModules(workspace_addon_path).get_modules()] if upgrade_workspace_modules else []
+    )
     if any(["-u" in i or "--update" in i for i in extra_cmd_args]):
         upgrade_addons = []
     update_addon_string = "--update " + ",".join(upgrade_addons) if upgrade_addons else ""
@@ -67,9 +69,9 @@ def pre_launch(
     odoo_demo: bool,
     dev_mode: bool,
     multithread_worker_count: int = 0,
-    extra_launch_args: List[str] = None,
-    extra_bootstrap_args: List[str] = None,
-    log_file_path: Path = None,
+    extra_launch_args: Optional[List[str]] = None,
+    extra_bootstrap_args: Optional[List[str]] = None,
+    log_file_path: Optional[Path] = None,
     install_workspace_addons: bool = True,
     launch_or_bootstrap: bool = False,
     languages: str = "de_DE,en_US",

{godoo_cli-0.11.10 → godoo_cli-0.11.12}/src/godoo_cli/git/git_repo.py

@@ -71,7 +71,7 @@ def git_pull_checkout_reset(
                 clone_kwargs = {}
                 if branch:
                     clone_kwargs["branch"] = branch
-                repo = _git_clean_clone(repo.remotes[0].url, repo.working_dir, **clone_kwargs)
+                repo = _git_clean_clone(repo.remotes[0].url, Path(repo.working_dir), **clone_kwargs)
             else:
                 raise e
     if commit:
@@ -135,12 +135,12 @@ def git_ensure_ref(
         git_pull_checkout_reset(repo=repo, branch=branch, commit=commit, pull=pull)
 
         if current == str(repo.head.commit):
-            LOGGER.info("Repo Commit matches. Skipping: '%s' --> '%s'", repo_src, target_folder)
+            LOGGER.debug("Repo Commit matches. Skipping: '%s' --> '%s'", repo_src, current)
         else:
             LOGGER.info("Pulled Repo from: '%s'. Head is now at: %s", repo_src, repo.head.commit)
     except InvalidGitRepositoryError:
         repo = _git_clean_clone(repo_src, target_folder, branch=branch, **kwargs)
-        git_pull_checkout_reset(repo=repo, branch=branch, commit=commit, pull=False)
+        git_pull_checkout_reset(repo=repo, branch=branch, commit=commit)
 
         LOGGER.info(
             "Cloned Repo: '%s'. Branch='%s' Head='%s'",

{godoo_cli-0.11.10 → godoo_cli-0.11.12}/src/godoo_cli/helpers/modules.py

@@ -56,7 +56,7 @@ class godooModule:
 class godooModules:
     """Abstract interface to Addon-Paths. Finds modules and their dependencies."""
 
-    def __init__(self, addon_paths: List[Path]) -> None:
+    def __init__(self, addon_paths: Union[List[Path], Path]) -> None:
         if not isinstance(addon_paths, list):
             addon_paths = [addon_paths]
         self.addon_paths = addon_paths
@@ -69,7 +69,8 @@ class godooModules:
         if module_names:
             for name in module_names:
                 try:
-                    yield self.get_module(name)
+                    if module := self.get_module(name):
+                        yield module
                 except ModuleNotFoundError as e:
                     if raise_missing_names:
                         raise e
@@ -106,7 +107,7 @@ class godooModules:
 
     def get_module_dependencies(
         self, module: Union[godooModule, List[godooModule]], dont_follow: Optional[List[str]] = None
-    ) -> List[str]:
+    ) -> List[godooModule]:
         """Get dependant modules of module(s). Recursively follows dependencies."""
         if isinstance(module, godooModule):
             module = [module]

{godoo_cli-0.11.10 → godoo_cli-0.11.12}/src/godoo_cli/helpers/modules_py.py

@@ -50,7 +50,7 @@ def _install_py_reqs_by_odoo_cmd(addon_paths: List[Path], odoo_bin_cmd: str):
     CompletedProcess
     """
     install_modules = []
-    for m in re.finditer(r'(--init|-i) "?([^ \n]+)"?', odoo_bin_cmd):
+    for m in re.finditer(r'(--init|-i|--load) "?([^ \n]+)"?', odoo_bin_cmd):
         install_modules += m.group(2).split(",")
     if install_modules:
         LOGGER.debug("Found Modules to install in odoo-bin command: %s", install_modules)

godoo_cli-0.11.12/src/godoo_cli/version.py

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

godoo_cli-0.11.10/src/godoo_cli/version.py

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