lib/fontist/import/files/collection_file.rb in fontist-1.10.1 vs lib/fontist/import/files/collection_file.rb in fontist-1.11.1

- old
+ new

@@ -9,11 +9,11 @@ attr_reader :fonts def initialize(path) @path = path @fonts = read - @extension = "ttc" + @extension = detect_extension end def filename File.basename(@path, ".*") + "." + @extension end @@ -43,9 +43,18 @@ def extract_ttfs(tmp_dir) filenames = ExtractTtc.extract(@path) filenames.map do |filename| File.join(tmp_dir, filename) end + end + + def detect_extension + base_extension = "ttc" + + file_extension = File.extname(File.basename(@path)).sub(/^\./, "") + return file_extension if file_extension.casecmp?(base_extension) + + base_extension end end end end end