flet 0.18.0.dev2027__tar.gz → 0.18.0.dev2033__tar.gz

{flet-0.18.0.dev2027 → flet-0.18.0.dev2033}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flet
-Version: 0.18.0.dev2027
+Version: 0.18.0.dev2033
 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.18.0.dev2027)
+Requires-Dist: flet-runtime (==0.18.0.dev2033)
 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.18.0.dev2027 → flet-0.18.0.dev2033}/pyproject.toml

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

{flet-0.18.0.dev2027 → flet-0.18.0.dev2033}/src/flet/cli/commands/build.py

@@ -13,9 +13,12 @@ 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
+from flet_runtime.utils import copy_tree, is_windows
 from rich import print
 
+if is_windows():
+    from ctypes import windll
+
 PYODIDE_ROOT_URL = "https://cdn.jsdelivr.net/pyodide/v0.24.1/full"
 
 
@@ -225,6 +228,7 @@ class Command(BaseCommand):
         parser.add_argument(
             "--module-name",
             dest="module_name",
+            default="main",
             help="python module name with an app entry point",
         )
         parser.add_argument(
@@ -266,6 +270,19 @@ class Command(BaseCommand):
         self.verbose = options.verbose
 
         python_app_path = Path(options.python_app_path).resolve()
+        if not os.path.exists(python_app_path) or not os.path.isdir(python_app_path):
+            print(
+                f"Path to Flet app does not exist or is not a directory: {python_app_path}"
+            )
+            sys.exit(1)
+
+        python_module_name = Path(options.module_name).stem
+        python_module_filename = f"{python_module_name}.py"
+        if not os.path.exists(os.path.join(python_app_path, python_module_filename)):
+            print(
+                f"{python_module_filename} not found in the root of Flet app directory. Use --module-name option to specify an entry point for your Flet app."
+            )
+            sys.exit(1)
 
         self.flutter_dir = Path(tempfile.gettempdir()).joinpath(
             f"flet_flutter_build_{random_string(10)}"
@@ -298,8 +315,7 @@ class Command(BaseCommand):
             template_data["description"] = options.description
 
         template_data["sep"] = os.sep
-        if options.module_name:
-            template_data["python_module_name"] = Path(options.module_name).stem
+        template_data["python_module_name"] = python_module_name
         if options.product_name:
             template_data["product_name"] = options.product_name
         if options.org_name:
@@ -496,11 +512,8 @@ class Command(BaseCommand):
 
         # generate icons
         print("Generating app icons...", end="")
-        icons_result = subprocess.run(
-            [dart_exe, "run", "flutter_launcher_icons"],
-            cwd=str(self.flutter_dir),
-            capture_output=self.verbose < 2,
-            text=True,
+        icons_result = self.run(
+            [dart_exe, "run", "flutter_launcher_icons"], cwd=str(self.flutter_dir)
         )
         if icons_result.returncode != 0:
             if icons_result.stdout:
@@ -514,11 +527,9 @@ class Command(BaseCommand):
         # generate splash
         if target_platform in ["web", "ipa", "apk", "aab"]:
             print("Generating splash screens...", end="")
-            splash_result = subprocess.run(
+            splash_result = self.run(
                 [dart_exe, "run", "flutter_native_splash:create"],
                 cwd=str(self.flutter_dir),
-                capture_output=self.verbose < 2,
-                text=True,
             )
             if splash_result.returncode != 0:
                 if splash_result.stdout:
@@ -573,12 +584,7 @@ class Command(BaseCommand):
                 ]
             )
 
-        package_result = subprocess.run(
-            package_args,
-            cwd=str(self.flutter_dir),
-            capture_output=self.verbose < 2,
-            text=True,
-        )
+        package_result = self.run(package_args, cwd=str(self.flutter_dir))
 
         if package_result.returncode != 0:
             if package_result.stdout:
@@ -616,12 +622,7 @@ class Command(BaseCommand):
         if self.verbose > 0:
             print(build_args)
 
-        build_result = subprocess.run(
-            build_args,
-            cwd=str(self.flutter_dir),
-            capture_output=self.verbose < 2,
-            text=True,
-        )
+        build_result = self.run(build_args, cwd=str(self.flutter_dir))
 
         if build_result.returncode != 0:
             if build_result.stdout:
@@ -690,6 +691,27 @@ class Command(BaseCommand):
             return Path(images[0]).name
         return None
 
+    def run(self, args, cwd):
+        if is_windows():
+            # Source: https://stackoverflow.com/a/77374899/1435891
+            # Save the current console output code page and switch to 65001 (UTF-8)
+            previousCp = windll.kernel32.GetConsoleOutputCP()
+            windll.kernel32.SetConsoleOutputCP(65001)
+
+        r = subprocess.run(
+            args,
+            cwd=cwd,
+            capture_output=self.verbose < 2,
+            text=True,
+            encoding="utf8",
+        )
+
+        if is_windows():
+            # Restore the previous output console code page.
+            windll.kernel32.SetConsoleOutputCP(previousCp)
+
+        return r
+
     def cleanup(self, exit_code: int):
         if self.verbose > 0:
             print(f"Deleting Flutter bootstrap directory {self.flutter_dir}")

{flet-0.18.0.dev2027 → flet-0.18.0.dev2033}/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": "5dd483512901378a327e045da6a81ae9",
-"/": "5dd483512901378a327e045da6a81ae9"};
+"index.html": "06e37e6ca5308718c7e99ea3958e60da",
+"/": "06e37e6ca5308718c7e99ea3958e60da"};
 // The application shell files that are downloaded before a service worker can
 // start.
 const CORE = ["main.dart.js",

{flet-0.18.0.dev2027 → flet-0.18.0.dev2033}/src/flet/web/index.html

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