refactor(font-enumeration)!: simplify API

tomcur · Jul 25, 2024 · 72feea2 · 72feea2
1 parent 544678c
commit 72feea2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 36 deletions.
diff --git a/font-enumeration/src/fontconfig.rs b/font-enumeration/src/fontconfig.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use fontconfig::{Fontconfig, ObjectSet, Pattern};
 
-use crate::{Error, OwnedFont, Stretch, Style, Weight};
+use crate::{Error, Font, Stretch, Style, Weight};
 
 impl Stretch {
     fn from_fc(width: i32) -> Self {
@@ -75,7 +75,7 @@ impl Weight {
     }
 }
 
-pub fn all_fonts() -> Result<Box<[OwnedFont]>, Error> {
+pub fn all_fonts() -> Result<Box<[Font]>, Error> {
     let fc = Fontconfig::new().ok_or(Error::SystemCollection)?;
 
     let pattern = Pattern::new(&fc);
@@ -100,7 +100,7 @@ pub fn all_fonts() -> Result<Box<[OwnedFont]>, Error> {
             let weight = font.weight().unwrap_or(fontconfig::FC_WEIGHT_REGULAR);
             let width = font.width().unwrap_or(fontconfig::FC_WIDTH_NORMAL);
 
-            Some(OwnedFont {
+            Some(Font {
                 family_name: family.to_owned(),
                 font_name: name.to_owned(),
                 path: PathBuf::from(path),

diff --git a/font-enumeration/src/lib.rs b/font-enumeration/src/lib.rs
@@ -1,4 +1,4 @@
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 
 use thiserror::Error;
 
@@ -24,7 +24,7 @@ pub enum Error {
 
 pub struct Collection {
     // Using a boxed slice rather than Vec saves [Collection] from having to store a capacity
-    all_fonts: Box<[OwnedFont]>,
+    all_fonts: Box<[Font]>,
 }
 
 impl Collection {
@@ -34,26 +34,19 @@ impl Collection {
         Ok(Self { all_fonts })
     }
 
-    pub fn all<'c>(&'c self) -> impl Iterator<Item = Font<'c>> {
-        self.all_fonts.iter().map(move |font| Font {
-            family_name: &font.family_name,
-            font_name: &font.font_name,
-            path: &font.path,
-            style: font.style,
-            weight: font.weight,
-            stretch: font.stretch,
-        })
+    pub fn all(&self) -> impl Iterator<Item = &'_ Font> {
+        self.all_fonts.iter()
     }
 
-    pub fn by_family<'c, 'f>(&'c self, family_name: &'f str) -> impl Iterator<Item = Font<'c>> + 'f
+    pub fn by_family<'c, 'f>(&'c self, family_name: &'f str) -> impl Iterator<Item = &'c Font> + 'f
     where
         'c: 'f,
     {
         self.all()
-            .filter(|font| utils::case_insensitive_match(font.family_name, family_name))
+            .filter(|font| utils::case_insensitive_match(&font.family_name, family_name))
     }
 
-    pub fn take(self) -> Vec<OwnedFont> {
+    pub fn take(self) -> Vec<Font> {
         self.all_fonts.into_vec()
     }
 }
@@ -163,24 +156,14 @@ impl Stretch {
     }
 }
 
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Font<'c> {
-    pub family_name: &'c str,
-    pub font_name: &'c str,
-    pub path: &'c Path,
-    style: Style,
-    weight: Weight,
-    stretch: Stretch,
-}
-
 #[derive(Clone, Debug, PartialEq)]
-pub struct OwnedFont {
-    family_name: String,
-    font_name: String,
-    path: PathBuf,
-    style: Style,
-    weight: Weight,
-    stretch: Stretch,
+pub struct Font {
+    pub family_name: String,
+    pub font_name: String,
+    pub path: PathBuf,
+    pub style: Style,
+    pub weight: Weight,
+    pub stretch: Stretch,
 }
 
 #[cfg(test)]

diff --git a/src/main.rs b/src/main.rs
@@ -375,8 +375,8 @@ fn main_(cli: Cli, mut out: impl Out) -> anyhow::Result<()> {
 
             let mut font_files: Vec<&'_ Path> = Vec::new();
             for font in font_collection.by_family(&family_name) {
-                if !font_files.contains(&font.path) {
-                    font_files.push(font.path);
+                if !font_files.contains(&font.path.as_ref()) {
+                    font_files.push(font.path.as_ref());
                 }
             }