fontist 1.10.1 → 1.11.5

data/lib/fontist/import/google_import.rb

@@ -1,11 +1,7 @@
 require "erb"
 require_relative "google"
 require_relative "google/new_fonts_fetcher"
-require_relative "google/fonts_public.pb"
-require_relative "template_helper"
-require_relative "text_helper"
-require_relative "otf_parser"
-require_relative "otf_style"
+require_relative "create_formula"
 
 module Fontist
   module Import
@@ -13,6 +9,7 @@ module Fontist
       def call
         fonts = new_fonts
         create_formulas(fonts)
+        rebuild_index
       end
 
       private
@@ -22,161 +19,48 @@ module Fontist
       end
 
       def create_formulas(fonts)
+        return puts("Nothing to update") if fonts.empty?
+
         puts "Creating formulas..."
         fonts.each do |path|
           create_formula(path)
         end
       end
 
-      def create_formula(path)
-        puts path
-        metadata = fetch_metadata(path)
-        font = build_font(metadata, path)
-        save_formula(font)
-      end
+      def create_formula(font_path)
+        puts font_path
 
-      def fetch_metadata(path)
-        protobuf = File.read(File.join(path, "METADATA.pb"))
-        ::Google::Fonts::FamilyProto.parse_from_text(protobuf)
-      end
+        path = Fontist::Import::CreateFormula.new(
+          url(font_path),
+          name: Google.metadata_name(font_path),
+          formula_dir: formula_dir,
+          skip_sha: variable_style?(font_path),
+          digest: Google.digest(font_path),
+        ).call
 
-      def build_font(metadata, path)
-        h = from_metadata(metadata)
-          .merge(from_otfinfo(path))
-          .merge(styles: styles_from_otfinfo(path, metadata.fonts))
-          .merge(from_license(path))
-
-        OpenStruct.new(h)
+        Fontist.ui.success("Formula has been successfully created: #{path}")
       end
 
-      def from_metadata(metadata)
-        copyright = metadata.fonts.first.copyright
-
-        Hash.new.tap do |h|
-          h[:fullname] = metadata.name
-          h[:cleanname] = metadata.name.gsub(/ /, "")
-          h[:sha256] = sha256(metadata.name) unless variable_style?(metadata)
-          h[:copyright] = Fontist::Import::TextHelper.cleanup(copyright)
-        end
+      def url(path)
+        name = Google.metadata_name(path)
+        "https://fonts.google.com/download?family=#{ERB::Util.url_encode(name)}"
       end
 
-      def variable_style?(metadata)
-        metadata.fonts.any? do |s|
-          s.filename.match?(/\[(.+,)?wght\]/)
+      def formula_dir
+        @formula_dir ||= Fontist.formulas_path.join("google").tap do |path|
+          FileUtils.mkdir_p(path) unless File.exist?(path)
         end
       end
 
-      def sha256(name)
-        file = Down.download("https://fonts.google.com/download?family=#{name}",
-                             open_timeout: 10,
-                             read_timeout: 10)
-
-        Digest::SHA256.file(file).to_s
-      end
-
-      def from_license(path)
-        file = Dir.glob(File.join(path, "{OFL.txt,UFL.txt,LICENSE.txt}")).first
-        print "warn, no license, " unless file
-        return { license: "" } unless file
-
-        { license: cleanup_text(File.read(file)) }
-      end
-
-      def cleanup_text(text)
-        text.rstrip
-          .gsub("\r\n", "\n")
-          .lines
-          .map(&:rstrip)
-          .drop_while(&:empty?)
-          .join("\n")
-      end
-
-      def from_otfinfo(path)
-        font_file = Dir.glob(File.join(path, "*.ttf")).first
-        otf = OtfParser.new(font_file).call
-
-        { homepage: otf["Vendor URL"],
-          license_url: otf["License URL"] }
-      end
-
-      def styles_from_otfinfo(path, fonts)
-        fonts.map do |f|
-          file_path = File.join(path, f.filename)
-          info = OtfParser.new(file_path).call
-          OtfStyle.new(info, file_path).call
+      def variable_style?(path)
+        fonts = Dir.glob(File.join(path, "*.{ttf,otf}"))
+        fonts.any? do |font|
+          File.basename(font).match?(/\[(.+,)?(wght|opsz)\]/)
         end
       end
 
