fontist 1.5.0 → 1.7.2

data/lib/fontist/manifest/install.rb

@@ -1,8 +1,8 @@
-require_relative "common"
+require_relative "locations"
 
 module Fontist
   module Manifest
-    class Install < Common
+    class Install < Locations
       def initialize(manifest, confirmation: "no")
         @manifest = manifest
         @confirmation = confirmation
@@ -15,15 +15,11 @@ module Fontist
       private
 
       def file_paths(font, style)
-        paths = find_installed_font(font, style)
-        return paths unless paths.empty?
+        paths = super
+        return paths unless paths["paths"].empty?
 
         install_font(font)
-        find_installed_font(font, style)
-      end
-
-      def find_installed_font(font, style)
-        Fontist::SystemFont.find_with_style(font, style)
+        super
       end
 
       def install_font(font)

data/lib/fontist/manifest/locations.rb

@@ -1,12 +1,59 @@
-require_relative "common"
-
 module Fontist
   module Manifest
-    class Locations < Common
+    class Locations
+      def initialize(manifest)
+        @manifest = manifest
+      end
+
+      def self.call(manifest)
+        new(manifest).call
+      end
+
+      def call
+        font_names.zip(font_paths).to_h
+      end
+
       private
 
+      def font_names
+        fonts.keys
+      end
+
+      def fonts
+        @fonts ||= begin
+          unless File.exist?(@manifest)
+            raise Fontist::Errors::ManifestCouldNotBeFoundError
+          end
+
+          fonts = YAML.load_file(@manifest)
+          unless fonts.is_a?(Hash)
+            raise Fontist::Errors::ManifestCouldNotBeReadError
+          end
+
+          fonts
+        end
+      end
+
+      def font_paths
+        fonts.map do |font, styles|
+          styles_to_ary = [styles].flatten
+          style_paths_map(font, styles_to_ary)
+        end
+      end
+
+      def style_paths_map(font, names)
+        paths = style_paths(font, names)
+        names.zip(paths).to_h
+      end
+
+      def style_paths(font, names)
+        names.map do |style|
+          file_paths(font, style)
+        end
+      end
+
       def file_paths(font, style)
-        Fontist::SystemFont.find_with_style(font, style)
+        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,22 +12,23 @@ 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
-      paths = grep_font_paths(font)
-      paths = lookup_using_font_name || []  if paths.empty?
+      styles = find_styles
+      return unless styles
 
-      paths.empty? ? nil : paths
+      styles.map { |x| x[:path] }
     end
 
-    def find_with_style
-      paths = lookup_using_font_and_style
-      return paths unless paths.empty?
+    def find_with_name
+      styles = find_styles
+      return { full_name: nil, paths: [] } unless styles
 
-      grep_font_paths(font, style)
+      { full_name: styles.first[:full_name],
+        paths: styles.map { |x| x[:path] } }
     end
 
     private
@@ -42,25 +45,6 @@ module Fontist
       end
     end
 
-    def grep_font_paths(font, style = nil)
-      pattern = prepare_pattern(font, style)
-
-      paths = font_paths.map { |path| [File.basename(path), path] }.to_h
-      files = paths.keys
-      matched = files.grep(pattern)
-      paths.values_at(*matched).compact
-    end
-
-    def prepare_pattern(font, style = nil)
-      style = nil if style&.casecmp?("regular")
-
-      s = [font, style].compact.map { |x| Regexp.quote(x) }
-        .join(".*")
-        .gsub("\\ ", "\s?") # space independent
-
-      Regexp.new(s, Regexp::IGNORECASE)
-    end
-
     def font_paths
       @font_paths ||= Dir.glob((
         user_sources +
@@ -69,11 +53,6 @@ module Fontist
       ).flatten.uniq)
     end
 
