deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add system-wide file read cache

Browse source
This commit is contained in:
Thomas Reynolds 2016-01-20 11:50:25 -08:00
parent 827d5fbb1d
commit ffa662a917
14 changed files with 76 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

30
middleman-core/lib/middleman-core/sources/source_watcher.rb
View file

@ -228,11 +228,11 @@ module Middleman
Contract ArrayOf[Pathname], ArrayOf[Pathname] => Any
def update(updated_paths, removed_paths)
valid_updates = updated_paths
.map { |p| ::Middleman::Util.path_to_source_file(p, @directory, @type, @options.fetch(:destination_dir, false)) }
.map { |p| @files[p] || path_to_source_file(p, @directory, @type, @options[:destination_dir]) }
.select(&method(:valid?))
valid_updates.each do |f|
add_file_to_cache(f)
record_file_change(f)
logger.debug "== Change (#{f[:types].inspect}): #{f[:relative_path]}"
end
@ -245,11 +245,9 @@ module Middleman
valid_updates |= related_updates
valid_removes = removed_paths
.lazy
.select(&@files.method(:key?))
.map(&@files.method(:[]))
.select(&method(:valid?))
.to_a
.each do |f|
remove_file_from_cache(f)
logger.debug "== Deletion (#{f[:types].inspect}): #{f[:relative_path]}"
@ -262,10 +260,28 @@ module Middleman
]) unless valid_updates.empty? && valid_removes.empty?
end
# Convert a path to a file resprentation.
#
# @param [Pathname] path The path.
# @return [Middleman::SourceFile]
Contract Pathname, Pathname, Symbol, Maybe[String] => ::Middleman::SourceFile
def path_to_source_file(path, directory, type, destination_dir)
types = Set.new([type])
relative_path = path.relative_path_from(directory)
relative_path = File.join(destination_dir, relative_path) if destination_dir
::Middleman::SourceFile.new(Pathname(relative_path), path, directory, types, 0)
end
Contract IsA['Middleman::SourceFile'] => Any
def add_file_to_cache(f)
@files[f[:full_path]] = f
@extensionless_files[strip_extensions(f[:full_path])] = f
def record_file_change(f)
if @files[f[:full_path]]
@files[f[:full_path]][:version] += 1
else
@files[f[:full_path]] = f
@extensionless_files[strip_extensions(f[:full_path])] = f
end
end
Contract IsA['Middleman::SourceFile'] => Any