IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

moved has_been_uploaded and uploaded_regex to the Upload model

Browse Source
This commit is contained in:
Régis Hanol
2013-06-16 10:21:01 +02:00
parent c11f4456ae
commit 2c3f757951
5 changed files with 42 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/tasks/images.rake
View File

@@ -18,7 +18,7 @@ task "images:reindex" => :environment do
doc = Nokogiri::HTML::fragment(p.cooked)
doc.search("img").each do |img|
src = img['src']
if src.present? && has_been_uploaded?(src) && m = uploaded_regex.match(src)
if src.present? && Upload.has_been_uploaded?(src) && m = Upload.uploaded_regex.match(src)
begin
PostUpload.create({ post_id: p.id, upload_id: m[:upload_id] })
rescue ActiveRecord::RecordNotUnique
@@ -30,19 +30,3 @@ task "images:reindex" => :environment do
end
puts "\ndone."
end
def uploaded_regex
/\/uploads\/#{RailsMultisite::ConnectionManagement.current_db}\/(?<upload_id>\d+)\/[0-9a-f]{16}\.(png|jpg|jpeg|gif|tif|tiff|bmp)/
end
def has_been_uploaded?(url)
url =~ /^\/[^\/]/ || url.start_with?(base_url) || (asset_host.present? && url.start_with?(asset_host))
end
def base_url
asset_host.present? ? asset_host : Discourse.base_url_no_prefix
end
def asset_host
ActionController::Base.asset_host
end