fontist 3.0.25 → 3.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e161f1ace760cebffefd73f61835fef3abb2875972836c3ad7e82324a465d11
-  data.tar.gz: 85f425e3a050b0e9674e32b413d750bde0d40e4e34f3c261c6138dadc571e0a5
+  metadata.gz: 215b46de2d4feadfbd1d3644dd060cc5afdd54afd30ba1f6a50e428c5c2be4ef
+  data.tar.gz: 7eea12f0743488fbfbd4c5d924a2bfce06de918aaa9cf4bbc24b92fbe02d937f
 SHA512:
-  metadata.gz: 282670c9e6c9ebc53dedbaa927e80259a489f44bc33392d388c977ad909209b721b354b7922a2190f0e7554221a63ca3c15a234a55b100e27bdce92cca1e496e
-  data.tar.gz: 46ca6895943eefe3a7dce37a6e4cf08241530b6dfacc9fef5233f259ea091ab9d94aac2d4bdd903cc468948d3783a6ceff66219fd04f3514576f88a4a62048ef
+  metadata.gz: 93ddd5d5863d137e0ed95f9e8829b2bb84797b7887f8d9a122f8259f920bde832f3d810b1057539504b1f7b584ba7e4d245726943cdcdc1a874c9656c52b125c
+  data.tar.gz: 2af73abb7b5d07aa4a5699aa309fbeec7e8053b7944f902a26a7e70804e3ff71c511dda0e0bb68e4e1e7e5f2e841e265eb08c06095de5f8390dd82e312190b79

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.25".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.25
+  version: 3.0.26
 platform: ruby
 authors:
 - Ribose Inc.