dcicutils 8.8.3.1b8__py3-none-any.whl → 8.8.3.1b10__py3-none-any.whl

dcicutils/progress_bar.py

@@ -61,8 +61,6 @@ class ProgressBar:
         self._bar = None
         self._disabled = False
         self._done = False
-        self._really_done = False
-        self.foo = time.time()
         self._tidy_output_hack = (tidy_output_hack is True)
         self._started = time.time()
         self._stop_requested = False
@@ -106,7 +104,7 @@ class ProgressBar:
             return True
         return False
 
-    def set_total(self, value: int) -> None:
+    def set_total(self, value: int, _norefresh: bool = False) -> None:
         if value == self._total:
             # If the total has not changed since last set then do nothing.
             return
@@ -117,13 +115,15 @@ class ProgressBar:
                 # the total during the course of a single ProgressBar instance.
                 self._bar.reset()
                 self._bar.total = value
-                self._bar.refresh()
+                if not _norefresh:
+                    self._bar.refresh()
 
-    def set_progress(self, value: int) -> None:
+    def set_progress(self, value: int, _norefresh: bool = False) -> None:
         if isinstance(value, int) and value >= 0:
             if (self._bar is not None) or self._initialize():
                 self._bar.n = value
-                self._bar.refresh()
+                if not _norefresh:
+                    self._bar.refresh()
 
     def increment_progress(self, value: int) -> None:
         if isinstance(value, int) and value > 0:
@@ -131,6 +131,13 @@ class ProgressBar:
                 self._bar.update(value)
                 self._bar.refresh()
 
+    def set_description(self, value: str) -> None:
+        if isinstance(value, str):
+            self._description = self._format_description(value)
+            if self._bar is not None:
+                # FYI: tqdm.set_description seems to imply a refresh.
+                self._bar.set_description(self._description)
+
     def reset_eta(self) -> None:
         # Since set_total does nothing if total is the same, provide
         # a way to reset the ETA if starting over with the same total.
@@ -142,11 +149,10 @@ class ProgressBar:
             self._bar.n = progress
             self._bar.refresh()
 
-    def set_description(self, value: str) -> None:
-        if isinstance(value, str):
-            self._description = self._format_description(value)
-            if self._bar is not None:
-                self._bar.set_description(self._description)
+    def reset(self, total: int, progress: int = 0, description: Optional[str] = None) -> None:
+        self.set_total(total, _norefresh=True)
+        self.set_progress(progress, _norefresh=True)
+        self.set_description(description)
 
     def done(self, description: Optional[str] = None) -> None:
         if self._done or self._bar is None:
@@ -279,7 +285,7 @@ class ProgressBar:
                 while text.endswith("  "):
                     text = text[:-1]
                 return text
-            if (not text) or (last_text == text) or self._really_done:
+            if (not text) or (last_text == text):
                 return
             last_text = text
             if (self._disabled or self._done) and sentinel_internal in text:
@@ -298,9 +304,6 @@ class ProgressBar:
                 text = replace_first(text, "s/ ", "/s ")
             sys_stdout_write(text)
             sys.stdout.flush()
-            if self._done:
-                self._really_done = True
-                return
             if self._captured_output_for_testing is not None:
                 # For testing only we replace vacilliting values in the out like rate,
                 # time elapsed, and ETA with static values; so that something like this:

{dcicutils-8.8.3.1b8.dist-info → dcicutils-8.8.3.1b10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.3.1b8
+Version: 8.8.3.1b10
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.8.3.1b8.dist-info → dcicutils-8.8.3.1b10.dist-info}/RECORD

@@ -48,7 +48,7 @@ dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmj
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
 dcicutils/portal_object_utils.py,sha256=gDXRgPsRvqCFwbC8WatsuflAxNiigOnqr0Hi93k3AgE,15422
 dcicutils/portal_utils.py,sha256=Xm0IqL2dA9C2gx98cPEbvlo81V76bEmpUpxb_8S3VqM,30480
-dcicutils/progress_bar.py,sha256=j6dZdh5EeZo52GWIBu2JL5254-V6eOhKHHB2eCkgevI,16569
+dcicutils/progress_bar.py,sha256=OFgLXJL-03tQw2WM6JVDr8_YhxN3eay090iUhiAJKZ4,16830
 dcicutils/project_utils.py,sha256=qPdCaFmWUVBJw4rw342iUytwdQC0P-XKpK4mhyIulMM,31250
 dcicutils/qa_checkers.py,sha256=cdXjeL0jCDFDLT8VR8Px78aS10hwNISOO5G_Zv2TZ6M,20534
 dcicutils/qa_utils.py,sha256=TT0SiJWiuxYvbsIyhK9VO4uV_suxhB6CpuC4qPacCzQ,160208
@@ -72,8 +72,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
 dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
 dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
 dcicutils/zip_utils.py,sha256=rnjNv_k6L9jT2SjDSgVXp4BEJYLtz9XN6Cl2Fy-tqnM,2027
-dcicutils-8.8.3.1b8.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.8.3.1b8.dist-info/METADATA,sha256=saFsKdu4mbE4RBPh2331yy2nC-ZUcE5n3fT740wn9iY,3356
-dcicutils-8.8.3.1b8.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.8.3.1b8.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
-dcicutils-8.8.3.1b8.dist-info/RECORD,,
+dcicutils-8.8.3.1b10.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.8.3.1b10.dist-info/METADATA,sha256=tpCuqrVIZ1fN1xzI_5_0ZnAMDzGC-Iqf9axDT66sdNw,3357
+dcicutils-8.8.3.1b10.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.8.3.1b10.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
+dcicutils-8.8.3.1b10.dist-info/RECORD,,