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

post queries: support single-quoted strings in metatags.

Browse Source
This commit is contained in:
evazion
2022-04-04 18:53:58 -05:00
parent 88be28ae36
commit 783419bcd7
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/post_query/ast.rb
View File

@@ -358,7 +358,7 @@ class PostQuery
def quoted_value def quoted_value
return nil unless metatag? return nil unless metatag?
if value.include?(" ") || value.starts_with?('"') || value.empty? if value.include?(" ") || value.starts_with?('"') || value.starts_with?("'") || value.empty?
%Q{"#{value.gsub(/"/, '\\"')}"} %Q{"#{value.gsub(/"/, '\\"')}"}
else else
value value

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

@@ -24,6 +24,7 @@ require "strscan"
# metatag = metatag_name ":" quoted_string # metatag = metatag_name ":" quoted_string
# metatag_name = "user" | "fav" | "pool" | "order" | ... # metatag_name = "user" | "fav" | "pool" | "order" | ...
# quoted_string = '"' /[^"]+/ '"' # quoted_string = '"' /[^"]+/ '"'
# | "'" /[^']+/ "'"
# tag = /[^ *]+/ # tag = /[^ *]+/
# wildcard = /[^ ]+/ # wildcard = /[^ ]+/
# #
@@ -172,6 +173,10 @@ class PostQuery
a = accept(/([^"\\]|\\")*/).gsub(/\\"/, '"') # handle backslash escaped quotes a = accept(/([^"\\]|\\")*/).gsub(/\\"/, '"') # handle backslash escaped quotes
expect('"') expect('"')
a a
elsif accept("'")
a = accept(/([^'\\]|\\')*/).gsub(/\\'/, "'") # handle backslash escaped quotes
expect("'")
a
else else
string(/[^ ]+/) string(/[^ ]+/)
end end

7
test/unit/post_query_parser_test.rb
View File

@@ -70,6 +70,13 @@ class PostQueryParserTest < ActiveSupport::TestCase
assert_parse_equals('source:"\""', 'source:"\""') assert_parse_equals('source:"\""', 'source:"\""')
assert_parse_equals(%q{source:"don't say \"lazy\" okay"}, %q{source:"don't say \"lazy\" okay"}) assert_parse_equals(%q{source:"don't say \"lazy\" okay"}, %q{source:"don't say \"lazy\" okay"})
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"))})
assert_parse_equals('source:"foo bar"', "source:'foo bar'")
assert_parse_equals("source:foobar'(", "source:foobar'(")
assert_parse_equals('source:""', "source:''")
assert_parse_equals('source:"\'"', "source:'\\''")
assert_parse_equals(%q{source:"don't say \"lazy\" okay"}, %q{source:'don\'t say "lazy" okay'})
assert_parse_equals(%q{(and source:foo)bar a)}, %q{(a (source:'foo)bar'))})
end end
should "parse wildcard tags correctly" do should "parse wildcard tags correctly" do