Update app.py

app.py

@@ -12,9 +12,6 @@ import PyPDF2
 
 app = Dash(__name__, external_stylesheets=[dbc.themes.BOOTSTRAP])
 
-# Global variable to track conversion progress
-conversion_progress = 0
-
 app.layout = dbc.Container([
     html.H1("Auto-Wiki", className="my-4"),
     dcc.Upload(
@@ -37,11 +34,10 @@ app.layout = dbc.Container([
         accept='.docx,.pdf'
     ),
     html.Div(id='upload-output'),
-    dbc.Progress(id="upload-progress", label="Upload Progress", style={"visibility": "hidden"}),
-    dbc.Progress(id="conversion-progress", label="Conversion Progress", style={"visibility": "hidden"}),
+    dbc.Spinner(html.Div(id="upload-spinner"), color="primary", type="grow", style={"display": "none"}),
+    dbc.Spinner(html.Div(id="conversion-spinner"), color="secondary", type="grow", style={"display": "none"}),
     dbc.Button("Convert and Download", id="convert-button", color="primary", className="mt-3", disabled=True),
-    dcc.Download(id="download-zip"),
-    dcc.Interval(id='interval-component', interval=500, n_intervals=0)
+    dcc.Download(id="download-zip")
 ])
 
 def process_docx(contents, filename):
@@ -64,9 +60,8 @@ def process_pdf(contents, filename):
     return '\n\n'.join(full_text)
 
 def process_files(contents, filenames):
-    global conversion_progress
     processed_files = []
-    for i, (c, n) in enumerate(zip(contents, filenames)):
+    for c, n in zip(contents, filenames):
         if n.lower().endswith('.docx'):
             text = process_docx(c, n)
         elif n.lower().endswith('.pdf'):
@@ -75,7 +70,6 @@ def process_files(contents, filenames):
             continue  # Skip unsupported file types
         md = markdown.markdown(text)
         processed_files.append((n.replace('.docx', '.md').replace('.pdf', '.md'), md))
-        conversion_progress = (i + 1) / len(contents) * 100
         time.sleep(0.1)  # Simulate processing time
 
     zip_buffer = io.BytesIO()
@@ -88,20 +82,16 @@ def process_files(contents, filenames):
 @app.callback(
     [Output('upload-output', 'children'),
      Output('convert-button', 'disabled'),
-     Output('upload-progress', 'value'),
-     Output('upload-progress', 'style'),
-     Output('conversion-progress', 'value'),
-     Output('conversion-progress', 'style'),
+     Output('upload-spinner', 'style'),
+     Output('conversion-spinner', 'style'),
      Output('download-zip', 'data')],
     [Input('upload-data', 'contents'),
      Input('upload-data', 'filename'),
-     Input('convert-button', 'n_clicks'),
-     Input('interval-component', 'n_intervals')],
+     Input('convert-button', 'n_clicks')],
     [State('upload-data', 'contents'),
      State('upload-data', 'filename')]
 )
-def update_output(list_of_contents, list_of_names, n_clicks, n_intervals, contents, filenames):
-    global conversion_progress
+def update_output(list_of_contents, list_of_names, n_clicks, contents, filenames):
     ctx = callback_context
     if not ctx.triggered:
         return no_update
@@ -114,27 +104,18 @@ def update_output(list_of_contents, list_of_names, n_clicks, n_intervals, conten
                     html.Hr()
                 ]) for name in list_of_names
             ]
-            return children, False, 100, {"visibility": "visible"}, 0, {"visibility": "hidden"}, None
+            return children, False, {"display": "none"}, {"display": "none"}, None
         return no_update
 
     if ctx.triggered[0]['prop_id'] == 'convert-button.n_clicks':
-        if n_clicks is None:
-            return no_update
-
-        if not contents:
+        if n_clicks is None or not contents:
             return no_update
 
-        conversion_progress = 0
-        thread = threading.Thread(target=process_files, args=(contents, filenames))
-        thread.start()
+        def process_and_download():
+            zip_data = process_files(contents, filenames)
+            return dcc.send_bytes(zip_data, "converted_files.zip")
 
-        return no_update, True, 100, {"visibility": "visible"}, 0, {"visibility": "visible"}, None
-
-    if ctx.triggered[0]['prop_id'] == 'interval-component.n_intervals':
-        if conversion_progress == 100:
-            return no_update, False, 100, {"visibility": "visible"}, 100, {"visibility": "visible"}, dcc.send_bytes(process_files(contents, filenames), "converted_files.zip")
-        else:
-            return no_update, True, 100, {"visibility": "visible"}, conversion_progress, {"visibility": "visible"}, None
+        return no_update, True, {"display": "none"}, {"display": "block"}, process_and_download()
 
     return no_update