-      def save_formula(font)
-        hash = formula_hash(font)
-        path = formula_path(font.fullname)
-        save_to_path(hash, path)
-      end
-
-      def formula_hash(font)
-        stringify_keys(name: font.cleanname.sub(/\S/, &:upcase),
-                       description: font.fullname,
-                       homepage: font.homepage,
-                       resources: formula_resource(font),
-                       fonts: [yaml_font(font)],
-                       extract: { format: :zip },
-                       copyright: font.copyright,
-                       license_url: font.license_url,
-                       open_license: font.license)
-      end
-
-      def stringify_keys(hash)
-        JSON.parse(hash.to_json)
-      end
-
-      def formula_resource(font)
-        encoded_name = ERB::Util.url_encode(font.fullname)
-        url = "https://fonts.google.com/download?family=#{encoded_name}"
-
-        options = {}
-        options[:urls] = [url]
-        options[:sha256] = font.sha256 if font.sha256
-
-        { "#{font.cleanname}.zip" => options }
-      end
-
-      def yaml_font(font)
-        { name: font.fullname,
-          styles: yaml_styles(font.styles) }
-      end
-
-      def yaml_styles(styles)
-        styles.map do |s|
-          yaml_style(s)
-        end
-      end
-
-      def yaml_style(style)
-        Hash.new.tap do |h|
-          h.merge!(family_name: style.family_name,
-                   type: style.style,
-                   full_name: style.full_name)
-          if style.preferred_family_name
-            h[:preferred_family_name] = style.preferred_family_name
-          end
-          h[:preferred_type] = style.preferred_style if style.preferred_style
-          h.merge!(style.to_h.select do |k, _|
-            %i(post_script_name version description copyright).include?(k)
-          end.compact)
-          h.merge!(font: fix_variable_filename(style.filename))
-        end
-      end
-
-      def fix_variable_filename(filename)
-        filename.sub("[wght]", "-VariableFont_wght")
-      end
-
-      def formula_path(name)
-        Fontist::Import::Google.formula_path(name)
-      end
-
-      def save_to_path(hash, path)
-        File.write(path, YAML.dump(hash))
+      def rebuild_index
+        Fontist::Index.rebuild
       end
     end
   end

data/lib/fontist/import/helpers/system_helper.rb

@@ -4,7 +4,7 @@ module Fontist
       module SystemHelper
         class << self
           def run(command)
-            Fontist.ui.say("Run `#{command}`")
+            Fontist.ui.say("Run `#{command}`") if Fontist.debug?
 
             result = `#{command}`
             unless $CHILD_STATUS.to_i.zero?

data/lib/fontist/import/otf/font_file.rb

@@ -106,7 +106,11 @@ module Fontist
         end
 
         def detect_extension
-          Files::FontDetector.standard_extension(@path)
+          detected = Files::FontDetector.standard_extension(@path)
+          file_extension = File.extname(File.basename(@path)).sub(/^\./, "")
+          return file_extension if file_extension.casecmp?(detected)
+
+          detected
         end
       end
     end

data/lib/fontist/import/otf_parser.rb

@@ -13,6 +13,8 @@ module Fontist
       end
 
       def call
+        raise ArgumentError, "Empty path" unless @path
+
         text = REQUIREMENTS[:otfinfo].call(@path)
         text.split("\n")
           .select { |x| x.include?(":") }

data/lib/fontist/import/recursive_extraction.rb

@@ -3,7 +3,8 @@ require_relative "files/font_detector"
 module Fontist
   module Import
     class RecursiveExtraction
-      LICENSE_PATTERN = /(ofl\.txt|ufl\.txt|licenses?\.txt|copying)$/i.freeze
+      LICENSE_PATTERN =
+        /(ofl\.txt|ufl\.txt|licenses?\.txt|license(\.md)?|copying)$/i.freeze
 
       def initialize(archive, subarchive: nil, subdir: nil)
         @archive = archive
@@ -69,6 +70,8 @@ module Fontist
 
       def extract_data(archive)
         Excavate::Archive.new(path(archive)).files(recursive_packages: true) do |path|
