flet 0.19.0.dev2106__tar.gz → 0.20.0.dev2112__tar.gz

{flet-0.19.0.dev2106 → flet-0.20.0.dev2112}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flet
-Version: 0.19.0.dev2106
+Version: 0.20.0.dev2112
 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.dev2106)
+Requires-Dist: flet-runtime (==0.20.0.dev2112)
 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.dev2106 → flet-0.20.0.dev2112}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "flet"
-version = "0.19.0.dev2106"
+version = "0.20.0.dev2112"
 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.dev2106"
+flet-runtime = "0.20.0.dev2112"
 python = "^3.7"
 typing-extensions = { version = "^4.6.2", python = "<3.8" }
 websocket-client = "^1.5.2"

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

@@ -11,9 +11,6 @@ from pathlib import Path
 from urllib.parse import quote, urlparse, urlunparse
 
 import qrcode
-from watchdog.events import FileSystemEventHandler
-from watchdog.observers import Observer
-
 from flet.cli.commands.base import BaseCommand
 from flet_core.utils import random_string
 from flet_runtime.app import close_flet_view, open_flet_view
@@ -23,6 +20,8 @@ from flet_runtime.utils import (
     is_windows,
     open_in_browser,
 )
+from watchdog.events import FileSystemEventHandler
+from watchdog.observers import Observer
 
 
 class Command(BaseCommand):
@@ -127,7 +126,7 @@ class Command(BaseCommand):
             dest="ignore_dirs",
             type=str,
             default=None,
-            help="directories to ignore during watch. If more than one, separate with a semicolon.",
+            help="directories to ignore during watch. If more than one, separate with a comma.",
         )
 
     def handle(self, options: argparse.Namespace) -> None:
@@ -166,28 +165,31 @@ class Command(BaseCommand):
                 Path(os.path.dirname(script_path)).joinpath(assets_dir).resolve()
             )
 
-        ignore_dirs = options.ignore_dirs
-        if ignore_dirs:
-            ignore_dirs = [
+        ignore_dirs = (
+            [
                 str(Path(os.path.dirname(script_path)).joinpath(directory).resolve())
-                for directory in ignore_dirs.split(";")
+                for directory in options.ignore_dirs.split(",")
             ]
+            if options.ignore_dirs
+            else []
+        )
 
         my_event_handler = Handler(
-            [sys.executable, "-u"]
+            args=[sys.executable, "-u"]
             + ["-m"] * options.module
             + [options.script if options.module else script_path],
-            None if options.directory or options.recursive else script_path,
-            port,
-            options.host,
-            options.app_name,
-            uds_path,
-            options.web,
-            options.ios,
-            options.android,
-            options.hidden,
-            assets_dir,
-            ignore_dirs if options.directory or options.recursive else None,
+            watch_directory=options.directory or options.recursive,
+            script_path=script_path,
+            port=port,
+            host=options.host,
+            page_name=options.app_name,
+            uds_path=uds_path,
+            web=options.web,
+            ios=options.ios,
+            android=options.android,
+            hidden=options.hidden,
+            assets_dir=assets_dir,
+            ignore_dirs=ignore_dirs,
         )
 
         my_observer = Observer()
@@ -210,6 +212,7 @@ class Handler(FileSystemEventHandler):
     def __init__(
         self,
         args,
+        watch_directory,
         script_path,
         port,
         host,
@@ -224,6 +227,7 @@ class Handler(FileSystemEventHandler):
     ) -> None:
         super().__init__()
         self.args = args
+        self.watch_directory = watch_directory
         self.script_path = script_path
         self.port = port
         self.host = host
@@ -234,7 +238,7 @@ class Handler(FileSystemEventHandler):
         self.android = android
         self.hidden = hidden
         self.assets_dir = assets_dir
-        self.ignore_dirs = ignore_dirs or []
+        self.ignore_dirs = ignore_dirs
         self.last_time = time.time()
         self.is_running = False
         self.fvp = None
@@ -275,21 +279,15 @@ 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(
+            if os.path.commonpath([directory]) == os.path.commonpath(
                 [directory, child]
-            )
-            if is_in_ignore_dirs:
-                break
+            ):
+                return
 
-        if (
-            not is_in_ignore_dirs
-            and (self.script_path is None or event.src_path == self.script_path)
-            and not event.is_directory
-        ):
+        if self.watch_directory or event.src_path == self.script_path:
             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.dev2106 → flet-0.20.0.dev2112}/src/flet/web/flutter_service_worker.js

@@ -17,7 +17,7 @@ const RESOURCES = {"assets/AssetManifest.json": "d9150da08bcab79647bb00a0700488d
 "favicon.png": "302ac04c14db027d016d1fe74c6a80a0",
 "manifest.json": "7909dae66a9203092dc86b5a6162e79c",
 "flutter.js": "7d69e653079438abfbb24b82a655b0a4",
-"main.dart.js": "5d496601e2a721cd721a22a9f2a9d214",
+"main.dart.js": "a9756ab96bdaba634d1e7cab51bcc346",
 "version.json": "3fea9d9c7b4ca6955aa03e762e0d2e13",
 "icons/apple-touch-icon-192.png": "8cf0d5162941f467a77f023c414a1812",
 "icons/icon-maskable-512.png": "aa798e6d780ff109da17c3a98d5f2619",
@@ -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": "8fafaaf356832fe718e222fcd93da0e5",
-"/": "8fafaaf356832fe718e222fcd93da0e5"};
+"index.html": "e529c7f8f6cf4288ac0504dbc22119c4",
+"/": "e529c7f8f6cf4288ac0504dbc22119c4"};
 // The application shell files that are downloaded before a service worker can
 // start.
 const CORE = ["main.dart.js",

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

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