mirror of
https://gitea.invidious.io/iv-org/invidious-copy-2022-03-16.git
synced 2024-08-15 00:53:18 +00:00
Declutter search bar to only show search query
This commit changes the way search filters are parsed. Instead of
directly appending the data into the search query and creating k:v
pairs, all of the search filters are now a URL parameter. This results
in a clear look overall and hides much of the logic from the end user.
Closes #1969
(cherry picked from commit 527fa42170)
This commit is contained in:
syeopite
parent
2b81a82620
commit
bd5ae97094
4 changed files with 29 additions and 36 deletions
|
|
@ -244,7 +244,7 @@ module Invidious::Routes::Playlists
|
|||
query = env.params.query["q"]?
|
||||
if query
|
||||
begin
|
||||
search_query, count, items, operators = process_search_query(query, page, user, region: nil)
|
||||
search_query, count, items, operators = process_search_query(env.params.query, query, page, user, region: nil)
|
||||
videos = items.select(SearchVideo).map(&.as(SearchVideo))
|
||||
rescue ex
|
||||
videos = [] of SearchVideo
|
||||
|
|
|
|||
|
|
@ -54,16 +54,19 @@ module Invidious::Routes::Search
|
|||
user = env.get? "user"
|
||||
|
||||
begin
|
||||
search_query, count, videos, operators = process_search_query(query, page, user, region: region)
|
||||
search_query, count, videos, operators = process_search_query(env.params.query, query, page, user, region: region)
|
||||
rescue ex
|
||||
return error_template(500, ex)
|
||||
end
|
||||
|
||||
operator_hash = {} of String => String
|
||||
operators.each do |operator|
|
||||
key, value = operator.downcase.split(":")
|
||||
operator_hash[key] = value
|
||||
end
|
||||
# Legacy stuff | TODO
|
||||
# operator_hash = {} of String => String
|
||||
# operators.each do |operator|
|
||||
# key, value = operator.downcase.split(":")
|
||||
# operator_hash[key] = value
|
||||
# end
|
||||
|
||||
operator_hash = operators
|
||||
|
||||
env.set "search", query
|
||||
templated "search"
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ def produce_channel_search_continuation(ucid, query, page)
|
|||
return continuation
|
||||
end
|
||||
|
||||
def process_search_query(query, page, user, region)
|
||||
def process_search_query(url_params, query, page, user, region)
|
||||
if user
|
||||
user = user.as(User)
|
||||
view_name = "subscriptions_#{sha256(user.email)}"
|
||||
|
|
@ -183,13 +183,18 @@ def process_search_query(query, page, user, region)
|
|||
sort = "relevance"
|
||||
subscriptions = nil
|
||||
|
||||
operators = query.split(" ").select(&.match(/\w+:[\w,]+/))
|
||||
operators.each do |operator|
|
||||
key, value = operator.downcase.split(":")
|
||||
# Legacy behavior. TODO add deprecated support.
|
||||
# operators = query.split(" ").select(&.match(/\w+:[\w,]+/))
|
||||
# operators.each do |operator|
|
||||
# key, value = operator.downcase.split(":")
|
||||
|
||||
# operators = url_params.split(" ").select { |a| a.match(/\w+:[\,]+/) }
|
||||
url_params.each do |operator|
|
||||
key, value = operator
|
||||
|
||||
case key
|
||||
when "channel", "user"
|
||||
channel = operator.split(":")[-1]
|
||||
channel = value
|
||||
when "content_type", "type"
|
||||
content_type = value
|
||||
when "date"
|
||||
|
|
@ -203,11 +208,11 @@ def process_search_query(query, page, user, region)
|
|||
when "subscriptions"
|
||||
subscriptions = value == "true"
|
||||
else
|
||||
operators.delete(operator)
|
||||
url_params.delete(key)
|
||||
end
|
||||
end
|
||||
|
||||
search_query = (query.split(" ") - operators).join(" ")
|
||||
search_query = query
|
||||
|
||||
if channel
|
||||
count, items = channel_search(search_query, page, channel)
|
||||
|
|
@ -232,20 +237,5 @@ def process_search_query(query, page, user, region)
|
|||
count, items = search(search_query, search_params, region).as(Tuple)
|
||||
end
|
||||
|
||||
# Light processing to flatten search results out of Categories.
|
||||
# They should ideally be supported in the future.
|
||||
items_without_category = [] of SearchItem | ChannelVideo
|
||||
items.each do |i|
|
||||
if i.is_a? Category
|
||||
i.contents.each do |nest_i|
|
||||
if !nest_i.is_a? Video
|
||||
items_without_category << nest_i
|
||||
end
|
||||
end
|
||||
else
|
||||
items_without_category << i
|
||||
end
|
||||
end
|
||||
|
||||
{search_query, items_without_category.size, items_without_category, operators}
|
||||
{search_query, count, items, url_params}
|
||||
end
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<% if operator_hash.fetch("date", "all") == date %>
|
||||
<b><%= translate(locale, date) %></b>
|
||||
<% else %>
|
||||
<a href="/search?q=<%= URI.encode_www_form(query.not_nil!.gsub(/ ?date:[a-z]+/, "") + " date:" + date) %>&page=<%= page %>">
|
||||
<a href="/search?q=<%= URI.encode_www_form(query.not_nil!) %>&page=<%= page %>&date=<%= date %>">
|
||||
<%= translate(locale, date) %>
|
||||
</a>
|
||||
<% end %>
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
<% if operator_hash.fetch("content_type", "all") == content_type %>
|
||||
<b><%= translate(locale, content_type) %></b>
|
||||
<% else %>
|
||||
<a href="/search?q=<%= URI.encode_www_form(query.not_nil!.gsub(/ ?content_type:[a-z]+/, "") + " content_type:" + content_type) %>&page=<%= page %>">
|
||||
<a href="/search?q=<%= URI.encode_www_form(query.not_nil!) %>&page=<%= page %>&content_type=<%= content_type %>">
|
||||
<%= translate(locale, content_type) %>
|
||||
</a>
|
||||
<% end %>
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
<% if operator_hash.fetch("duration", "all") == duration %>
|
||||
<b><%= translate(locale, duration) %></b>
|
||||
<% else %>
|
||||
<a href="/search?q=<%= URI.encode_www_form(query.not_nil!.gsub(/ ?duration:[a-z]+/, "") + " duration:" + duration) %>&page=<%= page %>">
|
||||
<a href="/search?q=<%= URI.encode_www_form(query.not_nil!) %>&page=<%= page %>&duration=<%= duration %>">
|
||||
<%= translate(locale, duration) %>
|
||||
</a>
|
||||
<% end %>
|
||||
|
|
@ -68,11 +68,11 @@
|
|||
<% if operator_hash.fetch("features", "all").includes?(feature) %>
|
||||
<b><%= translate(locale, feature) %></b>
|
||||
<% elsif operator_hash.has_key?("features") %>
|
||||
<a href="/search?q=<%= URI.encode_www_form(query.not_nil!.gsub(/features:/, "features:" + feature + ",")) %>&page=<%= page %>">
|
||||
<a href="/search?q=<%= URI.encode_www_form(query.not_nil!) %>&page=<%= page %>&features=<%= URI.encode_www_form(operator_hash["features"] + ",#{feature}") %>">
|
||||
<%= translate(locale, feature) %>
|
||||
</a>
|
||||
<% else %>
|
||||
<a href="/search?q=<%= URI.encode_www_form(query.not_nil! + " features:" + feature) %>&page=<%= page %>">
|
||||
<a href="/search?q=<%= URI.encode_www_form(query.not_nil!) %>&page=<%= page %>&features=<%= feature %>">
|
||||
<%= translate(locale, feature) %>
|
||||
</a>
|
||||
<% end %>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<% if operator_hash.fetch("sort", "relevance") == sort %>
|
||||
<b><%= translate(locale, sort) %></b>
|
||||
<% else %>
|
||||
<a href="/search?q=<%= URI.encode_www_form(query.not_nil!.gsub(/ ?sort:[a-z]+/, "") + " sort:" + sort) %>&page=<%= page %>">
|
||||
<a href="/search?q=<%= URI.encode_www_form(query.not_nil!) %>&page=<%= page %>&sort=<%= sort %>">
|
||||
<%= translate(locale, sort) %>
|
||||
</a>
|
||||
<% end %>
|
||||
|
|
|
|||
Loading…
Reference in a new issue