PyPI - codingpirates-maze - Versions diffs - 0.4.0__tar.gz → 0.4.2__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codingpirates-maze
-Version: 0.4.0
+Version: 0.4.2
 Summary: Turtle-graphics maze framework and code.org level importer used by Coding Pirates Python puzzles
 License-Expression: Apache-2.0
 Requires-Python: >=3.11

@@ -1,6 +1,6 @@
 [project]
 name = "codingpirates-maze"
-version = "0.4.0"
+version = "0.4.2"
 description = "Turtle-graphics maze framework and code.org level importer used by Coding Pirates Python puzzles"
 readme = "README.md"
 license = "Apache-2.0"

@@ -1,6 +1,6 @@
 [project]
 name = "codingpirates-maze"
-version = "0.4.0"
+version = "0.4.2"
 description = "Turtle-graphics maze framework and code.org level importer used by Coding Pirates Python puzzles"
 readme = "README.md"
 license = "Apache-2.0"

@@ -8,12 +8,7 @@ import sys
 from .resources import get_provider
-try:
-    # os.environ is unavailable under Skulpt (import os raises NotImplementedError there)
-    import os
-    _TESTMODE = os.environ.get('TESTMODE')
-except Exception:
-    _TESTMODE = None
+_TESTMODE = get_provider().get_setting('TESTMODE')
 _TRACER_DELAY = 0 if _TESTMODE == "True" else 15
 _TRACER_N = 0 if _TESTMODE == "True" else 1
@@ -338,14 +333,15 @@ class Maze:
         self.cells_to_visit = []
         self.visited = []
-        self.pen = Pen()
-        maze_type.setup(level, self)
+        # Under Skulpt, screen.setup() re-applies world coordinates and wipes any drawing
+        # (bgpic, or a Turtle's rendered state) already on the canvas, so establish the
+        # screen/coordinates before any Turtle subclass gets constructed.
         self.screen.bgcolor("white")
         self.screen.setup(410, 410)  # TODO Add dynamic size
         self.screen.tracer(0, 0)
+        maze_type.setup(level, self)
         self._setup_maze(level)
         self.pen.tick()
@@ -428,6 +424,10 @@ class Maze:
             direction = Direction(direction)
             self.player._turtle.setheading(direction.to_heading())
+        # Construct Pen last: Skulpt z-orders turtles by construction time, so this must
+        # come after every maze/player turtle to render success/failure text on top.
+        self.pen = Pen()
         self.update()
     def update(self):
@@ -493,12 +493,18 @@ class Player:
     maze: Maze = None
     instance = None
-    _turtle = turtle.Turtle()
+    # Constructed lazily in __init__ (not at class-definition/import time) so under Skulpt,
+    # where sprite z-order is fixed at Turtle-construction time, it's created after every
+    # cell/path/wall turtle instead of always being the earliest (and thus bottom-most) one.
+    _turtle = None
     def __init__(self, maze):
         Player.instance = self
         self.maze = maze
+        if Player._turtle is None:
+            Player._turtle = turtle.Turtle()
         self._turtle.penup()
         self._turtle.speed(1)

@@ -34,4 +34,7 @@ class Puzzle:
     @staticmethod
     def done():
+        if (get_provider().get_setting('SCREENSHOT', "false").lower() == "true"):
+            from . import screencapture
+            screencapture.capture()
         Maze.instance.done()

@@ -17,7 +17,7 @@ IS_SKULPT = platform.python_implementation() == "Skulpt"
 # Keep this aligned with the `version` in pyproject.toml and the matching GitHub release tag
 # (see README) so the CDN URL below actually resolves to the release these assets ship with.
-_PACKAGE_VERSION = "0.4.0"
+_PACKAGE_VERSION = "0.4.2"
 _GITHUB_REPO = "StefanUG/codingpirates-maze"
@@ -37,6 +37,10 @@ class ResourceProvider:
         filesystem path (desktop) or an image URL (browser)."""
         raise NotImplementedError
+    def get_setting(self, name: str, default=None):
+        """Return a configuration setting by name, or the default if not found."""
+        raise NotImplementedError
 class DefaultFilesystemProvider(ResourceProvider):
     """Reproduces the pre-refactor filesystem-based resolution exactly."""
@@ -79,6 +83,11 @@ class DefaultFilesystemProvider(ResourceProvider):
         with importlib.resources.path("maze.images." + subfolder, name + ext) as image_path:
             return str(image_path)
+    def get_setting(self, name: str, default=None):
+        """Return a configuration setting by name, or the default if not found."""
+        import os
+        return os.getenv(name, default)
 class SkulptBrowserProvider(ResourceProvider):
     """Only ever instantiated when IS_SKULPT is True."""
@@ -98,6 +107,10 @@ class SkulptBrowserProvider(ResourceProvider):
         # No fetch needed -- Skulpt's turtle loads images from a URL itself.
         return f"{self.asset_base_url}/images/{subfolder}/{name}{ext}"
+    def get_setting(self, name: str, default=None):
+        """os not available in Skulpt; simply return the default."""
+        return default
 _provider: ResourceProvider = (
     SkulptBrowserProvider(_default_asset_base_url()) if IS_SKULPT

@@ -6,11 +6,16 @@ Module to capture a turtle screen into image files
 def capture(screen:turtle.Screen, filename=None):
   # desktop-only tool: subprocess/datetime are unavailable under Skulpt, so import lazily
   import datetime
+  import os
   import subprocess
+  import sys
   if (not filename):
     dt = datetime.datetime.now()
-    filename = dt.strftime("%Y-%m-%d %H.%M.%S") + " screen"
+    script_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
+    #filename = os.path.join(script_dir, dt.strftime("%Y-%m-%d %H.%M.%S") + " screen")
+    filename = os.path.splitext(os.path.basename(sys.argv[0]))[0]
+    filename = os.path.join(script_dir, filename)
   psfile = filename + ".ps"
   canvas = screen.getcanvas()

codingpirates-maze 0.4.0__tar.gz → 0.4.2__tar.gz

codingpirates-maze 0.4.0tar.gz → 0.4.2tar.gz