iv-org/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-12-29 17:26:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
syeopite 2021-06-24 08:58:25 -07:00
parent 04e04efd19
commit 842c23a119
No known key found for this signature in database
GPG Key ID: 6FA616E5A5294A82
3 changed files with 116 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/invidious/routes/search.cr
View File

@ -52,17 +52,11 @@ class Invidious::Routes::Search < Invidious::Routes::BaseRoute
user = env.get? "user" user = env.get? "user"
begin begin
search_query, count, videos, operators = process_search_query(query, page, user, region: region) search_query, count, items, operators = process_search_query(env.params.query, query, page, user, region: nil)
rescue ex rescue ex
return error_template(500, ex) return error_template(500, ex)
end end
operator_hash = {} of String => String
operators.each do |operator|
key, value = operator.downcase.split(":")
operator_hash[key] = value
end
env.set "search", query env.set "search", query
templated "search" templated "search"
end end

6
src/invidious/search.cr
View File

@ -182,7 +182,7 @@ def process_search_query(url_params, query, page, user, region)
sort = "relevance" sort = "relevance"
subscriptions = nil subscriptions = nil
# operators = url_params.split(" ").select { |a| a.match(/\w+:[\,]+/) } # operators = query.split(" ").select { |a| a.match(/\w+:[\w,]+/) }
url_params.each do |operator| url_params.each do |operator|
key, value = operator key, value = operator
@ -237,7 +237,7 @@ def process_search_query(url_params, query, page, user, region)
items.each do |i| items.each do |i|
if i.is_a? Category if i.is_a? Category
i.contents.each do |cate_items| i.contents.each do |cate_items|
if cate_items.is_a? (SearchVideo | SearchPlaylist | SearchChannel) if cate_items.is_a?(SearchVideo | SearchPlaylist | SearchChannel)
extracted_items << cate_items extracted_items << cate_items
end end
end end
@ -246,5 +246,5 @@ def process_search_query(url_params, query, page, user, region)
end end
end end
{search_query, count, extracted_items, url_params} {search_query, count, items, url_params}
end end

24
src/invidious/views/search.ecr
View File

