mirror of
https://github.com/iv-org/invidious
synced 2024-11-27 21:43:28 +01:00
Merge pull request #1520 from matthewmcgarvey/extract-search-endpoints
Extracting search endpoints from global file
This commit is contained in:
commit
555cee3500
@ -311,68 +311,9 @@ Invidious::Routing.get "/add_playlist_items", Invidious::Routes::Playlists, :add
|
|||||||
Invidious::Routing.post "/playlist_ajax", Invidious::Routes::Playlists, :playlist_ajax
|
Invidious::Routing.post "/playlist_ajax", Invidious::Routes::Playlists, :playlist_ajax
|
||||||
Invidious::Routing.get "/playlist", Invidious::Routes::Playlists, :show
|
Invidious::Routing.get "/playlist", Invidious::Routes::Playlists, :show
|
||||||
Invidious::Routing.get "/mix", Invidious::Routes::Playlists, :mix
|
Invidious::Routing.get "/mix", Invidious::Routes::Playlists, :mix
|
||||||
|
Invidious::Routing.get "/opensearch.xml", Invidious::Routes::Search, :opensearch
|
||||||
# Search
|
Invidious::Routing.get "/results", Invidious::Routes::Search, :results
|
||||||
|
Invidious::Routing.get "/search", Invidious::Routes::Search, :search
|
||||||
get "/opensearch.xml" do |env|
|
|
||||||
locale = LOCALES[env.get("preferences").as(Preferences).locale]?
|
|
||||||
env.response.content_type = "application/opensearchdescription+xml"
|
|
||||||
|
|
||||||
XML.build(indent: " ", encoding: "UTF-8") do |xml|
|
|
||||||
xml.element("OpenSearchDescription", xmlns: "http://a9.com/-/spec/opensearch/1.1/") do
|
|
||||||
xml.element("ShortName") { xml.text "Invidious" }
|
|
||||||
xml.element("LongName") { xml.text "Invidious Search" }
|
|
||||||
xml.element("Description") { xml.text "Search for videos, channels, and playlists on Invidious" }
|
|
||||||
xml.element("InputEncoding") { xml.text "UTF-8" }
|
|
||||||
xml.element("Image", width: 48, height: 48, type: "image/x-icon") { xml.text "#{HOST_URL}/favicon.ico" }
|
|
||||||
xml.element("Url", type: "text/html", method: "get", template: "#{HOST_URL}/search?q={searchTerms}")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
get "/results" do |env|
|
|
||||||
locale = LOCALES[env.get("preferences").as(Preferences).locale]?
|
|
||||||
|
|
||||||
query = env.params.query["search_query"]?
|
|
||||||
query ||= env.params.query["q"]?
|
|
||||||
query ||= ""
|
|
||||||
|
|
||||||
page = env.params.query["page"]?.try &.to_i?
|
|
||||||
page ||= 1
|
|
||||||
|
|
||||||
if query
|
|
||||||
env.redirect "/search?q=#{URI.encode_www_form(query)}&page=#{page}"
|
|
||||||
else
|
|
||||||
env.redirect "/"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
get "/search" do |env|
|
|
||||||
locale = LOCALES[env.get("preferences").as(Preferences).locale]?
|
|
||||||
region = env.params.query["region"]?
|
|
||||||
|
|
||||||
query = env.params.query["search_query"]?
|
|
||||||
query ||= env.params.query["q"]?
|
|
||||||
query ||= ""
|
|
||||||
|
|
||||||
if query.empty?
|
|
||||||
next env.redirect "/"
|
|
||||||
end
|
|
||||||
|
|
||||||
page = env.params.query["page"]?.try &.to_i?
|
|
||||||
page ||= 1
|
|
||||||
|
|
||||||
user = env.get? "user"
|
|
||||||
|
|
||||||
begin
|
|
||||||
search_query, count, videos = process_search_query(query, page, user, region: nil)
|
|
||||||
rescue ex
|
|
||||||
next error_template(500, ex)
|
|
||||||
end
|
|
||||||
|
|
||||||
env.set "search", query
|
|
||||||
templated "search"
|
|
||||||
end
|
|
||||||
|
|
||||||
# Users
|
# Users
|
||||||
|
|
||||||
|
59
src/invidious/routes/search.cr
Normal file
59
src/invidious/routes/search.cr
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
class Invidious::Routes::Search < Invidious::Routes::BaseRoute
|
||||||
|
def opensearch(env)
|
||||||
|
locale = LOCALES[env.get("preferences").as(Preferences).locale]?
|
||||||
|
env.response.content_type = "application/opensearchdescription+xml"
|
||||||
|
|
||||||
|
XML.build(indent: " ", encoding: "UTF-8") do |xml|
|
||||||
|
xml.element("OpenSearchDescription", xmlns: "http://a9.com/-/spec/opensearch/1.1/") do
|
||||||
|
xml.element("ShortName") { xml.text "Invidious" }
|
||||||
|
xml.element("LongName") { xml.text "Invidious Search" }
|
||||||
|
xml.element("Description") { xml.text "Search for videos, channels, and playlists on Invidious" }
|
||||||
|
xml.element("InputEncoding") { xml.text "UTF-8" }
|
||||||
|
xml.element("Image", width: 48, height: 48, type: "image/x-icon") { xml.text "#{HOST_URL}/favicon.ico" }
|
||||||
|
xml.element("Url", type: "text/html", method: "get", template: "#{HOST_URL}/search?q={searchTerms}")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def results(env)
|
||||||
|
locale = LOCALES[env.get("preferences").as(Preferences).locale]?
|
||||||
|
|
||||||
|
query = env.params.query["search_query"]?
|
||||||
|
query ||= env.params.query["q"]?
|
||||||
|
query ||= ""
|
||||||
|
|
||||||
|
page = env.params.query["page"]?.try &.to_i?
|
||||||
|
page ||= 1
|
||||||
|
|
||||||
|
if query
|
||||||
|
env.redirect "/search?q=#{URI.encode_www_form(query)}&page=#{page}"
|
||||||
|
else
|
||||||
|
env.redirect "/"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def search(env)
|
||||||
|
locale = LOCALES[env.get("preferences").as(Preferences).locale]?
|
||||||
|
region = env.params.query["region"]?
|
||||||
|
|
||||||
|
query = env.params.query["search_query"]?
|
||||||
|
query ||= env.params.query["q"]?
|
||||||
|
query ||= ""
|
||||||
|
|
||||||
|
return env.redirect "/" if query.empty?
|
||||||
|
|
||||||
|
page = env.params.query["page"]?.try &.to_i?
|
||||||
|
page ||= 1
|
||||||
|
|
||||||
|
user = env.get? "user"
|
||||||
|
|
||||||
|
begin
|
||||||
|
search_query, count, videos = process_search_query(query, page, user, region: nil)
|
||||||
|
rescue ex
|
||||||
|
return error_template(500, ex)
|
||||||
|
end
|
||||||
|
|
||||||
|
env.set "search", query
|
||||||
|
templated "search"
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue
Block a user