fontist 3.0.24 → 3.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 954fe79bde0fb84cf7b2fcc96b686820a7c2f4fd6ec822abd4067b1c0d8c288e
-  data.tar.gz: ac7eb9f594dd5a9be155e2893c4a07bad197743e107a92f16786b45f47000224
+  metadata.gz: 215b46de2d4feadfbd1d3644dd060cc5afdd54afd30ba1f6a50e428c5c2be4ef
+  data.tar.gz: 7eea12f0743488fbfbd4c5d924a2bfce06de918aaa9cf4bbc24b92fbe02d937f
 SHA512:
-  metadata.gz: 9616ce9f46708c5acb1dc4643688f8ab0a43eeb5eafc7ee8259e9d5a110e415c738514cc00739d937b41d05d1b64868256419f3303d32159aeb41f462f260207
-  data.tar.gz: ba15c400a1fed88380cd28f8669c7272e6d52cf0dcf4df09f42166cc0b95cf55db36dcf5456bd3704981550308e087b2074f3aaaa9419567e75733ff96099bbf
+  metadata.gz: 93ddd5d5863d137e0ed95f9e8829b2bb84797b7887f8d9a122f8259f920bde832f3d810b1057539504b1f7b584ba7e4d245726943cdcdc1a874c9656c52b125c
+  data.tar.gz: 2af73abb7b5d07aa4a5699aa309fbeec7e8053b7944f902a26a7e70804e3ff71c511dda0e0bb68e4e1e7e5f2e841e265eb08c06095de5f8390dd82e312190b79

data/lib/fontist/font_path.rb

@@ -14,7 +14,7 @@ module Fontist
 
     def formulas
       @formulas ||= if fontist_font?
-                      Indexes::FilenameIndex.from_file.load_index_formulas(File.basename(@path)).flat_map(&:name)
+                      Indexes::FilenameIndex.lookup_index.load_index_formulas(File.basename(@path)).flat_map(&:name)
                     else
                       []
                     end

data/lib/fontist/formula.rb

@@ -122,15 +122,15 @@ module Fontist
       end
 
       def find(font_name)
-        Indexes::FontIndex.from_file.load_formulas(font_name).first
+        Indexes::FontIndex.lookup_index.load_formulas(font_name).first
       end
 
       def find_many(font_name)
-        Indexes::FontIndex.from_file.load_formulas(font_name)
+        Indexes::FontIndex.lookup_index.load_formulas(font_name)
       end
 
       def find_fonts(font_name)
-        formulas = Indexes::FontIndex.from_file.load_formulas(font_name)
+        formulas = Indexes::FontIndex.lookup_index.load_formulas(font_name)
 
         formulas.map do |formula|
           formula.all_fonts.select do |f|
@@ -140,7 +140,7 @@ module Fontist
       end
 
       def find_styles(font_name, style_name)
-        formulas = Indexes::FontIndex.from_file.load_formulas(font_name)
+        formulas = Indexes::FontIndex.lookup_index.load_formulas(font_name)
 
         formulas.map do |formula|
           formula.all_fonts.map do |f|
@@ -173,7 +173,7 @@ module Fontist
       end
 
       def find_by_font_file(font_file)
-        key = Indexes::FilenameIndex.from_file
+        key = Indexes::FilenameIndex.lookup_index
           .load_index_formulas(File.basename(font_file))
           .flat_map(&:name)
           .first

data/lib/fontist/indexes/font_index.rb

@@ -8,6 +8,14 @@ module Fontist
           DefaultFamilyFontIndex.from_file
         end
       end
+
+      def self.lookup_index
+        if Fontist.preferred_family?
+          PreferredFamilyFontIndex.lookup_index
+        else
+          DefaultFamilyFontIndex.lookup_index
+        end
+      end
     end
   end
 end

data/lib/fontist/indexes/index_mixin.rb

@@ -1,5 +1,9 @@
+require "json"
+
 module Fontist
   module Indexes
+    autoload :LookupIndex, "#{__dir__}/lookup_index"
+
     # IndexMixin provides common functionality for font index classes.
     #
     # == Performance Optimization (Tech Debt)
@@ -72,9 +76,38 @@ module Fontist
           # to force a fresh parse on next access
           Fontist::FromFileCache.clear
 
-          # Delete the index file to force rebuild on next access
-          # This is important for tests to ensure clean state
+          # Delete the index file and its lookup sidecar to force a
+          # rebuild on next access. This is important for tests to
+          # ensure clean state
           FileUtils.rm_f(path)
