flet-desktop-light 0.25.1__py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl → 0.26.0__py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.whl

flet_desktop/__init__.py

@@ -2,6 +2,7 @@ import asyncio
 import logging
 import os
 import signal
+import stat
 import subprocess
 import tarfile
 import tempfile
@@ -9,6 +10,8 @@ import urllib.request
 import zipfile
 from pathlib import Path
 
+import flet_desktop
+import flet_desktop.version
 from flet.utils import (
     get_arch,
     is_linux,
@@ -18,9 +21,6 @@ from flet.utils import (
     safe_tar_extractall,
 )
 
-import flet_desktop
-import flet_desktop.version
-
 logger = logging.getLogger(flet_desktop.__name__)
 
 
@@ -67,95 +67,129 @@ def __locate_and_unpack_flet_view(page_url, assets_dir, hidden):
     pid_file = str(Path(tempfile.gettempdir()).joinpath(random_string(20)))
 
     if is_windows():
-        flet_exe = "flet.exe"
-        temp_flet_dir = Path.home().joinpath(
-            ".flet", "bin", f"flet-{flet_desktop.version.version}"
-        )
-
-        # check if flet_view.exe exists in "bin" directory (user mode)
-        flet_path = os.path.join(get_package_bin_dir(), "flet", flet_exe)
-        if os.path.exists(flet_path):
-            logger.info(f"Flet View found in: {flet_path}")
-        else:
+        flet_path = None
+        # try loading Flet client built with the latest run of `flet build`
+        build_windows = os.path.join(os.getcwd(), "build", "windows")
+        if os.path.exists(build_windows):
+            for f in os.listdir(build_windows):
+                if f.endswith(".exe"):
+                    flet_path = os.path.join(build_windows, f)
+
+        if not flet_path:
+            flet_exe = "flet.exe"
+            temp_flet_dir = Path.home().joinpath(
+                ".flet", "bin", f"flet-{flet_desktop.version.version}"
+            )
+
+            # check if flet_view.exe exists in "bin" directory (user mode)
+            flet_path = os.path.join(get_package_bin_dir(), "flet", flet_exe)
+            logger.info(f"Looking for Flet executable at: {flet_path}")
+            if os.path.exists(flet_path):
+                logger.info(f"Flet View found in: {flet_path}")
+            else:
+                # check if flet.exe is in FLET_VIEW_PATH (flet developer mode)
+                flet_path = os.environ.get("FLET_VIEW_PATH")
+                if flet_path and os.path.exists(flet_path):
+                    logger.info(f"Flet View found in PATH: {flet_path}")
+                    flet_path = os.path.join(flet_path, flet_exe)
+                else:
+                    if not temp_flet_dir.exists():
+                        zip_file = __download_flet_client("flet-windows.zip")
+
+                        logger.info(
+                            f"Extracting flet.exe from archive to {temp_flet_dir}"
+                        )
+                        temp_flet_dir.mkdir(parents=True, exist_ok=True)
+                        with zipfile.ZipFile(zip_file, "r") as zip_arch:
+                            zip_arch.extractall(str(temp_flet_dir))
+                    flet_path = str(temp_flet_dir.joinpath("flet", flet_exe))
+        args = [flet_path, page_url, pid_file]
+    elif is_macos():
+        app_path = None
+        # try loading Flet client built with the latest run of `flet build`
+        build_macos = os.path.join(os.getcwd(), "build", "macos")
+        if os.path.exists(build_macos):
+            for f in os.listdir(build_macos):
+                if f.endswith(".app"):
+                    app_path = os.path.join(build_macos, f)
+
+        if not app_path:
+            # build version-specific path to Flet.app
+            temp_flet_dir = Path.home().joinpath(
+                ".flet", "bin", f"flet-{flet_desktop.version.version}"
+            )
+
             # check if flet.exe is in FLET_VIEW_PATH (flet developer mode)
             flet_path = os.environ.get("FLET_VIEW_PATH")
-            if flet_path and os.path.exists(flet_path):
-                logger.info(f"Flet View found in PATH: {flet_path}")
-                flet_path = os.path.join(flet_path, flet_exe)
+            if flet_path:
+                logger.info(f"Flet.app is set via FLET_VIEW_PATH: {flet_path}")
+                temp_flet_dir = Path(flet_path)
             else:
+                # check if flet_view.app exists in a temp directory
                 if not temp_flet_dir.exists():
-                    zip_file = __download_flet_client("flet-windows.zip")
-
-                    logger.info(f"Extracting flet.exe from archive to {temp_flet_dir}")
+                    # check if flet.tar.gz exists
+                    gz_filename = "flet-macos.tar.gz"
+                    tar_file = os.path.join(get_package_bin_dir(), gz_filename)
+                    logger.info(f"Looking for Flet.app archive at: {tar_file}")
+                    if not os.path.exists(tar_file):
+                        tar_file = __download_flet_client(gz_filename)
+
+                    logger.info(f"Extracting Flet.app from archive to {temp_flet_dir}")
                     temp_flet_dir.mkdir(parents=True, exist_ok=True)
-                    with zipfile.ZipFile(zip_file, "r") as zip_arch:
-                        zip_arch.extractall(str(temp_flet_dir))
-                flet_path = str(temp_flet_dir.joinpath("flet", flet_exe))
-        args = [flet_path, page_url, pid_file]
-    elif is_macos():
-        # build version-specific path to Flet.app
-        temp_flet_dir = Path.home().joinpath(
-            ".flet", "bin", f"flet-{flet_desktop.version.version}"
-        )
-
-        # check if flet.exe is in FLET_VIEW_PATH (flet developer mode)
-        flet_path = os.environ.get("FLET_VIEW_PATH")
-        if flet_path:
-            logger.info(f"Flet.app is set via FLET_VIEW_PATH: {flet_path}")
-            temp_flet_dir = Path(flet_path)
-        else:
-            # check if flet_view.app exists in a temp directory
-            if not temp_flet_dir.exists():
-                # check if flet.tar.gz exists
-                gz_filename = "flet-macos.tar.gz"
-                tar_file = os.path.join(get_package_bin_dir(), gz_filename)
-                if not os.path.exists(tar_file):
-                    tar_file = __download_flet_client(gz_filename)
-
-                logger.info(f"Extracting Flet.app from archive to {temp_flet_dir}")
-                temp_flet_dir.mkdir(parents=True, exist_ok=True)
-                with tarfile.open(str(tar_file), "r:gz") as tar_arch:
-                    safe_tar_extractall(tar_arch, str(temp_flet_dir))
-            else:
-                logger.info(f"Flet View found in: {temp_flet_dir}")
-
-        app_name = None
-        for f in os.listdir(temp_flet_dir):
-            if f.endswith(".app"):
-                app_name = f
-        assert app_name is not None, f"Application bundle not found in {temp_flet_dir}"
-        app_path = temp_flet_dir.joinpath(app_name)
+                    with tarfile.open(str(tar_file), "r:gz") as tar_arch:
+                        safe_tar_extractall(tar_arch, str(temp_flet_dir))
+                else:
+                    logger.info(f"Flet View found in: {temp_flet_dir}")
+
+            app_name = None
+            for f in os.listdir(temp_flet_dir):
+                if f.endswith(".app"):
+                    app_name = f
+            assert (
+                app_name is not None
+            ), f"Application bundle not found in {temp_flet_dir}"
+            app_path = temp_flet_dir.joinpath(app_name)
         args = ["open", str(app_path), "-n", "-W", "--args", page_url, pid_file]
     elif is_linux():
-        # build version-specific path to flet folder
-        temp_flet_dir = Path.home().joinpath(
-            ".flet", "bin", f"flet-{flet_desktop.version.version}"
-        )
-
         app_path = None
-        # check if flet.exe is in FLET_VIEW_PATH (flet developer mode)
-        flet_path = os.environ.get("FLET_VIEW_PATH")
-        if flet_path:
-            logger.info(f"Flet View is set via FLET_VIEW_PATH: {flet_path}")
-            temp_flet_dir = Path(flet_path)
-            app_path = temp_flet_dir.joinpath("flet")
-        else:
-            # check if flet_view.app exists in a temp directory
-            if not temp_flet_dir.exists():
-                # check if flet.tar.gz exists
-                gz_filename = f"flet-linux-{get_arch()}.tar.gz"
-                tar_file = os.path.join(get_package_bin_dir(), gz_filename)
-                if not os.path.exists(tar_file):
-                    tar_file = __download_flet_client(gz_filename)
-
-                logger.info(f"Extracting Flet from archive to {temp_flet_dir}")
-                temp_flet_dir.mkdir(parents=True, exist_ok=True)
-                with tarfile.open(str(tar_file), "r:gz") as tar_arch:
-                    safe_tar_extractall(tar_arch, str(temp_flet_dir))
+        # try loading Flet client built with the latest run of `flet build`
+        build_linux = os.path.join(os.getcwd(), "build", "linux")
+        if os.path.exists(build_linux):
+            for f in os.listdir(build_linux):
+                ef = os.path.join(build_linux, f)
+                if os.path.isfile(ef) and stat.S_IXUSR & os.stat(ef)[stat.ST_MODE]:
+                    app_path = ef
+
+        if not app_path:
+            # build version-specific path to flet folder
+            temp_flet_dir = Path.home().joinpath(
+                ".flet", "bin", f"flet-{flet_desktop.version.version}"
+            )
+
+            # check if flet.exe is in FLET_VIEW_PATH (flet developer mode)
+            flet_path = os.environ.get("FLET_VIEW_PATH")
+            if flet_path:
+                logger.info(f"Flet View is set via FLET_VIEW_PATH: {flet_path}")
+                temp_flet_dir = Path(flet_path)
+                app_path = temp_flet_dir.joinpath("flet")
             else:
-                logger.info(f"Flet View found in: {temp_flet_dir}")
+                # check if flet_view.app exists in a temp directory
+                if not temp_flet_dir.exists():
+                    # check if flet.tar.gz exists
+                    gz_filename = f"flet-linux-{get_arch()}.tar.gz"
+                    tar_file = os.path.join(get_package_bin_dir(), gz_filename)
+                    logger.info(f"Looking for Flet bundle archive at: {tar_file}")
+                    if not os.path.exists(tar_file):
+                        tar_file = __download_flet_client(gz_filename)
+
+                    logger.info(f"Extracting Flet from archive to {temp_flet_dir}")
+                    temp_flet_dir.mkdir(parents=True, exist_ok=True)
+                    with tarfile.open(str(tar_file), "r:gz") as tar_arch:
+                        safe_tar_extractall(tar_arch, str(temp_flet_dir))
+                else:
+                    logger.info(f"Flet View found in: {temp_flet_dir}")
 
-            app_path = temp_flet_dir.joinpath("flet", "flet")
+                app_path = temp_flet_dir.joinpath("flet", "flet")
         args = [str(app_path), page_url, pid_file]
 
     flet_env = {**os.environ}
@@ -171,8 +205,13 @@ def __locate_and_unpack_flet_view(page_url, assets_dir, hidden):
 
 def __download_flet_client(file_name):
     ver = flet_desktop.version.version
+    if not ver:
+        import flet.version
+        from flet.version import update_version
+
+        ver = flet.version.version or update_version()
     temp_arch = Path(tempfile.gettempdir()).joinpath(file_name)
-    logger.info(f"Downloading Flet v{ver} to {temp_arch}")
     flet_url = f"https://github.com/flet-dev/flet/releases/download/v{ver}/{file_name}"
+    logger.info(f"Downloading Flet v{ver} from {flet_url} to {temp_arch}")
     urllib.request.urlretrieve(flet_url, temp_arch)
     return str(temp_arch)

flet_desktop/version.py

@@ -1 +1 @@
-version = "0.25.1"
+version = "0.26.0"

{flet_desktop_light-0.25.1.dist-info → flet_desktop_light-0.26.0.dist-info}/METADATA

@@ -1,23 +1,22 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: flet-desktop-light
-Version: 0.25.1
+Version: 0.26.0
 Summary: Flet Desktop client in Flutter
 License: Apache-2.0
 Author: Appveyor Systems Inc.
 Author-email: hello@flet.dev
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: flet (==0.25.1)
-Project-URL: documentation, https://flet.dev/docs
-Project-URL: homepage, https://flet.dev
-Project-URL: repository, https://github.com/flet-dev/flet
+Requires-Dist: flet (==0.26.0)
+Project-URL: Documentation, https://flet.dev/docs
+Project-URL: Homepage, https://flet.dev
+Project-URL: Repository, https://github.com/flet-dev/flet
 Description-Content-Type: text/markdown
 
 # Flet Desktop client in Flutter

flet_desktop_light-0.26.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+flet_desktop/__init__.py,sha256=GU-Yzy2hPK_b7ZGzZYpHLh75C1tU-zqDAIXeNI2wdxE,8527
+flet_desktop/version.py,sha256=UnfM5XWCBfCj8s_jXZBuXu8MGePC4lTKjbMTTKrtOTE,19
+flet_desktop/app/flet-linux-arm64.tar.gz,sha256=3ZhC94hbvuZGmeXolIAuPcCpUBXFwVs39ptIwgiHpSw,14799888
+flet_desktop_light-0.26.0.dist-info/METADATA,sha256=oKcYO5iEZGdFxRGxCZ1bFobGSz7dOoGH1H_AM8PHreI,886
+flet_desktop_light-0.26.0.dist-info/WHEEL,sha256=KH1WTkRRon2AuM86--Lc9bLpQoRMyX1K_58agfppVkg,143
+flet_desktop_light-0.26.0.dist-info/RECORD,,

{flet_desktop_light-0.25.1.dist-info → flet_desktop_light-0.26.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-manylinux_2_17_aarch64
 Tag: py3-none-manylinux2014_aarch64

flet_desktop_light-0.25.1.dist-info/RECORD

@@ -1,6 +0,0 @@
-flet_desktop/__init__.py,sha256=CtqPLA0DvZuFidnu_UEE_-F197SviQtjekV7fS82LOw,6538
-flet_desktop/version.py,sha256=joCehuyy75nZ4ojk4u9VohsUvt5-trIsBZcSsypQgqQ,19
-flet_desktop/app/flet-linux-arm64.tar.gz,sha256=aBcj1OzfOV9-sDxN-Ekqrll1dKo6LNvXY8gIPlHvm8E,14755453
-flet_desktop_light-0.25.1.dist-info/METADATA,sha256=i4jXrtcWi8bdr38M1bOfh-dv0uaDE6kXt6RjGDNR6Bs,941
-flet_desktop_light-0.25.1.dist-info/WHEEL,sha256=IYMc7Nq_NQdSWIq7A_P3GQ5gs5MXvRmJZFtEM9bxp5I,143
-flet_desktop_light-0.25.1.dist-info/RECORD,,