Skip to content

Fix broken status and download-file in CLI #141

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
PeterPetrik merged 1 commit into from
Jun 10, 2022
Merged

Fix broken status and download-file in CLI #141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions mergin/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,10 +332,8 @@ def download_file(ctx, filepath, output, version):
mc = ctx.obj["client"]
if mc is None:
return
mp = MerginProject(os.getcwd())
project_path = mp.metadata["name"]
try:
job = download_file_async(mc, project_path, filepath, output, version)
job = download_file_async(mc, os.getcwd(), filepath, output, version)
with click.progressbar(length=job.total_size) as bar:
last_transferred_size = 0
while download_project_is_running(job):
Expand Down Expand Up @@ -377,7 +375,7 @@ def status(ctx):
_print_unhandled_exception()
return

if mc.has_unfinished_pull():
if mc.has_unfinished_pull(os.getcwd()):
click.secho("The previous pull has not finished completely: status "
"of some files may be reported incorrectly. Use "
"resolve_unfinished_pull command to try to fix that.", fg="yellow")
Expand Down