refactor ui

app.py

@@ -267,7 +267,6 @@ def main(file, name, fps=30, res: tuple=(1280,720), oscres=512, sr=11025, lyrics
     print('Frame Count: ' + str(num_frames))
     print('Segments per frame: ' + str(oscres))
     print('---------------------------------------------------------')
-    start_progress("Rendering:")
     try:
         with Pool(cpu_count()) as pool:
             num_frames = len(samples_array) // (sr // fps)
@@ -275,12 +274,9 @@ def main(file, name, fps=30, res: tuple=(1280,720), oscres=512, sr=11025, lyrics
             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)
                 
     except Exception as e:
         raise gr.Error("Something went wrong whilst rendering")
-    finally:
-        end_progress()
     
     p = gr.Progress()
     p(0.5, desc="Compiling video")
@@ -347,6 +343,11 @@ with gr.Blocks() as demo:
                 gr.Markdown('## Load your mp3 file here')
                 audio_file = gr.File(label="Upload your MP3 file", file_count='single', file_types=['mp3'])
                 
+            with gr.Accordion(label="Mp3 Metadata", open=False):
+                gr.Markdown('## Add Metadata here if your mp3 does not have one')
+                cover_img = gr.Image(label='Cover Art', type="filepath")
+                title_input = gr.Textbox(label='Title')
+                artist_input = gr.Textbox(label='Artists')
 
             with gr.Accordion(label="Video Output Settings", open=False):
                 gr.Markdown('## Configure Video Output Here')
@@ -360,11 +361,7 @@ with gr.Blocks() as demo:
                 gr.Markdown('If uploading LRC, ensure a blank timed line at the end to avoid conversion errors')
                 lyrics_file = gr.File(label="(Optional) Upload Lyrics as LRC or SRT", file_count='single', file_types=['lrc', 'srt'])
         
-            with gr.Accordion(label="Mp3 Metadata", open=False):
-                gr.Markdown('## Add Metadata here if your mp3 does not have one')
-                cover_img = gr.Image(label='Cover Art', type="filepath")
-                title_input = gr.Textbox(label='Title')
-                artist_input = gr.Textbox(label='Artists')
+            
 
             # Add a submit button
             submit_btn = gr.Button("Generate Video")
@@ -372,20 +369,14 @@ with gr.Blocks() as demo:
         # Outputs on the right
         with gr.Column():
             output_video = gr.Video(label="Output")
-            srt_output = gr.File(label="SRT Output", visible=False)
+            with gr.Accordion(label="SRT File (Only used if lyrics is provided)", open=False):
+                srt_output = gr.File(label="SRT Output")
 
     # Bind the button to the function
     submit_btn.click(
         fn=gradio_interface,
         inputs=[audio_file, lyrics_file, output_name, fps_slider, vidwidth_slider, vidheight_slider, oscres_slider, cover_img, title_input, artist_input],
-        outputs=[output_video, srt_output, gr.State()]
-    )
-    
-    # Update visibility of SRT output
-    demo.load(
-        fn=update_srt_output_visibility,
-        inputs=gr.State(),
-        outputs=srt_output
+        outputs=[output_video, srt_output]
     )
 
 # Launch Gradio interface