Upload 49 files

DEPLOYMENT_GUIDE.md

@@ -62,7 +62,7 @@ python test_conversion.py
 
 ### 2. اختبار الخطوط العربية:
 ```bash
-fc-list | grep -i "amiri\|noto.*arabic"
+fc-list | grep -i "amiri\|scheherazade\|noto.*arabic\|arial"
 ```
 
 ### 3. اختبار LibreOffice:
@@ -86,7 +86,7 @@ sudo apt-get install libreoffice libreoffice-writer libreoffice-java-common
 ### مشكلة: الخطوط العربية مفقودة
 **الحل:**
 ```bash
-# تثبيت خطوط إضافية يتم تنزيلها عبر arabic_fonts_setup.sh
+# تثبيت خطوط إضافية يتم تنزيلها عبر setup_fonts.py
 # تحديث cache
 sudo fc-cache -fv
 
@@ -143,10 +143,16 @@ tail -f /var/log/syslog
 - راقب استخدام الموارد
 - احتفظ بنسخ احتياطية من الإعدادات
 
-## 📞 الدعم
+## 🔄 التحديثات
 
-إذا واجهت مشاكل في النشر:
-1. تحقق من السجلات أولاً
-2. تأكد من تثبيت جميع التبعيات
-3. اختبر على بيئة محلية أولاً
-4. راجع دليل استكشاف الأخطاء أعلاه
+### تحديث الخطوط:
+لتحديث الخطوط العربية، قم بتشغيل:
+```bash
+python setup_fonts.py
+```
+
+### تحديث التبعيات:
+لتحديث التبعيات، قم بتعديل requirements.txt ثم:
+```bash
+pip install -r requirements.txt --upgrade
+```

Dockerfile

@@ -60,13 +60,8 @@ RUN mkdir -p static
 # Copy all remaining files
 COPY . .
 
-# Setup additional Arabic fonts
-RUN if [ -f "arabic_fonts_setup.sh" ]; then \
-        chmod +x arabic_fonts_setup.sh && \
-        ./arabic_fonts_setup.sh; \
-    else \
-        echo "arabic_fonts_setup.sh not found, skipping font setup"; \
-    fi
+# Setup additional Arabic fonts using Python script instead of shell script
+RUN python3 setup_fonts.py || echo "Font setup failed, continuing with default fonts..."
 
 # Pre-initialize LibreOffice to avoid first-run errors
 RUN libreoffice --headless --version || true

setup_fonts.py

@@ -25,6 +25,7 @@ def download_and_extract(url, extract_to):
     """Download a zip file and extract it"""
     try:
         with tempfile.NamedTemporaryFile(suffix='.zip', delete=False) as tmp_file:
+            print(f"Downloading {url}...")
             urllib.request.urlretrieve(url, tmp_file.name)
             
             with zipfile.ZipFile(tmp_file.name, 'r') as zip_ref:
@@ -44,56 +45,93 @@ def setup_arabic_fonts():
     fonts_dir = "/usr/share/fonts/truetype/arabic-enhanced"
     os.makedirs(fonts_dir, exist_ok=True)
     
-    # Download and install Amiri font
+    # Try to download and install Amiri font
     print("📥 Installing Amiri font...")
+    amiri_installed = False
     with tempfile.TemporaryDirectory() as tmp_dir:
-        amiri_url = "https://github.com/aliftype/amiri/releases/download/0.117/Amiri-0.117.zip"
-        if download_and_extract(amiri_url, tmp_dir):
-            amiri_dir = os.path.join(tmp_dir, "Amiri-0.117")
-            if os.path.exists(amiri_dir):
-                for file in os.listdir(amiri_dir):
-                    if file.endswith('.ttf'):
-                        src = os.path.join(amiri_dir, file)
-                        dst = os.path.join(fonts_dir, file)
-                        shutil.copy2(src, dst)
-                        os.chmod(dst, 0o644)
-                print("✅ Amiri font installed successfully")
+        try:
+            amiri_url = "https://github.com/aliftype/amiri/releases/download/0.117/Amiri-0.117.zip"
+            if download_and_extract(amiri_url, tmp_dir):
+                amiri_dir = os.path.join(tmp_dir, "Amiri-0.117")
+                if os.path.exists(amiri_dir):
+                    for file in os.listdir(amiri_dir):
+                        if file.endswith('.ttf'):
+                            src = os.path.join(amiri_dir, file)
+                            dst = os.path.join(fonts_dir, file)
+                            shutil.copy2(src, dst)
+                            os.chmod(dst, 0o644)
+                    print("✅ Amiri font installed successfully")
+                    amiri_installed = True
+                else:
+                    print("❌ Amiri font directory not found")
             else:
-                print("❌ Amiri font directory not found")
-        else:
-            print("❌ Failed to download Amiri font")
+                print("❌ Failed to download Amiri font")
+        except Exception as e:
+            print(f"❌ Error installing Amiri font: {e}")
     
-    # Download and install Scheherazade New font
+    # Try to download and install Scheherazade New font
     print("📥 Installing Scheherazade New font...")
+    scheherazade_installed = False
     with tempfile.TemporaryDirectory() as tmp_dir:
-        scheherazade_url = "https://github.com/silnrsi/font-scheherazade/releases/download/v3.300/ScheherazadeNew-3.300.zip"
-        if download_and_extract(scheherazade_url, tmp_dir):
-            scheherazade_dir = os.path.join(tmp_dir, "ScheherazadeNew-3.300")
-            if os.path.exists(scheherazade_dir):
-                for file in os.listdir(scheherazade_dir):
-                    if file.endswith('.ttf'):
-                        src = os.path.join(scheherazade_dir, file)
-                        dst = os.path.join(fonts_dir, file)
-                        shutil.copy2(src, dst)
-                        os.chmod(dst, 0o644)
-                print("✅ Scheherazade New font installed successfully")
+        try:
+            scheherazade_url = "https://github.com/silnrsi/font-scheherazade/releases/download/v3.300/ScheherazadeNew-3.300.zip"
+            if download_and_extract(scheherazade_url, tmp_dir):
+                scheherazade_dir = os.path.join(tmp_dir, "ScheherazadeNew-3.300")
+                if os.path.exists(scheherazade_dir):
+                    for file in os.listdir(scheherazade_dir):
+                        if file.endswith('.ttf'):
+                            src = os.path.join(scheherazade_dir, file)
+                            dst = os.path.join(fonts_dir, file)
+                            shutil.copy2(src, dst)
+                            os.chmod(dst, 0o644)
+                    print("✅ Scheherazade New font installed successfully")
+                    scheherazade_installed = True
+                else:
+                    print("❌ Scheherazade New font directory not found")
             else:
-                print("❌ Scheherazade New font directory not found")
-        else:
-            print("❌ Failed to download Scheherazade New font")
+                print("❌ Failed to download Scheherazade New font")
+        except Exception as e:
+            print(f"❌ Error installing Scheherazade New font: {e}")
+    
+    # If both fonts failed to install, try to copy local Arial font
+    if not amiri_installed and not scheherazade_installed:
+        print("📥 Copying local Arial font as fallback...")
+        try:
+            if os.path.exists("arial.ttf"):
+                dst = os.path.join(fonts_dir, "arial.ttf")
+                shutil.copy2("arial.ttf", dst)
+                os.chmod(dst, 0o644)
+                print("✅ Arial font copied successfully")
+            else:
+                print("❌ Local Arial font not found")
+        except Exception as e:
+            print(f"❌ Error copying Arial font: {e}")
     
     # Update font cache
     print("🔄 Updating font cache...")
-    run_command("fc-cache -fv")
+    try:
+        run_command("fc-cache -fv")
+        print("✅ Font cache updated successfully")
+    except Exception as e:
+        print(f"❌ Error updating font cache: {e}")
     
     # Verify installation
     print("✅ Verifying Arabic fonts installation...")
-    result = run_command("fc-list | grep -i 'amiri\\|scheherazade\\|noto.*arabic' | head -10")
-    if result:
-        print("Available Arabic fonts:")
-        print(result)
+    try:
+        result = run_command("fc-list | grep -i 'amiri\\|scheherazade\\|noto.*arabic\\|arial' | head -10")
+        if result:
+            print("Available Arabic fonts:")
+            print(result)
+        else:
+            print("No Arabic fonts found in font list")
+    except Exception as e:
+        print(f"❌ Error verifying font installation: {e}")
     
     print("🎯 Arabic fonts setup completed!")
 
 if __name__ == "__main__":
-    setup_arabic_fonts()
+    try:
+        setup_arabic_fonts()
+    except Exception as e:
+        print(f"❌ Font setup failed with error: {e}")
+        print("Continuing with default system fonts...")

test_font_setup.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+"""
+Test script to verify font setup functionality
+"""
+
+import os
+import sys
+import subprocess
+
+def test_font_setup():
+    """Test that font setup works correctly"""
+    print("Testing font setup...")
+    
+    # Test that setup_fonts.py exists
+    if not os.path.exists("setup_fonts.py"):
+        print("❌ setup_fonts.py not found")
+        return False
+    
+    # Test that arial.ttf exists
+    if not os.path.exists("arial.ttf"):
+        print("❌ arial.ttf not found")
+        return False
+    
+    # Test that Dockerfile references setup_fonts.py
+    if os.path.exists("Dockerfile"):
+        with open("Dockerfile", "r", encoding="utf-8") as f:
+            dockerfile_content = f.read()
+            if "setup_fonts.py" not in dockerfile_content:
+                print("❌ Dockerfile does not reference setup_fonts.py")
+                return False
+    else:
+        print("❌ Dockerfile not found")
+        return False
+    
+    # Test that the Python script is executable
+    try:
+        result = subprocess.run(["python3", "setup_fonts.py", "--help"], 
+                              capture_output=True, text=True, timeout=10)
+        # It's okay if it doesn't have a --help flag, we just want to verify it can run
+        print("✅ setup_fonts.py is executable")
+    except subprocess.TimeoutExpired:
+        print("✅ setup_fonts.py is executable (timed out as expected)")
+    except Exception as e:
+        print(f"❌ Error testing setup_fonts.py: {e}")
+        return False
+    
+    print("✅ All font setup tests passed")
+    return True
+
+if __name__ == "__main__":
+    success = test_font_setup()
+    sys.exit(0 if success else 1)