+          next unless File.file?(path)
+
           match_license(path)
           match_font(path) if font_directory?(path)
         end

data/lib/fontist/index.rb

@@ -3,33 +3,6 @@ require_relative "indexes/filename_index"
 
 module Fontist
   class Index
-    def self.rebuild_for_main_repo
-      unless Dir.exist?(Fontist.private_formulas_path)
-        return do_rebuild_for_main_repo_with
-      end
-
-      Dir.mktmpdir do |dir|
-        tmp_private_path = File.join(dir, "private")
-        FileUtils.mv(Fontist.private_formulas_path, tmp_private_path)
-
-        do_rebuild_for_main_repo_with
-
-        FileUtils.mv(tmp_private_path, Fontist.private_formulas_path)
-      end
-    end
-
-    def self.do_rebuild_for_main_repo_with
-      Fontist.formula_preferred_family_index_path =
-        Fontist.formulas_repo_path.join("index.yml")
-      Fontist.formula_filename_index_path =
-        Fontist.formulas_repo_path.join("filename_index.yml")
-
-      rebuild
-
-      Fontist.formula_preferred_family_index_path = nil
-      Fontist.formula_filename_index_path = nil
-    end
-
     def self.rebuild
       Fontist::Indexes::DefaultFamilyFontIndex.rebuild
       Fontist::Indexes::PreferredFamilyFontIndex.rebuild

data/lib/fontist/system_font.rb

@@ -1,5 +1,4 @@
 require_relative "system_index"
-require_relative "formula_paths"
 
 module Fontist
   class SystemFont
@@ -13,6 +12,10 @@ module Fontist
     end
 
     def self.system_font_paths
+      @system_font_paths ||= load_system_font_paths
+    end
+
+    def self.load_system_font_paths
       config_path = Fontist.system_file_path
       os = Fontist::Utils::System.user_os.to_s
       templates = YAML.load_file(config_path)["system"][os]["paths"]
@@ -21,6 +24,10 @@ module Fontist
       Dir.glob(patterns)
     end
 
+    def self.reset_system_font_paths_cache
+      @system_font_paths = nil
+    end
+
     def self.expand_paths(paths)
       paths.map do |path|
         require "etc"
@@ -51,7 +58,7 @@ module Fontist
     end
 
     def find_styles
-      find_by_index || find_by_formulas
+      find_by_index
     end
 
     private
@@ -61,9 +68,5 @@ module Fontist
     def find_by_index
       SystemIndex.system_index.find(font, style)
     end
-
-    def find_by_formulas
-      FormulaPaths.new(self.class.font_paths).find(font, style)
-    end
   end
 end

data/lib/fontist/system_index.rb

@@ -37,35 +37,39 @@ module Fontist
     LANGUAGE_MAC_ENGLISH = 0
     LANGUAGE_MS_ENGLISH_AMERICAN = 0x409
 
-    attr_reader :font_paths
-
     def self.system_index
-      if Fontist.preferred_family?
-        new(Fontist.system_preferred_family_index_path,
-            SystemFont.font_paths,
-            PreferredFamily.new)
-      else
-        new(Fontist.system_index_path,
-            SystemFont.font_paths,
-            DefaultFamily.new)
-      end
+      path = if Fontist.preferred_family?
+               Fontist.system_preferred_family_index_path
+             else
+               Fontist.system_index_path
+             end
+
+      @system_index ||= {}
+      @system_index[Fontist.preferred_family?] ||= {}
+      @system_index[Fontist.preferred_family?][path] ||=
+        new(path, -> { SystemFont.font_paths }, family)
     end
 
     def self.fontist_index
-      if Fontist.preferred_family?
-        new(Fontist.fontist_preferred_family_index_path,
-            SystemFont.fontist_font_paths,
-            PreferredFamily.new)
-      else
-        new(Fontist.fontist_index_path,
-            SystemFont.fontist_font_paths,
-            DefaultFamily.new)
-      end
+      path = if Fontist.preferred_family?
+               Fontist.fontist_preferred_family_index_path
+             else
+               Fontist.fontist_index_path
+             end
+
+      @fontist_index ||= {}
+      @fontist_index[Fontist.preferred_family?] ||= {}
+      @fontist_index[Fontist.preferred_family?][path] ||=
+        new(path, -> { SystemFont.fontist_font_paths }, family)
+    end
+
+    def self.family
+      Fontist.preferred_family? ? PreferredFamily.new : DefaultFamily.new
     end
 
