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

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

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

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

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

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

@@ -4,7 +4,9 @@ import beet.contrib.worldgen as wg
 from beet import Context, NamespaceProxy
 
 
-def gen_dp_overlays(ctx: Context, ctx_overlay: Context, overlay_dir: str) -> None:
+def gen_dp_overlays(
+    ctx: Context, ctx_overlay: Context, overlay_dir: str, ignore: list[str]
+) -> None:
     """
     Generates overlays between two datapacks.
 
@@ -118,6 +120,8 @@ def gen_dp_overlays(ctx: Context, ctx_overlay: Context, overlay_dir: str) -> Non
 
     # add overlays to pack.mcmeta
     for overlay in ctx.data.overlays:
+        if overlay in ignore:
+            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)

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

@@ -24,14 +24,20 @@ def beet_default(ctx: Context):
         ctx.meta["observer"]["default_dir_rp"] = ctx.meta["observer"]["default_dir"][
             "rp"
         ]
+    # save current overlays
+    save: list[str] = []
+    for overlay in ctx.data.overlays:
+        save.append(overlay)
     # loop through all overlays
     for overlay in ctx.meta["observer"]["overlays"]:
-        # create relative path
-        path = f"{ctx.directory}/{overlay['process']}"
+        # get pack
+        if overlay["process"].startswith("https://"):
+            load = overlay["process"]
+        else:
+            load = f"{ctx.directory}/{overlay['process']}"
         # generate context for overlay pack
         with run_beet(
-            config={"data_pack": {"load": "."}, "resource_pack": {"load": "."}},
-            directory=path,
+            config={"data_pack": {"load": load}, "resource_pack": {"load": load}}
         ) as ctx_overlay:
             if "directory" not in overlay:
                 dp_dir = f"overlay_{ctx_overlay.data.pack_format}"
@@ -40,5 +46,5 @@ 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)
-            gen_rp_overlays(ctx, ctx_overlay, rp_dir)
+            gen_dp_overlays(ctx, ctx_overlay, dp_dir, save)
+            gen_rp_overlays(ctx, ctx_overlay, rp_dir, save)

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

@@ -3,7 +3,9 @@ from typing import Any
 from beet import Context, NamespaceProxy
 
 
-def gen_rp_overlays(ctx: Context, ctx_overlay: Context, overlay_dir: str) -> None:
+def gen_rp_overlays(
+    ctx: Context, ctx_overlay: Context, overlay_dir: str, ignore: list[str]
+) -> None:
     """
     Generates overlays between two resource packs.
 
@@ -46,6 +48,8 @@ def gen_rp_overlays(ctx: Context, ctx_overlay: Context, overlay_dir: str) -> Non
 
     # add overlays to pack.mcmeta
     for overlay in ctx.assets.overlays:
+        if overlay in ignore:
+            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)

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "beet-observer"
-version = "0.4.0"
+version = "0.6.0"
 description = "A beet plugin to automatically generate overlays from previous datapacks"
 authors = ["BPR02 <dev@bpr02.com>"]
 license = "MIT"
@@ -38,6 +38,7 @@ typeCheckingMode = "strict"
 [tool.poe.tasks]
 format = {shell = "isort beet_observer & black beet_observer"}
 check = {shell = "isort --check-only beet_observer & black --check beet_observer"}
+typing = {shell = "pyright"}
 
 [build-system]
 requires = ["poetry-core"]