Update app.py

app.py

@@ -7,68 +7,80 @@ 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, progress=gr.Progress()):
+def encode(file_path):
     """
     Encodes a file by splitting it into chunks, rendering frames, and creating a video from the frames.
+    Streams progress updates as text.
     """
-    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)
+    total_steps = 5
+    current_step = 0
+    
+    # Step 1: Splitting file into chunks
+    yield f"Progress: {int((current_step/total_steps)*100)}% - Splitting file into chunks...", None
+    split_file(input_file=file_path)
+    current_step += 1
+    
+    # Step 2: Rendering frames from chunks
+    yield f"Progress: {int((current_step/total_steps)*100)}% - Rendering frames from chunks...", None
+    render_frame()
+    current_step += 1
+    
+    # Step 3: Creating video from frames
+    yield f"Progress: {int((current_step/total_steps)*100)}% - Creating video from frames...", None
+    create_video_from_images()
+    current_step += 1
+    
+    # Step 4: Cleaning up temporary files
+    yield f"Progress: {int((current_step/total_steps)*100)}% - Cleaning up temporary files...", None
+    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)
+    current_step += 1
     
-    return "encoded_video.mp4"
+    # Step 5: Completed
+    yield f"Progress: {int((current_step/total_steps)*100)}% - Encoding completed! Encoded video is ready.", "encoded_video.mp4"
 
-def decode(output_file, progress=gr.Progress()):
+def decode(output_file):
     """
     Decodes a video by extracting frames, recovering binary files, and merging the chunks back into the original file.
+    Streams progress updates as text.
     """
-    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)
+    total_steps = 5
+    current_step = 0
+    
+    # Step 1: Extracting frames from video
+    yield f"Progress: {int((current_step/total_steps)*100)}% - Extracting frames from video...", None
+    extract_frames_from_video()
+    current_step += 1
+    
+    # Step 2: Recovering binary files from frames
+    yield f"Progress: {int((current_step/total_steps)*100)}% - Recovering binary files from frames...", None
+    recover_binary_files()
+    current_step += 1
+    
+    # Step 3: Merging chunks to reconstruct the original file
+    yield f"Progress: {int((current_step/total_steps)*100)}% - Merging chunks to reconstruct the original file...", None
+    merge_cunks("./recovered", output_file)
+    current_step += 1
+    
+    # Step 4: Cleaning up temporary files
+    yield f"Progress: {int((current_step/total_steps)*100)}% - Cleaning up temporary files...", None
+    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)
+    current_step += 1
     
-    return f"Decoding completed! Output file: {output_file}"
+    # Step 5: Completed
+    yield f"Progress: {int((current_step/total_steps)*100)}% - Decoding completed! File successfully reconstructed.", f"Decoding completed! Output file: {output_file}"
 
 def encode_interface(file):
+    # Start encoding and stream progress updates.
     return encode(file.name)
 
 def decode_interface(video, output_file):
+    # Start decoding and stream progress updates.
     return decode(output_file)
 
 # Gradio interface
@@ -78,20 +90,35 @@ with gr.Blocks() as demo:
     with gr.Tab("Encode"):
         file_input = gr.File(label="Upload file to encode")
         encode_button = gr.Button("Encode")
-        progress_bar = gr.Progress()
+        progress_output = gr.Textbox(label="Encoding Progress", interactive=False)
         video_output = gr.Video(label="Encoded Video")
         download_button = gr.Button("Download Encoded Video")
         
-        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"))
+        # Use stream=True to update progress in real time.
+        encode_button.click(
+            encode_interface, 
+            inputs=file_input, 
+            outputs=[progress_output, video_output], 
+            stream=True
+        )
+        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_progress = gr.Progress()
+        decode_progress = gr.Textbox(label="Decoding Progress", interactive=False)
         
-        decode_button.click(decode_interface, inputs=[video_input, output_file_input], outputs=gr.Textbox(label="Status"), progress=decode_progress)
+        decode_button.click(
+            decode_interface, 
+            inputs=[video_input, output_file_input], 
+            outputs=decode_progress, 
+            stream=True
+        )
 
 # Launch the Gradio app
-demo.launch()
+demo.launch()