fontist 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4832b87f5d5535536b6f2f2e2761bf8ff8dbd82770703f93e201e2c7e81f496d
-  data.tar.gz: 32e720d4a33cb78a88bcdd8bf3b80bc24abec544d3dd755a459ae2a1a4a78d6b
+  metadata.gz: e024a76941056e06491654749b2a467dd1df4212752a3a98e8a9ee58755af281
+  data.tar.gz: d7caaade9c91008f4e0b91b157847d2de4dd26203d88c3558583549fec3bdb5a
 SHA512:
-  metadata.gz: 6567b976d958bc852244e5080753eb1fc2e44f8231fe08f3cded4076d510c553565160cf83c108e2e6c309cce042393acf7e19ab34e5a851f4c879a7f9c642ae
-  data.tar.gz: 2bab58316fdc830954b93daa716deaac90912ee4906510fad27efba2c0323af8cdb9bade71d5a5f257461063576863b44e1bfc0b72f7cdde1839689acb497f95
+  metadata.gz: 8d68a69167a89f6aa143f972da95f5bb06d2831e7e243d6c3ef338d47cc924b5b59c9f0404fad95dbd09b5ed870a555fae6a22e043a7a2eaa564b89036ddebfc
+  data.tar.gz: 3497ef80333b61a6a3df80f2493b3442779de017965cffbcffa13fbeb11a056de4f4741121100c8c7b34bd118e8af1aa1deaccad92423d8b68aa4b3b33c05c5a

data/fontist.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "ruby-ole", "~> 1.0"
   spec.add_runtime_dependency "thor", "~> 1.0.1"
   spec.add_runtime_dependency "git", "~> 1.0"
+  spec.add_runtime_dependency "ttfunk", "~> 1.0"
 
   spec.add_development_dependency "extract_ttc", "~> 0.1"
   spec.add_development_dependency "pry"

data/lib/fontist.rb

@@ -55,4 +55,8 @@ module Fontist
   def self.system_file_path
     Fontist.lib_path.join("fontist", "system.yml")
   end
+
+  def self.system_index_path
+    Fontist.fontist_path.join("system_index.yml")
+  end
 end

data/lib/fontist/formula.rb

@@ -19,8 +19,8 @@ module Fontist
       new(font_name: name).find_fonts
     end
 
-    def self.find_styles_with_fonts(font, style)
-      new(font_name: font, style_name: style).find_styles_with_fonts
+    def self.find_styles(font, style)
+      new(font_name: font, style_name: style).find_styles
     end
 
     def all
@@ -37,16 +37,12 @@ module Fontist
       fonts.empty? ? nil : fonts
     end
 
-    def find_styles_with_fonts
+    def find_styles
       formulas.values.flat_map do |formula|
         formula.fonts.flat_map do |f|
-          selected = f.styles.select do |s|
+          f.styles.select do |s|
             f.name.casecmp?(font_name) && s.type.casecmp?(style_name)
           end
-
-          selected.map do |s|
-            { font: f, style: s }
-          end
         end
       end
     end

data/lib/fontist/manifest/locations.rb

@@ -53,7 +53,7 @@ module Fontist
       end
 
       def file_paths(font, style)
-        Fontist::SystemFont.find_with_style(font, style).transform_keys(&:to_s)
+        Fontist::SystemFont.find_with_name(font, style).transform_keys(&:to_s)
       end
     end
   end

data/lib/fontist/system_font.rb

@@ -1,3 +1,5 @@
+require_relative "system_index"
+
 module Fontist
   class SystemFont
     def initialize(font:, style: nil, sources: nil)
@@ -10,8 +12,8 @@ module Fontist
       new(font: font, sources: sources).find
     end
 
-    def self.find_with_style(font, style)
-      new(font: font, style: style).find_with_style
+    def self.find_with_name(font, style)
+      new(font: font, style: style).find_with_name
     end
 
     def find
@@ -21,11 +23,12 @@ module Fontist
       paths.empty? ? nil : paths
     end
 
-    def find_with_style
-      styles = Formula.find_styles_with_fonts(font, style)
+    def find_with_name
+      styles = find_styles
+      return { full_name: nil, paths: [] } unless styles
 
-      { full_name: style_full_name(styles),
-        paths: style_paths(styles) }
+      { full_name: styles.first[:full_name],
+        paths: styles.map { |x| x[:path] } }
     end
 
     private
