sonolus.py 0.9.1__py3-none-any.whl → 0.9.3__py3-none-any.whl

sonolus/build/collection.py

@@ -246,9 +246,13 @@ class Collection:
                 use_item = level[key]
                 if "item" not in use_item:
                     continue
-                name = use_item["item"]["name"]
-                if name in self.categories.get(category, {}):
-                    use_item["item"] = self.get_item(category, name)
+                use_item_value = use_item["item"]
+                if isinstance(use_item_value, str) and use_item_value in self.categories.get(category, {}):
+                    use_item["item"] = self.get_item(category, use_item_value)
+                elif isinstance(use_item_value, dict) and "name" in use_item_value:
+                    name = use_item["item"]["name"]
+                    if name in self.categories.get(category, {}):
+                        use_item["item"] = self.get_item(category, name)
 
     def _create_base_directory(self, path: Asset) -> Path:
         base_dir = Path(path) / BASE_PATH.strip("/")

sonolus/build/dev_server.py

@@ -112,17 +112,14 @@ def parse_dev_command(command_line: str) -> Command | None:
         return None
 
 
-def command_input_thread(command_queue: queue.Queue, stop_event: threading.Event, prompt_event: threading.Event):
+def command_input_thread(command_queue: queue.Queue, prompt_event: threading.Event):
     print(f"\nAvailable commands:\n{HELP_TEXT}")
 
-    while not stop_event.is_set():
+    while True:
         try:
             prompt_event.wait()
             prompt_event.clear()
 
-            if stop_event.is_set():
-                break
-
             print("\n> ", end="", flush=True)
             command_line = input()
             if command_line.strip():
@@ -193,10 +190,9 @@ def run_server(
             threading.Thread(target=httpd.serve_forever, daemon=True).start()
 
             command_queue = queue.Queue()
-            stop_event = threading.Event()
             prompt_event = threading.Event()
             input_thread = threading.Thread(
-                target=command_input_thread, args=(command_queue, stop_event, prompt_event), daemon=True
+                target=command_input_thread, args=(command_queue, prompt_event), daemon=True
             )
             input_thread.start()
 
@@ -215,8 +211,5 @@ def run_server(
                 sys.exit(0)
             finally:
                 httpd.shutdown()
-                stop_event.set()
-                prompt_event.set()
-                input_thread.join()
         else:
             httpd.serve_forever()

{sonolus_py-0.9.1.dist-info → sonolus_py-0.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sonolus.py
-Version: 0.9.1
+Version: 0.9.3
 Summary: Sonolus engine development in Python
 Project-URL: Documentation, https://sonolus.py.qwewqa.xyz/
 Project-URL: Repository, https://github.com/qwewqa/sonolus.py

{sonolus_py-0.9.1.dist-info → sonolus_py-0.9.3.dist-info}/RECORD

@@ -27,9 +27,9 @@ sonolus/backend/optimize/simplify.py,sha256=RDNVTKfC7ByRyxY5z30_ShimOAKth_pKlVFV
 sonolus/backend/optimize/ssa.py,sha256=raQO0furQQRPYb8iIBKfNrJlj-_5wqtI4EWNfLZ8QFo,10834
 sonolus/build/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sonolus/build/cli.py,sha256=aEuuyWxo5u12z-0On2conYxQ31XHTIZ3npD4y0QNpFQ,9441
-sonolus/build/collection.py,sha256=KgMfdLsCA7bheT-E2wmdB2OBEWolbsECm8vrwAhGC1c,12415
+sonolus/build/collection.py,sha256=6hniAzriPWBKUeGDkXabNXpbdHiHnqiK9shs6U1OExM,12748
 sonolus/build/compile.py,sha256=3r3pbrOMS45ufQdtd12mhCq11b3km7BU4Npa2AMxTzo,8272
-sonolus/build/dev_server.py,sha256=oTvYsUaZDE8XyobS7jqOarwWiNkOjbWTm9bjp1r2M_s,6597
+sonolus/build/dev_server.py,sha256=5LgfHRhnR8cYGp8prkGxOp6E3TflTPw7xmJ1h1kOpGM,6331
 sonolus/build/engine.py,sha256=J5I1-oYpiwCl9lOKhLpEgw3iPRhzD6aLH9oBPjgHx_s,14139
 sonolus/build/level.py,sha256=KLqUAtxIuIqrzeFURJA97rdqjA5pcvYSmwNZQhElaMQ,702
 sonolus/build/node.py,sha256=gnX71RYDUOK_gYMpinQi-bLWO4csqcfiG5gFmhxzSec,1330
@@ -87,8 +87,8 @@ sonolus/script/internal/simulation_context.py,sha256=LGxLTvxbqBIhoe1R-SfwGajNIDw
 sonolus/script/internal/transient.py,sha256=y2AWABqF1aoaP6H4_2u4MMpNioC4OsZQCtPyNI0txqo,1634
 sonolus/script/internal/tuple_impl.py,sha256=DPNdmmRmupU8Ah4_XKq6-PdT336l4nt15_uCJKQGkkk,3587
 sonolus/script/internal/value.py,sha256=OngrCdmY_h6mV2Zgwqhuo4eYFad0kTk6263UAxctZcY,6963
-sonolus_py-0.9.1.dist-info/METADATA,sha256=1eOoNYUb6fpDM8Z9qtnEAfBd7tFQkpOaa1IfE2iRyLA,553
-sonolus_py-0.9.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sonolus_py-0.9.1.dist-info/entry_points.txt,sha256=oTYspY_b7SA8TptEMTDxh4-Aj-ZVPnYC9f1lqH6s9G4,54
-sonolus_py-0.9.1.dist-info/licenses/LICENSE,sha256=JEKpqVhQYfEc7zg3Mj462sKbKYmO1K7WmvX1qvg9IJk,1067
-sonolus_py-0.9.1.dist-info/RECORD,,
+sonolus_py-0.9.3.dist-info/METADATA,sha256=85b716gzemda0_TZ3ldIMytt7juroiJuQqt_oxkg2vY,553
+sonolus_py-0.9.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sonolus_py-0.9.3.dist-info/entry_points.txt,sha256=oTYspY_b7SA8TptEMTDxh4-Aj-ZVPnYC9f1lqH6s9G4,54
+sonolus_py-0.9.3.dist-info/licenses/LICENSE,sha256=JEKpqVhQYfEc7zg3Mj462sKbKYmO1K7WmvX1qvg9IJk,1067
+sonolus_py-0.9.3.dist-info/RECORD,,