Update app.py

app.py

@@ -25,122 +25,112 @@ DEFAULT_STYLES = {
 
 def is_repo2markdown_format(text):
     """Detects if the text is in the Repo2Markdown format."""
-    return "## File Structure" in text and text.count("### File:") > 1
+    return "## File Structure" in text and text.count("### File:") > 0
 
 def parse_repo2markdown(text):
     """
-    Parses Repo2Markdown text to extract individual files.
-    Returns a list of dictionaries, each representing a file.
+    Parses Repo2Markdown text, extracts files, and cleans content for display.
     """
     components = []
     # Regex to find sections starting with '### File:'
-    # It captures the filename and all content until the next '### File:' or the end of the string.
     pattern = re.compile(r'### File: (.*?)\n([\s\S]*?)(?=\n### File:|\Z)', re.MULTILINE)
     
-    # Find the introductory text before the first file.
     first_match = pattern.search(text)
     if first_match:
         intro_text = text[:first_match.start()].strip()
         if intro_text:
-            components.append({
-                'type': 'intro',
-                'filename': 'Introduction',
-                'content': intro_text,
-                'is_selected': True
-            })
+            components.append({'type': 'intro', 'filename': 'Introduction', 'content': intro_text, 'is_code_block': False, 'language': ''})
 
-    # Find all file sections
     for match in pattern.finditer(text):
         filename = match.group(1).strip()
-        content = match.group(2).strip()
-        components.append({
-            'type': 'file',
-            'filename': filename,
-            'content': content,
-            'is_selected': True # Default to selected
-        })
+        raw_content = match.group(2).strip()
         
+        # Check if the entire content is a single fenced code block
+        code_match = re.search(r'^```(\w*)\s*\n([\s\S]*?)\s*```$', raw_content, re.DOTALL)
+        
+        if code_match:
+            # It's a code block; store the inner content and language
+            language = code_match.group(1)
+            inner_content = code_match.group(2).strip()
+            components.append({'type': 'file', 'filename': filename, 'content': inner_content, 'is_code_block': True, 'language': language})
+        else:
+            # It's plain text (e.g., binary file notification)
+            components.append({'type': 'file', 'filename': filename, 'content': raw_content, 'is_code_block': False, 'language': ''})
+            
     return components
 
 @app.route("/", methods=["GET", "POST"])
 def index():
     """Main route to handle parsing, component selection, and conversion."""
-    # Initialize variables
     preview_html = None
     download_available = False
     error_message = None
     components = []
-    
-    # Set default values on GET request
+    final_markdown_to_render = ""
+
+    # Set defaults for a GET request
     markdown_text = ""
     download_type = "png"
     styles = DEFAULT_STYLES.copy()
     include_fontawesome = False
     
     if request.method == "POST":
-        # Preserve styling options across all POST requests
+        # Always update styles and settings from the form on any POST
         styles = {key: request.form.get(key, default) for key, default in DEFAULT_STYLES.items()}
         include_fontawesome = "include_fontawesome" in request.form
         download_type = request.form.get("download_type", "png")
+
+        # --- TEXT PROCESSING LOGIC ---
+        # Prioritize new text/file upload. This is the source of truth for parsing.
+        new_markdown_text = request.form.get("markdown_text", "")
+        uploaded_file = request.files.get("markdown_file")
         
-        final_markdown_to_render = ""
+        if uploaded_file and uploaded_file.filename != '':
+            try:
+                markdown_text = uploaded_file.read().decode("utf-8")
+            except Exception as e:
+                error_message = f"Error reading file: {e}"
+                markdown_text = "" # Clear text on error
+        else:
+            markdown_text = new_markdown_text
         
-        # Determine the action based on the button/data submitted
-        action = "parse"
-        if 'generate_from_components' in request.form:
-            action = "generate"
+        # --- PARSING & COMPONENT BUILDING ---
+        if markdown_text and is_repo2markdown_format(markdown_text):
+            try:
+                # Always re-parse the source text to generate fresh components
+                parsed_components = parse_repo2markdown(markdown_text)
+                final_markdown_parts = []
+                
+                # Check for user selections and reconstruct both the component list for the UI
+                # and the final markdown for rendering.
+                for i, comp_data in enumerate(parsed_components):
+                    is_selected = f'include_comp_{i}' in request.form
+                    
+                    # Update component with selection status for re-rendering the UI
+                    comp_data['is_selected'] = is_selected
+                    components.append(comp_data)
 
-        # --- ACTION 1: PARSE uploaded text or file ---
-        if action == "parse":
-            markdown_text = request.form.get("markdown_text", "")
-            uploaded_file = request.files.get("markdown_file")
-            if uploaded_file and uploaded_file.filename != '':
-                try:
-                    markdown_text = uploaded_file.read().decode("utf-8")
-                except Exception as e:
-                    error_message = f"Error reading file: {e}"
-            
-            if markdown_text and is_repo2markdown_format(markdown_text):
-                try:
-                    components = parse_repo2markdown(markdown_text)
-                    if not components:
-                        error_message = "Repo2Markdown format detected, but no file components could be parsed."
-                except Exception as e:
-                    error_message = f"Error parsing Repo2Markdown format: {e}"
-            else:
-                final_markdown_to_render = markdown_text
+                    # If selected, add it to the list for the final document
+                    if is_selected:
+                        if comp_data['type'] == 'intro':
+                            final_markdown_parts.append(comp_data['content'])
+                        else: # It's a file
+                            reconstructed_content = ""
+                            if comp_data['is_code_block']:
+                                # Re-add the fences for rendering
+                                reconstructed_content = f"```{comp_data['language']}\n{comp_data['content']}\n```"
+                            else:
+                                reconstructed_content = comp_data['content']
+                            final_markdown_parts.append(f"### File: {comp_data['filename']}\n{reconstructed_content}")
 
-        # --- ACTION 2: GENERATE from selected components ---
-        elif action == "generate":
-            final_markdown_parts = []
-            
-            # Re-read component data from hidden form fields to reconstruct the UI
-            comp_count = int(request.form.get('component_count', 0))
-            for i in range(comp_count):
-                comp_type = request.form.get(f'comp_type_{i}')
-                if not comp_type: continue
-                
-                is_selected = f'include_comp_{i}' in request.form
-                filename = request.form.get(f'comp_filename_{i}')
-                content = request.form.get(f'comp_content_{i}')
+                final_markdown_to_render = "\n\n---\n\n".join(final_markdown_parts)
 
-                # Re-add to components list to maintain UI state
-                components.append({
-                    'type': comp_type,
-                    'filename': filename,
-                    'content': content,
-                    'is_selected': is_selected
-                })
-                
-                # If selected, add it to the final document to be rendered
-                if is_selected:
-                    if comp_type == 'intro':
-                        final_markdown_parts.append(content)
-                    else: # file
-                        final_markdown_parts.append(f"### File: {filename}\n{content}")
+            except Exception as e:
+                error_message = f"Error processing Repo2Markdown: {e}"
+        else:
+            # If not Repo2Markdown format, just treat it as plain markdown
+            final_markdown_to_render = markdown_text
 
-            final_markdown_to_render = "\n\n---\n\n".join(final_markdown_parts)
-            
         # --- HTML & PNG Conversion Logic ---
         if final_markdown_to_render:
             try:
@@ -149,6 +139,7 @@ def index():
                 fontawesome_link = '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">' if include_fontawesome else ""
                 style_block = f"""<style>
                     body {{ font-family: {styles['font_family']}; font-size: {styles['font_size']}px; color: {styles['text_color']}; background-color: {styles['background_color']}; padding: 25px; display: inline-block; }}
+                    h3 {{ border-bottom: 1px solid #ccc; padding-bottom: 5px; margin-top: 2em; }}
                     table {{ border-collapse: collapse; width: 100%; }}
                     th, td {{ border: 1px solid #ddd; padding: 8px; text-align: left; }}
                     th {{ background-color: #f2f2f2; }}
@@ -175,7 +166,6 @@ def index():
                 error_message = f"An error occurred during conversion: {e}"
                 print(f"Error: {traceback.format_exc()}")
     
-    # --- RENDER THE MAIN TEMPLATE ---
     return render_template_string("""
     <!DOCTYPE html>
     <html lang="en">
@@ -184,7 +174,8 @@ def index():
         <title>Advanced Markdown Converter & Composer</title>
         <style>
             body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; max-width: 1200px; margin: 0 auto; padding: 20px; background-color: #f9f9f9; }
-            h1, h2 { text-align: center; color: #333; }
+            h1, h2, h3 { color: #333; }
+            h1 { text-align: center; }
             form { background: #fff; padding: 20px; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); margin-bottom: 20px; }
             textarea { width: 100%; box-sizing: border-box; border: 1px solid #ccc; border-radius: 4px; padding: 10px; font-family: monospace; }
             .controls { display: flex; flex-wrap: wrap; justify-content: space-between; align-items: center; gap: 20px; margin-top: 20px; }
@@ -203,7 +194,6 @@ def index():
             .preview { border: 1px solid #ddd; padding: 20px; margin-top: 20px; background: #fff; box-shadow: 0 2px 4px rgba(0,0,0,0.05); }
             .error { color: #D8000C; background-color: #FFD2D2; padding: 10px; border-radius: 5px; margin-top: 15px; }
             .info { color: #00529B; background-color: #BDE5F8; padding: 10px; border-radius: 5px; margin: 10px 0; }
-            /* Component Selection Styles */
             .component-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); gap: 15px; }
             .component-container { border: 1px solid #e0e0e0; border-radius: 5px; background: #fafafa; }
             .component-header { background: #f1f1f1; padding: 8px 12px; border-bottom: 1px solid #e0e0e0; display: flex; align-items: center; gap: 10px; }
@@ -222,29 +212,20 @@ def index():
     </head>
     <body>
         <h1>Advanced Markdown Converter & Composer</h1>
-
         <form method="post" enctype="multipart/form-data">
-            <!-- This section is shown if no components are parsed yet -->
-            {% if not components %}
-                <fieldset>
-                    <legend>Option 1: Paste Markdown</legend>
-                    <textarea name="markdown_text" rows="10" placeholder="Paste your Markdown here...">{{ markdown_text }}</textarea>
-                </fieldset>
-                <h2 style="font-size: 1.2em;">OR</h2>
-                <fieldset>
-                    <legend>Option 2: Upload a Markdown File</legend>
-                    <input type="file" name="markdown_file" accept=".md,.txt,text/markdown">
-                </fieldset>
-                <div class="controls"><button type="submit" class="action-btn">Parse and Preview</button></div>
-            {% endif %}
-            
-            <!-- This section is shown only after a Repo2Markdown file is parsed -->
+            <fieldset>
+                <legend>Source Content</legend>
+                <div class="info">Paste your content below, or upload a file. If Repo2Markdown format is detected, component selection will appear.</div>
+                <textarea name="markdown_text" rows="8" placeholder="Paste your Markdown here...">{{ markdown_text }}</textarea>
+                <div style="margin-top: 10px; display: flex; align-items: center; gap: 10px;">
+                    <label for="markdown_file" style="margin-bottom:0;">Or upload a file:</label>
+                    <input type="file" name="markdown_file" id="markdown_file" accept=".md,.txt,text/markdown">
+                </div>
+            </fieldset>
+
             {% if components %}
-                <input type="hidden" name="generate_from_components" value="true">
-                <input type="hidden" name="component_count" value="{{ components|length }}">
                 <fieldset>
                     <legend>Detected File Components</legend>
-                    <div class="info">Repo2Markdown format detected. Select the files to include in the final document.</div>
                     <div class="selection-controls">
                         <button type="button" onclick="toggleAllComponents(true)">Select All</button>
                         <button type="button" onclick="toggleAllComponents(false)">Deselect All</button>
@@ -253,23 +234,18 @@ def index():
                         {% for comp in components %}
                             <div class="component-container">
                                 <div class="component-header">
-                                    <input type="checkbox" name="include_comp_{{ loop.index0 }}" id="include_comp_{{ loop.index0 }}" class="component-checkbox" {% if comp.is_selected %}checked{% endif %}>
+                                    <input type="checkbox" name="include_comp_{{ loop.index0 }}" id="include_comp_{{ loop.index0 }}" class="component-checkbox" {% if comp.is_selected %}checked{% else %}checked{% endif %}>
                                     <label for="include_comp_{{ loop.index0 }}">{{ comp.filename }}</label>
                                 </div>
                                 <div class="component-content">
                                     <textarea readonly>{{ comp.content }}</textarea>
                                 </div>
                             </div>
-                            <!-- Hidden fields to preserve data on next post -->
-                            <input type="hidden" name="comp_type_{{ loop.index0 }}" value="{{ comp.type }}">
-                            <input type="hidden" name="comp_filename_{{ loop.index0 }}" value="{{ comp.filename }}">
-                            <input type="hidden" name="comp_content_{{ loop.index0 }}" value="{{ comp.content }}">
                         {% endfor %}
                     </div>
                 </fieldset>
             {% endif %}
 
-            <!-- Styling and Generation controls -->
             <fieldset>
                 <legend>Styling Options</legend>
                 <div class="style-grid">
@@ -286,9 +262,7 @@ def index():
 
             <div class="controls">
                 <div class="main-actions">
-                    <button type="submit" class="action-btn">
-                        {% if components %}Re-Generate Preview{% else %}Generate Preview{% endif %}
-                    </button>
+                    <button type="submit" class="action-btn">Generate / Update Preview</button>
                     <div><label for="download_type">Output format:</label><select id="download_type" name="download_type"><option value="png" {% if download_type == 'png' %}selected{% endif %}>PNG</option><option value="html" {% if download_type == 'html' %}selected{% endif %}>HTML</option></select></div>
                     {% if download_available %}<button type="submit" name="download" value="true" class="download-btn">Download {{ download_type.upper() }}</button>{% endif %}
                 </div>