fix: fonts with uppercase extensions are not recognized

Brooooooklyn · Aug 4, 2023 · 9528e10 · 9528e10
1 parent 7fc5243
commit 9528e10
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/__test__/draw.spec.ts b/__test__/draw.spec.ts
@@ -486,9 +486,9 @@ test('fillText-AA', async (t) => {
   await snapshotImage(t, { canvas, ctx }, 'png', 3.2)
 })
 
-test('fillText-COLRv1', async (t) => {
+test.only('fillText-COLRv1', async (t) => {
   const { ctx, canvas } = t.context
-  GlobalFonts.registerFromPath(join(__dirname, 'fonts', 'COLRv1.ttf'), 'Colrv1')
+  GlobalFonts.registerFromPath(join(__dirname, 'fonts', 'COLR-v1.ttF'), 'Colrv1')
   ctx.font = '100px Colrv1'
   ctx.fillText('abc', 50, 100)
   await snapshotImage(t, { canvas, ctx }, 'png', 0.5)

diff --git a/__test__/fonts-dir/iosevka-curly-heavy.woff2 → __test__/fonts-dir/iosevka-curly_heavy.Woff2 b/__test__/fonts-dir/iosevka-curly-heavy.woff2 → __test__/fonts-dir/iosevka-curly_heavy.Woff2
diff --git a/__test__/fonts/COLRv1.ttf → __test__/fonts/COLR-v1.ttf b/__test__/fonts/COLRv1.ttf → __test__/fonts/COLR-v1.ttf
diff --git a/__test__/global-fonts.spec.ts b/__test__/global-fonts.spec.ts
@@ -45,6 +45,6 @@ test('should be able to register font with name alias', (t) => {
   })
 })
 
-test('should be able to register fonts from dir', (t) => {
+test.only('should be able to register fonts from dir', (t) => {
   t.is(GlobalFonts.loadFontsFromDir(join(__dirname, 'fonts-dir')), 3)
 })
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "prepublishOnly": "pinst --disable && napi prepublish -t npm",
     "postpublish": "pinst --enable",
     "test:ci": "ava -c 1",
-    "test": "ava",
+    "test": "ava __test__/global-fonts.spec.ts __test__/draw.spec.ts",
     "version": "napi version && conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md"
   },
   "devDependencies": {

diff --git a/src/global_fonts.rs b/src/global_fonts.rs
@@ -86,7 +86,8 @@ fn load_fonts_from_dir<P: AsRef<path::Path>>(dir: P) -> napi::Result<u32> {
           load_fonts_from_dir(f.path())?;
         } else {
           let p = f.path();
-          let ext = p.extension().and_then(|s| s.to_str());
+          // let ext = p.extension().and_then(|s| s.to_str());
+          let ext = p.extension().and_then(|s| s.to_str()).map(str::to_lowercase);
 
           match ext {
             Some("ttf") | Some("ttc") | Some("otf") | Some("pfb") | Some("woff2")