lib/fontist/import/recursive_extraction.rb in fontist-1.20.0 vs lib/fontist/import/recursive_extraction.rb in fontist-1.21.1
- old
+ new
@@ -17,14 +17,10 @@
@collection_files = []
save_operation_subdir
end
- def extension
- fetch_extension(@archive)
- end
-
def font_files
ensure_extracted
@font_files
end
@@ -48,21 +44,9 @@
def save_operation_subdir
return unless @subdir
@operations[:options] ||= {}
@operations[:options][:fonts_sub_dir] = @subdir
- end
-
- def fetch_extension(file)
- File.extname(filename(file)).sub(/^\./, "")
- end
-
- def filename(file)
- if file.respond_to?(:original_filename)
- file.original_filename
- else
- File.basename(file)
- end
end
def ensure_extracted
return if @extracted