gOdoo-cli 0.11.9__tar.gz → 0.11.11__tar.gz

{godoo_cli-0.11.9 → godoo_cli-0.11.11}/PKG-INFO

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

{godoo_cli-0.11.9 → godoo_cli-0.11.11}/pyproject.toml

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

{godoo_cli-0.11.9 → godoo_cli-0.11.11}/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()
@@ -23,6 +23,7 @@ def dump_instance(
         dir_okay=True,
         writable=True,
         resolve_path=True,
+        envvar="GODOO_DUMP_PATH",
     ),
     db_name=CLI.database.db_name,
     db_host=CLI.database.db_host,
@@ -40,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"""
@@ -83,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.9 → godoo_cli-0.11.11}/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",
@@ -71,6 +71,7 @@ def load_instance_data(
             file_okay=False,
             dir_okay=True,
             exists=True,
+            envvar="GODOO_DUMP_PATH",
         ),
     ],
     filestore_target_folder: Annotated[

{godoo_cli-0.11.9 → godoo_cli-0.11.11}/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.11/src/godoo_cli/version.py

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

godoo_cli-0.11.9/src/godoo_cli/version.py

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