@@ -95,24 +98,37 @@ module Fontist
       @default_sources ||= YAML.load(system_path_file)["system"][user_os.to_s]
     end
 
-    def style_full_name(styles)
-      return if styles.empty?
+    def find_styles
+      find_by_index || find_by_formulas
+    end
 
-      s = styles.first
-      s[:style]["full_name"] || s[:font]["name"]
+    def find_by_index
+      SystemIndex.new(font_paths).find(font, style)
     end
 
-    def style_paths(styles)
-      filenames = styles.map { |x| x[:style]["font"] }
-      paths = lookup_using_filenames(filenames)
-      return paths unless paths.empty?
+    def find_by_formulas
+      styles = find_styles_by_formulas(font, style)
+      return if styles.empty?
 
-      grep_font_paths(font, style)
+      fonts = styles.uniq { |s| s["font"] }.flat_map do |s|
+        paths = search_font_paths(s["font"])
+        paths.map do |path|
+          { full_name: s["full_name"],
+            path: path }
+        end
+      end
+
+      fonts.empty? ? nil : fonts
     end
 
-    def lookup_using_filenames(filenames)
-      filenames.flat_map do |filename|
-        search_font_paths(filename)
+    def find_styles_by_formulas(font, style)
+      if style
+        Formula.find_styles(font, style)
+      else
+        fonts = Formula.find_fonts(font)
+        return [] unless fonts
+
+        fonts.flat_map(&:styles)
       end
     end
 

data/lib/fontist/system_index.rb

@@ -0,0 +1,92 @@
+require "ttfunk"
+
+module Fontist
+  class SystemIndex
+    attr_reader :font_paths
+
+    def initialize(font_paths)
+      @font_paths = font_paths
+    end
+
+    def find(font, style)
+      fonts = system_index.select do |file|
+        file[:family_name].casecmp?(font) &&
+          (style.nil? || file[:type].casecmp?(style))
+      end
+
+      fonts.empty? ? nil : fonts
+    end
+
+    private
+
+    def system_index
+      @system_index ||= build_system_index
+    end
+
+    def build_system_index
+      previous_index = load_system_index
+      updated_index = detect_paths(font_paths, previous_index)
+      updated_index.tap do |index|
+        save_index(index)
+      end
+    end
+
+    def load_system_index
+      index = File.exist?(Fontist.system_index_path) ? YAML.load_file(Fontist.system_index_path) : []
+      index.group_by { |x| x[:path] }
+    end
+
+    def detect_paths(paths, indexed)
+      paths.flat_map do |path|
+        next indexed[path] if indexed[path]
+
+        detect_fonts(path)
+      end
+    end
+
+    def detect_fonts(path)
+      case File.extname(path).delete_prefix(".").downcase
+      when "ttf", "otf"
+        detect_file_font(path)
+      when "ttc"
+        detect_collection_fonts(path)
+      else
+        raise Errors::UnknownFontTypeError.new(path)
+      end
+    end
+
+    def detect_file_font(path)
+      file = TTFunk::File.open(path)
+      parse_font(file, path)
+    end
+
+    def detect_collection_fonts(path)
+      TTFunk::Collection.open(path) do |collection|
+        collection.map do |file|
+          parse_font(file, path)
+        end
+      end
+    end
+
+    def parse_font(file, path)
+      x = file.name
+
+      {
+        path: path,
+        full_name: parse_text(x.font_name.first),
+        family_name: parse_text(x.preferred_family.first || x.font_family.first),
+        type: parse_text(x.preferred_subfamily.first || x.font_subfamily.first),
+      }
+    end
+
+    def parse_text(text)
+      text.gsub(/[^[:print:]]/, "").to_s
+    end
+
+    def save_index(index)
+      dir = File.dirname(Fontist.system_index_path)
+      FileUtils.mkdir_p(dir) unless File.exist?(dir)
+      File.write(Fontist.system_index_path, YAML.dump(index))
+    end
+  end
+end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.7.0".freeze
+  VERSION = "1.7.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-28 00:00:00.000000000 Z
+date: 2020-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -109,6 +109,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ttfunk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: extract_ttc
   requirement: !ruby/object:Gem::Requirement
@@ -313,6 +327,7 @@ files:
 - lib/fontist/registry.rb
 - lib/fontist/system.yml
 - lib/fontist/system_font.rb
+- lib/fontist/system_index.rb
 - lib/fontist/utils.rb
 - lib/fontist/utils/cache.rb
 - lib/fontist/utils/downloader.rb