flet 0.19.0.dev2091__tar.gz → 0.19.0.dev2106__tar.gz

{flet-0.19.0.dev2091 → flet-0.19.0.dev2106}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flet
-Version: 0.19.0.dev2091
+Version: 0.19.0.dev2106
 Summary: Flet for Python - easily build interactive multi-platform apps in Python
 License: Apache-2.0
 Author: Appveyor Systems Inc.
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: cookiecutter (>=2.4.0,<3.0.0)
-Requires-Dist: flet-runtime (==0.19.0.dev2091)
+Requires-Dist: flet-runtime (==0.19.0.dev2106)
 Requires-Dist: packaging (>=23.1,<24.0)
 Requires-Dist: qrcode (>=7.4.2,<8.0.0)
 Requires-Dist: typing-extensions (>=4.6.2,<5.0.0) ; python_version < "3.8"

{flet-0.19.0.dev2091 → flet-0.19.0.dev2106}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "flet"
-version = "0.19.0.dev2091"
+version = "0.19.0.dev2106"
 description = "Flet for Python - easily build interactive multi-platform apps in Python"
 authors = ["Appveyor Systems Inc. <hello@flet.dev>"]
 license = "Apache-2.0"
@@ -16,7 +16,7 @@ repository = "https://github.com/flet-dev/flet"
 documentation = "https://flet.dev/docs"
 
 [tool.poetry.dependencies]
-flet-runtime = "0.19.0.dev2091"
+flet-runtime = "0.19.0.dev2106"
 python = "^3.7"
 typing-extensions = { version = "^4.6.2", python = "<3.8" }
 websocket-client = "^1.5.2"

{flet-0.19.0.dev2091 → flet-0.19.0.dev2106}/src/flet/cli/commands/build.py

@@ -13,7 +13,7 @@ from pathlib import Path
 import yaml
 from flet.cli.commands.base import BaseCommand
 from flet_core.utils import random_string, slugify
-from flet_runtime.utils import copy_tree, is_windows
+from flet_runtime.utils import calculate_file_hash, copy_tree, is_windows
 from rich import print
 
 if is_windows():
@@ -207,13 +207,6 @@ class Command(BaseCommand):
             default="path",
             help="URL routing strategy (web only)",
         )
-        parser.add_argument(
-            "--windows-tcp-port",
-            dest="windows_tcp_port",
-            type=int,
-            default=63777,
-            help="TCP port for Windows app",
-        )
         parser.add_argument(
             "--flutter-build-args",
             dest="flutter_build_args",
@@ -261,17 +254,9 @@ class Command(BaseCommand):
     def handle(self, options: argparse.Namespace) -> None:
         from cookiecutter.main import cookiecutter
 
-        # check if `flutter` executable is available in the path
-        flutter_exe = shutil.which("flutter")
-        if not flutter_exe:
-            print("`flutter` command is not available in PATH. Install Flutter SDK.")
-            sys.exit(1)
-
-        # check if `dart` executable is available in the path
-        dart_exe = shutil.which("dart")
-        if not dart_exe:
-            print("`dart` command is not available in PATH. Install Flutter SDK.")
-            sys.exit(1)
+        # get `flutter` and `dart` executables from PATH
+        flutter_exe = self.find_flutter_batch("flutter")
+        dart_exe = self.find_flutter_batch("dart")
 
         target_platform = options.target_platform.lower()
         # platform check
@@ -351,7 +336,6 @@ class Command(BaseCommand):
         template_data["use_color_emoji"] = (
             "true" if options.use_color_emoji else "false"
         )
-        template_data["windows_tcp_port"] = options.windows_tcp_port
 
         # create Flutter project from a template
         print("Creating Flutter bootstrap project...", end="")
@@ -590,6 +574,8 @@ class Command(BaseCommand):
                 package_args.extend(
                     [
                         "--mobile",
+                        "--platform",
+                        "mobile",
                     ]
                 )
             package_args.extend(
@@ -603,6 +589,9 @@ class Command(BaseCommand):
                 ]
             )
 
+        if self.verbose > 1:
+            package_args.append("--verbose")
+
         package_result = self.run(package_args, cwd=str(self.flutter_dir))
 
         if package_result.returncode != 0:
@@ -611,6 +600,17 @@ class Command(BaseCommand):
             if package_result.stderr:
                 print(package_result.stderr)
             self.cleanup(package_result.returncode)
+
+        # make sure app/app.zip exists
+        app_zip_path = self.flutter_dir.joinpath("app", "app.zip")
+        if not os.path.exists(app_zip_path):
+            print("Flet app package app/app.zip was not created.")
+            self.cleanup(1)
+
+        # create {flutter_dir}/app/app.hash
+        app_hash_path = self.flutter_dir.joinpath("app", "app.zip.hash")
+        with open(app_hash_path, "w") as hf:
+            hf.write(calculate_file_hash(app_zip_path))
         print("[spring_green3]OK[/spring_green3]")
 
         # run `flutter build`
