Update app.py

app.py

@@ -77,6 +77,14 @@ def create_zip(svg_files):
 # ------------------------
 # UFO / FONTMAKE
 # ------------------------
+def validate_svg_path(path_data):
+    try:
+        parse_path(path_data)
+        return True
+    except Exception as e:
+        print(f"Invalid SVG path: {e}")
+        return False
+
 def build_ufo_from_glyphs(glyphs):
     font = Font()
     font.info.familyName = "TipTopType"
@@ -88,28 +96,25 @@ def build_ufo_from_glyphs(glyphs):
     font.info.descender = -200
     font.info.capHeight = 700
     font.info.xHeight = 500
-
     for letter, path_data in glyphs:
+        if not validate_svg_path(path_data):
+            print(f"Skipping glyph {letter} due to invalid SVG path.")
+            continue
         glyph = Glyph()
         glyph.name = letter
         glyph.unicode = ord(letter)
         pen = glyph.getPen()
-
         try:
             # Analyser le chemin SVG
             path = parse_path(path_data)
-
             # Créer un nouveau chemin SVG pour normaliser et simplifier
             normalized_path = SvgPath()
-
             for segment in path:
                 if segment.length() == 0:
                     continue
-
                 # Commencer un nouveau sous-chemin
                 if not normalized_path or not normalized_path[-1].end == segment.start:
                     normalized_path.append(Line(start=segment.start, end=segment.start))
-
                 # Ajouter le segment au chemin normalisé
                 if isinstance(segment, Line):
                     normalized_path.append(Line(start=normalized_path[-1].end, end=segment.end))
@@ -138,7 +143,6 @@ def build_ufo_from_glyphs(glyphs):
                     # Convertir l'arc en une série de courbes cubiques
                     # Pour simplifier, nous allons approximer l'arc avec une ligne droite
                     normalized_path.append(Line(start=normalized_path[-1].end, end=segment.end))
-
             # Dessiner le chemin normalisé dans le glyphe
             if normalized_path:
                 # Calculer les limites du chemin pour centrer et mettre à l'échelle
@@ -147,13 +151,11 @@ def build_ufo_from_glyphs(glyphs):
                     # Définir la largeur du glyphe (par exemple, 80% de 1000 unités)
                     glyph_width = 800
                     glyph_height = 1000  # unités par em
-
                     # Calculer le facteur d'échelle pour que le glyphe tienne dans la hauteur
                     scale_factor = glyph_height * 0.8 / bounds.height
                     # Calculer le décalage pour centrer le glyphe horizontalement
                     offset_x = (glyph_width - bounds.width * scale_factor) / 2
                     offset_y = -bounds.bottom * scale_factor  # décalage pour positionner la base sur la ligne de base
-
                     # Appliquer la transformation aux points du chemin
                     for segment in normalized_path:
                         # Appliquer la transformation aux points du segment
@@ -164,11 +166,9 @@ def build_ufo_from_glyphs(glyphs):
                             new_x = x * scale_factor + offset_x
                             new_y = y * scale_factor + offset_y
                             return (new_x, -new_y)  # Inverser Y car les systèmes de coordonnées sont différents
-
                         start_point = transform_point(segment.start)
                         if len(normalized_path) == 1 or segment == normalized_path[0]:
                             pen.moveTo(start_point)
-
                         if isinstance(segment, Line):
                             end_point = transform_point(segment.end)
                             pen.lineTo(end_point)
@@ -177,11 +177,9 @@ def build_ufo_from_glyphs(glyphs):
                             control2 = transform_point(segment.control2)
                             end_point = transform_point(segment.end)
                             pen.curveTo(control1, control2, end_point)
-
                     # Fermer le chemin si nécessaire
                     if normalized_path.isclosed():
                         pen.closePath()
-
             # Définir la largeur du glyphe
             glyph.width = glyph_width
             print(f"Glyph {letter} created with SVG path.")
@@ -202,30 +200,36 @@ def save_otf_font(glyphs, font_name="TipTopType-Regular.otf"):
     if not glyphs:
         print("No glyphs provided to generate OTF font.")
         return None
-    with tempfile.TemporaryDirectory() as tmpdir:
-        ufo_path = os.path.join(tmpdir, "font.ufo")
-        font = build_ufo_from_glyphs(glyphs)
-        font.save(ufo_path)
-        print(f"UFO file saved at: {ufo_path}")
-        output_dir = os.path.join(tmpdir, "out")
-        os.makedirs(output_dir, exist_ok=True)
-        project = FontProject()
-        try:
+    try:
+        with tempfile.TemporaryDirectory() as tmpdir:
+            ufo_path = os.path.join(tmpdir, "font.ufo")
+            font = build_ufo_from_glyphs(glyphs)
+            font.save(ufo_path)
+            print(f"UFO file saved at: {ufo_path}")
+
+            output_dir = os.path.join(tmpdir, "out")
+            os.makedirs(output_dir, exist_ok=True)
+
+            project = FontProject()
             project.run_from_ufos([ufo_path], output=["otf"], output_dir=output_dir)
             print("Fontmake ran successfully.")
-        except Exception as e:
-            print(f"Error running fontmake: {e}")
-            return None
-        otf_files = glob.glob(os.path.join(output_dir, "**/*.otf"), recursive=True)
-        if not otf_files:
-            print("No OTF files generated by fontmake.")
-            return None
-        generated_path = otf_files[0]
-        print(f"OTF file generated at: {generated_path}")
-        final_path = os.path.join(tempfile.gettempdir(), font_name)
-        os.replace(generated_path, final_path)
-        print(f"OTF file moved to: {final_path}")
-        return final_path
+
+            otf_files = glob.glob(os.path.join(output_dir, "**/*.otf"), recursive=True)
+            if not otf_files:
+                print("No OTF files generated by fontmake.")
+                return None
+
+            generated_path = otf_files[0]
+            print(f"OTF file generated at: {generated_path}")
+
+            final_path = os.path.join(tempfile.gettempdir(), font_name)
+            os.replace(generated_path, final_path)
+            print(f"OTF file moved to: {final_path}")
+
+            return final_path
+    except Exception as e:
+        print(f"Error in save_otf_font: {e}")
+        return None
 
 # ------------------------
 # GENERATION