rubocop: fix various Rubocop warnings.
This commit is contained in:
@@ -34,14 +34,12 @@ class UploadService
|
||||
|
||||
def in_progress?
|
||||
if md5.present?
|
||||
return Upload.where(status: "preprocessing", md5: md5).exists?
|
||||
Upload.exists?(status: "preprocessing", md5: md5)
|
||||
elsif Utils.is_downloadable?(source)
|
||||
Upload.exists?(status: "preprocessing", source: source)
|
||||
else
|
||||
false
|
||||
end
|
||||
|
||||
if Utils.is_downloadable?(source)
|
||||
return Upload.where(status: "preprocessing", source: source).exists?
|
||||
end
|
||||
|
||||
false
|
||||
end
|
||||
|
||||
def predecessor
|
||||
|
||||
@@ -11,7 +11,7 @@ class UploadService
|
||||
end
|
||||
|
||||
def comment_replacement_message(post, replacement)
|
||||
%("#{replacement.creator.name}":[#{Routes.user_path(replacement.creator)}] replaced this post with a new file:\n\n#{replacement_message(post, replacement)})
|
||||
%{"#{replacement.creator.name}":[#{Routes.user_path(replacement.creator)}] replaced this post with a new file:\n\n#{replacement_message(post, replacement)}}
|
||||
end
|
||||
|
||||
def replacement_message(post, replacement)
|
||||
@@ -49,7 +49,7 @@ class UploadService
|
||||
truncated_source = source.gsub(%r{\Ahttps?://}, "").truncate(64, omission: "...#{source.last(32)}")
|
||||
|
||||
if source =~ %r{\Ahttps?://}i
|
||||
%("#{truncated_source}":[#{source}])
|
||||
%{"#{truncated_source}":[#{source}]}
|
||||
else
|
||||
truncated_source
|
||||
end
|
||||
@@ -70,7 +70,7 @@ class UploadService
|
||||
return "file://#{repl.replacement_file.original_filename}"
|
||||
end
|
||||
|
||||
if !upload.source.present?
|
||||
if upload.source.blank?
|
||||
raise "No source found in upload for replacement"
|
||||
end
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ class UploadService
|
||||
end
|
||||
|
||||
def is_downloadable?(source)
|
||||
source =~ /^https?:\/\//
|
||||
source =~ %r{\Ahttps?://}
|
||||
end
|
||||
|
||||
def generate_resizes(media_file)
|
||||
|
||||
Reference in New Issue
Block a user