Videos: Convert URL before putting result into cache #4850
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SamantazFox
force-pushed
the
url-convert-before-cache
branch
from
ed121e3 to
dc5e9c2
Compare
src/invidious/videos/parser.cr
Outdated
Comment on lines
139
to
149
| # This part is complex just because we can't directly edit inside a JSON::Any | ||
| # object, so we have to unpack everything, just to repack it afterwards. | ||
| if streaming_data = player_response["streamingData"]?.try &.as_h | ||
| new_streaming_data = {} of String => JSON::Any | ||
|
|
||
| streaming_data.each do |key, value| | ||
| if key == "formats" || key == "adaptiveFormats" | ||
| new_formats = [] of JSON::Any | ||
|
|
||
| value.as_a.map(&.as_h).each do |fmt| | ||
| fmt["url"] = JSON::Any.new(convert_url(fmt)) | ||
| new_formats << JSON::Any.new(fmt) | ||
| end | ||
|
|
||
| new_streaming_data[key] = JSON::Any.new(new_formats) | ||
| else | ||
| new_streaming_data[key] = value | ||
| end | ||
| end | ||
|
|
||
| params["streamingData"] = JSON::Any.new(new_streaming_data) | ||
| end | ||
|
|
There was a problem hiding this comment.
suggestion: It's entirely possible to mutate data in a JSON::Any. So I think this can be simplified quite a lot to something like this:
if streaming_data = player_response["streamingData"]?
%w[formats adaptiveFormats].each do |key|
streaming_data.as_h[key]?.try &.as_a.each do |format|
format.as_h["url"] = JSON::Any.new(convert_url(format))
end
end
endThere was a problem hiding this comment.
Thanks a lot! Now that seems obvious ^^
SamantazFox
force-pushed
the
url-convert-before-cache
branch
from
dc5e9c2 to
b2133c6
Compare
SamantazFox
added
the
in-testing
SamantazFox
added
ready
and removed
in-testing
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #4837