crystalwindow 4.6__py3-none-any.whl → 4.7__py3-none-any.whl

crystalwindow/FileHelper.py

@@ -1,8 +1,9 @@
 """
 CrystalWindow FileHelper
 ------------------------
-A utility class that handles saving/loading text, JSON, and pickle files,
-with optional Tk file dialogs and a default 'saves' directory.
+Handles saving/loading text, JSON, and pickle files.
+Uses Tk file dialogs, auto-creates 'saves/' folder,
+and supports image fallback + resizing.
 """
 
 import os
@@ -10,30 +11,160 @@ import json
 import pickle
 import tkinter as tk
 from tkinter import filedialog
+from PIL import Image, ImageTk
+from .assets import load_image
 
 
 class FileHelper:
-    """CrystalWindow integrated file helper with default folders & Tk dialogs."""
+    """CrystalWindow integrated file helper."""
 
     def __init__(self, default_save_folder="saves"):
+        self.default_save_folder = default_save_folder
+        self.last_dir = "."
+        os.makedirs(self.default_save_folder, exist_ok=True)
+
+    # ======================================================================
+    # INTERNAL TK ROOT
+    # ======================================================================
+    def _make_root(self):
+        """Create hidden Tk root without any custom icon."""
+        root = tk.Tk()
+        root.withdraw()
+        return root
+
+    # ======================================================================
+    # SAFE RESIZE HANDLER
+    # ======================================================================
+    def _resize_any(self, img, size):
+        """Resize PIL image safely and return Tk PhotoImage."""
+        if size is None:
+            # If already a PhotoImage, keep as is
+            if isinstance(img, Image.Image):
+                return ImageTk.PhotoImage(img)
+            return img
+
+        if isinstance(img, Image.Image):
+            pil = img.resize(size, Image.Resampling.LANCZOS)
+            return ImageTk.PhotoImage(pil)
+
+        print("[WARN] Unknown image type, cannot resize.")
+        return img
+
+    # ======================================================================
+    # IMAGE OPENING WITH RETRY + FALLBACK + RESIZE
+    # ======================================================================
+    def open_img(
+        self,
+        start_in=None,
+        retry=False,
+        fallback_size=(64, 64),
+        fallback_color=(255, 0, 255),
+        resize=None,
+        return_pil=False
+    ):
         """
-        Initialize the FileHelper.
+        Open an image using a dialog.
 
-        Args:
-            default_save_folder (str): Folder to save files in by default.
-                                       Created automatically if missing.
+        Params:
+            retry=True → reopen dialog until image selected
+            fallback_size → fallback square size when cancelled
+            fallback_color → fallback color
+            resize=(w, h) → resize final image
+
+        Returns dict:
+            - Always returns `image` as a Tk-compatible image (ImageTk.PhotoImage or PhotoImage)
+            - If `return_pil=True` and Pillow is available, also returns `pil` with the PIL Image
+            { "path": str|None, "image": PhotoImage, "pil": PIL.Image.Image|None, "cancelled": bool }
         """
-        self.default_save_folder = default_save_folder
-        os.makedirs(self.default_save_folder, exist_ok=True)
 
