From 0724e7e5d02f15e509460161359259607a254200 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 14 Feb 2020 21:04:39 +0000 Subject: [PATCH 1/3] ui: show missing progress Fixes #3332 --- dvc/remote/gdrive.py | 2 +- dvc/remote/gs.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dvc/remote/gdrive.py b/dvc/remote/gdrive.py index 0175cbd74a..d92f630a9c 100644 --- a/dvc/remote/gdrive.py +++ b/dvc/remote/gdrive.py @@ -246,7 +246,7 @@ def gdrive_upload_file( self, parent_id, title, - no_progress_bar=True, + no_progress_bar=False, from_file="", progress_name="", ): diff --git a/dvc/remote/gs.py b/dvc/remote/gs.py index d9ee6d0e1f..9230699535 100644 --- a/dvc/remote/gs.py +++ b/dvc/remote/gs.py @@ -51,7 +51,7 @@ def _upload_to_bucket( to_info, chunk_size=None, name=None, - no_progress_bar=True, + no_progress_bar=False, ): blob = bucket.blob(to_info.path, chunk_size=chunk_size) with io.open(from_file, mode="rb") as fobj: @@ -166,7 +166,7 @@ def exists(self, path_info): """ return self.isfile(path_info) or self.isdir(path_info) - def _upload(self, from_file, to_info, name=None, no_progress_bar=True): + def _upload(self, from_file, to_info, name=None, no_progress_bar=False): bucket = self.gs.bucket(to_info.bucket) _upload_to_bucket( bucket, @@ -176,7 +176,7 @@ def _upload(self, from_file, to_info, name=None, no_progress_bar=True): no_progress_bar=no_progress_bar, ) - def _download(self, from_info, to_file, name=None, no_progress_bar=True): + def _download(self, from_info, to_file, name=None, no_progress_bar=False): bucket = self.gs.bucket(from_info.bucket) blob = bucket.get_blob(from_info.path) with io.open(to_file, mode="wb") as fobj: From 37850cb30007bf16cbef6f41fdd44143b8181763 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 14 Feb 2020 21:16:19 +0000 Subject: [PATCH 2/3] ui: more verbose progress --- dvc/remote/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dvc/remote/base.py b/dvc/remote/base.py index 2d2cf4748e..3b37a29dad 100644 --- a/dvc/remote/base.py +++ b/dvc/remote/base.py @@ -234,7 +234,7 @@ def _get_dir_info_checksum(self, dir_info): from_info = PathInfo(tmp) to_info = self.cache.path_info / tmp_fname("") - self.cache.upload(from_info, to_info, no_progress_bar=True) + self.cache.upload(from_info, to_info, no_progress_bar=False) checksum = self.get_file_checksum(to_info) + self.CHECKSUM_DIR_SUFFIX return checksum, to_info From 780f33d3cbf2e47a3cef8d50e85d4a7d404a3935 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Tue, 18 Feb 2020 21:44:15 +0000 Subject: [PATCH 3/3] remote: base: back to no_progres_bar=True --- dvc/remote/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dvc/remote/base.py b/dvc/remote/base.py index 3b37a29dad..2d2cf4748e 100644 --- a/dvc/remote/base.py +++ b/dvc/remote/base.py @@ -234,7 +234,7 @@ def _get_dir_info_checksum(self, dir_info): from_info = PathInfo(tmp) to_info = self.cache.path_info / tmp_fname("") - self.cache.upload(from_info, to_info, no_progress_bar=False) + self.cache.upload(from_info, to_info, no_progress_bar=True) checksum = self.get_file_checksum(to_info) + self.CHECKSUM_DIR_SUFFIX return checksum, to_info