PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-02-17 11:04:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

format

Browse source
This commit is contained in:
Liam P. White 2019-08-27 19:37:44 -04:00
parent 8cb0cbc244
commit cb0b6788a4
2 changed files with 66 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
lib/philomena/images/query.ex
View file

@ -1,7 +1,7 @@
defmodule Philomena.Images.Query do defmodule Philomena.Images.Query do
import Philomena.Search.Parser import Philomena.Search.Parser
defparser "anonymous", defparser("anonymous",
int: int:
~W(id width height comment_count score upvotes downvotes faves uploader_id faved_by_id tag_count), ~W(id width height comment_count score upvotes downvotes faves uploader_id faved_by_id tag_count),
float: ~W(aspect_ratio wilson_score), float: ~W(aspect_ratio wilson_score),
@ -19,8 +19,9 @@ defmodule Philomena.Images.Query do
"faved_by_id" => "favourited_by_user_ids" "faved_by_id" => "favourited_by_user_ids"
}, },
default: "namespaced_tags.name" default: "namespaced_tags.name"
)
defparser "user", defparser("user",
int: int:
~W(id width height comment_count score upvotes downvotes faves uploader_id faved_by_id tag_count), ~W(id width height comment_count score upvotes downvotes faves uploader_id faved_by_id tag_count),
float: ~W(aspect_ratio wilson_score), float: ~W(aspect_ratio wilson_score),
@ -33,11 +34,18 @@ defmodule Philomena.Images.Query do
%{nested: %{path: :galleries, query: %{term: %{"galleries.id" => value}}}} %{nested: %{path: :galleries, query: %{term: %{"galleries.id" => value}}}}
end, end,
"my" => fn "my" => fn
%{user: %{id: id}}, "faves" -> %{term: %{favourited_by_user_ids: id}} %{user: %{id: id}}, "faves" ->
%{user: %{id: id}}, "upvotes" -> %{term: %{upvoter_ids: id}} %{term: %{favourited_by_user_ids: id}}
%{user: %{id: id}}, "downvotes" -> %{term: %{downvoter_ids: id}}
%{user: %{id: id}}, "upvotes" ->
%{term: %{upvoter_ids: id}}
%{user: %{id: id}}, "downvotes" ->
%{term: %{downvoter_ids: id}}
%{user: _u}, "watched" -> %{user: _u}, "watched" ->
%{query: %{match_all: %{}}} # todo # todo
%{query: %{match_all: %{}}}
end end
}, },
aliases: %{ aliases: %{
@ -45,13 +53,15 @@ defmodule Philomena.Images.Query do
"faved_by_id" => "favourited_by_user_ids" "faved_by_id" => "favourited_by_user_ids"
}, },
default: "namespaced_tags.name" default: "namespaced_tags.name"
)
defparser "moderator", defparser("moderator",
int: int:
~W(id width height comment_count score upvotes downvotes faves uploader_id faved_by_id upvoted_by_id downvoted_by_id tag_count true_uploader_id hidden_by_id deleted_by_user-id), ~W(id width height comment_count score upvotes downvotes faves uploader_id faved_by_id upvoted_by_id downvoted_by_id tag_count true_uploader_id hidden_by_id deleted_by_user-id),
float: ~W(aspect_ratio wilson_score), float: ~W(aspect_ratio wilson_score),
date: ~W(created_at updated_at first_seen_at), date: ~W(created_at updated_at first_seen_at),
literal: ~W(faved_by orig_sha512_hash sha512_hash uploader source_url original_format fingerprint upvoted_by downvoted_by true_uploader hidden_by deleted_by_user), literal:
~W(faved_by orig_sha512_hash sha512_hash uploader source_url original_format fingerprint upvoted_by downvoted_by true_uploader hidden_by deleted_by_user),
ngram: ~W(description deletion_reason), ngram: ~W(description deletion_reason),
ip: ~W(ip), ip: ~W(ip),
bool: ~W(deleted), bool: ~W(deleted),
@ -61,23 +71,31 @@ defmodule Philomena.Images.Query do
%{nested: %{path: :galleries, query: %{term: %{"galleries.id" => value}}}} %{nested: %{path: :galleries, query: %{term: %{"galleries.id" => value}}}}
end, end,
"my" => fn "my" => fn
%{user: %{id: id}}, "faves" -> %{term: %{favourited_by_user_ids: id}} %{user: %{id: id}}, "faves" ->
%{user: %{id: id}}, "upvotes" -> %{term: %{upvoter_ids: id}} %{term: %{favourited_by_user_ids: id}}
%{user: %{id: id}}, "downvotes" -> %{term: %{downvoter_ids: id}}
%{user: %{id: id}}, "upvotes" ->
%{term: %{upvoter_ids: id}}
%{user: %{id: id}}, "downvotes" ->
%{term: %{downvoter_ids: id}}
%{user: _u}, "watched" -> %{user: _u}, "watched" ->
%{query: %{match_all: %{}}} # todo # todo
%{query: %{match_all: %{}}}
end end
}, },
aliases: %{ aliases: %{
"faved_by" => "favourited_by_users", "faved_by" => "favourited_by_users",
"upvoted_by" => "upvoters", "upvoted_by" => "upvoters",
"downvoted_by" => "downvoters", "downvoted_by" => "downvoters",
"faved_by_id" => "favourited_by_user_ids", "faved_by_id" => "favourited_by_user_ids",
"upvoted_by_id" => "upvoter_ids", "upvoted_by_id" => "upvoter_ids",
"downvoted_by_id" => "downvoter_ids", "downvoted_by_id" => "downvoter_ids",
"hidden_by" => "hidden_by_users", "hidden_by" => "hidden_by_users",
"hidden_by_id" => "hidden_by_user_ids", "hidden_by_id" => "hidden_by_user_ids",
"deleted" => "hidden_from_users" "deleted" => "hidden_from_users"
}, },
default: "namespaced_tags.name" default: "namespaced_tags.name"
)
end end

