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

Strip source whitespace before upload

Browse Source 
This was already done for post edits but not on upload.
This commit is contained in:
Toks
2015-10-04 16:57:40 -04:00
parent f694c780c6
commit b12b637568
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/upload.rb
View File

@@ -102,6 +102,7 @@ class Upload < ActiveRecord::Base
def process_once def process_once
CurrentUser.scoped(uploader, uploader_ip_addr) do CurrentUser.scoped(uploader, uploader_ip_addr) do
update_attribute(:status, "processing") update_attribute(:status, "processing")
self.source = strip_source
if is_downloadable? if is_downloadable?
self.source = download_from_source(temp_file_path) self.source = download_from_source(temp_file_path)
end end
@@ -379,6 +380,10 @@ class Upload < ActiveRecord::Base
end end
module DownloaderMethods module DownloaderMethods
def strip_source
source.try(:strip)
end
# Determines whether the source is downloadable # Determines whether the source is downloadable
def is_downloadable? def is_downloadable?
source =~ /^https?:\/\// && file_path.blank? source =~ /^https?:\/\// && file_path.blank?