From a5df2c86cd03b595469d83a64bb7d57632c1c297 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 7 Apr 2014 08:17:58 -0400 Subject: [PATCH] move changed count and screenshot logic to model --- app.rb | 9 ++------- models/site.rb | 12 ++++++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app.rb b/app.rb index ebab0a6f..d4321703 100644 --- a/app.rb +++ b/app.rb @@ -309,14 +309,9 @@ post '/site_files/upload' do end sanitized_filename = params[:newfile][:filename].gsub(/[^a-zA-Z0-9_\-.]/, '') + current_site.store_file sanitized_filename, params[:newfile][:tempfile] - - if sanitized_filename =~ /index\.html/ - ScreenshotWorker.perform_async current_site.username - current_site.update site_changed: true - end - - current_site.update changed_count: 1+current_site.changed_count, updated_at: Time.now + current_site.increment_changed_count flash[:success] = "Successfully uploaded file #{sanitized_filename}." redirect '/dashboard' diff --git a/models/site.rb b/models/site.rb index 453dba41..0b907ec9 100644 --- a/models/site.rb +++ b/models/site.rb @@ -128,6 +128,18 @@ class Site < Sequel::Model def store_file(filename, uploaded) FileUtils.mv uploaded.path, file_path(filename) File.chmod(0640, file_path(filename)) + + if filename =~ /index\.html/ + ScreenshotWorker.perform_async values[:username] + self.site_changed = true + save(validate: false) + end + end + + def increment_changed_count + self.changed_count += 1 + self.updated_at = Time.now + save(validate: false) end def files_zip