41
lib/philomena/search/parser.ex
View file

@ -8,7 +8,7 @@ defmodule Philomena.Search.Parser do
import Philomena.Search.Lexer import Philomena.Search.Lexer
import Philomena.Search.Helpers import Philomena.Search.Helpers
deflexer unquote(name), unquote(opts) deflexer(unquote(name), unquote(opts))
def unquote(:"#{name}_parser")(ctx, input) do def unquote(:"#{name}_parser")(ctx, input) do
with {:ok, tree, _1, _2, _3, _4} <- unquote(:"#{name}_lexer")(input) do with {:ok, tree, _1, _2, _3, _4} <- unquote(:"#{name}_lexer")(input) do
@ -23,12 +23,12 @@ defmodule Philomena.Search.Parser do
{tree, []} = unquote(:"#{name}_top")(ctx, tokens) {tree, []} = unquote(:"#{name}_top")(ctx, tokens)
{:ok, tree} {:ok, tree}
#rescue # rescue
# e in ArgumentError -> # e in ArgumentError ->
# {:error, e.message} # {:error, e.message}
# _ -> # _ ->
# {:error, "Parsing error."} # {:error, "Parsing error."}
end end
# #
@ -120,7 +120,12 @@ defmodule Philomena.Search.Parser do
case tokens do case tokens do
[{:int_field, field}, {:eq, _}, {:int, value}, {:fuzz, _}, {:number, fuzz} | r_tokens] -> [{:int_field, field}, {:eq, _}, {:int, value}, {:fuzz, _}, {:number, fuzz} | r_tokens] ->
{%{ {%{
range: %{unquote(:"#{name}_alias")(field) => %{gte: trunc(value - fuzz), lte: trunc(value + fuzz)}} range: %{
unquote(:"#{name}_alias")(field) => %{
gte: trunc(value - fuzz),
lte: trunc(value + fuzz)
}
}
}, r_tokens} }, r_tokens}
[ [
@ -131,7 +136,12 @@ defmodule Philomena.Search.Parser do
{:number, fuzz} | r_tokens {:number, fuzz} | r_tokens
] -> ] ->
{%{ {%{
range: %{unquote(:"#{name}_alias")(field) => %{gte: trunc(value - fuzz), lte: trunc(value + fuzz)}} range: %{
unquote(:"#{name}_alias")(field) => %{
gte: trunc(value - fuzz),
lte: trunc(value + fuzz)
}
}
}, r_tokens} }, r_tokens}
[ [
@ -141,7 +151,8 @@ defmodule Philomena.Search.Parser do
{:fuzz, _}, {:fuzz, _},
{:number, fuzz} | r_tokens {:number, fuzz} | r_tokens
] -> ] ->
{%{fuzzy: %{unquote(:"#{name}_alias")(field) => %{value: value, fuzziness: fuzz}}}, r_tokens} {%{fuzzy: %{unquote(:"#{name}_alias")(field) => %{value: value, fuzziness: fuzz}}},
r_tokens}
[ [
{:ngram_field, field}, {:ngram_field, field},
@ -150,7 +161,8 @@ defmodule Philomena.Search.Parser do
{:fuzz, _}, {:fuzz, _},
{:number, fuzz} | r_tokens {:number, fuzz} | r_tokens
] -> ] ->
{%{fuzzy: %{unquote(:"#{name}_alias")(field) => %{value: value, fuzziness: fuzz}}}, r_tokens} {%{fuzzy: %{unquote(:"#{name}_alias")(field) => %{value: value, fuzziness: fuzz}}},
r_tokens}
[{:default, [text: value]}, {:fuzz, _}, {:number, fuzz} | r_tokens] -> [{:default, [text: value]}, {:fuzz, _}, {:number, fuzz} | r_tokens] ->
{%{fuzzy: %{unquote(default_field) => %{value: value, fuzziness: fuzz}}}, r_tokens} {%{fuzzy: %{unquote(default_field) => %{value: value, fuzziness: fuzz}}}, r_tokens}
@ -196,13 +208,15 @@ defmodule Philomena.Search.Parser do
defp unquote(:"#{name}_term")(_ctx, tokens) do defp unquote(:"#{name}_term")(_ctx, tokens) do
case tokens do case tokens do
[{:date_field, field}, {:eq, _}, {:date, [lower, higher]} | r_tokens] -> [{:date_field, field}, {:eq, _}, {:date, [lower, higher]} | r_tokens] ->
{%{range: %{unquote(:"#{name}_alias")(field) => %{gte: lower, lte: higher}}}, r_tokens} {%{range: %{unquote(:"#{name}_alias")(field) => %{gte: lower, lte: higher}}},
r_tokens}
[{:ngram_field, field}, {:eq, _}, {:text, value} | r_tokens] -> [{:ngram_field, field}, {:eq, _}, {:text, value} | r_tokens] ->
value = process_term(value) value = process_term(value)
if contains_wildcard?(value) do if contains_wildcard?(value) do
{%{wildcard: %{unquote(:"#{name}_alias")(field) => unescape_wildcard(value)}}, r_tokens} {%{wildcard: %{unquote(:"#{name}_alias")(field) => unescape_wildcard(value)}},
r_tokens}
else else
{%{match: %{unquote(:"#{name}_alias")(field) => unescape_regular(value)}}, r_tokens} {%{match: %{unquote(:"#{name}_alias")(field) => unescape_regular(value)}}, r_tokens}
end end
@ -211,7 +225,8 @@ defmodule Philomena.Search.Parser do
value = process_term(value) value = process_term(value)
if contains_wildcard?(value) do if contains_wildcard?(value) do
{%{wildcard: %{unquote(:"#{name}_alias")(field) => unescape_wildcard(value)}}, r_tokens} {%{wildcard: %{unquote(:"#{name}_alias")(field) => unescape_wildcard(value)}},
r_tokens}
else else
{%{term: %{unquote(:"#{name}_alias")(field) => unescape_regular(value)}}, r_tokens} {%{term: %{unquote(:"#{name}_alias")(field) => unescape_regular(value)}}, r_tokens}
end end