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

fixes #3762

Browse Source
This commit is contained in:
Albert Yi
2018-06-20 10:07:27 -07:00
parent 56ee44dc00
commit 3f6e069eed
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/logical/upload_service.rb
View File

@@ -282,7 +282,7 @@ class UploadService
end end
def in_progress? def in_progress?
if source.present? if Utils.is_downloadable?(source)
Upload.where(status: "preprocessing", source: source).exists? Upload.where(status: "preprocessing", source: source).exists?
elsif md5.present? elsif md5.present?
Upload.where(status: "preprocessing", md5: md5).exists? Upload.where(status: "preprocessing", md5: md5).exists?
@@ -292,7 +292,7 @@ class UploadService
end end
def predecessor def predecessor
if source.present? if Utils.is_downloadable?(source)
Upload.where(status: ["preprocessed", "preprocessing"], source: source).first Upload.where(status: ["preprocessed", "preprocessing"], source: source).first
elsif md5.present? elsif md5.present?
Upload.where(status: ["preprocessed", "preprocessing"], md5: md5).first Upload.where(status: ["preprocessed", "preprocessing"], md5: md5).first
@@ -535,7 +535,7 @@ class UploadService
@upload.update(status: "processing") @upload.update(status: "processing")
if @upload.file.nil? && source.present? if @upload.file.nil? && Utils.is_downloadable?(source)
@upload.file = Utils.download_for_upload(source, @upload) @upload.file = Utils.download_for_upload(source, @upload)
end end