allow sub-directories in input vectors

FontCustom · Jul 26, 2017 · c589621 · c589621
1 parent 4ff2fbf
commit c589621
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/fontcustom/base.rb b/lib/fontcustom/base.rb
@@ -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

diff --git a/lib/fontcustom/generator/font.rb b/lib/fontcustom/generator/font.rb
@@ -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"

diff --git a/lib/fontcustom/options.rb b/lib/fontcustom/options.rb
@@ -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