@@ -710,6 +710,17 @@ class Command(BaseCommand):
             return Path(images[0]).name
         return None
 
+    def find_flutter_batch(self, exe_filename: str):
+        batch_path = shutil.which(exe_filename)
+        if not batch_path:
+            print(
+                f"`{exe_filename}` command is not available in PATH. Install Flutter SDK."
+            )
+            sys.exit(1)
+        if is_windows() and batch_path.endswith(".file"):
+            return batch_path.replace(".file", ".bat")
+        return batch_path
+
     def run(self, args, cwd):
         if is_windows():
             # Source: https://stackoverflow.com/a/77374899/1435891

{flet-0.19.0.dev2091 → flet-0.19.0.dev2106}/src/flet/cli/commands/run.py

@@ -122,6 +122,13 @@ class Command(BaseCommand):
             default="assets",
             help="path to assets directory",
         )
+        parser.add_argument(
+            "--ignore-dirs",
+            dest="ignore_dirs",
+            type=str,
+            default=None,
+            help="directories to ignore during watch. If more than one, separate with a semicolon.",
+        )
 
     def handle(self, options: argparse.Namespace) -> None:
         if options.module:
@@ -159,6 +166,13 @@ class Command(BaseCommand):
                 Path(os.path.dirname(script_path)).joinpath(assets_dir).resolve()
             )
 
+        ignore_dirs = options.ignore_dirs
+        if ignore_dirs:
+            ignore_dirs = [
+                str(Path(os.path.dirname(script_path)).joinpath(directory).resolve())
+                for directory in ignore_dirs.split(";")
+            ]
+
         my_event_handler = Handler(
             [sys.executable, "-u"]
             + ["-m"] * options.module
@@ -173,6 +187,7 @@ class Command(BaseCommand):
             options.android,
             options.hidden,
             assets_dir,
+            ignore_dirs if options.directory or options.recursive else None,
         )
 
         my_observer = Observer()
@@ -205,6 +220,7 @@ class Handler(FileSystemEventHandler):
         android,
         hidden,
         assets_dir,
+        ignore_dirs,
     ) -> None:
         super().__init__()
         self.args = args
@@ -218,6 +234,7 @@ class Handler(FileSystemEventHandler):
         self.android = android
         self.hidden = hidden
         self.assets_dir = assets_dir
+        self.ignore_dirs = ignore_dirs or []
         self.last_time = time.time()
         self.is_running = False
         self.fvp = None
@@ -258,9 +275,21 @@ class Handler(FileSystemEventHandler):
         th.start()
 
     def on_any_event(self, event):
+        is_in_ignore_dirs = False
+        for directory in self.ignore_dirs:
+            child = os.path.abspath(event.src_path)
+            # check if the file which triggered the reload is in the (ignored) directory
+            is_in_ignore_dirs = os.path.commonpath([directory]) == os.path.commonpath(
+                [directory, child]
+            )
+            if is_in_ignore_dirs:
+                break
+
         if (
-            self.script_path is None or event.src_path == self.script_path
-        ) and not event.is_directory:
+            not is_in_ignore_dirs
+            and (self.script_path is None or event.src_path == self.script_path)
+            and not event.is_directory
+        ):
             current_time = time.time()
             if (current_time - self.last_time) > 0.5 and self.is_running:
                 self.last_time = current_time

{flet-0.19.0.dev2091 → flet-0.19.0.dev2106}/src/flet/web/flutter_service_worker.js

@@ -34,8 +34,8 @@ const RESOURCES = {"assets/AssetManifest.json": "d9150da08bcab79647bb00a0700488d
 "canvaskit/chromium/canvaskit.wasm": "143af6ff368f9cd21c863bfa4274c406",
 "canvaskit/chromium/canvaskit.js": "0ae8bbcc58155679458a0f7a00f66873",
 "python-worker.js": "62a4865b3d41771b39660076485879be",
-"index.html": "152afe2af26db1bb88fe802459f5f853",
-"/": "152afe2af26db1bb88fe802459f5f853"};
+"index.html": "8fafaaf356832fe718e222fcd93da0e5",
+"/": "8fafaaf356832fe718e222fcd93da0e5"};
 // The application shell files that are downloaded before a service worker can
 // start.
 const CORE = ["main.dart.js",

{flet-0.19.0.dev2091 → flet-0.19.0.dev2106}/src/flet/web/index.html

@@ -37,7 +37,7 @@
 
   <script>
     // The value below is injected by flutter build, do not touch.
-    const serviceWorkerVersion = "3694833858";
+    const serviceWorkerVersion = "1548393452";
   </script>
   <!-- This script adds the flutter initialization JS code -->
   <script src="flutter.js" defer></script>