Merge pull request #1661 from dmach/fix-urlquoted-filenames-in-getbin…

…aries

Fix urlquoted filenames in getbinaries

osc/core.py

@@ -2680,7 +2680,7 @@ def download(url: str, filename, progress_obj=None, mtime=None):
         os.fchmod(fd, 0o644)
         try:
             o = os.fdopen(fd, 'wb')
-            for buf in streamfile(url, http_GET, BUFSIZE, progress_obj=progress_obj):
+            for buf in streamfile(url, http_GET, BUFSIZE, progress_obj=progress_obj, text=filename):
                 if isinstance(buf, str):
                     o.write(bytes(buf, "utf-8"))
                 else:

osc/meter.py

@@ -37,14 +37,14 @@ def __init__(self):
 
     def start(self, basename: str, size: Optional[int] = None):
         if size is None:
-            widgets = [f"{basename}: ", pb.AnimatedMarker(), ' ', pb.Timer()]
+            widgets = [f"{basename} ", pb.AnimatedMarker(), ' ', pb.Timer()]
             self.bar = pb.ProgressBar(widgets=widgets, maxval=pb.UnknownLength)
         else:
-            widgets = [f"{basename}: ", pb.Bar(), ' ', pb.ETA()]
+            widgets = [f"{basename} ", pb.Bar(), ' ', pb.ETA()]
             if size:
                 # if size is 0, using pb.Percentage will result in
                 # a ZeroDivisionException
-                widgets.insert(1, pb.Percentage())
+                widgets[3:3] = [pb.Percentage(), " "]
             self.bar = pb.ProgressBar(widgets=widgets, maxval=size)
         # When a signal handler is set, it resets SA_RESTART flag
         # - see signal.siginterrupt() python docs.
@@ -57,6 +57,15 @@ def update(self, amount_read: int):
         self.bar.update(amount_read)
 
     def end(self):
+        # replace marker (ticks) and left+right borders of the bar with spaces
+        # to hide it from output after completion
+        for i in self.bar.widgets:
+            if not isinstance(i, pb.Bar):
+                continue
+            i.marker = " "
+            i.left = " "
+            i.right = " "
+
         self.bar.finish()