flet-cli 0.85.0.dev0__tar.gz → 0.85.0.dev2__tar.gz

{flet_cli-0.85.0.dev0 → flet_cli-0.85.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-cli
-Version: 0.85.0.dev0
+Version: 0.85.0.dev2
 Summary: Flet CLI
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -9,7 +9,7 @@ Project-URL: Repository, https://github.com/flet-dev/flet
 Project-URL: Documentation, https://flet.dev/docs
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: flet==0.85.0.dev0
+Requires-Dist: flet==0.85.0.dev2
 Requires-Dist: watchdog>=4.0.0
 Requires-Dist: packaging>=25.0
 Requires-Dist: qrcode>=7.4.2

{flet_cli-0.85.0.dev0 → flet_cli-0.85.0.dev2}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "flet-cli"
-version = "0.85.0.dev0"
+version = "0.85.0.dev2"
 description = "Flet CLI"
 authors = [{ name = "Appveyor Systems Inc.", email = "hello@flet.dev" }]
 license = "Apache-2.0"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "flet==0.85.0.dev0",
+    "flet==0.85.0.dev2",
     "watchdog >=4.0.0",
     "packaging >=25.0",
     "qrcode >=7.4.2",

flet_cli-0.85.0.dev2/src/flet_cli/__pyinstaller/rthooks/pyi_rth_localhost_fletd.py

@@ -0,0 +1,16 @@
+import logging
+import os
+import sys
+
+logger = logging.getLogger("flet")
+
+
+logger.info("Running PyInstaller runtime hook for Flet...")
+
+os.environ["FLET_SERVER_IP"] = "127.0.0.1"
+
+# On Windows, set AppUserModelID so the taskbar associates the Flet client window
+# with the parent executable (a PyInstaller bundle in this case) rather than the cached
+# flet.exe. This ensures taskbar pins and shortcuts point to the correct executable.
+if sys.platform == "win32" and "FLET_APP_USER_MODEL_ID" not in os.environ:
+    os.environ["FLET_APP_USER_MODEL_ID"] = os.path.abspath(sys.executable)

{flet_cli-0.85.0.dev0 → flet_cli-0.85.0.dev2}/src/flet_cli/commands/build_base.py

@@ -2272,7 +2272,13 @@ class BaseBuildCommand(BaseFlutterCommand):
         hash: HashStamp,
     ):
         """
-        Find first matching image file by base name and queue it for copy.
+        Find the best matching image file for the current target platform.
+
+        When multiple files share the same base name (e.g. `icon.icns`,
+        `icon.ico`, `icon.png`), the method filters out formats that are
+        incompatible with the build target before selecting the first match.
+        For example, `.icns` is skipped on Windows builds because
+        `flutter_launcher_icons` cannot decode it.
 
         Args:
             src_path: Source assets directory.
@@ -2285,17 +2291,30 @@ class BaseBuildCommand(BaseFlutterCommand):
             File name of matched image, or `None` if not found.
         """
 
-        images = glob.glob(str(src_path.joinpath(f"{image_name}.*")))
-        if len(images) > 0:
-            if self.verbose > 0:
-                console.log(
-                    f'Found "{image_name}" image at {images[0]}', style=verbose1_style
-                )
-            copy_ops.append((images[0], dest_path))
-            hash.update(images[0])
-            hash.update(Path(images[0]).stat().st_mtime)
-            return Path(images[0]).name
-        return None
+        # .icns is macOS-only and .ico is Windows-only; filter out
+        # incompatible formats so flutter_launcher_icons gets a decodable file.
+        images = list(
+            filter(
+                lambda p: not (
+                    (ext := Path(p).suffix.lower()) == ".icns"
+                    and self.target_platform != "macos"
+                    or ext == ".ico"
+                    and self.target_platform != "windows"
+                ),
+                glob.glob(str(src_path.joinpath(f"{image_name}.*"))),
+            )
+        )
+
+        if not images:
+            return None
+
+        best = images[0]
+        if self.verbose > 0:
+            console.log(f'Found "{image_name}" image at {best}', style=verbose1_style)
+        copy_ops.append((best, dest_path))
+        hash.update(best)
+        hash.update(Path(best).stat().st_mtime)
+        return Path(best).name
 
     def run(self, args, cwd, env: Optional[dict] = None, capture_output=True):
         """

{flet_cli-0.85.0.dev0 → flet_cli-0.85.0.dev2}/src/flet_cli/commands/pack.py

@@ -2,10 +2,12 @@ import argparse
 import os
 import shutil
 import sys
+import tarfile
+import zipfile
 from pathlib import Path
 
 import flet_cli.__pyinstaller.config as hook_config
-from flet.utils import is_macos, is_windows
+from flet.utils import is_linux, is_macos, is_windows
 from flet_cli.commands.base import BaseCommand
 
 
@@ -152,6 +154,31 @@ class Command(BaseCommand):
             help="Enable non-interactive mode. All prompts will be skipped",
         )
 
+    def compress_flet_client_dir(self, temp_bin_dir: str, archive_name: str) -> None:
+        """Compress the flet/ directory into an archive and remove the original.
+
+        Args:
+            temp_bin_dir: Path to the temporary directory containing the flet/
+                subdirectory with client binaries.
+            archive_name: Target archive filename. Uses zip for `.zip`
+                extensions and gzipped tar for everything else.
+        """
+        flet_dir = os.path.join(temp_bin_dir, "flet")
+        if not os.path.isdir(flet_dir):
+            return
+        archive_path = os.path.join(temp_bin_dir, archive_name)
+        if archive_name.endswith(".zip"):  # windows
+            with zipfile.ZipFile(archive_path, "w", zipfile.ZIP_DEFLATED) as zf:
+                for root, _dirs, files in os.walk(flet_dir):
+                    for f in files:
+                        full = os.path.join(root, f)
+                        arcname = os.path.relpath(full, temp_bin_dir)
+                        zf.write(full, arcname)
+        else:
+            with tarfile.open(archive_path, "w:gz") as tar:
+                tar.add(flet_dir, arcname="flet")
+        shutil.rmtree(flet_dir)
+
     def handle(self, options: argparse.Namespace) -> None:
         """
         Package the app into a standalone desktop artifact.
