mirror of
https://github.com/philomena-dev/philomena.git
synced 2025-02-01 03:46:44 +01:00
add sort options
This commit is contained in:
byte[]
parent
9d26cef16b
commit
38447e7e9c
4 changed files with 206 additions and 4 deletions
|
|
@ -49,7 +49,8 @@ defmodule PhilomenaWeb.ProfileController do
|
|||
"show.html",
|
||||
user: user,
|
||||
recent_uploads: recent_uploads,
|
||||
recent_faves: recent_faves
|
||||
recent_faves: recent_faves,
|
||||
layout_class: "layout--wide"
|
||||
)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -11,11 +11,14 @@ defmodule PhilomenaWeb.SearchController do
|
|||
user = conn.assigns.current_user
|
||||
|
||||
with {:ok, query} <- Query.compile(user, params["q"]) do
|
||||
sd = parse_sd(params)
|
||||
sf = parse_sf(params, sd)
|
||||
|
||||
images =
|
||||
Image.search_records(
|
||||
%{
|
||||
query: %{bool: %{must: query, must_not: [filter, %{term: %{hidden_from_users: true}}]}},
|
||||
sort: %{created_at: :desc}
|
||||
query: %{bool: %{must: [query | sf.query], must_not: [filter, %{term: %{hidden_from_users: true}}]}},
|
||||
sort: sf.sort
|
||||
},
|
||||
conn.assigns.pagination,
|
||||
Image |> preload(:tags)
|
||||
|
|
@ -36,4 +39,68 @@ defmodule PhilomenaWeb.SearchController do
|
|||
)
|
||||
end
|
||||
end
|
||||
|
||||
defp parse_sd(%{"sd" => sd}) when sd in ~W(asc desc),
|
||||
do: sd
|
||||
defp parse_sd(_params), do: :desc
|
||||
|
||||
defp parse_sf(%{"sf" => sf}, sd) when
|
||||
sf in ~W(created_at updated_at first_seen_at width height score comment_count tag_count wilson_score _score)
|
||||
do
|
||||
%{query: [], sort: %{sf => sd}}
|
||||
end
|
||||
|
||||
defp parse_sf(%{"sf" => "random"}, sd) do
|
||||
random_query(:rand.uniform(4_294_967_296), sd)
|
||||
end
|
||||
|
||||
defp parse_sf(%{"sf" => <<"random:", seed::binary>>}, sd) do
|
||||
case Integer.parse(seed) do
|
||||
{seed, _rest} ->
|
||||
random_query(seed, sd)
|
||||
|
||||
_ ->
|
||||
random_query(:rand.uniform(4_294_967_296), sd)
|
||||
end
|
||||
end
|
||||
|
||||
defp parse_sf(%{"sf" => <<"gallery_id:", gallery::binary>>}, sd) do
|
||||
case Integer.parse(gallery) do
|
||||
{gallery, _rest} ->
|
||||
%{
|
||||
query: [],
|
||||
sort: %{
|
||||
"galleries.position": %{
|
||||
order: sd,
|
||||
nested_path: :galleries,
|
||||
nested_filter: %{
|
||||
term: %{
|
||||
"galleries.id": gallery
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
_ ->
|
||||
%{query: [], sort: %{match_none: %{}}}
|
||||
end
|
||||
end
|
||||
|
||||
defp parse_sf(_params, sd) do
|
||||
%{query: [], sort: %{created_at: sd}}
|
||||
end
|
||||
|
||||
defp random_query(seed, sd) do
|
||||
%{
|
||||
query: [%{
|
||||
function_score: %{
|
||||
query: %{match_all: %{}},
|
||||
random_score: %{seed: seed},
|
||||
boost_mode: :replace
|
||||
}
|
||||
}],
|
||||
sort: %{_score: sd}
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
|
|||
132
lib/philomena_web/templates/search/_form.html.slime
Normal file
132
lib/philomena_web/templates/search/_form.html.slime
Normal file
|
|
@ -0,0 +1,132 @@
|
|||
h1 Search
|
||||
|
||||
= form_for :search, Routes.search_path(@conn, :index), [id: "searchform", method: "get", class: "js-search-form", enforce_utf8: false], fn f ->
|
||||
= text_input f, :q, class: "input input--wide js-search-field", placeholder: "Search terms are chained with commas", autocapitalize: "none", name: "q", value: @conn.params["q"]
|
||||
|
||||
.block
|
||||
.block__header.flex
|
||||
a data-search-prepend="-" NOT
|
||||
.dropdown.block__header__dropdown-tab
|
||||
a
|
||||
' Search terms
|
||||
span data-click-preventdefault="true"
|
||||
i.fa.fa-caret-down<
|
||||
.dropdown__content
|
||||
a data-search-add="score.gte:100" data-search-select-last="3" data-search-show-help="numeric" Score
|
||||
a data-search-add="created_at.lte:3 years ago" data-search-select-last="11" data-search-show-help="date" Created at
|
||||
a data-search-add="faves.gte:100" data-search-select-last="3" data-search-show-help="numeric" Number of faves
|
||||
a data-search-add="upvotes.gte:100" data-search-select-last="3" data-search-show-help="numeric" Number of upvotes
|
||||
a data-search-add="downvotes.gte:100" data-search-select-last="3" data-search-show-help="numeric" Number of downvotes
|
||||
a data-search-add="comment_count.gt:20" data-search-select-last="2" data-search-show-help="numeric" Number of comments
|
||||
a data-search-add="uploader:k_a" data-search-select-last="3" data-search-show-help="literal" Uploader
|
||||
a data-search-add="source_url:*deviantart.com*" data-search-select-last="16" data-search-show-help="literal" Image source URL
|
||||
a data-search-add="width:1920" data-search-select-last="4" data-search-show-help="numeric" Image width
|
||||
a data-search-add="height:1080" data-search-select-last="4" data-search-show-help="numeric" Image height
|
||||
a data-search-add="aspect_ratio:1" data-search-select-last="1" data-search-show-help="numeric" Aspect ratio
|
||||
|
||||
= if @conn.assigns.current_user do
|
||||
.dropdown.block__header__dropdown-tab
|
||||
a
|
||||
' Belonging to…
|
||||
span data-click-preventdefault="true"
|
||||
i.fa.fa-caret-down<
|
||||
.dropdown__content
|
||||
a data-search-add="my:faves" data-search-show-help=" " My favorites
|
||||
a data-search-add="my:upvotes" data-search-show-help=" " My upvotes
|
||||
a data-search-add="my:uploads" data-search-show-help=" " My uploads
|
||||
a data-search-add="my:watched" data-search-show-help=" " My watched tags
|
||||
/.flex__right
|
||||
a href="#" data-click-toggle="#js-search-tags" Quick tags
|
||||
a href=search_syntax_path Help
|
||||
|
||||
.block__content
|
||||
.hidden.walloftext data-search-help="numeric"
|
||||
strong.js-search-help-subject>
|
||||
| is a numerical range field. Four qualifiers,
|
||||
code<> gte
|
||||
| (greater than or equal),
|
||||
code<> lte
|
||||
| (less than or equal),
|
||||
code<> gt
|
||||
| (greater than), and
|
||||
code<> lt
|
||||
| (less than), can be applied to the desired value.
|
||||
br
|
||||
br
|
||||
em<> Example:
|
||||
| to find images with a score greater than 100, you would use
|
||||
code<> score.gt:100
|
||||
| .
|
||||
|
||||
.hidden.walloftext data-search-help="date"
|
||||
strong.js-search-help-subject>
|
||||
' is a date/time field. It accepts a
|
||||
a href="search/syntax#date-range" tweaked subset of the ISO 8601 standard
|
||||
| , as well as relative dates
|
||||
code<
|
||||
| (X minutes/hours/days/months/years ago)
|
||||
| . Four qualifiers,
|
||||
code<> gte
|
||||
| (greater than or equal),
|
||||
code<> lte
|
||||
| (less than or equal),
|
||||
code<> gt
|
||||
| (greater than), and
|
||||
code<> lt
|
||||
| (less than), can be applied to the desired value.
|
||||
br
|
||||
br
|
||||
em<> Example:
|
||||
| to find images created before 2013, you would use
|
||||
code<> created_at.lt:2013
|
||||
| .
|
||||
|
||||
.hidden.walloftext data-search-help="literal"
|
||||
strong.js-search-help-subject>
|
||||
' is a literal field. You can apply apply a wildcard
|
||||
code<> *
|
||||
| as a substitute for zero or more characters.
|
||||
br
|
||||
br
|
||||
em<> Example:
|
||||
| to find images from DeviantArt, you would use
|
||||
code<> source_url:*deviantart.com*
|
||||
| .
|
||||
|
||||
/#js-search-tags.hidden
|
||||
/= render partial: 'tags/quick_tag_table', locals: { target: '.js-search-field' }
|
||||
|
||||
.field.field--inline.flex-wrap
|
||||
= submit "Search", class: "button button--state-primary"
|
||||
/= submit_tag "I'm Feeling Poni", class: 'button button--separate-left spacing-right', name: 'random_image'
|
||||
|
||||
elixir:
|
||||
random_is_selected = to_string(@conn.params["sf"]) =~ ~r/\Arandom(:\d+)?\z/
|
||||
random_seed =
|
||||
if random_is_selected do
|
||||
@conn.params["sf"]
|
||||
else
|
||||
"random:#{:rand.uniform(4_294_967_296)}"
|
||||
end
|
||||
|
||||
sort_fields = [
|
||||
"Sort by upload date": :created_at,
|
||||
"Sort by last modified": :updated_at,
|
||||
"Sort by initial post date": :first_seen_at,
|
||||
"Sort by score": :score,
|
||||
"Sort by Wilson score": :wilson_score,
|
||||
"Sort by relevance": :_score,
|
||||
"Sort by width": :width,
|
||||
"Sort by height": :height,
|
||||
"Sort by comments": :comment_count,
|
||||
"Sort by tag count": :tag_count,
|
||||
"Random!": random_seed
|
||||
]
|
||||
|
||||
sort_directions = [
|
||||
"Descending": :desc,
|
||||
"Ascending": :asc
|
||||
]
|
||||
|
||||
= select f, :sf, sort_fields, class: "input input--separate-left", name: "sf", autocomplete: "off", selected: @conn.params["sf"]
|
||||
= select f, :sd, sort_directions, class: "input input--separate-left", name: "sd", autocomplete: "off", selected: @conn.params["sd"]
|
||||
|
|
@ -8,3 +8,5 @@
|
|||
- true ->
|
||||
p
|
||||
' No images found!
|
||||
|
||||
= render PhilomenaWeb.SearchView, "_form.html", conn: @conn
|
||||
Loading…
Reference in a new issue