-    # -------------------------------------------------------------------------
-    # TK FILE DIALOGS
-    # -------------------------------------------------------------------------
+        while True:
+            root = self._make_root()
+            folder = start_in if start_in else self.last_dir
+
+            path = filedialog.askopenfilename(
+                title="Select image",
+                initialdir=folder,
+                filetypes=[
+                    ("Image files", "*.png;*.jpg;*.jpeg;*.gif;*.bmp"),
+                    ("All files", "*.*")
+                ]
+            )
+            root.destroy()
+
+            # ------------------------ CANCELLED ------------------------
+            if not path:
+                if retry:
+                    print("⚠️ No image selected. Trying again...")
+                    continue
+
+                print("⚠️ No image selected. Using fallback.")
+                # Create a PIL fallback if Pillow available, then make a Tk image
+                if Image is not None:
+                    w, h = fallback_size if fallback_size else (64, 64)
+                    pil_fb = Image.new("RGB", (w, h), fallback_color)
+                    if resize:
+                        pil_fb = pil_fb.resize(resize, Image.Resampling.LANCZOS)
+                    tk_fb = ImageTk.PhotoImage(pil_fb)
+                    if return_pil:
+                        return {"path": None, "image": tk_fb, "pil": pil_fb, "cancelled": True}
+                    return {"path": None, "image": tk_fb, "pil": None, "cancelled": True}
+
+                # Fallback to existing asset loader (returns PhotoImage)
+                fb = load_image(None, size=fallback_size, color=fallback_color)
+                if resize:
+                    fb = self._resize_any(fb, resize)
+                return {"path": None, "image": fb, "pil": None, "cancelled": True}
+
+            # ------------------------ LOAD IMAGE -----------------------
+            self.last_dir = os.path.dirname(path)
+
+            try:
+                # If Pillow is available, open with PIL and create a Tk PhotoImage for compatibility
+                if Image is not None:
+                    pil_img = Image.open(path).convert("RGBA")
+                    if resize:
+                        pil_img = pil_img.resize(resize, Image.Resampling.LANCZOS)
+                    tk_img = ImageTk.PhotoImage(pil_img)
+                    if return_pil:
+                        return {"path": path, "image": tk_img, "pil": pil_img, "cancelled": False}
+                    return {"path": path, "image": tk_img, "pil": None, "cancelled": False}
+
+                # Otherwise fall back to the asset loader which returns a Tk image
+                img = load_image(path)
+                if resize:
+                    img = self._resize_any(img, resize)
+                return {"path": path, "image": img, "pil": None, "cancelled": False}
+
+            except Exception as e:
+                print(f"[ERROR] Failed to load image '{path}': {e}")
+
+                if retry:
+                    print("Trying again...")
+                    continue
+
+                # On error, provide a fallback (PIL if available)
+                if Image is not None:
+                    w, h = fallback_size if fallback_size else (64, 64)
+                    pil_fb = Image.new("RGB", (w, h), fallback_color)
+                    if resize:
+                        pil_fb = pil_fb.resize(resize, Image.Resampling.LANCZOS)
+                    tk_fb = ImageTk.PhotoImage(pil_fb)
+                    if return_pil:
+                        return {"path": None, "image": tk_fb, "pil": pil_fb, "cancelled": True}
+                    return {"path": None, "image": tk_fb, "pil": None, "cancelled": True}
+
+                fb = load_image(None, size=fallback_size, color=fallback_color)
+                if resize:
+                    fb = self._resize_any(fb, resize)
+                return {"path": None, "image": fb, "pil": None, "cancelled": True}
+
+    # ======================================================================
+    # FILE DIALOGS
+    # ======================================================================
     def ask_save_file(self, default_name="save.json",
                       filetypes=[("JSON files", "*.json"), ("All files", "*.*")]):
-        """Open a Tkinter Save dialog starting in the default folder."""
-        root = tk.Tk()
-        root.withdraw()
+        root = self._make_root()
+
         path = filedialog.asksaveasfilename(
             title="Save As",
             initialdir=self.default_save_folder,
@@ -42,13 +173,11 @@ class FileHelper:
             defaultextension=filetypes[0][1]
         )
         root.destroy()
-        return path if path else None  # Return None if cancelled
+        return path if path else None
+
+    def ask_open_file(self, filetypes=[("JSON files", "*.json"), ("All files", "*.*")]):
+        root = self._make_root()
 
