Update app.py

app.py

@@ -7,51 +7,63 @@ from modules.video import create_video_from_images, extract_frames_from_video
 from modules.frame_decoder import recover_binary_files
 from modules.merge import merge_cunks
 
-def encode(file_path):
+def encode(file_path, progress=gr.Progress()):
     """
     Encodes a file by splitting it into chunks, rendering frames, and creating a video from the frames.
     """
-    steps = gr.Steps()
-    steps.append("Splitting file into chunks...")
-    split_file(input_file=file_path)
-    
-    steps.append("Rendering frames from chunks...")
-    render_frame()
-    
-    steps.append("Creating video from frames...")
-    create_video_from_images()
-    
-    steps.append("Cleaning up temporary files...")
-    shutil.rmtree("./chunks", ignore_errors=True)
-    shutil.rmtree("./images", ignore_errors=True)
-    shutil.rmtree("./extracted_frames", ignore_errors=True)
-    shutil.rmtree("./recovered", ignore_errors=True)
+    with progress.tqdm(total=5) as pbar:
+        pbar.set_description("Splitting file into chunks...")
+        split_file(input_file=file_path)
+        pbar.update(1)
+        
+        pbar.set_description("Rendering frames from chunks...")
+        render_frame()
+        pbar.update(1)
+        
+        pbar.set_description("Creating video from frames...")
+        create_video_from_images()
+        pbar.update(1)
+        
+        pbar.set_description("Cleaning up temporary files...")
+        shutil.rmtree("./chunks", ignore_errors=True)
+        shutil.rmtree("./images", ignore_errors=True)
+        shutil.rmtree("./extracted_frames", ignore_errors=True)
+        shutil.rmtree("./recovered", ignore_errors=True)
+        pbar.update(1)
+        
+        pbar.set_description("Encoding completed!")
+        pbar.update(1)
     
-    steps.append("Encoding completed! Encoded video is ready.")
-    return steps, "encoded_video.mp4"
+    return "encoded_video.mp4"
 
-def decode(output_file):
+def decode(output_file, progress=gr.Progress()):
     """
     Decodes a video by extracting frames, recovering binary files, and merging the chunks back into the original file.
     """
-    steps = gr.Steps()
-    steps.append("Extracting frames from video...")
-    extract_frames_from_video()
-    
-    steps.append("Recovering binary files from frames...")
-    recover_binary_files()
-    
-    steps.append("Merging chunks to reconstruct the original file...")
-    merge_cunks("./recovered", output_file)
-    
-    steps.append("Cleaning up temporary files...")
-    shutil.rmtree("./extracted_frames", ignore_errors=True)
-    shutil.rmtree("./chunks", ignore_errors=True)
-    shutil.rmtree("./recovered", ignore_errors=True)
-    shutil.rmtree("./images", ignore_errors=True)
+    with progress.tqdm(total=5) as pbar:
+        pbar.set_description("Extracting frames from video...")
+        extract_frames_from_video()
+        pbar.update(1)
+        
+        pbar.set_description("Recovering binary files from frames...")
+        recover_binary_files()
+        pbar.update(1)
+        
+        pbar.set_description("Merging chunks to reconstruct the original file...")
+        merge_cunks("./recovered", output_file)
+        pbar.update(1)
+        
+        pbar.set_description("Cleaning up temporary files...")
+        shutil.rmtree("./extracted_frames", ignore_errors=True)
+        shutil.rmtree("./chunks", ignore_errors=True)
+        shutil.rmtree("./recovered", ignore_errors=True)
+        shutil.rmtree("./images", ignore_errors=True)
+        pbar.update(1)
+        
+        pbar.set_description("Decoding completed!")
+        pbar.update(1)
     
-    steps.append("Decoding completed! File successfully reconstructed.")
-    return steps, f"Decoding completed! Output file: {output_file}"
+    return f"Decoding completed! Output file: {output_file}"
 
 def encode_interface(file):
     return encode(file.name)
@@ -66,20 +78,20 @@ with gr.Blocks() as demo:
     with gr.Tab("Encode"):
         file_input = gr.File(label="Upload file to encode")
         encode_button = gr.Button("Encode")
-        steps_output = gr.Steps(label="Encoding Steps")
+        progress_bar = gr.Progress()
         video_output = gr.Video(label="Encoded Video")
         download_button = gr.Button("Download Encoded Video")
         
-        encode_button.click(encode_interface, inputs=file_input, outputs=[steps_output, video_output])
+        encode_button.click(encode_interface, inputs=file_input, outputs=[video_output], progress=progress_bar)
         download_button.click(lambda: "encoded_video.mp4", inputs=None, outputs=gr.File(label="Download Encoded Video"))
     
     with gr.Tab("Decode"):
         video_input = gr.Video(label="Upload video to decode")
         output_file_input = gr.Textbox(label="Output file name")
         decode_button = gr.Button("Decode")
-        decode_steps = gr.Steps(label="Decoding Steps")
+        decode_progress = gr.Progress()
         
-        decode_button.click(decode_interface, inputs=[video_input, output_file_input], outputs=decode_steps)
+        decode_button.click(decode_interface, inputs=[video_input, output_file_input], outputs=gr.Textbox(label="Status"), progress=decode_progress)
 
 # Launch the Gradio app
 demo.launch()