beet-observer 0.6.0__tar.gz → 0.6.2__tar.gz

{beet_observer-0.6.0 → beet_observer-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: beet-observer
-Version: 0.6.0
+Version: 0.6.2
 Summary: A beet plugin to automatically generate overlays from previous datapacks
 License: MIT
 Author: BPR02

{beet_observer-0.6.0 → beet_observer-0.6.2}/beet_observer/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.6.0"
+__version__ = "0.6.2"
 
 from .plugin import *

{beet_observer-0.6.0 → beet_observer-0.6.2}/beet_observer/data_pack.py

@@ -1,7 +1,7 @@
 from typing import Any
 
 import beet.contrib.worldgen as wg
-from beet import Context, NamespaceProxy
+from beet import Context, NamespaceProxy, Structure
 
 
 def gen_dp_overlays(
@@ -124,11 +124,6 @@ def gen_dp_overlays(
             continue
         # check if it's the top-level overlay
         if overlay == ctx.meta["observer"]["default_dir_dp"]:
-            # delete pack.mcmeta from overlay (required for tests)
-            default_dir = ctx.meta["observer"]["default_dir_dp"]
-            if ctx.data.overlays[default_dir].mcmeta:
-                del ctx.data.overlays[default_dir].mcmeta
-
             # get pack format from build context
             if "default_format" in ctx.meta["observer"]:
                 formats = ctx.meta["observer"]["default_format"]
@@ -219,6 +214,10 @@ def gen_registry_overlay(
     else:
         # check if files are exactly the same
         try:
+            if isinstance(registry[name], Structure):
+                registry_overlay[name].data["DataVersion"] = registry[name].data[
+                    "DataVersion"
+                ]
             if registry[name].data != registry_overlay[name].data:
                 # move file from overlay pack to overlay in build pack
                 ctx.data.overlays[overlay_dir][name] = registry_overlay[name]

{beet_observer-0.6.0 → beet_observer-0.6.2}/beet_observer/plugin.py

@@ -7,6 +7,26 @@ from .resource_pack import *
 def beet_default(ctx: Context):
     if "observer" not in ctx.meta:
         return
+
+    # # check cache
+    cache = ctx.cache["observer"]
+    cached_dp = False
+    cached_rp = False
+    dp_path = None
+    rp_path = None
+    if ctx.data:
+        dp_path = cache.get_path(f"{ctx.directory} saved_data_pack")
+        if dp_path.is_dir():
+            ctx.data.load(f"{dp_path}")
+            cached_dp = True
+    if ctx.assets:
+        rp_path = cache.get_path(f"{ctx.directory} saved_resource_pack")
+        if rp_path.is_dir():
+            ctx.assets.load(f"{rp_path}")
+            cached_rp = True
+    if cached_dp and cached_rp:
+        return
+
     # get default directories
     if "default_dir" not in ctx.meta["observer"]:
         # default dir not defined
@@ -46,5 +66,13 @@ def beet_default(ctx: Context):
                 dp_dir = overlay["directory"]
                 rp_dir = overlay["directory"]
             # compare build pack and overlay pack
-            gen_dp_overlays(ctx, ctx_overlay, dp_dir, save)
-            gen_rp_overlays(ctx, ctx_overlay, rp_dir, save)
+            if not cached_dp and ctx.data:
+                gen_dp_overlays(ctx, ctx_overlay, dp_dir, save)
+            if not cached_rp and ctx.assets:
+                gen_rp_overlays(ctx, ctx_overlay, rp_dir, save)
+
+    # save to cache
+    if not cached_dp and ctx.data:
+        ctx.data.save(path=dp_path)
+    if not cached_rp and ctx.assets:
+        ctx.assets.save(path=rp_path)

{beet_observer-0.6.0 → beet_observer-0.6.2}/beet_observer/resource_pack.py

@@ -52,11 +52,6 @@ def gen_rp_overlays(
             continue
         # check if it's the top-level overlay
         if overlay == ctx.meta["observer"]["default_dir_rp"]:
-            # delete pack.mcmeta from overlay (required for tests)
-            default_dir = ctx.meta["observer"]["default_dir_rp"]
-            if ctx.assets.overlays[default_dir].mcmeta:
-                del ctx.assets.overlays[default_dir].mcmeta
-
             # get pack format from build context
             if "default_format" in ctx.meta["observer"]:
                 formats = ctx.meta["observer"]["default_format"]

{beet_observer-0.6.0 → beet_observer-0.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "beet-observer"
-version = "0.6.0"
+version = "0.6.2"
 description = "A beet plugin to automatically generate overlays from previous datapacks"
 authors = ["BPR02 <dev@bpr02.com>"]
 license = "MIT"