zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

site changed to false for empty index files

Browse source
This commit is contained in:
Kyle Drake 2015-08-28 11:55:36 -07:00
parent 4447d24ed3
commit ff953f4c09
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
models/site.rb
View file

@ -74,6 +74,8 @@ class Site < Sequel::Model
/PHP\.Hide/ /PHP\.Hide/
] ]
EMPTY_FILE_HASH = Digest::SHA1.hexdigest ''
PHISHING_FORM_REGEX = /www.formbuddy.com\/cgi-bin\/form.pl/i PHISHING_FORM_REGEX = /www.formbuddy.com\/cgi-bin\/form.pl/i
SPAM_MATCH_REGEX = ENV['RACK_ENV'] == 'test' ? /pillz/ : /#{$config['spam_smart_filter'].join('|')}/i SPAM_MATCH_REGEX = ENV['RACK_ENV'] == 'test' ? /pillz/ : /#{$config['spam_smart_filter'].join('|')}/i
EMAIL_SANITY_REGEX = /.+@.+\..+/i EMAIL_SANITY_REGEX = /.+@.+\..+/i
@ -1177,6 +1179,10 @@ class Site < Sequel::Model
end end
end end
def empty_index?
!site_files_dataset.where(path: /^\/?index.html$/).where(sha1_hash: EMPTY_FILE_HASH).first.nil?
end
# array of hashes: filename, tempfile, opts. # array of hashes: filename, tempfile, opts.
def store_files(files, opts={}) def store_files(files, opts={})
results = [] results = []
@ -1206,12 +1212,14 @@ class Site < Sequel::Model
end end
if results.include? true && opts[:new_install] != true if results.include? true && opts[:new_install] != true
if files.select {|f| f[:filename] =~ /^\/?index.html$/}.length > 0 || site_changed == true if((files.select {|f| f[:filename] =~ /^\/?index.html$/}.length > 0 || site_changed == true))
index_changed = true index_changed = true
else else
index_changed = false index_changed = false
end end
index_changed = false if empty_index?
time = Time.now time = Time.now
sql = DB["update sites set site_changed=?, site_updated_at=?, updated_at=?, changed_count=changed_count+1, space_used=space_used#{new_size < 0 ? new_size.to_s : '+'+new_size.to_s} where id=?", sql = DB["update sites set site_changed=?, site_updated_at=?, updated_at=?, changed_count=changed_count+1, space_used=space_used#{new_size < 0 ? new_size.to_s : '+'+new_size.to_s} where id=?",
index_changed, index_changed,

0
tests/files/blankindex/index.html Normal file
View file

8
tests/site_file_tests.rb
View file

@ -188,6 +188,14 @@ describe 'site_files' do
@site.site_changed.must_equal false @site.site_changed.must_equal false
end end
it 'sets site changed to false if index is empty' do
uploaded_file = Rack::Test::UploadedFile.new('./tests/files/blankindex/index.html', 'text/html')
upload 'files[]' => uploaded_file
last_response.body.must_match /successfully uploaded/i
@site.empty_index?.must_equal true
@site.site_changed.must_equal false
end
it 'fails with unsupported file' do it 'fails with unsupported file' do
upload 'files[]' => Rack::Test::UploadedFile.new('./tests/files/flowercrime.wav', 'audio/x-wav') upload 'files[]' => Rack::Test::UploadedFile.new('./tests/files/flowercrime.wav', 'audio/x-wav')
last_response.body.must_match /only supported by.+supporter account/i last_response.body.must_match /only supported by.+supporter account/i