-    def ask_open_file(self,
-                      filetypes=[("JSON files", "*.json"), ("All files", "*.*")]):
-        """Open a Tkinter Open dialog starting in the default folder."""
-        root = tk.Tk()
-        root.withdraw()
         path = filedialog.askopenfilename(
             title="Open File",
             initialdir=self.default_save_folder,
@@ -57,22 +186,20 @@ class FileHelper:
         root.destroy()
         return path if path else None
 
-    # -------------------------------------------------------------------------
-    # INTERNAL PATH HELPER
-    # -------------------------------------------------------------------------
+    # ======================================================================
+    # PATH HANDLING
+    # ======================================================================
     def _resolve_path(self, filename):
-        """Return a full path, resolving relative paths to the default folder."""
         if not filename:
             return None
         if os.path.isabs(filename):
             return filename
         return os.path.join(self.default_save_folder, filename)
 
-    # -------------------------------------------------------------------------
+    # ======================================================================
     # TEXT FILES
-    # -------------------------------------------------------------------------
+    # ======================================================================
     def save_text(self, filename, content):
-        """Save plain text data to a file."""
         path = self._resolve_path(filename)
         if not path:
             print("[CANCELLED] No save path provided.")
@@ -84,7 +211,6 @@ class FileHelper:
         return path
 
     def load_text(self, filename):
-        """Load plain text data from a file."""
         path = self._resolve_path(filename)
         if path and os.path.exists(path):
             with open(path, "r", encoding="utf-8") as f:
@@ -92,11 +218,10 @@ class FileHelper:
         print(f"[WARN] Text file not found: {path}")
         return None
 
-    # -------------------------------------------------------------------------
+    # ======================================================================
     # JSON FILES
-    # -------------------------------------------------------------------------
+    # ======================================================================
     def save_json(self, filename, data):
-        """Save JSON-serializable data."""
         path = self._resolve_path(filename)
         if not path:
             print("[CANCELLED] No save path provided.")
@@ -108,7 +233,6 @@ class FileHelper:
         return path
 
     def load_json(self, filename):
-        """Load JSON data."""
         path = self._resolve_path(filename)
         if path and os.path.exists(path):
             with open(path, "r", encoding="utf-8") as f:
@@ -116,11 +240,10 @@ class FileHelper:
         print(f"[WARN] JSON file not found: {path}")
         return None
 
-    # -------------------------------------------------------------------------
+    # ======================================================================
     # PICKLE FILES
-    # -------------------------------------------------------------------------
+    # ======================================================================
     def save_pickle(self, filename, obj):
-        """Save a Python object using pickle."""
         path = self._resolve_path(filename)
         if not path:
             print("[CANCELLED] No save path provided.")
@@ -132,11 +255,9 @@ class FileHelper:
         return path
 
     def load_pickle(self, filename):
-        """Load a pickled Python object."""
         path = self._resolve_path(filename)
         if path and os.path.exists(path):
             with open(path, "rb") as f:
                 return pickle.load(f)
         print(f"[WARN] Pickle file not found: {path}")
         return None
-

crystalwindow/__init__.py

@@ -4,9 +4,9 @@ check_for_update("crystalwindow")
 
 # === Core Systems ===
 from .window import Window
-from .sprites import Sprite
+from .sprites import Sprite, CollisionHandler
 from .tilemap import TileMap
-from .player import Player
+from .objects import Player, Block, Enemy
 from .gravity import Gravity
 from .FileHelper import FileHelper
 from .math import Mathematics
@@ -22,6 +22,8 @@ from .assets import (
     flip_vertical,
     LoopAnim,
     loop_image,
+    load_file,
+    Sound,
 )
 from .animation import Animation
 
@@ -33,8 +35,7 @@ from .gui import Button, Label, GUIManager, hex_to_rgb, Fade
 from .gui_ext import Toggle, Slider
 
 # === Time System ===
-# Includes upgraded Clock + all helper utilities
-from .clock import Clock, Stopwatch, CountdownTimer, Scheduler
+from .clock import Clock, CountdownTimer
 
 # === Drawing Helpers ===
 from .draw_helpers import gradient_rect, CameraShake
@@ -43,23 +44,18 @@ from .draw_text_helper import DrawTextManager
 from .draw_tool import CrystalDraw
 
 # === Misc Helpers ===
-from .fun_helpers import random_name, DebugOverlay, random_color, random_palette, lerp
+from .fun_helpers import random_name, DebugOverlay, random_color, random_palette, lerp, random_number
 from .camera import Camera
 from .color_handler import Colors, Color
-from .websearch import WebSearchResult, WebSearch
+from .websearch import SearchResult, WebBrowse
 
 # === 3D Engine ===
-from .crystal3d import CW3D
+from .crystal3d import CW3DShape, CW3D
 
-# === AI Engine ===
-from .ai import AI
-
-# === Server Manager ===
-from .cw_client import CWClient
 
 __all__ = [
     # --- Core ---
-    "Window", "Sprite", "TileMap", "Player", "Gravity", "FileHelper", "Mathematics",
+    "Window", "Sprite", "TileMap", "Player", "Block", "Enemy", "Gravity", "FileHelper", "Mathematics",
 
     # --- Assets & Animation ---
     "load_image",
@@ -72,9 +68,11 @@ __all__ = [
     "Animation",
     "LoopAnim",
     "loop_image",
+    "load_file",
+    "Sound",
 
     # --- Collision ---
-    "check_collision", "resolve_collision",
+    "check_collision", "resolve_collision", "CollisionHandler",
 
     # --- GUI ---
     "Button", "Label", "GUIManager", "random_color", "hex_to_rgb", "Fade",
@@ -83,25 +81,16 @@ __all__ = [
     "Toggle", "Slider",
 
     # --- Time System ---
-    # FULL time system is now exposed
-    "Clock",
-    "Stopwatch",
-    "CountdownTimer",
-    "Scheduler",
+    "Clock", "CountdownTimer",
 
     # --- Drawing ---
     "gradient_rect", "CameraShake", "DrawHelper", "DrawTextManager", "CrystalDraw", 
 
     # --- Misc ---
     "random_name", "DebugOverlay", "Camera", "Colors", "Color",
-    "random_palette", "lerp", "WebSearchResult", "WebSearch",
+    "random_palette", "lerp", "SearchResult", "WebBrowse", "random_number",
 
     # --- 3D ---
-    "CW3D",
-
-    # --- AI ---
-    "AI",
+    "CW3DShape", "CW3D",
 
-    # --- Server Client ---
-    "CWClient",
-]
+]