PrivateCoffee/invidious
4
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Detect the type of subscription import format based on the content type of the file uploaded

Browse source
This commit is contained in:
bbielsa 2021-11-03 00:45:03 -04:00 committed by Samantaz Fox
parent 62057e676a
commit 9607fe03af
No known key found for this signature in database
GPG key ID: F42821059186176E
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/invidious.cr
View file

@ -746,6 +746,8 @@ post "/data_control" do |env|
HTTP::FormData.parse(env.request) do |part| HTTP::FormData.parse(env.request) do |part|
body = part.body.gets_to_end body = part.body.gets_to_end
type = part.headers["Content-Type"]
next if body.empty? next if body.empty?
# TODO: Unify into single import based on content-type # TODO: Unify into single import based on content-type
@ -816,12 +818,12 @@ post "/data_control" do |env|
end end
end end
when "import_youtube" when "import_youtube"
if body[0..4] == "<opml" if type == "application/xml"
subscriptions = XML.parse(body) subscriptions = XML.parse(body)
user.subscriptions += subscriptions.xpath_nodes(%q(//outline[@type="rss"])).map do |channel| user.subscriptions += subscriptions.xpath_nodes(%q(//outline[@type="rss"])).map do |channel|
channel["xmlUrl"].match(/UC[a-zA-Z0-9_-]{22}/).not_nil![0] channel["xmlUrl"].match(/UC[a-zA-Z0-9_-]{22}/).not_nil![0]
end end
elsif body[0] == '[' elsif type == "application/json"
subscriptions = JSON.parse(body) subscriptions = JSON.parse(body)
user.subscriptions += subscriptions.as_a.compact_map do |entry| user.subscriptions += subscriptions.as_a.compact_map do |entry|
entry["snippet"]["resourceId"]["channelId"].as_s entry["snippet"]["resourceId"]["channelId"].as_s