Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow sub-directories in input vectors #317

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow sub-directories in input vectors #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/fontcustom/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def check_woff2

# Calculates a hash of vectors, options, and templates (content and filenames)
def checksum
files = Dir.glob(File.join(@options[:input][:vectors], "*.svg")).select { |fn| File.file?(fn) }
files = Dir.glob(File.join(@options[:input][:vectors], "**/*.svg")).select { |fn| File.file?(fn) }
files += Dir.glob(File.join(@options[:input][:templates], "*")).select { |fn| File.file?(fn) }
content = files.map { |file| File.read(file) }.join
content << files.join
Expand Down
4 changes: 2 additions & 2 deletions lib/fontcustom/generator/font.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ def set_glyph_info
0xf100
end

files = Dir.glob File.join(@options[:input][:vectors], "*.svg")
files = Dir.glob File.join(@options[:input][:vectors], "**/*.svg")
glyphs = {}
files.each do |file|
name = File.basename file, ".svg"
name = file.sub(/^#{@options[:input][:vectors]}\/?/, '').sub(/\.svg$/, '')
name = name.strip.gsub(/\W/, "-")
glyphs[name.to_sym] = { :source => file }
if File.read(file).include? "rgba"
Expand Down
2 changes: 1 addition & 1 deletion lib/fontcustom/options.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def set_input_paths
@options[:input] = { :vectors => input, :templates => input }
end

if Dir[File.join(@options[:input][:vectors], "*.svg")].empty?
if Dir.glob(File.join(@options[:input][:vectors], "**/*.svg")).empty?
raise Fontcustom::Error, "`#{@options[:input][:vectors]}` doesn't contain any SVGs."
end
end
Expand Down