-    def lookup_using_font_name
-      font_names = map_name_to_valid_font_names || []
-      font_paths.grep(/#{font_names.join("|")}/i) unless font_names.empty?
-    end
-
     def fontist_fonts_path
       @fontist_fonts_path ||= Fontist.fonts_path
     end
@@ -82,24 +61,45 @@ module Fontist
       Fontist::Utils::System.user_os
     end
 
-    def map_name_to_valid_font_names
-      fonts =  Formula.find_fonts(font)
-      fonts.map { |font| font.styles.map(&:font) }.flatten if fonts
-    end
-
     def system_path_file
       File.open(Fontist.system_file_path)
     end
 
     def default_sources
-      @default_sources ||= YAML.load(system_path_file)["system"][user_os.to_s]
+      @default_sources ||= YAML.safe_load(system_path_file)["system"][user_os.to_s]
+    end
+
+    def find_styles
+      find_by_index || find_by_formulas
     end
 
-    def lookup_using_font_and_style
-      styles = Formula.find_styles(font, style)
-      filenames = styles.map(&:font)
-      filenames.flat_map do |filename|
-        search_font_paths(filename)
+    def find_by_index
+      SystemIndex.new(font_paths).find(font, style)
+    end
+
+    def find_by_formulas
+      styles = find_styles_by_formulas(font, style)
+      return if styles.empty?
+
+      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 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/utils.rb

@@ -2,6 +2,7 @@ require "fontist/utils/ui"
 require "fontist/utils/system"
 require "fontist/utils/dsl"
 require "fontist/utils/dsl/font"
+require "fontist/utils/dsl/collection_font"
 require "fontist/utils/downloader"
 require "fontist/utils/zip_extractor"
 require "fontist/utils/exe_extractor"

data/lib/fontist/utils/cache.rb

@@ -1,14 +1,18 @@
 module Fontist
   module Utils
     class Cache
-      def fetch(key)
+      def fetch(key, bar: nil)
         map = load_cache
-        return downloaded_path(map[key]) if cache_exist?(map[key])
+        if cache_exist?(map[key])
+          print_bar(bar, map[key]) if bar
+
+          return downloaded_file(map[key])
+        end
 
         generated_file = yield
-        path = save_cache(generated_file, key, map)
+        path = save_cache(generated_file, key)
 
-        downloaded_path(path)
+        downloaded_file(path)
       end
 
       private
@@ -21,18 +25,33 @@ module Fontist
         cache_map_path.exist? ? YAML.load_file(cache_map_path) : {}
       end
 
-      def downloaded_path(path)
-        File.new(Fontist.downloads_path.join(path))
+      def downloaded_file(path)
+        File.new(downloaded_path(path))
       end
 
       def cache_exist?(path)
-        path && File.exist?(Fontist.downloads_path.join(path))
+        path && File.exist?(downloaded_path(path))
+      end
+
+      def downloaded_path(path)
+        Fontist.downloads_path.join(path)
       end
 
-      def save_cache(generated_file, key, map)
+      def print_bar(bar, path)
+        File.size(downloaded_path(path)).tap do |size|
+          bar.total = size
+          bar.increment(size)
+          bar.finish("cache")
+        end
+      end
+
+      def save_cache(generated_file, key)
         path = move_to_downloads(generated_file)
+
+        map = load_cache
         map[key] = path
         File.write(cache_map_path, YAML.dump(map))
+
         path
       end
 

data/lib/fontist/utils/downloader.rb

@@ -7,13 +7,15 @@ module Fontist
         # TODO: If the first mirror fails, try the second one
         @file = file
         @sha = [sha].flatten.compact
-        @progress_bar = set_progress_bar(progress_bar)
         @file_size = (file_size || default_file_size).to_i
+        @progress_bar = set_progress_bar(progress_bar)
         @cache = Cache.new
       end
 
       def download
-        file = @cache.fetch(@file) { download_file }
+        file = @cache.fetch(@file, bar: @progress_bar) do
+          download_file
+        end
 
         if !sha.empty? && !sha.include?(Digest::SHA256.file(file).to_s)
           raise(Fontist::Errors::TamperedFileError.new(
@@ -46,25 +48,27 @@ module Fontist
       end
 
       def set_progress_bar(progress_bar)
-        ENV.fetch("TEST_ENV", "") === "CI" ? false : progress_bar
+        if ENV.fetch("TEST_ENV", "") === "CI" || progress_bar
+          ProgressBar.new(@file_size)
+        else
+          NullProgressBar.new
+        end
       end
 
       def download_file
-        bar = ProgressBar.new(file_size / byte_to_megabyte)
-
         file = Down.download(
           @file,
           open_timeout: 10,
           read_timeout: 10,
           content_length_proc: ->(content_length) {
-            bar.total = content_length / byte_to_megabyte if content_length
+            @progress_bar.total = content_length if content_length
           },
           progress_proc: -> (progress) {
-            bar.increment(progress / byte_to_megabyte) if @progress_bar === true
+            @progress_bar.increment(progress)
           }
         )
 
-        puts if @progress_bar === true
+        @progress_bar.finish
 
         file
       rescue Down::NotFound
@@ -72,6 +76,20 @@ module Fontist
       end
     end
 
+    class NullProgressBar
+      def total=(_)
+        # do nothing
+      end
+
+      def increment(_)
+        # do nothing
+      end
+
+      def finish(_ = nil)
+        # do nothing
+      end
+    end
+
     class ProgressBar
       def initialize(total)
         @counter = 1
@@ -83,9 +101,35 @@ module Fontist
       end
 
       def increment(progress)
-        complete = sprintf("%#.2f%%", ((@counter.to_f / @total.to_f) * 100))
-        print "\r\e[0KDownloads: #{@counter}MB/#{@total}MB (#{complete})"
         @counter = progress
+        Fontist.ui.print "\r\e[0KDownloads: #{counter_mb}MB/#{total_mb}MB " \
+                         "(#{completeness})"
+      end
+
+      def finish(message = nil)
+        if message
+          Fontist.ui.print " (#{message})\n"
+        else
+          Fontist.ui.print "\n"
+        end
+      end
+
+      private
+
+      def completeness
+        sprintf("%#.2f%%", (@counter.fdiv(@total) * 100)) # rubocop:disable Style/FormatStringToken, Metrics/LineLength
+      end
+
+      def counter_mb
+        @counter / byte_to_megabyte
+      end
+
+      def total_mb
+        @total / byte_to_megabyte
+      end
+
+      def byte_to_megabyte
+        @byte_to_megabyte ||= 1024 * 1024
       end
     end
   end