update console progress

app.py

@@ -194,28 +194,22 @@ def stripinvisibles(s):
 
 def start_progress(title):
     global progress_x
-    sys.stdout.write(title + ": [" + "-"*40 + "] 0%")
-    sys.stdout.write(chr(8) * 44)  # Move the cursor back to the start of the progress bar
+    sys.stdout.write(f"{title}:\n")
+    sys.stdout.write(f"[{'-'*60}] 0%\r")
     sys.stdout.flush()
     progress_x = 0
 
 def progress(x):
     global progress_x
-    x = int(x * 40 // 100)
-    percent_complete = int(x / 40 * 100)
-    sys.stdout.write("#" * (x - progress_x))
-    sys.stdout.write(" " * (40 - x) + "] " + f"{percent_complete}%")
-    sys.stdout.write(chr(8) * (44 + len(str(percent_complete)) + 1))  # Move the cursor back to the start of the progress bar
+    sys.stdout.write(f"[{'#'*round(60*x)}{'-'*(60-round(60*x))}] {x:.2%}\r")
     sys.stdout.flush()
     progress_x = x
 
 def end_progress():
-    global progress_x
-    sys.stdout.write("#" * (40 - progress_x) + "] 100%\n")
+    sys.stdout.write(f"[{'#'*60}] 100.00%\r\n")
     sys.stdout.flush()
 
 
-
 haslyrics = False
 
 
@@ -294,7 +288,7 @@ def main(file, name, fps=30, res: tuple = (1280, 720), oscres=512, sr=11025, lyr
     # Prepare parameters for each frame
     params = [(n, samples_array, cover_img, title, artist, dominant_color,
                width, height, fps, name, oscres, sr) for n in range(num_frames)]
-    print('---------------------------------------------------------')
+    print('-'*50)
     print('Info:' + "External" if img else "ID3")
     print("Title: " + title)
     print("Artist: " + artist)
@@ -303,7 +297,7 @@ def main(file, name, fps=30, res: tuple = (1280, 720), oscres=512, sr=11025, lyr
     print('Framerate: ' + str(fps))
     print('Frame Count: ' + str(num_frames))
     print('Segments per frame: ' + str(oscres))
-    print('---------------------------------------------------------')
+    print('-'*50)
     start_progress("Rendering:")
     try:
         with Pool(cpu_count()-1) as pool:
@@ -312,7 +306,7 @@ def main(file, name, fps=30, res: tuple = (1280, 720), oscres=512, sr=11025, lyr
             for _ in pool.imap_unordered(render_frame, params):
                 iii += 1  # Increment frame count for progress
                 p((iii, num_frames), desc="Rendering Frames")
-                progress(iii/num_frames*100)
+                progress(iii/num_frames)
 
     except Exception as e:
         raise gr.Error("Something went wrong whilst rendering")
@@ -321,7 +315,7 @@ def main(file, name, fps=30, res: tuple = (1280, 720), oscres=512, sr=11025, lyr
 
     p = gr.Progress()
     p(0, desc="Compiling video")
-    print('---------------------------------------------------------')
+    print('-'*50)
     print('FFMPEG')
     if haslyrics:
         ffmpeg_cmd = [
@@ -355,6 +349,7 @@ def main(file, name, fps=30, res: tuple = (1280, 720), oscres=512, sr=11025, lyr
     # Regular expression to match frame information
     frame_re = re.compile(r"frame=\s*(\d+)")
     p = gr.Progress()
+    start_progress('Compliling video')
     while True:
         output = process.stderr.readline()
         if output == '' and process.poll() is not None:
@@ -365,11 +360,12 @@ def main(file, name, fps=30, res: tuple = (1280, 720), oscres=512, sr=11025, lyr
             if match:
                 frame = match.group(1)
                 p((int(frame), num_frames), desc="Compiling Video")
-                print(f"Frame: {frame}")
+                progress(int(frame)/num_frames)
 
     # Wait for the process to complete
     process.wait()
-    print('---------------------------------------------------------')
+    end_progress()
+    print('-'*50)
     return f"{name}.mp4", haslyrics