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

Merge pull request #4019 from lllusion3469/patch-3

Browse Source 
#3767: Prioritize md5 check over source download
This commit is contained in:
Albert Yi
2018-12-17 10:07:46 -08:00
committed by GitHub
parent d52d5ff260 e21f067fab
commit f859f4babc
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/logical/upload_service/preprocessor.rb
View File

@@ -33,25 +33,25 @@ class UploadService
memoize :canonical_source memoize :canonical_source
def in_progress? def in_progress?
if Utils.is_downloadable?(source)
return Upload.where(status: "preprocessing", source: source).exists?
end
if md5.present? if md5.present?
return Upload.where(status: "preprocessing", md5: md5).exists? return Upload.where(status: "preprocessing", md5: md5).exists?
end end
if Utils.is_downloadable?(source)
return Upload.where(status: "preprocessing", source: source).exists?
end
false false
end end
def predecessor def predecessor
if Utils.is_downloadable?(source)
return Upload.where(status: ["preprocessed", "preprocessing"], source: source).first
end
if md5.present? if md5.present?
return Upload.where(status: ["preprocessed", "preprocessing"], md5: md5).first return Upload.where(status: ["preprocessed", "preprocessing"], md5: md5).first
end end
if Utils.is_downloadable?(source)
return Upload.where(status: ["preprocessed", "preprocessing"], source: source).first
end
end end
def completed? def completed?