@ -15,7 +15,6 @@
<div id="filters" class="pure-g h-box"> <div id="filters" class="pure-g h-box">
<!-- Grabs all search filters. This is to make sure we don't accidently overwrite something within the <!-- Grabs all search filters. This is to make sure we don't accidently overwrite something within the
search query later on--> search query later on-->
<% filter_params = env.request.query_params.to_s.gsub(/q=.+?(?=&|$)/, "") %> <% filter_params = env.request.query_params.to_s.gsub(/q=.+?(?=&|$)/, "") %>
<% base_url = "/search?q=#{HTML.escape(query.not_nil!)}" %> <% base_url = "/search?q=#{HTML.escape(query.not_nil!)}" %>
@ -25,7 +24,7 @@
<ul class="pure-menu-list"> <ul class="pure-menu-list">
<% ["hour", "today", "week", "month", "year"].each do |date| %> <% ["hour", "today", "week", "month", "year"].each do |date| %>
<li class="pure-menu-item"> <li class="pure-menu-item">
<% if operator_hash.fetch("date", "all") == date %> <% if operators.fetch("date", "all") == date %>
<a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&date=[a-z]+/, "")}"%>"> <a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&date=[a-z]+/, "")}"%>">
<b><%= translate(locale, date) %></b> <b><%= translate(locale, date) %></b>
<i class="remove-filter icon ion-md-close"></i> <i class="remove-filter icon ion-md-close"></i>
@ -46,7 +45,7 @@
<ul class="pure-menu-list"> <ul class="pure-menu-list">
<% ["video", "channel", "playlist", "movie", "show"].each do |content_type| %> <% ["video", "channel", "playlist", "movie", "show"].each do |content_type| %>
<li class="pure-menu-item"> <li class="pure-menu-item">
<% if operator_hash.fetch("content_type", "all") == content_type %> <% if operators.fetch("content_type", "all") == content_type %>
<a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&content_type=[a-z]+/, "")}"%>"> <a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&content_type=[a-z]+/, "")}"%>">
<b><%= translate(locale, content_type) %></b> <b><%= translate(locale, content_type) %></b>
<i class="remove-filter icon ion-md-close"></i> <i class="remove-filter icon ion-md-close"></i>
@ -67,7 +66,7 @@
<ul class="pure-menu-list"> <ul class="pure-menu-list">
<% ["short", "long"].each do |duration| %> <% ["short", "long"].each do |duration| %>
<li class="pure-menu-item"> <li class="pure-menu-item">
<% if operator_hash.fetch("duration", "all") == duration %> <% if operators.fetch("duration", "all") == duration %>
<a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&duration=[a-z]+/, "")}"%>"> <a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&duration=[a-z]+/, "")}"%>">
<b><%= translate(locale, duration) %></b> <b><%= translate(locale, duration) %></b>
<i class="remove-filter icon ion-md-close"></i> <i class="remove-filter icon ion-md-close"></i>
@ -88,8 +87,8 @@
<ul class="pure-menu-list"> <ul class="pure-menu-list">
<% ["hd", "subtitles", "creative_commons", "3d", "live", "purchased", "4k", "360", "location", "hdr"].each do |feature| %> <% ["hd", "subtitles", "creative_commons", "3d", "live", "purchased", "4k", "360", "location", "hdr"].each do |feature| %>
<li class="pure-menu-item"> <li class="pure-menu-item">
<% if operator_hash.fetch("features", "all").includes?(feature) %> <% if operators.fetch("features", "all").includes?(feature) %>
<% if operator_hash["features"].split(",").size == 1 %> <% if operators["features"].split(",").size == 1 %>
<a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&features=[a-z]+/, "")}"%>"> <a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&features=[a-z]+/, "")}"%>">
<b><%= translate(locale, feature) %></b> <b><%= translate(locale, feature) %></b>
<i class="remove-filter icon ion-md-close"></i> <i class="remove-filter icon ion-md-close"></i>
@ -104,7 +103,7 @@
<i class="remove-filter icon ion-md-close"></i> <i class="remove-filter icon ion-md-close"></i>
</a> </a>
<% end %> <% end %>
<% elsif operator_hash.has_key?("features") %> <% elsif operators.has_key?("features") %>
<a href="<%= base_url + filter_params.gsub(/features=/, "features=#{feature},")%>"> <a href="<%= base_url + filter_params.gsub(/features=/, "features=#{feature},")%>">
<%= translate(locale, feature) %> <%= translate(locale, feature) %>
</a> </a>
@ -121,17 +120,20 @@
<div class="pure-u-1-3 pure-u-md-1-5 filter-catagory" id="filter-sort"> <div class="pure-u-1-3 pure-u-md-1-5 filter-catagory" id="filter-sort">
<b><%= translate(locale, "sort") %></b> <b><%= translate(locale, "sort") %></b>
<hr/> <hr/>
<ul class="pure-menu-list">
<% ["relevance", "rating", "date", "views"].each do |sort| %> <% ["relevance", "rating", "date", "views"].each do |sort| %>
<div class="pure-u-1 pure-md-1-5"> <li class="pure-menu-item">
<% if operator_hash.fetch("sort", "relevance") == sort %> <% if operators.fetch("sort", "relevance") == sort %>
<b><%= translate(locale, sort) %></b> <b><%= translate(locale, sort) %></b>
<% else %> <% else %>
<a href="<%= base_url + "#{filter_params.gsub(/&sort=[a-z]+/, "")}&sort=#{sort}"%>"> <a href="<%= base_url + "#{filter_params.gsub(/&sort=[a-z]+/, "")}&sort=#{sort}"%>">
<%= translate(locale, sort) %> <%= translate(locale, sort) %>
</a> </a>
<% end %> <% end %>
</div> </li>
<% end %> <% end %>
</ul>
</div>
</div> </div>
</details> </details>
<% end %> <% end %>
@ -161,7 +163,7 @@
</div> </div>
<div class="pure-g"> <div class="pure-g">
<% videos.each_slice(4) do |slice| %> <% items.each_slice(4) do |slice| %>
<% slice.each do |item| %> <% slice.each do |item| %>
<%= rendered "components/item" %> <%= rendered "components/item" %>
<% end %> <% end %>