Git-Mirrors/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-12-29 09:16:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve youtube import type detection

Browse Source 
Code courtesy of bbielsa:
https://gist.github.com/bbielsa/7d131aa2188945f591a8379ec0defc9b
This commit is contained in:
Samantaz Fox 2022-01-12 18:13:15 +01:00
parent 81a2300af8
commit eff8b23f57
No known key found for this signature in database
GPG Key ID: F42821059186176E
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/invidious.cr
View File

@ -818,22 +818,29 @@ post "/data_control" do |env|
end end
end end
when "import_youtube" when "import_youtube"
if type == "application/xml" || type == "text/xml" filename = part.filename || ""
extension = filename.split(".").last
if extension == "xml" || type == "application/xml" || type == "text/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 type == "application/json" elsif extension == "json" || 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
end end
else elsif extension == "csv" || type == "text/csv"
subscriptions = parse_subscription_export_csv(body) subscriptions = parse_subscription_export_csv(body)
user.subscriptions += subscriptions user.subscriptions += subscriptions
else
halt(env, status_code: 415,
response: error_template(415, "Invalid subscription file uploaded")
)
end end
user.subscriptions.uniq!
user.subscriptions.uniq!
user.subscriptions = get_batch_channels(user.subscriptions, false, false) user.subscriptions = get_batch_channels(user.subscriptions, false, false)
Invidious::Database::Users.update_subscriptions(user) Invidious::Database::Users.update_subscriptions(user)