rocketdoo 2.3.0__tar.gz → 2.3.1__tar.gz

{rocketdoo-2.3.0 → rocketdoo-2.3.1}/LICENSE

@@ -57,7 +57,7 @@ If the Library as you received it specifies that a proxy can decide whether futu
 <div RKD as ROCKETDOO V2=""></div>
 
 Licencia: LGPL-3.0+
-Versión: "2.3.0"
+Versión: "2.3.1"
 Autor: Horacio Montaño, Elias Braceras
 Fecha: 16/10/2024
 Descripción: Framework to development Odoo

{rocketdoo-2.3.0/rocketdoo.egg-info → rocketdoo-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rocketdoo
-Version: 2.3.0
+Version: 2.3.1
 Summary: Framework for creating Odoo development environments with Docker and custom templates.
 Author-email: Horacio Montaño <horaciomontano@hdmsoft.com.ar>
 License: GNU LESSER GENERAL PUBLIC LICENSE
@@ -62,7 +62,7 @@ License: GNU LESSER GENERAL PUBLIC LICENSE
         <div RKD as ROCKETDOO V2=""></div>
         
         Licencia: LGPL-3.0+
-        Versión: "2.3.0"
+        Versión: "2.3.1"
         Autor: Horacio Montaño, Elias Braceras
         Fecha: 16/10/2024
         Descripción: Framework to development Odoo
@@ -95,7 +95,7 @@ Odoo Development Framework
    - "Horacio Montaño" and "Elias Braceras"
 
 ## Version: 
-   - "2.3.0"
+   - "2.3.1"
 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------
 

{rocketdoo-2.3.0 → rocketdoo-2.3.1}/README.md

@@ -15,7 +15,7 @@ Odoo Development Framework
    - "Horacio Montaño" and "Elias Braceras"
 
 ## Version: 
-   - "2.3.0"
+   - "2.3.1"
 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------
 

{rocketdoo-2.3.0 → rocketdoo-2.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rocketdoo"
-version = "2.3.0"
+version = "2.3.1"
 description = "Framework for creating Odoo development environments with Docker and custom templates."
 authors = [
     { name = "Horacio Montaño", email = "horaciomontano@hdmsoft.com.ar" }

{rocketdoo-2.3.0 → rocketdoo-2.3.1}/rocketdoo/pack_environment.py

@@ -108,37 +108,67 @@ def _backup_database(db_container: str, db_name: str, output_path: Path) -> bool
 def _backup_filestore(odoo_container: str, db_name: str, output_path: Path) -> bool:
     """
     Copies and compresses the Odoo filestore from the container to the host.
-    Filestore path inside container: /var/lib/odoo/.local/share/Odoo/filestore/<db_name>/
+
+    Supports multiple filestore layouts:
+      - /var/lib/odoo/.local/share/Odoo/filestore/<db_name>
+      - /var/lib/odoo/filestore/<db_name>
     """
-    filestore_path = f"/var/lib/odoo/.local/share/Odoo/filestore/{db_name}"
     console.print(f"  [dim]Copying filestore from container...[/dim]")
+
+    POSSIBLE_PATHS = [
+        f"/var/lib/odoo/.local/share/Odoo/filestore/{db_name}",
+        f"/var/lib/odoo/filestore/{db_name}",
+    ]
+
+    filestore_path = None
+    filestore_base = None
+
     try:
-        check = subprocess.run(
-            ["docker", "exec", odoo_container, "test", "-d", filestore_path],
-            capture_output=True
-        )
-        if check.returncode != 0:
-            console.print(f"  [yellow]⚠[/yellow]  Filestore not found at [dim]{filestore_path}[/dim] — skipping.")
-            return True  # Not a fatal error
+        # ── Detect filestore path dynamically ──
+        for path in POSSIBLE_PATHS:
+            check = subprocess.run(
+                ["docker", "exec", odoo_container, "test", "-d", path],
+                capture_output=True
+            )
+            if check.returncode == 0:
+                filestore_path = path
+                filestore_base = str(Path(path).parent)
+                break
+
+        if not filestore_path:
+            console.print(
+                f"  [yellow]⚠[/yellow]  Filestore not found for database "
+                f"[cyan]{db_name}[/cyan] in any known location — skipping."
+            )
+            return True  # Not fatal
+
+        console.print(f"  [dim]Detected filestore path:[/dim] [cyan]{filestore_path}[/cyan]")
 
+        # ── Compress filestore ──
         with open(output_path, "wb") as f:
             result = subprocess.run(
                 [
                     "docker", "exec", odoo_container,
                     "tar", "-czf", "-", "-C",
-                    "/var/lib/odoo/.local/share/Odoo/filestore/",
+                    filestore_base,
                     db_name
                 ],
                 stdout=f,
                 stderr=subprocess.PIPE
             )
+
         if result.returncode != 0:
             console.print(f"  [red]✗ Error copying filestore:[/red] {result.stderr.decode()}")
             return False
 
         size_mb = output_path.stat().st_size / (1024 * 1024)
-        console.print(f"  [green]✓[/green] Filestore compressed: [yellow]{output_path.name}[/yellow] ({size_mb:.1f} MB)")
+        console.print(
+            f"  [green]✓[/green] Filestore compressed: "
+            f"[yellow]{output_path.name}[/yellow] ({size_mb:.1f} MB)"
+        )
+
         return True
+
     except Exception as e:
         console.print(f"  [red]✗ Exception during filestore backup:[/red] {e}")
         return False
@@ -199,11 +229,11 @@ def _verify_no_ssh_in_zip(zip_path: Path) -> list[str]:
 def _create_zip(project_dir: Path, zip_path: Path, backup_dir: Path, exclude_dirs: list[str]) -> int:
     """
     Creates the ZIP archive of the full environment.
-    Excludes: .ssh/, __pycache__, .git/, node_modules, and any extra dirs provided.
+    Excludes: .ssh/, __pycache__, node_modules, and any extra dirs provided.
     Includes the backup directory contents under rkd_backups/.
     Returns the number of files included.
     """
-    ALWAYS_EXCLUDE = {".ssh", "__pycache__", ".git", "node_modules", ".mypy_cache"}
+    ALWAYS_EXCLUDE = {".ssh", "__pycache__", "node_modules", ".mypy_cache"}
     excluded = ALWAYS_EXCLUDE | set(exclude_dirs)
 
     file_count = 0

{rocketdoo-2.3.0 → rocketdoo-2.3.1}/rocketdoo/unpack_environment.py

@@ -206,6 +206,30 @@ def _wait_for_postgres(db_container: str, max_wait: int = 60) -> bool:
     return False
 
 
+def _wait_for_odoo_volume(odoo_container: str, max_wait: int = 90) -> bool:
+    """
+    Waits until /var/lib/odoo is mounted and accessible inside the Odoo container.
+
+    Replaces time.sleep(5): the Docker volume may take several seconds to become
+    available after the container starts, especially on first run. Without this
+    check the filestore restore would silently fail writing to a non-existent path.
+    """
+    console.print(f"  [dim]Waiting for Odoo volume to be ready (max {max_wait}s)...[/dim]")
+    for i in range(max_wait):
+        result = subprocess.run(
+            ["docker", "exec", odoo_container, "test", "-d", "/var/lib/odoo"],
+            capture_output=True
+        )
+        if result.returncode == 0:
+            console.print(f"  [green]✓[/green] Odoo volume is ready.")
+            return True
+        time.sleep(1)
+        if i % 15 == 14:
+            console.print(f"  [dim]  ...{i + 1}s[/dim]")
+    console.print(f"  [yellow]⚠[/yellow]  Odoo volume not ready after {max_wait}s.")
+    return False
+
+
 def _restore_database(db_container: str, dump_path: Path) -> str | None:
     """
     Restores the PostgreSQL dump into the container.
@@ -264,9 +288,16 @@ def _restore_database(db_container: str, dump_path: Path) -> str | None:
 
 
 def _restore_filestore(odoo_container: str, filestore_tar: Path, db_name: str) -> bool:
-    """Restores the Odoo filestore into the web container."""
+    """Restores the Odoo filestore into the web container (supports multiple layouts)."""
     console.print(f"  [dim]Restoring filestore for [cyan]{db_name}[/cyan]...[/dim]")
+
+    POSSIBLE_BASES = [
+        "/var/lib/odoo/.local/share/Odoo/filestore",
+        "/var/lib/odoo/filestore",
+    ]
+
     try:
+        # ── 1. Copy tar to container ──
         copy_result = subprocess.run(
             ["docker", "cp", str(filestore_tar), f"{odoo_container}:/tmp/rkd_filestore.tar.gz"],
             capture_output=True, text=True
@@ -275,23 +306,67 @@ def _restore_filestore(odoo_container: str, filestore_tar: Path, db_name: str) -
             console.print(f"  [yellow]⚠[/yellow]  Could not copy filestore: {copy_result.stderr}")
             return False
 
-        filestore_base = "/var/lib/odoo/.local/share/Odoo/filestore"
+        # ── 2. Detect filestore base ──
+        filestore_base = None
+
+        for base in POSSIBLE_BASES:
+            check = subprocess.run(
+                ["docker", "exec", odoo_container, "test", "-d", base],
+                capture_output=True
+            )
+            if check.returncode == 0:
+                filestore_base = base
+                break
+
+        # fallback → usar layout simple
+        if not filestore_base:
+            filestore_base = "/var/lib/odoo/filestore"
+            console.print(
+                f"  [yellow]⚠[/yellow]  Filestore base not found. Using fallback: "
+                f"[cyan]{filestore_base}[/cyan]"
+            )
+
+        console.print(f"  [dim]Using filestore base:[/dim] [cyan]{filestore_base}[/cyan]")
+
+        # ── 3. Ensure base exists ──
         subprocess.run(
             ["docker", "exec", odoo_container, "mkdir", "-p", filestore_base],
             capture_output=True
         )
 
+        # ── 4. Clean existing filestore (VERY IMPORTANT) ──
+        console.print(f"  [dim]Cleaning existing filestore for {db_name}...[/dim]")
+        subprocess.run(
+            ["docker", "exec", odoo_container, "rm", "-rf", f"{filestore_base}/{db_name}"],
+            capture_output=True
+        )
+
+        # ── 5. Extract tar ──
         extract_result = subprocess.run(
-            ["docker", "exec", odoo_container,
-             "tar", "-xzf", "/tmp/rkd_filestore.tar.gz", "-C", filestore_base],
+            [
+                "docker", "exec", odoo_container,
+                "tar", "-xzf", "/tmp/rkd_filestore.tar.gz",
+                "-C", filestore_base
+            ],
             capture_output=True, text=True
         )
+
         if extract_result.returncode != 0:
             console.print(f"  [yellow]⚠[/yellow]  Error extracting filestore: {extract_result.stderr}")
             return False
 
-        console.print(f"  [green]✓[/green] Filestore restored inside the container.")
+        # ── 6. Fix permissions ──
+        subprocess.run(
+            [
+                "docker", "exec", odoo_container,
+                "chown", "-R", "odoo:odoo", f"{filestore_base}/{db_name}"
+            ],
+            capture_output=True
+        )
+
+        console.print(f"  [green]✓[/green] Filestore restored successfully.")
         return True
+
     except Exception as e:
         console.print(f"  [yellow]⚠[/yellow]  Exception while restoring filestore: {e}")
         return False
@@ -451,11 +526,18 @@ def unpack_environment(no_restore, build):
                     console.print("[bold]🗂️  Restoring filestore:[/bold]")
                     console.print("[dim]  Starting web service to restore filestore...[/dim]")
                     subprocess.run(["docker", "compose", "up", "-d", "web"], capture_output=True)
-                    time.sleep(5)
 
                     odoo_container = _get_odoo_container_name(project_dir)
                     if odoo_container:
-                        _restore_filestore(odoo_container, filestore_tar, restored_db)
+                        volume_ready = _wait_for_odoo_volume(odoo_container)
+                        if volume_ready:
+                            _restore_filestore(odoo_container, filestore_tar, restored_db)
+                        else:
+                            console.print(
+                                "[yellow]⚠[/yellow]  Skipping filestore restore: "
+                                "Odoo volume was not ready in time.\n"
+                                "[dim]  Try running the restore manually after the environment is up.[/dim]"
+                            )
 
         _launch_environment(build=build)
     else:

{rocketdoo-2.3.0 → rocketdoo-2.3.1/rocketdoo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rocketdoo
-Version: 2.3.0
+Version: 2.3.1
 Summary: Framework for creating Odoo development environments with Docker and custom templates.
 Author-email: Horacio Montaño <horaciomontano@hdmsoft.com.ar>
 License: GNU LESSER GENERAL PUBLIC LICENSE
@@ -62,7 +62,7 @@ License: GNU LESSER GENERAL PUBLIC LICENSE
         <div RKD as ROCKETDOO V2=""></div>
         
         Licencia: LGPL-3.0+
-        Versión: "2.3.0"
+        Versión: "2.3.1"
         Autor: Horacio Montaño, Elias Braceras
         Fecha: 16/10/2024
         Descripción: Framework to development Odoo
@@ -95,7 +95,7 @@ Odoo Development Framework
    - "Horacio Montaño" and "Elias Braceras"
 
 ## Version: 
-   - "2.3.0"
+   - "2.3.1"
 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------