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

post queries: parse count metatag synonyms.

Browse Source
This commit is contained in:
evazion
2022-04-06 16:18:15 -05:00
parent f15f365375
commit 2adc530ba0
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/logical/post_query/parser.rb
View File

@@ -162,9 +162,10 @@ class PostQuery
# metatag_name = "user" | "fav" | "pool" | "order" | ... # metatag_name = "user" | "fav" | "pool" | "order" | ...
def metatag def metatag
if accept(METATAG_NAME_REGEX) if accept(METATAG_NAME_REGEX)
name = @scanner.matched.delete_suffix(":") name = @scanner.matched.delete_suffix(":").downcase
name = name.singularize + "_count" if name.in?(PostQueryBuilder::COUNT_METATAG_SYNONYMS)
value = quoted_string value = quoted_string
node(:metatag, name.downcase, value) node(:metatag, name, value)
end end
end end

21
test/unit/post_query_parser_test.rb
View File

@@ -79,6 +79,27 @@ class PostQueryParserTest < ActiveSupport::TestCase
assert_parse_equals(%q{(and source:foo)bar a)}, %q{(a (source:'foo)bar'))}) assert_parse_equals(%q{(and source:foo)bar a)}, %q{(a (source:'foo)bar'))})
end end
should "parse metatag synonyms correctly" do
assert_parse_equals("comment_count:0", "comments:0")
assert_parse_equals("deleted_comment_count:0", "deleted_comments:0")
assert_parse_equals("active_comment_count:0", "active_comments:0")
assert_parse_equals("note_count:0", "notes:0")
assert_parse_equals("deleted_note_count:0", "deleted_notes:0")
assert_parse_equals("active_note_count:0", "active_notes:0")
assert_parse_equals("flag_count:0", "flags:0")
assert_parse_equals("child_count:0", "children:0")
assert_parse_equals("deleted_child_count:0", "deleted_children:0")
assert_parse_equals("active_child_count:0", "active_children:0")
assert_parse_equals("pool_count:0", "pools:0")
assert_parse_equals("deleted_pool_count:0", "deleted_pools:0")
assert_parse_equals("active_pool_count:0", "active_pools:0")
assert_parse_equals("series_pool_count:0", "series_pools:0")
assert_parse_equals("collection_pool_count:0", "collection_pools:0")
assert_parse_equals("appeal_count:0", "appeals:0")
assert_parse_equals("approval_count:0", "approvals:0")
assert_parse_equals("replacement_count:0", "replacements:0")
end
should "parse wildcard tags correctly" do should "parse wildcard tags correctly" do
assert_parse_equals("(wildcard *)", "*") assert_parse_equals("(wildcard *)", "*")
assert_parse_equals("(wildcard *a)", "*a") assert_parse_equals("(wildcard *a)", "*a")