+          FileUtils.rm_f("#{path}.json")
+        end
+
+        # Read-only lookups over the sidecar JSON beside the index
+        # file, which skips binding every entry into model objects. The
+        # sidecar is (re)written whenever the index file is written,
+        # and regenerated here when it is missing or stale.
+        def lookup_index
+          entries_hash = sidecar_entries || rebuild_sidecar_entries
+          normalizer = new.method(:normalize_key)
+          LookupIndex.new(entries_hash, normalizer: normalizer)
+        end
+
+        def sidecar_entries
+          sidecar_path = "#{path}.json"
+          return unless File.exist?(sidecar_path)
+          return if File.exist?(path) &&
+            File.mtime(sidecar_path) < File.mtime(path)
+
+          JSON.parse(File.read(sidecar_path))["entries"]
+        rescue JSON::ParserError, TypeError
+          nil
+        end
+
+        def rebuild_sidecar_entries
+          entries_hash = from_file(path).entries_hash
+          File.write("#{path}.json", JSON.dump("entries" => entries_hash))
+          entries_hash
         end
       end
 
@@ -158,6 +191,19 @@ module Fontist
 
         FileUtils.mkdir_p(File.dirname(file_path))
         File.write(file_path, to_yaml)
+        write_lookup_sidecar(file_path)
+      end
+
+      def write_lookup_sidecar(file_path)
+        File.write("#{file_path}.json",
+                   JSON.dump("entries" => entries_hash))
+      end
+
+      # key -> formula paths, in the sidecar's JSON-friendly shape
+      def entries_hash
+        Array(entries).to_h do |entry|
+          [normalize_key(entry.key), entry.formula_path]
+        end
       end
 
       private

data/lib/fontist/indexes/lookup_index.rb

@@ -0,0 +1,34 @@
+module Fontist
+  module Indexes
+    # Read-only lookups over the JSON sidecar written beside an index
+    # file. Binding every index entry into model objects dominates the
+    # cost of loading an index; the sidecar holds the key-to-path map
+    # as plain data, and FormulaKeyToPath entries are materialized only
+    # for the requested key.
+    class LookupIndex
+      def initialize(entries_hash, normalizer:)
+        @entries_hash = entries_hash
+        @normalizer = normalizer
+      end
+
+      def load_index_formulas(key)
+        [
+          FormulaKeyToPath.new(
+            key: key,
+            formula_path: paths_for(@normalizer.call(key)),
+          ),
+        ]
+      end
+
+      def load_formulas(key)
+        load_index_formulas(key).flat_map(&:to_full)
+      end
+
+      private
+
+      def paths_for(normalized_key)
+        @entries_hash[normalized_key] || []
+      end
+    end
+  end
+end

data/lib/fontist/system_index.rb

@@ -140,6 +140,33 @@ module Fontist
     end
   end
 
+  # Scan metadata for a system index collection, persisted in a
+  # companion file beside the index (an index file is a flat entry
+  # list and cannot carry scalars). Restoring it across processes is
+  # what makes the 30-minute scan threshold and the directory-mtime
+  # change check work at all.
+  class SystemIndexMetadata < Lutaml::Model::Serializable
+    attribute :last_scan_time, :integer, default: -> { 0 }
+    attribute :directory_mtimes, :string, collection: true, default: -> { [] }
+
+    key_value do
+      map "last_scan_time", to: :last_scan_time
+      map "directory_mtimes", to: :directory_mtimes
+    end
+
+    def self.load(path)
+      return new unless File.exist?(path)
+
+      from_yaml(File.read(path))
+    rescue Lutaml::Model::Error, Psych::SyntaxError, TypeError
+      new
+    end
+
+    def save(path)
+      File.write(path, to_yaml)
+    end
+  end
+
   class SystemIndexFontCollection < Lutaml::Model::Collection
     include Utils::Locking
 
@@ -151,14 +178,40 @@ module Fontist
     attribute :directory_mtimes, :string, collection: true, default: -> { [] }
 
     key_value do
+      # A bare entry list: the scan metadata lives in a companion
+      # metadata file (see SystemIndexMetadata), because a flat list
+      # cannot carry scalars and lutaml ignores scalar maps declared
+      # alongside map_instances
       map_instances to: :fonts
