diff options
| author | Omar Roth <omarroth@hotmail.com> | 2019-03-25 16:32:11 -0500 |
|---|---|---|
| committer | Omar Roth <omarroth@hotmail.com> | 2019-03-25 17:09:20 -0500 |
| commit | 13924a83537040e6101f17dc07f8197edb12eab4 (patch) | |
| tree | c77a2c21e3e0334e9c678e9e8b9bcc335da416f2 | |
| parent | fd84b57ac8467992b23678aae9f7af04be8050de (diff) | |
| download | invidious-13924a83537040e6101f17dc07f8197edb12eab4.tar.gz invidious-13924a83537040e6101f17dc07f8197edb12eab4.tar.bz2 invidious-13924a83537040e6101f17dc07f8197edb12eab4.zip | |
Fix duplicate file extension
| -rw-r--r-- | src/invidious.cr | 10 | ||||
| -rw-r--r-- | src/invidious/views/watch.ecr | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/invidious.cr b/src/invidious.cr index 65a81f79..6824ec74 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -4228,15 +4228,15 @@ get "/videoplayback" do |env| client.get(url, headers) do |response| env.response.status_code = response.status_code - if title = env.params.query["title"]? - # https://blog.fastmail.com/2011/06/24/download-non-english-filenames/ - env.response.headers["Content-Disposition"] = "attachment; filename=\"#{URI.escape(title)}\"; filename*=UTF-8''#{URI.escape(title)}" - end - response.headers.each do |key, value| env.response.headers[key] = value end + if title = query_params["title"]? + # https://blog.fastmail.com/2011/06/24/download-non-english-filenames/ + env.response.headers["Content-Disposition"] = "attachment; filename=\"#{URI.escape(title)}\"; filename*=UTF-8''#{URI.escape(title)}" + end + env.response.headers["Access-Control-Allow-Origin"] = "*" begin diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr index 5173c9fb..0c812757 100644 --- a/src/invidious/views/watch.ecr +++ b/src/invidious/views/watch.ecr @@ -59,17 +59,17 @@ <label for="download_widget"><%= translate(locale, "Download as: ") %></label> <select style="width:100%" name="download_widget" id="download_widget"> <% video_streams.each do |option| %> - <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split("/")[1].split(";")[0] %>"}'> + <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split(";")[0].split("/")[1] %>"}'> <%= option["quality_label"] %> - <%= option["type"].split(";")[0] %> @ <%= option["fps"] %>fps - video only </option> <% end %> <% audio_streams.each do |option| %> - <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split("/")[1].split(";")[0] %>"}'> + <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split(";")[0].split("/")[1] %>"}'> <%= option["type"].split(";")[0] %> @ <%= option["bitrate"] %>k - audio only </option> <% end %> <% fmt_stream.each do |option| %> - <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split("/")[1].split(";")[0] %>"}'> + <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split(";")[0].split("/")[1] %>"}'> <%= itag_to_metadata?(option["itag"]).try &.["height"]? || "~240" %>p - <%= option["type"].split(";")[0] %> </option> <% end %> |