-    def initialize(index_path, font_paths, family)
+    def initialize(index_path, font_paths_fetcher, family)
       @index_path = index_path
-      @font_paths = font_paths
+      @font_paths_fetcher = font_paths_fetcher
       @family = family
     end
 
@@ -85,7 +89,18 @@ module Fontist
     private
 
     def index
-      @index ||= build_index
+      return @index unless index_changed?
+
+      @index = build_index
+    end
+
+    def index_changed?
+      @index.nil? ||
+        @index.map { |x| x[:path] }.uniq.sort != font_paths.sort
+    end
+
+    def font_paths
+      @font_paths_fetcher.call
     end
 
     def build_index
@@ -148,6 +163,11 @@ module Fontist
       else
         raise Errors::UnknownFontTypeError.new(path)
       end
+    rescue StandardError
+      Fontist.ui.error($!.message)
+      Fontist.ui.error(
+        "Warning: File at #{path} not recognized as a font file.",
+      )
     end
 
     def detect_file_font(path)
@@ -155,9 +175,6 @@ module Fontist
       file = TTFunk::File.new(content)
 
       parse_font(file, path)
-    rescue StandardError
-      warn $!.message
-      warn "Warning: File at #{path} not recognized as a font file."
     end
 
     def detect_collection_fonts(path)
@@ -166,9 +183,6 @@ module Fontist
           parse_font(file, path)
         end
       end
-    rescue StandardError
-      warn $!.message
-      warn "Warning: File at #{path} not recognized as a font file."
     end
 
     def parse_font(file, path)

data/lib/fontist/update.rb

@@ -1,7 +1,13 @@
 module Fontist
   class Update
+    VERSION = "v2".freeze
+
     def self.call
-      new.call
+      new(VERSION).call
+    end
+
+    def initialize(branch = "main")
+      @branch = branch
     end
 
     def call
@@ -17,13 +23,21 @@ module Fontist
       dir = File.dirname(Fontist.formulas_repo_path)
       FileUtils.mkdir_p(dir) unless File.exist?(dir)
 
-      if Dir.exist?(Fontist.formulas_repo_path)
-        Git.open(Fontist.formulas_repo_path).pull
-      else
-        Git.clone(Fontist.formulas_repo_url,
-                  Fontist.formulas_repo_path,
-                  depth: 1)
+      unless Dir.exist?(Fontist.formulas_repo_path)
+        return Git.clone(Fontist.formulas_repo_url,
+                         Fontist.formulas_repo_path,
+                         branch: @branch,
+                         depth: 1)
       end
+
+      git = Git.open(Fontist.formulas_repo_path)
+      return git.pull("origin", @branch) if git.current_branch == @branch
+
+      git.config("remote.origin.fetch",
+                 "+refs/heads/#{@branch}:refs/remotes/origin/#{@branch}")
+      git.fetch
+      git.checkout(@branch)
+      git.pull("origin", @branch)
     end
 
     def update_private_repos

data/lib/fontist/utils/downloader.rb

@@ -15,7 +15,7 @@ module Fontist
         @file = file
         @sha = [sha].flatten.compact
         @file_size = file_size.to_i if file_size
-        @progress_bar = set_progress_bar(progress_bar)
+        @progress_bar = progress_bar
         @cache = Cache.new
       end
 
@@ -24,12 +24,7 @@ module Fontist
           download_file
         end
 
-        if !sha.empty? && !sha.include?(Digest::SHA256.file(file).to_s)
-          raise(Fontist::Errors::TamperedFileError.new(
-            "The downloaded file from #{@file} doesn't " \
-            "match with the expected sha256 checksum!"
-          ))
-        end
+        raise_if_tampered(file)
 
         file
       end
@@ -38,6 +33,19 @@ module Fontist
 
       attr_reader :file, :sha, :file_size
 
