Skip to content

Add --distpath option to flet pack and flet publish commands #1018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 9, 2023
Merged

Add --distpath option to flet pack and flet publish commands #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a9b2ca
Add `--distpath` option to `flet pack` command
FeodorFitsner Feb 9, 2023
521ab15
Add `--distpath` option to `flet publish` command
FeodorFitsner Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion sdk/python/packages/flet/src/flet/cli/commands/pack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ def add_arguments(self, parser: argparse.ArgumentParser) -> None:
default=False,
help="create a one-folder bundle containing an executable (Windows)",
)
parser.add_argument(
"--distpath",
dest="distpath",
help="where to put the bundled app (default: ./dist)",
)
parser.add_argument(
"--add-data",
dest="add_data",
Expand Down Expand Up @@ -99,14 +104,15 @@ def handle(self, options: argparse.Namespace) -> None:

try:
import PyInstaller.__main__

from flet.__pyinstaller.utils import copy_flet_bin

pyi_args = [options.script, "--noconsole", "--noconfirm"]
if options.icon:
pyi_args.extend(["--icon", options.icon])
if options.name:
pyi_args.extend(["--name", options.name])
if options.distpath:
pyi_args.extend(["--distpath", options.distpath])
if options.add_data:
for add_data_arr in options.add_data:
for add_data_item in add_data_arr:
Expand Down
18 changes: 14 additions & 4 deletions sdk/python/packages/flet/src/flet/cli/commands/publish.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ def add_arguments(self, parser: argparse.ArgumentParser) -> None:
default=None,
help="path to an assets directory",
)
parser.add_argument(
"--distpath",
dest="distpath",
help="where to put the published app (default: ./dist)",
)
parser.add_argument(
"--app-name",
dest="app_name",
Expand Down Expand Up @@ -82,14 +87,13 @@ def handle(self, options: argparse.Namespace) -> None:

# constants
dist_name = "dist"
flet_web_filename = "flet-web.tar.gz"
app_tar_gz_filename = "app.tar.gz"
reqs_filename = "requirements.txt"

# script path
script_path = options.script
if not os.path.isabs(options.script):
script_path = str(Path(os.getcwd()).joinpath(options.script).resolve())
if not os.path.isabs(script_path):
script_path = str(Path(os.getcwd()).joinpath(script_path).resolve())

if not Path(script_path).exists():
print(f"File not found: {script_path}")
Expand All @@ -98,7 +102,13 @@ def handle(self, options: argparse.Namespace) -> None:
script_dir = os.path.dirname(script_path)

# delete "dist" directory
dist_dir = os.path.join(script_dir, dist_name)
dist_dir = options.distpath
if dist_dir:
if not os.path.isabs(dist_dir):
dist_dir = str(Path(os.getcwd()).joinpath(dist_dir).resolve())
else:
dist_dir = os.path.join(script_dir, dist_name)

print(f"Cleaning up {dist_dir}...")
if os.path.exists(dist_dir):
shutil.rmtree(dist_dir, ignore_errors=True)
Expand Down