iv-org
/
invidious
mirror of https://github.com/iv-org/invidious.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3087 from iv-org/fix-captions-download 

Fix download of captions
This commit is contained in:
Samantaz Fox 2022-05-07 15:39:23 +02:00 committed by GitHub
parent ef8c7184de 81ca205caa
commit da8a2c7bbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/invidious/routes/watch.cr
View File

@ -308,25 +308,26 @@ module Invidious::Routes::Watch
extension = download_widget["ext"].as_s extension = download_widget["ext"].as_s
filename = "#{video_id}-#{title}.#{extension}" filename = "#{video_id}-#{title}.#{extension}"
# Pass form parameters as URL parameters for the handlers of both # Delete the now useless URL parameters
# /latest_version and /api/v1/captions. This avoids an un-necessary
# redirect and duplicated (and hazardous) sanity checks.
env.params.query["id"] = video_id
env.params.query["title"] = filename
# Delete the useless ones
env.params.body.delete("id") env.params.body.delete("id")
env.params.body.delete("title") env.params.body.delete("title")
env.params.body.delete("download_widget") env.params.body.delete("download_widget")
# Pass form parameters as URL parameters for the handlers of both
# /latest_version and /api/v1/captions. This avoids an un-necessary
# redirect and duplicated (and hazardous) sanity checks.
if label = download_widget["label"]? if label = download_widget["label"]?
# URL params specific to /api/v1/captions/:id # URL params specific to /api/v1/captions/:id
env.params.query["label"] = URI.encode_www_form(label.as_s, space_to_plus: false) env.params.url["id"] = video_id
env.params.query["title"] = filename
env.params.query["label"] = URI.decode_www_form(label.as_s)
return Invidious::Routes::API::V1::Videos.captions(env) return Invidious::Routes::API::V1::Videos.captions(env)
elsif itag = download_widget["itag"]?.try &.as_i elsif itag = download_widget["itag"]?.try &.as_i
# URL params specific to /latest_version # URL params specific to /latest_version
env.params.query["id"] = video_id
env.params.query["itag"] = itag.to_s env.params.query["itag"] = itag.to_s
env.params.query["title"] = filename
env.params.query["local"] = "true" env.params.query["local"] = "true"
return Invidious::Routes::VideoPlayback.latest_version(env) return Invidious::Routes::VideoPlayback.latest_version(env)