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

search: clean up pool: metatag.

Browse Source
This commit is contained in:
evazion
2020-04-20 21:28:10 -05:00
parent 34d4344eaf
commit f6fb3c0169
1 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/logical/post_query_builder.rb
View File

@@ -204,6 +204,23 @@ class PostQueryBuilder
end end
end end
def pool_matches(pool_name)
case pool_name.downcase
when "none"
Post.where.not(id: Pool.select("unnest(post_ids)"))
when "any"
Post.where(id: Pool.select("unnest(post_ids)"))
when "series"
Post.where(id: Pool.series.select("unnest(post_ids)"))
when "collection"
Post.where(id: Pool.collection.select("unnest(post_ids)"))
when /\*/
Post.where(id: Pool.name_matches(pool_name).select("unnest(post_ids)"))
else
Post.where(id: Pool.named(pool_name).select("unnest(post_ids)"))
end
end
def commentary_matches(query) def commentary_matches(query)
case query case query
when "none", "false" when "none", "false"
@@ -315,38 +332,12 @@ class PostQueryBuilder
end end
end end
q[:pool].to_a.each do |pool_name| q[:pool_neg].to_a.each do |pool_name|
case pool_name relation = relation.merge(pool_matches(pool_name).negate)
when "none"
relation = relation.where.not(id: Pool.select("unnest(post_ids)"))
when "any"
relation = relation.where(id: Pool.select("unnest(post_ids)"))
when "series"
relation = relation.where(id: Pool.series.select("unnest(post_ids)"))
when "collection"
relation = relation.where(id: Pool.collection.select("unnest(post_ids)"))
when /\*/
relation = relation.where(id: Pool.name_matches(pool_name).select("unnest(post_ids)"))
else
relation = relation.where(id: Pool.named(pool_name).select("unnest(post_ids)"))
end
end end
q[:pool_neg].to_a.each do |pool_name| q[:pool].to_a.each do |pool_name|
case pool_name relation = relation.merge(pool_matches(pool_name))
when "none"
relation = relation.where(id: Pool.select("unnest(post_ids)"))
when "any"
relation = relation.where.not(id: Pool.select("unnest(post_ids)"))
when "series"
relation = relation.where.not(id: Pool.series.select("unnest(post_ids)"))
when "collection"
relation = relation.where.not(id: Pool.collection.select("unnest(post_ids)"))
when /\*/
relation = relation.where.not(id: Pool.name_matches(pool_name).select("unnest(post_ids)"))
else
relation = relation.where.not(id: Pool.named(pool_name).select("unnest(post_ids)"))
end
end end
q[:commentary_neg].to_a.each do |query| q[:commentary_neg].to_a.each do |query|