-      map "last_scan_time", to: :last_scan_time
-      map "directory_mtimes", to: :directory_mtimes
     end
 
     # Don't rebuild index more frequently than this (in seconds)
     INDEX_REBUILD_THRESHOLD = 30 * 60 # 30 minutes
 
+    def metadata_path
+      "#{@path}.metadata.yml"
+    end
+
+    def persist_metadata
+      return unless @path
+
+      SystemIndexMetadata
+        .new(last_scan_time: last_scan_time,
+             directory_mtimes: directory_mtimes)
+        .save(metadata_path)
+    end
+
+    def restore_metadata
+      return unless @path
+      return unless last_scan_time.to_i.zero?
+
+      meta = SystemIndexMetadata.load(metadata_path)
+      return unless meta.last_scan_time.to_i.positive?
+
+      self.last_scan_time = meta.last_scan_time
+      self.directory_mtimes = meta.directory_mtimes
+    end
+
     def set_path(path)
       @path = path
     end
@@ -172,12 +225,17 @@ module Fontist
       return new.set_content(path, paths_loader) unless File.exist?(path)
 
       from_yaml(File.read(path)).set_content(path, paths_loader)
+    rescue Lutaml::Model::Error, Psych::SyntaxError, TypeError
+      # Corrupt or unreadable index files degrade to an empty
+      # collection; the next rebuild rewrites them
+      new.set_content(path, paths_loader)
     end
 
     def set_content(path, paths_loader)
       tap do |content|
         content.set_path(path)
         content.set_path_loader(paths_loader)
+        content.restore_metadata
       end
     end
 
@@ -351,7 +409,8 @@ module Fontist
 
     def build(forced: false, verbose: false, stats: nil)
       if forced
-        return rebuild_with_lock(verbose: verbose, stats: stats)
+        return rebuild_with_lock(verbose: verbose, stats: stats,
+                                 honor_recent: false)
       end
 
       previous_index = load_index
@@ -372,14 +431,18 @@ module Fontist
 
     private
 
-    def rebuild_with_lock(verbose: false, stats: nil)
+    def rebuild_with_lock(verbose: false, stats: nil, honor_recent: true)
       # Use file locking to prevent concurrent rebuilds across processes
       lock_path = index_lock_path
       start_time = Time.now
 
       lock(lock_path) do
-        # Re-check if another process already rebuilt while we waited for lock
-        if File.exist?(@path)
+        # Re-check if another process already rebuilt while we waited
+        # for lock. Forced rebuilds (add_font, explicit rebuild) carry
+        # write intent and must always rescan: honoring the recent
+        # rebuild here served the pre-write index and silently dropped
+        # the font that triggered the rebuild
+        if honor_recent && File.exist?(@path)
           existing = self.class.from_file(path: @path,
                                           paths_loader: @paths_loader)
 
@@ -407,6 +470,7 @@ module Fontist
         self.last_scan_time = Time.now.to_i
         self.directory_mtimes = scan_directory_mtimes.map { |k, v| "#{k}:#{v}" }
         to_file(@path)
+        persist_metadata
 
         # Show completion message for large collections
         elapsed = Time.now - start_time
@@ -505,6 +569,7 @@ module Fontist
 
       # Save to file
       to_file(@path)
+      persist_metadata
     end
 
     def detect_paths(paths, verbose: false, stats: nil)

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "3.0.24".freeze
+  VERSION = "3.0.26".freeze
 end

data/lib/fontist.rb

@@ -25,6 +25,7 @@ module Fontist
   autoload :FontPath, "#{__dir__}/fontist/font_path"
   autoload :FontStyle, "#{__dir__}/fontist/font_style"
   autoload :Fontconfig, "#{__dir__}/fontist/fontconfig"
+  autoload :FormatSpec, "#{__dir__}/fontist/format_spec"
   autoload :Formula, "#{__dir__}/fontist/formula"
   autoload :FormulaCollection, "#{__dir__}/fontist/formula"
   autoload :FormulaPicker, "#{__dir__}/fontist/formula_picker"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.24
+  version: 3.0.26
 platform: ruby
 authors:
 - Ribose Inc.
@@ -452,6 +452,7 @@ files:
 - lib/fontist/indexes/incremental_index_updater.rb
 - lib/fontist/indexes/incremental_scanner.rb
 - lib/fontist/indexes/index_mixin.rb
+- lib/fontist/indexes/lookup_index.rb
 - lib/fontist/indexes/preferred_family_font_index.rb
 - lib/fontist/indexes/system_index.rb
 - lib/fontist/indexes/user_index.rb