flet-cli 0.86.4__tar.gz → 1.0.0.dev0__tar.gz

{flet_cli-0.86.4 → flet_cli-1.0.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-cli
-Version: 0.86.4
+Version: 1.0.0.dev0
 Summary: Flet CLI
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -9,7 +9,8 @@ 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.86.4
+Requires-Dist: flet==1.0.0.dev0
+Requires-Dist: flet-platform-assets==1.0.0.dev0
 Requires-Dist: watchdog>=4.0.0
 Requires-Dist: packaging>=25.0
 Requires-Dist: qrcode>=7.4.2

{flet_cli-0.86.4 → flet_cli-1.0.0.dev0}/pyproject.toml

@@ -1,13 +1,14 @@
 [project]
 name = "flet-cli"
-version = "0.86.4"
+version = "1.0.0.dev0"
 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.86.4",
+    "flet==1.0.0.dev0",
+    "flet-platform-assets==1.0.0.dev0",
     "watchdog >=4.0.0",
     "packaging >=25.0",
     "qrcode >=7.4.2",
@@ -29,6 +30,9 @@ Documentation = "https://flet.dev/docs"
 [project.entry-points."pyinstaller40"]
 hook-dirs = "flet_cli.__pyinstaller:get_hook_dirs"
 
+[tool.setuptools.package-data]
+"flet_cli.__pyinstaller" = ["rthooks.dat", "rthooks/*.py"]
+
 [build-system]
 requires = ["setuptools"]
 build-backend = "setuptools.build_meta"

{flet_cli-0.86.4 → flet_cli-1.0.0.dev0}/src/flet_cli/__pyinstaller/macos_utils.py

@@ -1,3 +1,4 @@
+import gzip
 import os
 import plistlib
 import shutil
@@ -8,6 +9,7 @@ from pathlib import Path
 from PyInstaller.building.icon import normalize_icon_type
 
 from flet.utils import safe_tar_extractall
+from flet_cli.__pyinstaller.utils import normalize_tar_entry
 
 
 def unpack_app_bundle(tar_path):
@@ -143,9 +145,18 @@ def assemble_app_bundle(app_path, tar_path):
             f"error code {p.returncode}!\noutput: {p.stdout}"
         )
 
-    # pack tar
-    with tarfile.open(tar_path, "w:gz") as tar:
-        tar.add(app_path, arcname=os.path.basename(app_path))
+    # Pack tar with fixed timestamps, so archives of identical content are
+    # byte-identical and the runtime cache fingerprint stays stable
+    with (
+        open(tar_path, "wb") as raw,
+        gzip.GzipFile(fileobj=raw, mode="wb", mtime=0) as gz,
+        tarfile.open(fileobj=gz, mode="w") as tar,
+    ):
+        tar.add(
+            app_path,
+            arcname=os.path.basename(app_path),
+            filter=normalize_tar_entry,
+        )
 
     # cleanup
     shutil.rmtree(app_path, ignore_errors=True)

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

@@ -0,0 +1,52 @@
+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. flet_desktop additionally stamps this ID and the relaunch
+# properties below onto the client window (see flet_desktop.win_taskbar) so the
+# taskbar name, icon, jump list and pins all resolve to the bundle exe.
+if sys.platform == "win32" and "FLET_APP_USER_MODEL_ID" not in os.environ:
+    exe_path = os.path.abspath(sys.executable)
+    os.environ["FLET_APP_USER_MODEL_ID"] = exe_path
+    os.environ.setdefault("FLET_APP_RELAUNCH_COMMAND", f'"{exe_path}"')
+    os.environ.setdefault(
+        "FLET_APP_RELAUNCH_DISPLAY_NAME",
+        os.path.splitext(os.path.basename(exe_path))[0],
+    )
+    os.environ.setdefault("FLET_APP_RELAUNCH_ICON", f"{exe_path},0")
+
+
+# On Linux the taskbar keys on the window's WM_CLASS (X11) or app_id
+# (Wayland), both of which GTK takes from the client binary's argv[0]. That
+# binary is the shared, prebuilt `flet`, so every packed app shows up as
+# "flet". flet_desktop relaunches it under this id instead -- the bundle's
+# own name -- so the app groups and labels as itself, and can be matched by
+# a desktop entry carrying StartupWMClass.
+if sys.platform.startswith("linux") and "FLET_APP_ID" not in os.environ:
+    # --bundle-id when it was given, so the identity matches what `flet build`
+    # uses and what a desktop entry's StartupWMClass would name. Otherwise the
+    # executable's own name, which reads better bare than a reverse-DNS id and
+    # follows the binary if it is renamed.
+    app_id = ""
+    meipass = getattr(sys, "_MEIPASS", None)
+    if meipass:
+        try:
+            with open(os.path.join(meipass, "flet_app_id"), encoding="utf-8") as f:
+                app_id = f.read().strip()
+        except OSError:
+            pass
+    # No splitext here: a Linux executable has no extension, so it would eat
+    # whatever follows the last dot in the app's own name -- turning
+    # `myapp-1.2.3` into `myapp-1.2`, which then matches no desktop entry.
+    os.environ["FLET_APP_ID"] = (
+        app_id or os.path.basename(os.path.abspath(sys.executable)).strip()
+    )

flet_cli-1.0.0.dev0/src/flet_cli/__pyinstaller/rthooks.dat

@@ -0,0 +1,5 @@
+{
+    'flet': [
+        'pyi_rth_localhost_fletd.py'
+    ],
+}

{flet_cli-0.86.4 → flet_cli-1.0.0.dev0}/src/flet_cli/__pyinstaller/utils.py

@@ -1,4 +1,5 @@
 import os
+import tarfile
 import tempfile
 import uuid
 from pathlib import Path
@@ -33,6 +34,24 @@ def get_flet_bin_path():
     return None
 
 
+def normalize_tar_entry(tarinfo: tarfile.TarInfo) -> tarfile.TarInfo:
+    """
+    Normalize a tar entry's metadata (mtime, owner) so that archives built
+    from identical content are byte-identical across builds.
+
+    Args:
+        tarinfo: Entry to normalize, as passed by `tarfile.TarFile.add`.
+
+    Returns:
+        The same entry, with mtime and ownership zeroed.
+    """
+
+    tarinfo.mtime = 0
+    tarinfo.uid = tarinfo.gid = 0
+    tarinfo.uname = tarinfo.gname = ""
+    return tarinfo
+
+
 def copy_flet_bin():
     """
     Copy packaged Flet desktop binaries into a temporary directory.

{flet_cli-0.86.4 → flet_cli-1.0.0.dev0}/src/flet_cli/cli.py

@@ -16,6 +16,7 @@ import flet_cli.commands.publish
 import flet_cli.commands.run
 import flet_cli.commands.serve
 import flet_cli.commands.test
+from flet_cli.utils.cli import quote_for_shell
 from flet_cli.utils.linux_deps import linux_dependencies
 
 
@@ -184,10 +185,13 @@ def parse_command_line(argv: list) -> argparse.Namespace:
     if unrecognized:
         message = f"unrecognized arguments: {' '.join(unrecognized)}"
         if getattr(args, "command", None) == "run":
+            # The example is meant to be pasted, so both the script path and
+            # the arguments being forwarded have to survive the shell.
+            forwarded = " ".join(quote_for_shell(arg) for arg in unrecognized)
             message += (
                 "\nIf these are arguments for your app script, put them after "
                 "a `--` separator, e.g. "
-                f"`flet run {args.script} -- {' '.join(unrecognized)}`"
+                f"`flet run {quote_for_shell(args.script)} -- {forwarded}`"
             )
         parser.error(message)