gOdoo-cli 1.0.0__tar.gz → 1.0.2__tar.gz

{godoo_cli-1.0.0 → godoo_cli-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: gOdoo-cli
-Version: 1.0.0
+Version: 1.0.2
 Summary: Odoo lifecycle, Python dependency preflight, and shared Git workspaces.
 Project-URL: repository, https://github.com/OpenJKSoftware/gOdoo
 Author-email: Joshua Kreuder <Joshua_Kreuder@outlook.com>

{godoo_cli-1.0.0 → godoo_cli-1.0.2}/docs/lifecycle.md

@@ -112,9 +112,9 @@ filestore, SQL and archive overlays are staged once and reused. Disabling the fu
 checks. CRC checks detect accidental corruption; they do not establish the archive's origin.
 
 On Linux, gOdoo probes one nonempty file before recursive reflink copying, then falls back to rsync or Python copying.
-Desktop bind mounts can make many small attachment copies expensive; see
-[dataset storage](downstream.md#restore-dataset-storage). Reset baselines can share reflink extents, so logical sizes
-may count shared data more than once.
+Rsync shows progress only when stdout is a terminal; diagnostics remain visible in captured output. Desktop bind mounts
+can make many small attachment copies expensive; see [dataset storage](downstream.md#restore-dataset-storage). Reset
+baselines can share reflink extents, so logical sizes may count shared data more than once.
 
 The official upgrade client reports phase start and completion or failure without a heartbeat. Child processes retain
 their native streams. gOdoo forwards SIGINT/SIGTERM, waits for shutdown, and preserves child exit status.
@@ -178,6 +178,12 @@ sequenceDiagram
     Maintainer->>Maintainer: Review Odoo's report before restoring into a test runtime
 ```
 
+Before downloading the official client, `godoo upgrade` logs the modification date and absolute path of the dump
+selected by `-i` / `--dump` and the adjacent `odoo_filestore` directory. Dates include the local timezone offset. The
+filestore stays local for restoring the result. Its directory timestamp reflects changes to immediate entries, not
+changes throughout the attachment tree or proof that the dump and filestore were captured together. Missing metadata
+produces a warning; the official client still owns input validation. Commands without a dump do not log source dates.
+
 HTTPS certificate and hostname verification is enabled by default. `GODOO_UPGRADE_SSL=0` disables verification for both
 the download and client while retaining HTTPS encryption; use it only for an endpoint whose certificate the host cannot
 verify.

{godoo_cli-1.0.0 → godoo_cli-1.0.2}/src/godoo_cli/__about__.py

@@ -1,3 +1,3 @@
 """Version information."""
 
-__version__ = "1.0.0"
+__version__ = "1.0.2"

{godoo_cli-1.0.0 → godoo_cli-1.0.2}/src/godoo_cli/commands/upgrade.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import argparse
 import logging
 import os
 import signal
@@ -10,6 +11,7 @@ import subprocess
 import sys
 import tempfile
 from contextlib import suppress
+from datetime import UTC, datetime
 from pathlib import Path
 from typing import Annotated, cast
 from urllib.error import URLError
@@ -24,8 +26,35 @@ LOGGER = logging.getLogger(__name__)
 UPGRADE_CLIENT_URL = "https://upgrade.odoo.com/upgrade"
 
 
+def _log_upgrade_sources(arguments: list[str]) -> None:
+    """Log the selected dump and paired local filestore before the client starts."""
+    parser = argparse.ArgumentParser(add_help=False, allow_abbrev=False, exit_on_error=False)
+    parser.add_argument("-i", "--dump", type=Path)
+    try:
+        options, _ = parser.parse_known_args(arguments)
+    except argparse.ArgumentError:
+        # Odoo's client owns argument validation and its error messages.
+        return
+    if options.dump is None:
+        return
+
+    dump = options.dump.absolute()
+    sources = (
+        ("Dump change date (upload)", dump),
+        ("Filestore change date (local restore)", dump.parent / "odoo_filestore"),
+    )
+    for label, path in sources:
+        try:
+            modified_at = datetime.fromtimestamp(path.stat().st_mtime, tz=UTC).astimezone()
+        except OSError as error:
+            LOGGER.warning("Could not read %s (%s): %s", label, path, error)
+            continue
+        LOGGER.info("%s: %s (%s)", label, modified_at.isoformat(timespec="seconds"), path)
+
+
 def _run_upgrade_client(arguments: list[str]) -> int:
     """Download and run Odoo's official upgrade client with its arguments."""
+    _log_upgrade_sources(arguments)
     ssl_disabled = os.getenv("GODOO_UPGRADE_SSL") == "0"
     context = ssl._create_unverified_context() if ssl_disabled else None
     try:

{godoo_cli-1.0.0 → godoo_cli-1.0.2}/src/godoo_cli/runtime/filestore.py

@@ -85,7 +85,10 @@ def _copy_with_rsync(source: Path, destination: Path) -> tuple[bool, str | None]
     if not shutil.which("rsync"):
         return False, "rsync is not available"
 
-    command = ["rsync", "-rLpt", "--human-readable", "--info=progress2", f"{source}/", str(destination)]
+    command = ["rsync", "-rLpt", "--human-readable"]
+    if sys.stdout.isatty():
+        command.append("--info=progress2")
+    command.extend([f"{source}/", str(destination)])
     try:
         process = subprocess.Popen(command, stdout=None, stderr=subprocess.STDOUT)
     except OSError as error:

{godoo_cli-1.0.0 → godoo_cli-1.0.2}/tests/commands/test_upgrade.py

@@ -3,10 +3,12 @@
 from __future__ import annotations
 
 import importlib
+import logging
 import os
 import signal
 import ssl
 import sys
+from datetime import UTC, datetime
 from io import BytesIO
 from pathlib import Path
 from unittest.mock import Mock
@@ -194,3 +196,70 @@ def test_upgrade_cli_preserves_nonzero_client_status(monkeypatch: pytest.MonkeyP
     result = CliRunner().invoke(main_cli(), ["upgrade", "status", "token"])
 
     assert result.exit_code == 23, result.output
+
+
+@pytest.mark.parametrize("dump_option", ["-i", "--dump", "--dump=", "-i-attached"])
+def test_upgrade_logs_source_dates_before_download_and_client(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path: Path,
+    caplog: pytest.LogCaptureFixture,
+    dump_option: str,
+) -> None:
+    """The actual selected file and paired directory are logged before network work."""
+    dataset = tmp_path / "dataset with spaces"
+    dataset.mkdir()
+    dump = dataset / "source.dump"
+    dump.touch()
+    filestore = dataset / "odoo_filestore"
+    filestore.mkdir()
+    os.utime(dump, (1700000000, 1700000000))
+    os.utime(filestore, (1600000000, 1600000000))
+    monkeypatch.chdir(tmp_path)
+    relative_dump = str(dump.relative_to(tmp_path))
+    if dump_option == "--dump=":
+        selection = [f"--dump={relative_dump}"]
+    elif dump_option == "-i-attached":
+        selection = [f"-i{relative_dump}"]
+    else:
+        selection = [dump_option, relative_dump]
+    arguments = ["test", *selection, "--future-official-option", "value", "-x"]
+    caplog.set_level(logging.INFO, logger=upgrade_command.LOGGER.name)
+
+    def download(*_args: object, **_kwargs: object) -> BytesIO:
+        assert (
+            f"Dump change date (upload): {datetime.fromtimestamp(1700000000, UTC).astimezone().isoformat()} ({dump})"
+            in caplog.text
+        )
+        assert (
+            f"Filestore change date (local restore): {datetime.fromtimestamp(1600000000, UTC).astimezone().isoformat()} ({filestore})"
+            in caplog.text
+        )
+        return BytesIO(b"official client")
+
+    child = Mock(return_value=Mock(wait=lambda: 0, pid=42))
+    monkeypatch.setattr(upgrade_command, "urlopen", download)
+    monkeypatch.setattr(upgrade_command.subprocess, "Popen", child)
+
+    assert upgrade_command._run_upgrade_client(arguments) == 0
+    assert child.call_args.args[0][2:] == arguments
+
+
+def test_upgrade_missing_source_metadata_does_not_replace_client_validation(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Missing timestamps produce warnings while the official client keeps ownership."""
+    dump = tmp_path / "missing.dump"
+    monkeypatch.setattr(upgrade_command, "urlopen", lambda *_args, **_kwargs: BytesIO(b""))
+    monkeypatch.setattr(upgrade_command, "_run_process", lambda *_args, **_kwargs: 23)
+
+    assert upgrade_command._run_upgrade_client(["test", "-i", str(dump)]) == 23
+    assert f"Could not read Dump change date (upload) ({dump})" in caplog.text
+    assert f"Could not read Filestore change date (local restore) ({tmp_path / 'odoo_filestore'})" in caplog.text
+
+
+@pytest.mark.parametrize("arguments", [["status", "token"], ["test", "--dbname", "database"], ["test", "-i"]])
+def test_upgrade_skips_source_logging_without_a_dump(arguments: list[str], caplog: pytest.LogCaptureFixture) -> None:
+    """Database mode, status, and malformed dump options stay with the official client."""
+    caplog.set_level(logging.INFO, logger=upgrade_command.LOGGER.name)
+    upgrade_command._log_upgrade_sources(arguments)
+    assert not caplog.records

{godoo_cli-1.0.0 → godoo_cli-1.0.2}/tests/runtime/test_filestore.py

@@ -235,14 +235,17 @@ def _fake_rsync(tmp_path: Path, monkeypatch: pytest.MonkeyPatch, *, status: int)
     rsync.write_text(
         "#!/bin/sh\n"
         'printf \'%s\\n\' "$@" > "$GODOO_RSYNC_ARGS"\n'
-        "printf '12%%\\rdiagnostic one\\n34%%\\rdiagnostic two\\n56%%\\r78%%\\n'\n"
+        'if [ "$3" = "--info=progress2" ]; then\n'
+        "    printf '12%%\\rdiagnostic one\\n34%%\\rdiagnostic two\\n56%%\\r78%%\\n'\n"
+        "    shift\n"
+        "fi\n"
         "printf 'rsync diagnostic\\n' >&2\n"
         f"if [ {status} -ne 0 ]; then\n"
-        '    mkdir -p "$5"\n'
-        '    printf stale > "$5/stale"\n'
+        '    mkdir -p "$4"\n'
+        '    printf stale > "$4/stale"\n'
         f"    exit {status}\n"
         "fi\n"
-        'cp -RL "$4/." "$5"\n'
+        'cp -RL "$3/." "$4"\n'
         f"exit {status}\n",
         encoding="utf-8",
     )
@@ -252,12 +255,16 @@ def _fake_rsync(tmp_path: Path, monkeypatch: pytest.MonkeyPatch, *, status: int)
     return rsync
 
 
+@pytest.mark.parametrize("interactive", [False, True])
 def test_rsync_copy_passes_output_directly_to_stdout_and_materializes_symlinks(
     tmp_path: Path,
     monkeypatch: pytest.MonkeyPatch,
     caplog: pytest.LogCaptureFixture,
     capfdbinary: pytest.CaptureFixture[bytes],
+    interactive: bool,
 ) -> None:
+    monkeypatch.setattr("godoo_cli.runtime.filestore.sys.stdout.isatty", lambda: interactive)
+    monkeypatch.setattr("godoo_cli.runtime.filestore.sys.stderr.isatty", lambda: not interactive)
     source = tmp_path / "source"
     source.mkdir()
     (source / "kept").write_text("original")
@@ -277,13 +284,14 @@ def test_rsync_copy_passes_output_directly_to_stdout_and_materializes_symlinks(
     assert (tmp_path / "rsync-args").read_text().splitlines() == [
         "-rLpt",
         "--human-readable",
-        "--info=progress2",
+        *(["--info=progress2"] if interactive else []),
         f"{source}/",
         str(destination),
     ]
     assert "-a" not in (tmp_path / "rsync-args").read_text().splitlines()
     captured = capfdbinary.readouterr()
-    assert captured.out == b"12%\rdiagnostic one\n34%\rdiagnostic two\n56%\r78%\nrsync diagnostic\n"
+    progress = b"12%\rdiagnostic one\n34%\rdiagnostic two\n56%\r78%\n" if interactive else b""
+    assert captured.out == progress + b"rsync diagnostic\n"
     assert captured.err == b""
     assert not caplog.records