Fix the reading of incorrect font files

Author: ChugunovRoman

index.mjs

@@ -1,6 +1,7 @@
 import addon from './native/index.node';
 
 let dirs = [
+    `${process.env.HOME}/.local/share/bad_fonts`,
     `${process.env.HOME}/.local/share/fonts`,
     '/usr/share/fonts'
 ];

native/Cargo.lock

@@ -24,4 +24,4 @@ neon-build = "0.3.3"
 
 [dependencies]
 neon = "0.3.3"
-libfonthelper = "0.1.4"
+libfonthelper = "0.2.4"

native/Cargo.toml

@@ -1,53 +1,73 @@
 extern crate libfonthelper;
 
-use libfonthelper::{get_fonts, types::FontMap};
+use libfonthelper::{font::Font, Fonts};
 use neon::{prelude::*, task::Task};
 
 struct Worker {
     dirs: Vec<String>,
 }
 
 impl Task for Worker {
-    type Output = FontMap;
+    type Output = Vec<Font>;
     type Error = String;
     type JsEvent = JsObject;
 
-    fn perform(&self) -> Result<FontMap, String> {
-        match get_fonts(&self.dirs) {
+    fn perform(&self) -> Result<Vec<Font>, String> {
+        match Fonts::new(&self.dirs) {
             Err(err) => return Err(String::from(err.to_string())),
-            Ok(fonts) => return Ok(fonts),
+            Ok(fonts) => {
+                let mut map: Vec<Font> = Vec::new();
+                for font in fonts {
+                    map.push(font);
+                }
+
+                return Ok(map);
+            }
         };
     }
 
-    fn complete(self, mut cx: TaskContext, result: Result<FontMap, String>) -> JsResult<JsObject> {
+    fn complete(
+        self,
+        mut cx: TaskContext,
+        result: Result<Vec<Font>, String>,
+    ) -> JsResult<JsObject> {
         let js_fonts = JsObject::new(&mut cx);
 
-        for (path, font) in result.unwrap() {
-            let js_font_entries = JsArray::new(&mut cx, font.len() as u32);
-
-            for (index, entry) in font.iter().enumerate() {
-                let js_font_entry = JsObject::new(&mut cx);
-
-                let id = cx.string(&entry.id);
-                let postscript = cx.string(&entry.postscript);
-                let family = cx.string(&entry.family);
-                let style = cx.string(&entry.style);
-                let weight = cx.number(i32::from(entry.weight));
-                let stretch = cx.number(i32::from(entry.stretch));
-                let italic = cx.boolean(entry.italic);
-
-                js_font_entry.set(&mut cx, "id", id)?;
-                js_font_entry.set(&mut cx, "postscript", postscript)?;
-                js_font_entry.set(&mut cx, "family", family)?;
-                js_font_entry.set(&mut cx, "style", style)?;
-                js_font_entry.set(&mut cx, "weight", weight)?;
-                js_font_entry.set(&mut cx, "stretch", stretch)?;
-                js_font_entry.set(&mut cx, "italic", italic)?;
-
-                js_font_entries.set(&mut cx, index.to_string().as_str(), js_font_entry)?;
+        match result {
+            Err(err) => println!("Cannot get fonts, error: {}", err),
+            Ok(fonts) => {
+                for font in fonts {
+                    if (font.path.eq("")) {
+                        continue;
+                    }
+
+                    let js_font_entries = JsArray::new(&mut cx, font.entries.len() as u32);
+
+                    for (index, entry) in font.entries.iter().enumerate() {
+                        let js_font_entry = JsObject::new(&mut cx);
+
+                        let id = cx.string(&entry.id);
+                        let postscript = cx.string(&entry.postscript);
+                        let family = cx.string(&entry.family);
+                        let style = cx.string(&entry.style);
+                        let weight = cx.number(i32::from(entry.weight));
+                        let stretch = cx.number(i32::from(entry.stretch));
+                        let italic = cx.boolean(entry.italic);
+
+                        js_font_entry.set(&mut cx, "id", id)?;
+                        js_font_entry.set(&mut cx, "postscript", postscript)?;
+                        js_font_entry.set(&mut cx, "family", family)?;
+                        js_font_entry.set(&mut cx, "style", style)?;
+                        js_font_entry.set(&mut cx, "weight", weight)?;
+                        js_font_entry.set(&mut cx, "stretch", stretch)?;
+                        js_font_entry.set(&mut cx, "italic", italic)?;
+
+                        js_font_entries.set(&mut cx, index.to_string().as_str(), js_font_entry)?;
+                    }
+
+                    js_fonts.set(&mut cx, font.path.as_str(), js_font_entries)?;
+                }
             }
-
-            js_fonts.set(&mut cx, path.as_str(), js_font_entries)?;
         }
 
         Ok(js_fonts)

native/src/async_font.rs

@@ -1,6 +1,6 @@
 {
   "name": "figma-linux-rust-binding",
-  "version": "0.1.1",
+  "version": "0.1.4",
   "description": "Rust module that makes object of meta data of fonts",
   "main": "native/index.node",
   "author": "ChugunovRoman <Zebs-BMK@yandex.ru>",
@@ -25,12 +25,16 @@
   "dependencies": {
     "neon-cli": "^0.3.3"
   },
+  "devDependencies": {
+    "electron-build-env": "^0.2",
+    "neon-cli": "^0.3.3"
+  },
   "types": "index.d.ts",
   "deprecated": false,
   "scripts": {
-    "install": "neon build --release",
+    "install": "electron-build-env neon build --release",
     "start": "node --experimental-modules ./index.mjs",
-    "build": "neon build",
-    "release": "neon build --release"
+    "build": "electron-build-env neon build",
+    "release": "electron-build-env neon build --release"
   }
 }