jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#2025: update tests

Browse Source
This commit is contained in:
Toks
2013-11-17 21:25:11 -05:00
parent 18417628c3
commit ba88aaad49
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/upload.rb
View File

@@ -71,7 +71,7 @@ class Upload < ActiveRecord::Base
download_from_source(temp_file_path)
end
validate_file_exists
self.content_type = file_header_to_content_type
self.content_type = file_header_to_content_type(file_path)
self.file_ext = content_type_to_file_ext(content_type)
validate_file_content_type
calculate_hash(file_path)
@@ -235,8 +235,8 @@ class Upload < ActiveRecord::Base
end
end
def file_header_to_content_type
case File.read(file_path, 10)
def file_header_to_content_type(source_path)
case File.read(source_path, 10)
when /^\xff\xd8/
"image/jpeg"