remove double-change count, and only increment for actual changes

This commit is contained in:
Kyle Drake 2014-06-04 18:26:17 -07:00
parent da9d1e4eb3
commit 7eee0f062d
4 changed files with 22 additions and 10 deletions

View file

@ -213,6 +213,12 @@ class Site < Sequel::Model
end
def store_file(filename, uploaded)
# If the uploaded file matches an existing file, no actual change has happened.
if File.exist?(file_path(filename)) &&
Digest::SHA2.file(file_path(filename)).digest == Digest::SHA2.file(uploaded.path).digest
return false
end
FileUtils.mv uploaded.path, file_path(filename)
File.chmod(0640, file_path(filename))
@ -226,15 +232,18 @@ class Site < Sequel::Model
SiteChange.record self, filename
self.site_changed = true
self.changed_count += 1
save(validate: false)
if self.site_changed != true
self.site_changed = true
save_changes(validate: false)
end
true
end
def increment_changed_count
self.changed_count += 1
self.updated_at = Time.now
save(validate: false)
save_changes(validate: false)
end
def files_zip