+      def raise_if_tampered(file)
+        file_checksum = Digest::SHA256.file(file).to_s
+        if !sha.empty? && !sha.include?(file_checksum)
+          raise(
+            Fontist::Errors::TamperedFileError.new(
+              "The downloaded file from #{@file} doesn't " \
+              "match with the expected sha256 checksum (#{file_checksum})!\n" \
+              "Beginning of content: #{File.read(file, 3000)}",
+            ),
+          )
+        end
+      end
+
       def byte_to_megabyte
         @byte_to_megabyte ||= 1024 * 1024
       end
@@ -46,34 +54,48 @@ module Fontist
         options[:download_path] || Fontist.root_path.join("tmp")
       end
 
-      def set_progress_bar(progress_bar)
-        if progress_bar
+      def download_file
+        tries = tries ? tries + 1 : 1
+        do_download_file
+      rescue Down::Error => e
+        retry if tries < 3
+
+        raise Fontist::Errors::InvalidResourceError,
+              "Invalid URL: #{@file}. Error: #{e.inspect}."
+      end
+
+      def do_download_file
+        progress_bar = create_progress_bar
+        file = do_download_file_with_progress_bar(progress_bar)
+        progress_bar.finish
+        file
+      end
+
+      def create_progress_bar
+        if @progress_bar
           ProgressBar.new(@file_size)
         else
           NullProgressBar.new(@file_size)
         end
       end
 
-      def download_file
-        file = Down.download(
+      # rubocop:disable Metrics/MethodLength
+      def do_download_file_with_progress_bar(progress_bar)
+        Down.download(
           url,
           open_timeout: 10,
           read_timeout: 10,
+          max_redirects: 10,
           headers: headers,
           content_length_proc: ->(content_length) {
-            @progress_bar.total = content_length if content_length
+            progress_bar.total = content_length if content_length
           },
           progress_proc: -> (progress) {
-            @progress_bar.increment(progress)
+            progress_bar.increment(progress)
           }
         )
-
-        @progress_bar.finish
-
-        file
-      rescue Down::NotFound
-        raise(Fontist::Errors::InvalidResourceError.new("Invalid URL: #{@file}"))
       end
+      # rubocop:enable Metrics/MethodLength
 
       def url
         @file.respond_to?(:url) ? @file.url : @file

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.10.1".freeze
+  VERSION = "1.11.5".freeze
 end

data/lib/fontist.rb

@@ -40,7 +40,11 @@ module Fontist
   end
 
   def self.formulas_repo_path
-    Fontist.fontist_path.join("formulas")
+    Fontist.fontist_version_path.join("formulas")
+  end
+
+  def self.fontist_version_path
+    Fontist.fontist_path.join("versions", Update::VERSION)
   end
 
   def self.formulas_repo_url
@@ -48,7 +52,11 @@ module Fontist
   end
 
   def self.formulas_path
-    Fontist.formulas_repo_path.join("Formulas")
+    @formulas_path || Fontist.formulas_repo_path.join("Formulas")
+  end
+
+  def self.formulas_path=(path)
+    @formulas_path = path
   end
 
   def self.private_formulas_path
@@ -84,25 +92,15 @@ module Fontist
   end
 
   def self.formula_preferred_family_index_path
-    @formula_preferred_family_index_path ||
-      Fontist.formula_index_dir.join("formula_index.preferred_family.yml")
-  end
-
-  def self.formula_preferred_family_index_path=(path)
-    @formula_preferred_family_index_path = path
+    Fontist.formula_index_dir.join("formula_index.preferred_family.yml")
   end
 
   def self.formula_filename_index_path
-    @formula_filename_index_path ||
-      Fontist.formula_index_dir.join("filename_index.yml")
-  end
-
-  def self.formula_filename_index_path=(path)
-    @formula_filename_index_path = path
+    Fontist.formula_index_dir.join("filename_index.yml")
   end
 
   def self.formula_index_dir
-    Fontist.fontist_path
+    Fontist.fontist_version_path
   end
 
   def self.preferred_family?
@@ -112,4 +110,12 @@ module Fontist
   def self.preferred_family=(bool)
     @preferred_family = bool
   end
+
+  def self.debug?
+    @debug || false
+  end
+
+  def self.debug=(bool)
+    @debug = bool
+  end
 end