@@ -293,6 +320,12 @@ class Command(BaseCommand):
 
                         pyi_args.extend(["--version-file", version_info_path])
 
+                    # Compress the patched flet/ directory into flet-windows.zip
+                    # so ensure_client_cached() finds it at runtime.
+                    self.compress_flet_client_dir(
+                        hook_config.temp_bin_dir, "flet-windows.zip"
+                    )
+
                 elif is_macos():
                     from flet_cli.__pyinstaller.macos_utils import (
                         assemble_app_bundle,
@@ -341,12 +374,12 @@ class Command(BaseCommand):
                         copyright=options.copyright,
                     )
 
-                    # assemble
+                    # Compress the patched .app bundle back into flet-macos.tar.gz so
+                    # ensure_client_cached() finds it at runtime.
                     assemble_app_bundle(app_path, tar_path)
 
-                    # Remove everything except the tar.gz so
-                    # PyInstaller doesn't try to process loose
-                    # framework binaries.
+                    # Remove everything except the tar.gz so PyInstaller doesn't try
+                    # to process loose framework binaries.
                     for entry in os.listdir(hook_config.temp_bin_dir):
                         entry_path = os.path.join(hook_config.temp_bin_dir, entry)
                         if entry_path == tar_path:
@@ -356,7 +389,16 @@ class Command(BaseCommand):
                         else:
                             os.remove(entry_path)
 
-            # run PyInstaller!
+                elif is_linux():
+                    from flet_desktop import get_artifact_filename
+
+                    # Compress the flet/ directory into a tar.gz
+                    # so ensure_client_cached() finds it at runtime.
+                    self.compress_flet_client_dir(
+                        hook_config.temp_bin_dir, get_artifact_filename()
+                    )
+
+            # run PyInstaller
             print("Running PyInstaller:", pyi_args)
             PyInstaller.__main__.run(pyi_args)
 

flet_cli-0.85.0.dev2/src/flet_cli/version.py

@@ -0,0 +1 @@
+version = "0.85.0.dev2"

{flet_cli-0.85.0.dev0 → flet_cli-0.85.0.dev2}/src/flet_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-cli
-Version: 0.85.0.dev0
+Version: 0.85.0.dev2
 Summary: Flet CLI
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -9,7 +9,7 @@ Project-URL: Repository, https://github.com/flet-dev/flet
 Project-URL: Documentation, https://flet.dev/docs
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: flet==0.85.0.dev0
+Requires-Dist: flet==0.85.0.dev2
 Requires-Dist: watchdog>=4.0.0
 Requires-Dist: packaging>=25.0
 Requires-Dist: qrcode>=7.4.2

{flet_cli-0.85.0.dev0 → flet_cli-0.85.0.dev2}/src/flet_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-flet==0.85.0.dev0
+flet==0.85.0.dev2
 watchdog>=4.0.0
 packaging>=25.0
 qrcode>=7.4.2

flet_cli-0.85.0.dev0/src/flet_cli/__pyinstaller/rthooks/pyi_rth_localhost_fletd.py

@@ -1,9 +0,0 @@
-import logging
-import os
-
-logger = logging.getLogger("flet")
-
-
-logger.info("Running PyInstaller runtime hook for Flet...")
-
-os.environ["FLET_SERVER_IP"] = "127.0.0.1"

flet_cli-0.85.0.dev0/src/flet_cli/version.py

@@ -1 +0,0 @@
-version = "0.85.0.dev0"