Split run() into two parts to use with Flet

Close #6

Author: FeodorFitsner

example/flet_example/app/src/counter.py example/flet_example/app/src/main.pyexample/flet_example/app/src/counter.py renamed to example/flet_example/app/src/main.py

@@ -44,7 +44,7 @@ PODS:
   - SDWebImage/Core (5.15.8)
   - sensors_plus (0.0.1):
     - Flutter
-  - serious_python (0.1.1):
+  - serious_python (0.1.4):
     - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
@@ -97,7 +97,7 @@ SPEC CHECKSUMS:
   path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
   SDWebImage: cb032eba469c54e0000e78bcb0a13cdde0a52798
   sensors_plus: 5717760720f7e6acd96fdbd75b7428f5ad755ec2
-  serious_python: 76a8038b2e4deae2bad1daee4040d7a49e60bc4f
+  serious_python: 22931497cfcc8ea8531a1f65c8d317787b5786c8
   shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4

example/flet_example/ios/Podfile.lock

@@ -1,6 +1,9 @@
+import 'dart:io';
+
 import 'package:flet/flet.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:path/path.dart' as path;
 import 'package:serious_python/serious_python.dart';
 
 void main() async {
@@ -10,14 +13,20 @@ void main() async {
   } else if (defaultTargetPlatform == TargetPlatform.android) {
     fletPlatform = "Android";
   }
-  SeriousPython.run("app/app.zip",
-      appFileName: "counter.py",
+
+  // extract app from asset
+  var appDir = await extractAssetZip("app/app.zip");
+
+  // set current directory to app path
+  Directory.current = appDir;
+
+  SeriousPython.runProgram(path.join(appDir, "main.pyc"),
       environmentVariables: {
         "FLET_PLATFORM": fletPlatform,
         "FLET_SERVER_UDS_PATH": "flet.sock"
       });
-  runApp(const FletApp(
+  runApp(FletApp(
     pageUrl: "flet.sock",
-    assetsDir: "",
+    assetsDir: path.join(appDir, "assets"),
   ));
 }

example/flet_example/lib/main.dart

@@ -329,7 +329,7 @@ packages:
     source: hosted
     version: "1.9.1"
   path:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path
       sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"

example/flet_example/pubspec.lock

@@ -35,6 +35,8 @@ dependencies:
     path: ../../
 
   flet: ^0.7.4
+  
+  path: ^1.8.3
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.

example/flet_example/pubspec.yaml

@@ -1,11 +1,12 @@
 import 'dart:io';
 
-import 'package:flutter/widgets.dart';
-import 'package:path/path.dart' as p;
+import 'package:path/path.dart' as path;
 
 import 'src/serious_python_platform_interface.dart';
 import 'src/utils.dart';
 
+export 'src/utils.dart';
+
 /// Provides cross-platform functionality for running Python programs.
 class SeriousPython {
   SeriousPython._();
@@ -40,17 +41,16 @@ class SeriousPython {
       List<String>? modulePaths,
       Map<String, String>? environmentVariables,
       bool? sync}) async {
-    // unpack app
-    WidgetsFlutterBinding.ensureInitialized();
+    // unpack app from asset
     String appPath = "";
-    if (p.extension(assetPath) == ".zip") {
+    if (path.extension(assetPath) == ".zip") {
       appPath = await extractAssetZip(assetPath);
       if (appFileName != null) {
-        appPath = p.join(appPath, appFileName);
-      } else if (await File(p.join(appPath, "main.pyc")).exists()) {
-        appPath = p.join(appPath, "main.pyc");
-      } else if (await File(p.join(appPath, "main.py")).exists()) {
-        appPath = p.join(appPath, "main.py");
+        appPath = path.join(appPath, appFileName);
+      } else if (await File(path.join(appPath, "main.pyc")).exists()) {
+        appPath = path.join(appPath, "main.pyc");
+      } else if (await File(path.join(appPath, "main.py")).exists()) {
+        appPath = path.join(appPath, "main.py");
       } else {
         throw Exception(
             "App archive must contain either `main.py` or `main.pyc`; otherwise `appFileName` must be specified.");
@@ -60,8 +60,35 @@ class SeriousPython {
     }
 
     // set current directory to app path
-    Directory.current = p.dirname(appPath);
+    Directory.current = path.dirname(appPath);
 
+    // run python program
+    return runProgram(appPath,
+        modulePaths: modulePaths,
+        environmentVariables: environmentVariables,
+        sync: sync);
+  }
+
+  /// Runs Python program from a path.
+  ///
+  /// This is low-level method.
+  /// Make sure `Directory.current` is set before calling this method.
+  ///
+  /// [appPath] is the full path to a .py or .pyc file to run.
+  ///
+  /// Environment variables that must be available to a Python program could
+  /// be passed in [environmentVariables].
+  ///
+  /// By default, Serious Python expects Python dependencies installed into
+  /// `__pypackages__` directory in the root of app directory. Additional paths
+  /// to look for 3rd-party packages can be specified with [modulePaths] parameter.
+  ///
+  /// Set [sync] to `true` to sychronously run Python program; otherwise the
+  /// program starts in a new thread.
+  static Future<String?> runProgram(String appPath,
+      {List<String>? modulePaths,
+      Map<String, String>? environmentVariables,
+      bool? sync}) async {
     // run python program
     return SeriousPythonPlatform.instance.run(appPath,
         modulePaths: modulePaths,

lib/serious_python.dart

@@ -4,10 +4,12 @@ import 'package:archive/archive.dart';
 import 'package:archive/archive_io.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 
 Future<String> extractAssetZip(String assetPath) async {
+  WidgetsFlutterBinding.ensureInitialized();
   final documentsDir = await getApplicationDocumentsDirectory();
   final destDir = Directory(p.join(documentsDir.path, p.dirname(assetPath)));
 
@@ -41,6 +43,7 @@ Future<String> extractAssetZip(String assetPath) async {
 }
 
 Future<String> extractAsset(String assetPath) async {
+  WidgetsFlutterBinding.ensureInitialized();
   Directory documentsDir = await getApplicationDocumentsDirectory();
 
   // (re-)create destination directory