summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamantaz Fox <coding@samantaz.fr>2022-01-12 18:13:15 +0100
committerSamantaz Fox <coding@samantaz.fr>2022-01-12 18:13:15 +0100
commiteff8b23f57bbec2d6d33fb577f8bf9604da86d16 (patch)
treea922857b80d59266c8bfe9f59a6c0a7e353b6d94
parent81a2300af88c137e1c9be7577a9c68deb45499a0 (diff)
downloadinvidious-eff8b23f57bbec2d6d33fb577f8bf9604da86d16.tar.gz
invidious-eff8b23f57bbec2d6d33fb577f8bf9604da86d16.tar.bz2
invidious-eff8b23f57bbec2d6d33fb577f8bf9604da86d16.zip
Improve youtube import type detection
Code courtesy of bbielsa: https://gist.github.com/bbielsa/7d131aa2188945f591a8379ec0defc9b
-rw-r--r--src/invidious.cr15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/invidious.cr b/src/invidious.cr
index 85053da2..7a324bd1 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -818,22 +818,29 @@ post "/data_control" do |env|
end
end
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)
user.subscriptions += subscriptions.xpath_nodes(%q(//outline[@type="rss"])).map do |channel|
channel["xmlUrl"].match(/UC[a-zA-Z0-9_-]{22}/).not_nil![0]
end
- elsif type == "application/json"
+ elsif extension == "json" || type == "application/json"
subscriptions = JSON.parse(body)
user.subscriptions += subscriptions.as_a.compact_map do |entry|
entry["snippet"]["resourceId"]["channelId"].as_s
end
- else
+ elsif extension == "csv" || type == "text/csv"
subscriptions = parse_subscription_export_csv(body)
user.subscriptions += subscriptions
+ else
+ halt(env, status_code: 415,
+ response: error_template(415, "Invalid subscription file uploaded")
+ )
end
- user.subscriptions.uniq!
+ user.subscriptions.uniq!
user.subscriptions = get_batch_channels(user.subscriptions, false, false)
Invidious::Database::Users.update_subscriptions(user)